chore: bump version to v6.2.0a1

Checking if it fixes an issue w/ async validators

.github/workflows/typegen-checks.yml

@@ -39,18 +39,6 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      - name: Free up more disk space on the runner
-        # https://github.com/actions/runner-images/issues/2840#issuecomment-1284059930
-        run: |
-          echo "----- Free space before cleanup"
-          df -h
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          sudo swapoff /mnt/swapfile
-          sudo rm -rf /mnt/swapfile
-          echo "----- Free space after cleanup"
-          df -h
-
       - name: check for changed files
         if: ${{ inputs.always_run != true }}
         id: changed-files

docker/.env.sample

@@ -22,10 +22,6 @@
 ## GPU_DRIVER can be set to either `cuda` or `rocm` to enable GPU support in the container accordingly.
 # GPU_DRIVER=cuda #| rocm
 
-## If you are using ROCM, you will need to ensure that the render group within the container and the host system use the same group ID.
-## To obtain the group ID of the render group on the host system, run `getent group render` and grab the number.
-# RENDER_GROUP_ID=
-
 ## CONTAINER_UID can be set to the UID of the user on the host system that should own the files in the container.
 ## It is usually not necessary to change this. Use `id -u` on the host system to find the UID.
 # CONTAINER_UID=1000

docker/Dockerfile

@@ -43,6 +43,7 @@ ENV \
     UV_MANAGED_PYTHON=1 \
     UV_LINK_MODE=copy \
     UV_PROJECT_ENVIRONMENT=/opt/venv \
+    UV_INDEX="https://download.pytorch.org/whl/cu124" \
     INVOKEAI_ROOT=/invokeai \
     INVOKEAI_HOST=0.0.0.0 \
     INVOKEAI_PORT=9090 \
@@ -73,18 +74,20 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     # this is just to get the package manager to recognize that the project exists, without making changes to the docker layer
     --mount=type=bind,source=invokeai/version,target=invokeai/version \
-    ulimit -n 30000 && \
-    uv sync --extra $GPU_DRIVER --frozen
-
-# Link amdgpu.ids for ROCm builds
-# contributed by https://github.com/Rubonnek
-RUN mkdir -p "/opt/amdgpu/share/libdrm" &&\
-    ln -s "/usr/share/libdrm/amdgpu.ids" "/opt/amdgpu/share/libdrm/amdgpu.ids" && groupadd render
+    if [ "$TARGETPLATFORM" = "linux/arm64" ] || [ "$GPU_DRIVER" = "cpu" ]; then UV_INDEX="https://download.pytorch.org/whl/cpu"; \
+    elif [ "$GPU_DRIVER" = "rocm" ]; then UV_INDEX="https://download.pytorch.org/whl/rocm6.2"; \
+    fi && \
+    uv sync --frozen
 
 # build patchmatch
 RUN cd /usr/lib/$(uname -p)-linux-gnu/pkgconfig/ && ln -sf opencv4.pc opencv.pc
 RUN python -c "from patchmatch import patch_match"
 
+# Link amdgpu.ids for ROCm builds
+# contributed by https://github.com/Rubonnek
+RUN mkdir -p "/opt/amdgpu/share/libdrm" &&\
+    ln -s "/usr/share/libdrm/amdgpu.ids" "/opt/amdgpu/share/libdrm/amdgpu.ids"
+
 RUN mkdir -p ${INVOKEAI_ROOT} && chown -R ${CONTAINER_UID}:${CONTAINER_GID} ${INVOKEAI_ROOT}
 
 COPY docker/docker-entrypoint.sh ./
@@ -102,6 +105,8 @@ COPY invokeai ${INVOKEAI_SRC}/invokeai
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     --mount=type=bind,source=uv.lock,target=uv.lock \
-    ulimit -n 30000 && \
-    uv pip install -e .[$GPU_DRIVER]
+    if [ "$TARGETPLATFORM" = "linux/arm64" ] || [ "$GPU_DRIVER" = "cpu" ]; then UV_INDEX="https://download.pytorch.org/whl/cpu"; \
+    elif [ "$GPU_DRIVER" = "rocm" ]; then UV_INDEX="https://download.pytorch.org/whl/rocm6.2"; \
+    fi && \
+    uv pip install -e .
 

docker/Dockerfile-rocm-full

@@ -1,136 +0,0 @@
-# syntax=docker/dockerfile:1.4
-
-#### Web UI ------------------------------------
-
-FROM docker.io/node:22-slim AS web-builder
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack use pnpm@8.x
-RUN corepack enable
-
-WORKDIR /build
-COPY invokeai/frontend/web/ ./
-RUN --mount=type=cache,target=/pnpm/store \
-    pnpm install --frozen-lockfile
-RUN npx vite build
-
-## Backend ---------------------------------------
-
-FROM library/ubuntu:24.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
-RUN --mount=type=cache,target=/var/cache/apt \
-    --mount=type=cache,target=/var/lib/apt \
-    apt update && apt install -y --no-install-recommends \
-    ca-certificates \
-    git \
-    gosu \
-    libglib2.0-0 \
-    libgl1 \
-    libglx-mesa0 \
-    build-essential \
-    libopencv-dev \
-    libstdc++-10-dev \
-    wget
-
-ENV \
-    PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    VIRTUAL_ENV=/opt/venv \
-    INVOKEAI_SRC=/opt/invokeai \
-    PYTHON_VERSION=3.12 \
-    UV_PYTHON=3.12 \
-    UV_COMPILE_BYTECODE=1 \
-    UV_MANAGED_PYTHON=1 \
-    UV_LINK_MODE=copy \
-    UV_PROJECT_ENVIRONMENT=/opt/venv \
-    INVOKEAI_ROOT=/invokeai \
-    INVOKEAI_HOST=0.0.0.0 \
-    INVOKEAI_PORT=9090 \
-    PATH="/opt/venv/bin:$PATH" \
-    CONTAINER_UID=${CONTAINER_UID:-1000} \
-    CONTAINER_GID=${CONTAINER_GID:-1000}
-
-ARG GPU_DRIVER=cuda
-
-# Install `uv` for package management
-COPY --from=ghcr.io/astral-sh/uv:0.6.9 /uv /uvx /bin/
-
-# Install python & allow non-root user to use it by traversing the /root dir without read permissions
-RUN --mount=type=cache,target=/root/.cache/uv \
-    uv python install ${PYTHON_VERSION} && \
-    # chmod --recursive a+rX /root/.local/share/uv/python
-    chmod 711 /root
-
-WORKDIR ${INVOKEAI_SRC}
-
-# Install project's dependencies as a separate layer so they aren't rebuilt every commit.
-# bind-mount instead of copy to defer adding sources to the image until next layer.
-#
-# NOTE: there are no pytorch builds for arm64 + cuda, only cpu
-# x86_64/CUDA is the default
-RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    --mount=type=bind,source=uv.lock,target=uv.lock \
-    # this is just to get the package manager to recognize that the project exists, without making changes to the docker layer
-    --mount=type=bind,source=invokeai/version,target=invokeai/version \
-    ulimit -n 30000 && \
-    uv sync --extra $GPU_DRIVER --frozen
-
-RUN --mount=type=cache,target=/var/cache/apt \
-    --mount=type=cache,target=/var/lib/apt \
-    if [ "$GPU_DRIVER" = "rocm" ]; then \
-    wget -O /tmp/amdgpu-install.deb \
-    https://repo.radeon.com/amdgpu-install/6.3.4/ubuntu/noble/amdgpu-install_6.3.60304-1_all.deb && \
-    apt install -y /tmp/amdgpu-install.deb && \
-    apt update && \
-    amdgpu-install --usecase=rocm -y && \
-    apt-get autoclean && \
-    apt clean && \
-    rm -rf /tmp/* /var/tmp/* && \
-    usermod -a -G render ubuntu && \
-    usermod -a -G video ubuntu && \
-    echo "\\n/opt/rocm/lib\\n/opt/rocm/lib64" >> /etc/ld.so.conf.d/rocm.conf && \
-    ldconfig && \
-    update-alternatives --auto rocm; \
-    fi
-
-## Heathen711: Leaving this for review input, will remove before merge
-# RUN --mount=type=cache,target=/var/cache/apt \
-#     --mount=type=cache,target=/var/lib/apt \
-#     if [ "$GPU_DRIVER" = "rocm" ]; then \
-#     groupadd render && \
-#     usermod -a -G render ubuntu && \
-#     usermod -a -G video ubuntu; \
-#     fi
-
-## Link amdgpu.ids for ROCm builds
-## contributed by https://github.com/Rubonnek
-# RUN mkdir -p "/opt/amdgpu/share/libdrm" &&\
-#     ln -s "/usr/share/libdrm/amdgpu.ids" "/opt/amdgpu/share/libdrm/amdgpu.ids"
-
-# build patchmatch
-RUN cd /usr/lib/$(uname -p)-linux-gnu/pkgconfig/ && ln -sf opencv4.pc opencv.pc
-RUN python -c "from patchmatch import patch_match"
-
-RUN mkdir -p ${INVOKEAI_ROOT} && chown -R ${CONTAINER_UID}:${CONTAINER_GID} ${INVOKEAI_ROOT}
-
-COPY docker/docker-entrypoint.sh ./
-ENTRYPOINT ["/opt/invokeai/docker-entrypoint.sh"]
-CMD ["invokeai-web"]
-
-# --link requires buldkit w/ dockerfile syntax 1.4, does not work with podman
-COPY --link --from=web-builder /build/dist ${INVOKEAI_SRC}/invokeai/frontend/web/dist
-
-# add sources last to minimize image changes on code changes
-COPY invokeai ${INVOKEAI_SRC}/invokeai
-
-# this should not increase image size because we've already installed dependencies
-# in a previous layer
-RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    --mount=type=bind,source=uv.lock,target=uv.lock \
-    ulimit -n 30000 && \
-    uv pip install -e .[$GPU_DRIVER]
-

docker/docker-compose.yml

@@ -47,9 +47,8 @@ services:
 
   invokeai-rocm:
     <<: *invokeai
-    environment:
-      - AMD_VISIBLE_DEVICES=all
-      - RENDER_GROUP_ID=${RENDER_GROUP_ID}
-    runtime: amd
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
     profiles:
       - rocm

docker/docker-entrypoint.sh

@@ -21,17 +21,6 @@ _=$(id ${USER} 2>&1) || useradd -u ${USER_ID} ${USER}
 # ensure the UID is correct
 usermod -u ${USER_ID} ${USER} 1>/dev/null
 
-## ROCM specific configuration
-# render group within the container must match the host render group
-# otherwise the container will not be able to access the host GPU.
-if [[ -v "RENDER_GROUP_ID" ]] && [[ ! -z "${RENDER_GROUP_ID}" ]]; then
-  # ensure the render group exists
-  groupmod -g ${RENDER_GROUP_ID} render
-  usermod -a -G render ${USER}
-  usermod -a -G video ${USER}
-fi
-
-
 ### Set the $PUBLIC_KEY env var to enable SSH access.
 # We do not install openssh-server in the image by default to avoid bloat.
 # but it is useful to have the full SSH server e.g. on Runpod.

docker/run.sh

@@ -13,7 +13,7 @@ run() {
 
   # parse .env file for build args
   build_args=$(awk '$1 ~ /=[^$]/ && $0 !~ /^#/ {print "--build-arg " $0 " "}' .env) &&
-  profile="$(awk -F '=' '/GPU_DRIVER=/ {print $2}' .env)"
+  profile="$(awk -F '=' '/GPU_DRIVER/ {print $2}' .env)"
 
   # default to 'cuda' profile
   [[ -z "$profile" ]] && profile="cuda"
@@ -30,7 +30,7 @@ run() {
 
   printf "%s\n" "starting service $service_name"
   docker compose --profile "$profile" up -d "$service_name"
-  docker compose --profile "$profile" logs -f
+  docker compose logs -f
 }
 
 run

docs/installation/manual.md

@@ -69,34 +69,34 @@ The following commands vary depending on the version of Invoke being installed a
     - If you have an Nvidia 20xx series GPU or older, use `invokeai[xformers]`.
     - If you have an Nvidia 30xx series GPU or newer, or do not have an Nvidia GPU, use `invokeai`.
 
-7. Determine the torch backend to use for installation, if any. This is necessary to get the right version of torch installed. This is acheived by using [UV's built in torch support.](https://docs.astral.sh/uv/guides/integration/pytorch/#automatic-backend-selection)
+7. Determine the `PyPI` index URL to use for installation, if any. This is necessary to get the right version of torch installed.
 
     === "Invoke v5.12 and later"
 
-        - If you are on Windows or Linux with an Nvidia GPU, use `--torch-backend=cu128`.
-        - If you are on Linux with no GPU, use `--torch-backend=cpu`.
-        - If you are on Linux with an AMD GPU, use `--torch-backend=rocm6.3`.
-        - **In all other cases, do not use a torch backend.**
+        - If you are on Windows or Linux with an Nvidia GPU, use `https://download.pytorch.org/whl/cu128`.
+        - If you are on Linux with no GPU, use `https://download.pytorch.org/whl/cpu`.
+        - If you are on Linux with an AMD GPU, use `https://download.pytorch.org/whl/rocm6.2.4`.
+        - **In all other cases, do not use an index.**
 
     === "Invoke v5.10.0 to v5.11.0"
 
-        - If you are on Windows or Linux with an Nvidia GPU, use `--torch-backend=cu126`.
-        - If you are on Linux with no GPU, use `--torch-backend=cpu`.
-        - If you are on Linux with an AMD GPU, use `--torch-backend=rocm6.2.4`.
+        - If you are on Windows or Linux with an Nvidia GPU, use `https://download.pytorch.org/whl/cu126`.
+        - If you are on Linux with no GPU, use `https://download.pytorch.org/whl/cpu`.
+        - If you are on Linux with an AMD GPU, use `https://download.pytorch.org/whl/rocm6.2.4`.
         - **In all other cases, do not use an index.**
 
     === "Invoke v5.0.0 to v5.9.1"
 
-        - If you are on Windows with an Nvidia GPU, use `--torch-backend=cu124`.
-        - If you are on Linux with no GPU, use `--torch-backend=cpu`.
-        - If you are on Linux with an AMD GPU, use `--torch-backend=rocm6.1`.
+        - If you are on Windows with an Nvidia GPU, use `https://download.pytorch.org/whl/cu124`.
+        - If you are on Linux with no GPU, use `https://download.pytorch.org/whl/cpu`.
+        - If you are on Linux with an AMD GPU, use `https://download.pytorch.org/whl/rocm6.1`.
         - **In all other cases, do not use an index.**
 
     === "Invoke v4"
 
-        - If you are on Windows with an Nvidia GPU, use `--torch-backend=cu124`.
-        - If you are on Linux with no GPU, use `--torch-backend=cpu`.
-        - If you are on Linux with an AMD GPU, use `--torch-backend=rocm5.2`.
+        - If you are on Windows with an Nvidia GPU, use `https://download.pytorch.org/whl/cu124`.
+        - If you are on Linux with no GPU, use `https://download.pytorch.org/whl/cpu`.
+        - If you are on Linux with an AMD GPU, use `https://download.pytorch.org/whl/rocm5.2`.
         - **In all other cases, do not use an index.**
 
 8. Install the `invokeai` package. Substitute the package specifier and version.
@@ -105,10 +105,10 @@ The following commands vary depending on the version of Invoke being installed a
     uv pip install <PACKAGE_SPECIFIER>==<VERSION> --python 3.12 --python-preference only-managed --force-reinstall
     ```
 
-    If you determined you needed to use a torch backend in the previous step, you'll need to set the backend like this:
+    If you determined you needed to use a `PyPI` index URL in the previous step, you'll need to add `--index=<INDEX_URL>` like this:
 
     ```sh
-    uv pip install <PACKAGE_SPECIFIER>==<VERSION> --python 3.12 --python-preference only-managed --torch-backend=<VERSION> --force-reinstall
+    uv pip install <PACKAGE_SPECIFIER>==<VERSION> --python 3.12 --python-preference only-managed --index=<INDEX_URL> --force-reinstall
     ```
 
 9. Deactivate and reactivate your venv so that the invokeai-specific commands become available in the environment:

invokeai/app/api/routers/app_info.py

@@ -5,9 +5,9 @@ from pathlib import Path
 from typing import Optional
 
 import torch
-from fastapi import Body
+from fastapi import Body, HTTPException, Query
 from fastapi.routing import APIRouter
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, JsonValue
 
 from invokeai.app.api.dependencies import ApiDependencies
 from invokeai.app.invocations.upscale import ESRGAN_MODELS
@@ -173,3 +173,50 @@ async def disable_invocation_cache() -> None:
 async def get_invocation_cache_status() -> InvocationCacheStatus:
     """Clears the invocation cache"""
     return ApiDependencies.invoker.services.invocation_cache.get_status()
+
+
+@app_router.get(
+    "/client_state",
+    operation_id="get_client_state_by_key",
+    response_model=JsonValue | None,
+)
+async def get_client_state_by_key(
+    key: str = Query(..., description="Key to get"),
+) -> JsonValue | None:
+    """Gets the client state"""
+    try:
+        return ApiDependencies.invoker.services.client_state_persistence.get_by_key(key)
+    except Exception as e:
+        logging.error(f"Error getting client state: {e}")
+        raise HTTPException(status_code=500, detail="Error setting client state")
+
+
+@app_router.post(
+    "/client_state",
+    operation_id="set_client_state",
+    response_model=None,
+)
+async def set_client_state(
+    key: str = Query(..., description="Key to set"),
+    value: JsonValue = Body(..., description="Value of the key"),
+) -> None:
+    """Sets the client state"""
+    try:
+        ApiDependencies.invoker.services.client_state_persistence.set_by_key(key, value)
+    except Exception as e:
+        logging.error(f"Error setting client state: {e}")
+        raise HTTPException(status_code=500, detail="Error setting client state")
+
+
+@app_router.delete(
+    "/client_state",
+    operation_id="delete_client_state",
+    responses={204: {"description": "Client state deleted"}},
+)
+async def delete_client_state() -> None:
+    """Deletes the client state"""
+    try:
+        ApiDependencies.invoker.services.client_state_persistence.delete()
+    except Exception as e:
+        logging.error(f"Error deleting client state: {e}")
+        raise HTTPException(status_code=500, detail="Error deleting client state")

invokeai/app/api/routers/client_state.py

@@ -1,58 +0,0 @@
-from fastapi import Body, HTTPException, Path, Query
-from fastapi.routing import APIRouter
-
-from invokeai.app.api.dependencies import ApiDependencies
-from invokeai.backend.util.logging import logging
-
-client_state_router = APIRouter(prefix="/v1/client_state", tags=["client_state"])
-
-
-@client_state_router.get(
-    "/{queue_id}/get_by_key",
-    operation_id="get_client_state_by_key",
-    response_model=str | None,
-)
-async def get_client_state_by_key(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-    key: str = Query(..., description="Key to get"),
-) -> str | None:
-    """Gets the client state"""
-    try:
-        return ApiDependencies.invoker.services.client_state_persistence.get_by_key(queue_id, key)
-    except Exception as e:
-        logging.error(f"Error getting client state: {e}")
-        raise HTTPException(status_code=500, detail="Error setting client state")
-
-
-@client_state_router.post(
-    "/{queue_id}/set_by_key",
-    operation_id="set_client_state",
-    response_model=str,
-)
-async def set_client_state(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-    key: str = Query(..., description="Key to set"),
-    value: str = Body(..., description="Stringified value to set"),
-) -> str:
-    """Sets the client state"""
-    try:
-        return ApiDependencies.invoker.services.client_state_persistence.set_by_key(queue_id, key, value)
-    except Exception as e:
-        logging.error(f"Error setting client state: {e}")
-        raise HTTPException(status_code=500, detail="Error setting client state")
-
-
-@client_state_router.post(
-    "/{queue_id}/delete",
-    operation_id="delete_client_state",
-    responses={204: {"description": "Client state deleted"}},
-)
-async def delete_client_state(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-) -> None:
-    """Deletes the client state"""
-    try:
-        ApiDependencies.invoker.services.client_state_persistence.delete(queue_id)
-    except Exception as e:
-        logging.error(f"Error deleting client state: {e}")
-        raise HTTPException(status_code=500, detail="Error deleting client state")

invokeai/app/api_app.py

@@ -19,7 +19,6 @@ from invokeai.app.api.routers import (
     app_info,
     board_images,
     boards,
-    client_state,
     download_queue,
     images,
     model_manager,
@@ -132,7 +131,6 @@ app.include_router(app_info.app_router, prefix="/api")
 app.include_router(session_queue.session_queue_router, prefix="/api")
 app.include_router(workflows.workflows_router, prefix="/api")
 app.include_router(style_presets.style_presets_router, prefix="/api")
-app.include_router(client_state.client_state_router, prefix="/api")
 
 app.openapi = get_openapi_func(app)
 
@@ -157,12 +155,6 @@ def overridden_redoc() -> HTMLResponse:
 
 web_root_path = Path(list(web_dir.__path__)[0])
 
-if app_config.unsafe_disable_picklescan:
-    logger.warning(
-        "The unsafe_disable_picklescan option is enabled. This disables malware scanning while installing and"
-        "loading models, which may allow malicious code to be executed. Use at your own risk."
-    )
-
 try:
     app.mount("/", NoCacheStaticFiles(directory=Path(web_root_path, "dist"), html=True), name="ui")
 except RuntimeError:

invokeai/app/invocations/flux_denoise.py

@@ -63,7 +63,7 @@ from invokeai.backend.util.devices import TorchDevice
     title="FLUX Denoise",
     tags=["image", "flux"],
     category="image",
-    version="4.1.0",
+    version="4.0.0",
 )
 class FluxDenoiseInvocation(BaseInvocation):
     """Run denoising process with a FLUX transformer model."""
@@ -153,7 +153,7 @@ class FluxDenoiseInvocation(BaseInvocation):
         description=FieldDescriptions.ip_adapter, title="IP-Adapter", default=None, input=Input.Connection
     )
 
-    kontext_conditioning: FluxKontextConditioningField | list[FluxKontextConditioningField] | None = InputField(
+    kontext_conditioning: Optional[FluxKontextConditioningField] = InputField(
         default=None,
         description="FLUX Kontext conditioning (reference image).",
         input=Input.Connection,
@@ -386,15 +386,13 @@ class FluxDenoiseInvocation(BaseInvocation):
             )
 
             kontext_extension = None
-            if self.kontext_conditioning:
+            if self.kontext_conditioning is not None:
                 if not self.controlnet_vae:
                     raise ValueError("A VAE (e.g., controlnet_vae) must be provided to use Kontext conditioning.")
 
                 kontext_extension = KontextExtension(
                     context=context,
-                    kontext_conditioning=self.kontext_conditioning
-                    if isinstance(self.kontext_conditioning, list)
-                    else [self.kontext_conditioning],
+                    kontext_conditioning=self.kontext_conditioning,
                     vae_field=self.controlnet_vae,
                     device=TorchDevice.choose_torch_device(),
                     dtype=inference_dtype,

invokeai/app/invocations/image.py

@@ -1347,96 +1347,3 @@ class PasteImageIntoBoundingBoxInvocation(BaseInvocation, WithMetadata, WithBoar
 
         image_dto = context.images.save(image=target_image)
         return ImageOutput.build(image_dto)
-
-
-@invocation(
-    "flux_kontext_image_prep",
-    title="FLUX Kontext Image Prep",
-    tags=["image", "concatenate", "flux", "kontext"],
-    category="image",
-    version="1.0.0",
-)
-class FluxKontextConcatenateImagesInvocation(BaseInvocation, WithMetadata, WithBoard):
-    """Prepares an image or images for use with FLUX Kontext. The first/single image is resized to the nearest
-    preferred Kontext resolution. All other images are concatenated horizontally, maintaining their aspect ratio."""
-
-    images: list[ImageField] = InputField(
-        description="The images to concatenate",
-        min_length=1,
-        max_length=10,
-    )
-
-    use_preferred_resolution: bool = InputField(
-        default=True, description="Use FLUX preferred resolutions for the first image"
-    )
-
-    def invoke(self, context: InvocationContext) -> ImageOutput:
-        from invokeai.backend.flux.util import PREFERED_KONTEXT_RESOLUTIONS
-
-        # Step 1: Load all images
-        pil_images = []
-        for image_field in self.images:
-            image = context.images.get_pil(image_field.image_name, mode="RGBA")
-            pil_images.append(image)
-
-        # Step 2: Determine target resolution for the first image
-        first_image = pil_images[0]
-        width, height = first_image.size
-
-        if self.use_preferred_resolution:
-            aspect_ratio = width / height
-
-            # Find the closest preferred resolution for the first image
-            _, target_width, target_height = min(
-                ((abs(aspect_ratio - w / h), w, h) for w, h in PREFERED_KONTEXT_RESOLUTIONS), key=lambda x: x[0]
-            )
-
-            # Apply BFL's scaling formula
-            scaled_height = 2 * int(target_height / 16)
-            final_height = 8 * scaled_height  # This will be consistent for all images
-            scaled_width = 2 * int(target_width / 16)
-            first_width = 8 * scaled_width
-        else:
-            # Use original dimensions of first image, ensuring divisibility by 16
-            final_height = 16 * (height // 16)
-            first_width = 16 * (width // 16)
-            # Ensure minimum dimensions
-            if final_height < 16:
-                final_height = 16
-            if first_width < 16:
-                first_width = 16
-
-        # Step 3: Process and resize all images with consistent height
-        processed_images = []
-        total_width = 0
-
-        for i, image in enumerate(pil_images):
-            if i == 0:
-                # First image uses the calculated dimensions
-                final_width = first_width
-            else:
-                # Subsequent images maintain aspect ratio with the same height
-                img_aspect_ratio = image.width / image.height
-                # Calculate width that maintains aspect ratio at the target height
-                calculated_width = int(final_height * img_aspect_ratio)
-                # Ensure width is divisible by 16 for proper VAE encoding
-                final_width = 16 * (calculated_width // 16)
-                # Ensure minimum width
-                if final_width < 16:
-                    final_width = 16
-
-            # Resize image to calculated dimensions
-            resized_image = image.resize((final_width, final_height), Image.Resampling.LANCZOS)
-            processed_images.append(resized_image)
-            total_width += final_width
-
-        # Step 4: Concatenate images horizontally
-        concatenated_image = Image.new("RGB", (total_width, final_height))
-        x_offset = 0
-        for img in processed_images:
-            concatenated_image.paste(img, (x_offset, 0))
-            x_offset += img.width
-
-        # Save the concatenated image
-        image_dto = context.images.save(image=concatenated_image)
-        return ImageOutput.build(image_dto)

invokeai/app/services/client_state_persistence/client_state_persistence_base.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
 
+from pydantic import JsonValue
+
 
 class ClientStatePersistenceABC(ABC):
     """
@@ -8,35 +10,26 @@ class ClientStatePersistenceABC(ABC):
     """
 
     @abstractmethod
-    def set_by_key(self, queue_id: str, key: str, value: str) -> str:
+    def set_by_key(self, key: str, value: JsonValue) -> None:
         """
-        Set a key-value pair for the client.
+        Store the data for the client.
 
-        Args:
-            key (str): The key to set.
-            value (str): The value to set for the key.
-
-        Returns:
-            str: The value that was set.
+        :param data: The client data to be stored.
         """
         pass
 
     @abstractmethod
-    def get_by_key(self, queue_id: str, key: str) -> str | None:
+    def get_by_key(self, key: str) -> JsonValue | None:
         """
-        Get the value for a specific key of the client.
+        Get the data for the client.
 
-        Args:
-            key (str): The key to retrieve the value for.
-
-        Returns:
-            str | None: The value associated with the key, or None if the key does not exist.
+        :return: The client data.
         """
         pass
 
     @abstractmethod
-    def delete(self, queue_id: str) -> None:
+    def delete(self) -> None:
         """
-        Delete all client state.
+        Delete the data for the client.
         """
         pass

invokeai/app/services/client_state_persistence/client_state_persistence_sqlite.py

@@ -1,5 +1,7 @@
 import json
 
+from pydantic import JsonValue
+
 from invokeai.app.services.client_state_persistence.client_state_persistence_base import ClientStatePersistenceABC
 from invokeai.app.services.invoker import Invoker
 from invokeai.app.services.shared.sqlite.sqlite_database import SqliteDatabase
@@ -19,21 +21,8 @@ class ClientStatePersistenceSqlite(ClientStatePersistenceABC):
     def start(self, invoker: Invoker) -> None:
         self._invoker = invoker
 
-    def _get(self) -> dict[str, str] | None:
-        with self._db.transaction() as cursor:
-            cursor.execute(
-                f"""
-                SELECT data FROM client_state
-                WHERE id = {self._default_row_id}
-                """
-            )
-            row = cursor.fetchone()
-            if row is None:
-                return None
-            return json.loads(row[0])
-
-    def set_by_key(self, queue_id: str, key: str, value: str) -> str:
-        state = self._get() or {}
+    def set_by_key(self, key: str, value: JsonValue) -> None:
+        state = self.get() or {}
         state.update({key: value})
 
         with self._db.transaction() as cursor:
@@ -47,15 +36,26 @@ class ClientStatePersistenceSqlite(ClientStatePersistenceABC):
                 (json.dumps(state),),
             )
 
-        return value
+    def get(self) -> dict[str, JsonValue] | None:
+        with self._db.transaction() as cursor:
+            cursor.execute(
+                f"""
+                SELECT data FROM client_state
+                WHERE id = {self._default_row_id}
+                """
+            )
+            row = cursor.fetchone()
+            if row is None:
+                return None
+            return json.loads(row[0])
 
-    def get_by_key(self, queue_id: str, key: str) -> str | None:
-        state = self._get()
+    def get_by_key(self, key: str) -> JsonValue | None:
+        state = self.get()
         if state is None:
             return None
         return state.get(key, None)
 
-    def delete(self, queue_id: str) -> None:
+    def delete(self) -> None:
         with self._db.transaction() as cursor:
             cursor.execute(
                 f"""

invokeai/app/services/config/config_default.py

@@ -107,7 +107,6 @@ class InvokeAIAppConfig(BaseSettings):
         hashing_algorithm: Model hashing algorthim for model installs. 'blake3_multi' is best for SSDs. 'blake3_single' is best for spinning disk HDDs. 'random' disables hashing, instead assigning a UUID to models. Useful when using a memory db to reduce model installation time, or if you don't care about storing stable hashes for models. Alternatively, any other hashlib algorithm is accepted, though these are not nearly as performant as blake3.<br>Valid values: `blake3_multi`, `blake3_single`, `random`, `md5`, `sha1`, `sha224`, `sha256`, `sha384`, `sha512`, `blake2b`, `blake2s`, `sha3_224`, `sha3_256`, `sha3_384`, `sha3_512`, `shake_128`, `shake_256`
         remote_api_tokens: List of regular expression and token pairs used when downloading models from URLs. The download URL is tested against the regex, and if it matches, the token is provided in as a Bearer token.
         scan_models_on_startup: Scan the models directory on startup, registering orphaned models. This is typically only used in conjunction with `use_memory_db` for testing purposes.
-        unsafe_disable_picklescan: UNSAFE. Disable the picklescan security check during model installation. Recommended only for development and testing purposes. This will allow arbitrary code execution during model installation, so should never be used in production.
     """
 
     _root: Optional[Path] = PrivateAttr(default=None)
@@ -197,7 +196,6 @@ class InvokeAIAppConfig(BaseSettings):
     hashing_algorithm: HASHING_ALGORITHMS = Field(default="blake3_single",  description="Model hashing algorthim for model installs. 'blake3_multi' is best for SSDs. 'blake3_single' is best for spinning disk HDDs. 'random' disables hashing, instead assigning a UUID to models. Useful when using a memory db to reduce model installation time, or if you don't care about storing stable hashes for models. Alternatively, any other hashlib algorithm is accepted, though these are not nearly as performant as blake3.")
     remote_api_tokens: Optional[list[URLRegexTokenPair]] = Field(default=None, description="List of regular expression and token pairs used when downloading models from URLs. The download URL is tested against the regex, and if it matches, the token is provided in as a Bearer token.")
     scan_models_on_startup:        bool = Field(default=False,              description="Scan the models directory on startup, registering orphaned models. This is typically only used in conjunction with `use_memory_db` for testing purposes.")
-    unsafe_disable_picklescan:     bool = Field(default=False,              description="UNSAFE. Disable the picklescan security check during model installation. Recommended only for development and testing purposes. This will allow arbitrary code execution during model installation, so should never be used in production.")
 
     # fmt: on
 

invokeai/app/services/model_install/model_install_default.py

@@ -7,7 +7,7 @@ import threading
 import time
 from pathlib import Path
 from queue import Empty, Queue
-from shutil import move, rmtree
+from shutil import copyfile, copytree, move, rmtree
 from tempfile import mkdtemp
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, Union
 
@@ -186,14 +186,13 @@ class ModelInstallService(ModelInstallServiceBase):
         info: AnyModelConfig = self._probe(Path(model_path), config)  # type: ignore
 
         if preferred_name := config.name:
-            # Careful! Don't use pathlib.Path(...).with_suffix - it can will strip everything after the first dot.
-            preferred_name = f"{preferred_name}{model_path.suffix}"
+            preferred_name = Path(preferred_name).with_suffix(model_path.suffix)
 
         dest_path = (
             self.app_config.models_path / info.base.value / info.type.value / (preferred_name or model_path.name)
         )
         try:
-            new_path = self._move_model(model_path, dest_path)
+            new_path = self._copy_model(model_path, dest_path)
         except FileExistsError as excp:
             raise DuplicateModelException(
                 f"A model named {model_path.name} is already installed at {dest_path.as_posix()}"
@@ -618,6 +617,16 @@ class ModelInstallService(ModelInstallServiceBase):
         self.record_store.update_model(key, ModelRecordChanges(path=model.path))
         return model
 
+    def _copy_model(self, old_path: Path, new_path: Path) -> Path:
+        if old_path == new_path:
+            return old_path
+        new_path.parent.mkdir(parents=True, exist_ok=True)
+        if old_path.is_dir():
+            copytree(old_path, new_path)
+        else:
+            copyfile(old_path, new_path)
+        return new_path
+
     def _move_model(self, old_path: Path, new_path: Path) -> Path:
         if old_path == new_path:
             return old_path

invokeai/app/services/model_load/model_load_default.py

@@ -87,21 +87,9 @@ class ModelLoadService(ModelLoadServiceBase):
         def torch_load_file(checkpoint: Path) -> AnyModel:
             scan_result = scan_file_path(checkpoint)
             if scan_result.infected_files != 0:
-                if self._app_config.unsafe_disable_picklescan:
-                    self._logger.warning(
-                        f"Model at {checkpoint} is potentially infected by malware, but picklescan is disabled. "
-                        "Proceeding with caution."
-                    )
-                else:
-                    raise Exception(f"The model at {checkpoint} is potentially infected by malware. Aborting load.")
+                raise Exception(f"The model at {checkpoint} is potentially infected by malware. Aborting load.")
             if scan_result.scan_err:
-                if self._app_config.unsafe_disable_picklescan:
-                    self._logger.warning(
-                        f"Error scanning model at {checkpoint} for malware, but picklescan is disabled. "
-                        "Proceeding with caution."
-                    )
-                else:
-                    raise Exception(f"Error scanning model at {checkpoint} for malware. Aborting load.")
+                raise Exception(f"Error scanning model at {checkpoint} for malware. Aborting load.")
 
             result = torch_load(checkpoint, map_location="cpu")
             return result

invokeai/backend/flux/denoise.py

@@ -112,7 +112,7 @@ def denoise(
         )
 
         # Slice prediction to only include the main image tokens
-        if img_cond_seq is not None:
+        if img_input_ids is not None:
             pred = pred[:, :original_seq_len]
 
         step_cfg_scale = cfg_scale[step_index]
@@ -125,26 +125,9 @@ def denoise(
             if neg_regional_prompting_extension is None:
                 raise ValueError("Negative text conditioning is required when cfg_scale is not 1.0.")
 
-            # For negative prediction with Kontext, we need to include the reference images
-            # to maintain consistency between positive and negative passes. Without this,
-            # CFG would create artifacts as the attention mechanism would see different
-            # spatial structures in each pass
-            neg_img_input = img
-            neg_img_input_ids = img_ids
-
-            # Add channel-wise conditioning for negative pass if present
-            if img_cond is not None:
-                neg_img_input = torch.cat((neg_img_input, img_cond), dim=-1)
-
-            # Add sequence-wise conditioning (Kontext) for negative pass
-            # This ensures reference images are processed consistently
-            if img_cond_seq is not None:
-                neg_img_input = torch.cat((neg_img_input, img_cond_seq), dim=1)
-                neg_img_input_ids = torch.cat((neg_img_input_ids, img_cond_seq_ids), dim=1)
-
             neg_pred = model(
-                img=neg_img_input,
-                img_ids=neg_img_input_ids,
+                img=img,
+                img_ids=img_ids,
                 txt=neg_regional_prompting_extension.regional_text_conditioning.t5_embeddings,
                 txt_ids=neg_regional_prompting_extension.regional_text_conditioning.t5_txt_ids,
                 y=neg_regional_prompting_extension.regional_text_conditioning.clip_embeddings,
@@ -157,10 +140,6 @@ def denoise(
                 ip_adapter_extensions=neg_ip_adapter_extensions,
                 regional_prompting_extension=neg_regional_prompting_extension,
             )
-
-            # Slice negative prediction to match main image tokens
-            if img_cond_seq is not None:
-                neg_pred = neg_pred[:, :original_seq_len]
             pred = neg_pred + step_cfg_scale * (pred - neg_pred)
 
         preview_img = img - t_curr * pred

invokeai/backend/flux/extensions/kontext_extension.py

@@ -1,14 +1,15 @@
+import einops
+import numpy as np
 import torch
-import torch.nn.functional as F
-import torchvision.transforms as T
 from einops import repeat
+from PIL import Image
 
 from invokeai.app.invocations.fields import FluxKontextConditioningField
+from invokeai.app.invocations.flux_vae_encode import FluxVaeEncodeInvocation
 from invokeai.app.invocations.model import VAEField
 from invokeai.app.services.shared.invocation_context import InvocationContext
-from invokeai.backend.flux.modules.autoencoder import AutoEncoder
 from invokeai.backend.flux.sampling_utils import pack
-from invokeai.backend.util.devices import TorchDevice
+from invokeai.backend.flux.util import PREFERED_KONTEXT_RESOLUTIONS
 
 
 def generate_img_ids_with_offset(
@@ -18,10 +19,8 @@ def generate_img_ids_with_offset(
     device: torch.device,
     dtype: torch.dtype,
     idx_offset: int = 0,
-    h_offset: int = 0,
-    w_offset: int = 0,
 ) -> torch.Tensor:
-    """Generate tensor of image position ids with optional index and spatial offsets.
+    """Generate tensor of image position ids with an optional offset.
 
     Args:
         latent_height (int): Height of image in latent space (after packing, this becomes h//2).
@@ -29,9 +28,7 @@ def generate_img_ids_with_offset(
         batch_size (int): Number of images in the batch.
         device (torch.device): Device to create tensors on.
         dtype (torch.dtype): Data type for the tensors.
-        idx_offset (int): Offset to add to the first dimension of the image ids (default: 0).
-        h_offset (int): Spatial offset for height/y-coordinates in latent space (default: 0).
-        w_offset (int): Spatial offset for width/x-coordinates in latent space (default: 0).
+        idx_offset (int): Offset to add to the first dimension of the image ids.
 
     Returns:
         torch.Tensor: Image position ids with shape [batch_size, (latent_height//2 * latent_width//2), 3].
@@ -45,10 +42,6 @@ def generate_img_ids_with_offset(
     packed_height = latent_height // 2
     packed_width = latent_width // 2
 
-    # Convert spatial offsets from latent space to packed space
-    packed_h_offset = h_offset // 2
-    packed_w_offset = w_offset // 2
-
     # Create base tensor for position IDs with shape [packed_height, packed_width, 3]
     # The 3 channels represent: [batch_offset, y_position, x_position]
     img_ids = torch.zeros(packed_height, packed_width, 3, device=device, dtype=dtype)
@@ -56,13 +49,13 @@ def generate_img_ids_with_offset(
     # Set the batch offset for all positions
     img_ids[..., 0] = idx_offset
 
-    # Create y-coordinate indices (vertical positions) with spatial offset
-    y_indices = torch.arange(packed_height, device=device, dtype=dtype) + packed_h_offset
+    # Create y-coordinate indices (vertical positions)
+    y_indices = torch.arange(packed_height, device=device, dtype=dtype)
     # Broadcast y_indices to match the spatial dimensions [packed_height, 1]
     img_ids[..., 1] = y_indices[:, None]
 
-    # Create x-coordinate indices (horizontal positions) with spatial offset
-    x_indices = torch.arange(packed_width, device=device, dtype=dtype) + packed_w_offset
+    # Create x-coordinate indices (horizontal positions)
+    x_indices = torch.arange(packed_width, device=device, dtype=dtype)
     # Broadcast x_indices to match the spatial dimensions [1, packed_width]
     img_ids[..., 2] = x_indices[None, :]
 
@@ -80,14 +73,14 @@ class KontextExtension:
 
     def __init__(
         self,
-        kontext_conditioning: list[FluxKontextConditioningField],
+        kontext_conditioning: FluxKontextConditioningField,
         context: InvocationContext,
         vae_field: VAEField,
         device: torch.device,
         dtype: torch.dtype,
     ):
         """
-        Initializes the KontextExtension, pre-processing the reference images
+        Initializes the KontextExtension, pre-processing the reference image
         into latents and positional IDs.
         """
         self._context = context
@@ -100,101 +93,54 @@ class KontextExtension:
         self.kontext_latents, self.kontext_ids = self._prepare_kontext()
 
     def _prepare_kontext(self) -> tuple[torch.Tensor, torch.Tensor]:
-        """Encodes the reference images and prepares their concatenated latents and IDs with spatial tiling."""
-        all_latents = []
-        all_ids = []
+        """Encodes the reference image and prepares its latents and IDs."""
+        image = self._context.images.get_pil(self.kontext_conditioning.image.image_name)
 
-        # Track cumulative dimensions for spatial tiling
-        # These track the running extent of the virtual canvas in latent space
-        h = 0  # Running height extent
-        w = 0  # Running width extent
+        # Calculate aspect ratio of input image
+        width, height = image.size
+        aspect_ratio = width / height
 
+        # Find the closest preferred resolution by aspect ratio
+        _, target_width, target_height = min(
+            ((abs(aspect_ratio - w / h), w, h) for w, h in PREFERED_KONTEXT_RESOLUTIONS), key=lambda x: x[0]
+        )
+
+        # Apply BFL's scaling formula
+        # This ensures compatibility with the model's training
+        scaled_width = 2 * int(target_width / 16)
+        scaled_height = 2 * int(target_height / 16)
+
+        # Resize to the exact resolution used during training
+        image = image.convert("RGB")
+        final_width = 8 * scaled_width
+        final_height = 8 * scaled_height
+        image = image.resize((final_width, final_height), Image.Resampling.LANCZOS)
+
+        # Convert to tensor with same normalization as BFL
+        image_np = np.array(image)
+        image_tensor = torch.from_numpy(image_np).float() / 127.5 - 1.0
+        image_tensor = einops.rearrange(image_tensor, "h w c -> 1 c h w")
+        image_tensor = image_tensor.to(self._device)
+
+        # Continue with VAE encoding
         vae_info = self._context.models.load(self._vae_field.vae)
+        kontext_latents_unpacked = FluxVaeEncodeInvocation.vae_encode(vae_info=vae_info, image_tensor=image_tensor)
 
-        for idx, kontext_field in enumerate(self.kontext_conditioning):
-            image = self._context.images.get_pil(kontext_field.image.image_name)
+        # Extract tensor dimensions
+        batch_size, _, latent_height, latent_width = kontext_latents_unpacked.shape
 
-            # Convert to RGB
-            image = image.convert("RGB")
+        # Pack the latents and generate IDs
+        kontext_latents_packed = pack(kontext_latents_unpacked).to(self._device, self._dtype)
+        kontext_ids = generate_img_ids_with_offset(
+            latent_height=latent_height,
+            latent_width=latent_width,
+            batch_size=batch_size,
+            device=self._device,
+            dtype=self._dtype,
+            idx_offset=1,
+        )
 
-            # Convert to tensor using torchvision transforms for consistency
-            transformation = T.Compose(
-                [
-                    T.ToTensor(),  # Converts PIL image to tensor and scales to [0, 1]
-                ]
-            )
-            image_tensor = transformation(image)
-            # Convert from [0, 1] to [-1, 1] range expected by VAE
-            image_tensor = image_tensor * 2.0 - 1.0
-            image_tensor = image_tensor.unsqueeze(0)  # Add batch dimension
-            image_tensor = image_tensor.to(self._device)
-
-            # Continue with VAE encoding
-            # Don't sample from the distribution for reference images - use the mean (matching ComfyUI)
-            with vae_info as vae:
-                assert isinstance(vae, AutoEncoder)
-                vae_dtype = next(iter(vae.parameters())).dtype
-                image_tensor = image_tensor.to(device=TorchDevice.choose_torch_device(), dtype=vae_dtype)
-                # Use sample=False to get the distribution mean without noise
-                kontext_latents_unpacked = vae.encode(image_tensor, sample=False)
-
-            # Extract tensor dimensions
-            batch_size, _, latent_height, latent_width = kontext_latents_unpacked.shape
-
-            # Pad latents to be compatible with patch_size=2
-            # This ensures dimensions are even for the pack() function
-            pad_h = (2 - latent_height % 2) % 2
-            pad_w = (2 - latent_width % 2) % 2
-            if pad_h > 0 or pad_w > 0:
-                kontext_latents_unpacked = F.pad(kontext_latents_unpacked, (0, pad_w, 0, pad_h), mode="circular")
-                # Update dimensions after padding
-                _, _, latent_height, latent_width = kontext_latents_unpacked.shape
-
-            # Pack the latents
-            kontext_latents_packed = pack(kontext_latents_unpacked).to(self._device, self._dtype)
-
-            # Determine spatial offsets for this reference image
-            # - Compare the potential new canvas dimensions if we add the image vertically vs horizontally
-            # - Choose the placement that results in a more square-like canvas
-            h_offset = 0
-            w_offset = 0
-
-            if idx > 0:  # First image starts at (0, 0)
-                # Check which placement would result in better canvas dimensions
-                # If adding to height would make the canvas taller than wide, tile horizontally
-                # Otherwise, tile vertically
-                if latent_height + h > latent_width + w:
-                    # Tile horizontally (to the right of existing images)
-                    w_offset = w
-                else:
-                    # Tile vertically (below existing images)
-                    h_offset = h
-
-            # Generate IDs with both index offset and spatial offsets
-            kontext_ids = generate_img_ids_with_offset(
-                latent_height=latent_height,
-                latent_width=latent_width,
-                batch_size=batch_size,
-                device=self._device,
-                dtype=self._dtype,
-                idx_offset=1,  # All reference images use index=1 (matching ComfyUI implementation)
-                h_offset=h_offset,
-                w_offset=w_offset,
-            )
-
-            # Update cumulative dimensions
-            # Track the maximum extent of the virtual canvas after placing this image
-            h = max(h, latent_height + h_offset)
-            w = max(w, latent_width + w_offset)
-
-            all_latents.append(kontext_latents_packed)
-            all_ids.append(kontext_ids)
-
-        # Concatenate all latents and IDs along the sequence dimension
-        concatenated_latents = torch.cat(all_latents, dim=1)  # Concatenate along sequence dimension
-        concatenated_ids = torch.cat(all_ids, dim=1)  # Concatenate along sequence dimension
-
-        return concatenated_latents, concatenated_ids
+        return kontext_latents_packed, kontext_ids
 
     def ensure_batch_size(self, target_batch_size: int) -> None:
         """Ensures the kontext latents and IDs match the target batch size by repeating if necessary."""

invokeai/backend/model_manager/legacy_probe.py

@@ -9,7 +9,6 @@ import spandrel
 import torch
 
 import invokeai.backend.util.logging as logger
-from invokeai.app.services.config.config_default import get_config
 from invokeai.app.util.misc import uuid_string
 from invokeai.backend.flux.controlnet.state_dict_utils import (
     is_state_dict_instantx_controlnet,
@@ -494,21 +493,9 @@ class ModelProbe(object):
         # scan model
         scan_result = pscan.scan_file_path(checkpoint)
         if scan_result.infected_files != 0:
-            if get_config().unsafe_disable_picklescan:
-                logger.warning(
-                    f"The model {model_name} is potentially infected by malware, but picklescan is disabled. "
-                    "Proceeding with caution."
-                )
-            else:
-                raise RuntimeError(f"The model {model_name} is potentially infected by malware. Aborting import.")
+            raise Exception(f"The model {model_name} is potentially infected by malware. Aborting import.")
         if scan_result.scan_err:
-            if get_config().unsafe_disable_picklescan:
-                logger.warning(
-                    f"Error scanning the model at {model_name} for malware, but picklescan is disabled. "
-                    "Proceeding with caution."
-                )
-            else:
-                raise RuntimeError(f"Error scanning the model at {model_name} for malware. Aborting import.")
+            raise Exception(f"Error scanning model {model_name} for malware. Aborting import.")
 
 
 # Probing utilities

invokeai/backend/model_manager/model_on_disk.py

@@ -6,17 +6,13 @@ import torch
 from picklescan.scanner import scan_file_path
 from safetensors import safe_open
 
-from invokeai.app.services.config.config_default import get_config
 from invokeai.backend.model_hash.model_hash import HASHING_ALGORITHMS, ModelHash
 from invokeai.backend.model_manager.taxonomy import ModelRepoVariant
 from invokeai.backend.quantization.gguf.loaders import gguf_sd_loader
-from invokeai.backend.util.logging import InvokeAILogger
 from invokeai.backend.util.silence_warnings import SilenceWarnings
 
 StateDict: TypeAlias = dict[str | int, Any]  # When are the keys int?
 
-logger = InvokeAILogger.get_logger()
-
 
 class ModelOnDisk:
     """A utility class representing a model stored on disk."""
@@ -83,24 +79,8 @@ class ModelOnDisk:
         with SilenceWarnings():
             if path.suffix.endswith((".ckpt", ".pt", ".pth", ".bin")):
                 scan_result = scan_file_path(path)
-                if scan_result.infected_files != 0:
-                    if get_config().unsafe_disable_picklescan:
-                        logger.warning(
-                            f"The model {path.stem} is potentially infected by malware, but picklescan is disabled. "
-                            "Proceeding with caution."
-                        )
-                    else:
-                        raise RuntimeError(
-                            f"The model {path.stem} is potentially infected by malware. Aborting import."
-                        )
-                if scan_result.scan_err:
-                    if get_config().unsafe_disable_picklescan:
-                        logger.warning(
-                            f"Error scanning the model at {path.stem} for malware, but picklescan is disabled. "
-                            "Proceeding with caution."
-                        )
-                    else:
-                        raise RuntimeError(f"Error scanning the model at {path.stem} for malware. Aborting import.")
+                if scan_result.infected_files != 0 or scan_result.scan_err:
+                    raise RuntimeError(f"The model {path.stem} is potentially infected by malware. Aborting import.")
                 checkpoint = torch.load(path, map_location="cpu")
                 assert isinstance(checkpoint, dict)
             elif path.suffix.endswith(".gguf"):

invokeai/backend/model_manager/starter_models.py

@@ -149,29 +149,13 @@ flux_kontext = StarterModel(
     dependencies=[t5_base_encoder, flux_vae, clip_l_encoder],
 )
 flux_kontext_quantized = StarterModel(
-    name="FLUX.1 Kontext dev (quantized)",
+    name="FLUX.1 Kontext dev (Quantized)",
     base=BaseModelType.Flux,
     source="https://huggingface.co/unsloth/FLUX.1-Kontext-dev-GGUF/resolve/main/flux1-kontext-dev-Q4_K_M.gguf",
     description="FLUX.1 Kontext dev quantized (q4_k_m). Total size with dependencies: ~14GB",
     type=ModelType.Main,
     dependencies=[t5_8b_quantized_encoder, flux_vae, clip_l_encoder],
 )
-flux_krea = StarterModel(
-    name="FLUX.1 Krea dev",
-    base=BaseModelType.Flux,
-    source="https://huggingface.co/InvokeAI/FLUX.1-Krea-dev/resolve/main/flux1-krea-dev.safetensors",
-    description="FLUX.1 Krea dev. Total size with dependencies: ~33GB",
-    type=ModelType.Main,
-    dependencies=[t5_8b_quantized_encoder, flux_vae, clip_l_encoder],
-)
-flux_krea_quantized = StarterModel(
-    name="FLUX.1 Krea dev (quantized)",
-    base=BaseModelType.Flux,
-    source="https://huggingface.co/InvokeAI/FLUX.1-Krea-dev-GGUF/resolve/main/flux1-krea-dev-Q4_K_M.gguf",
-    description="FLUX.1 Krea dev quantized (q4_k_m). Total size with dependencies: ~14GB",
-    type=ModelType.Main,
-    dependencies=[t5_8b_quantized_encoder, flux_vae, clip_l_encoder],
-)
 sd35_medium = StarterModel(
     name="SD3.5 Medium",
     base=BaseModelType.StableDiffusion3,
@@ -596,14 +580,13 @@ t2i_sketch_sdxl = StarterModel(
 )
 # endregion
 # region SpandrelImageToImage
-animesharp_v4_rcan = StarterModel(
-    name="2x-AnimeSharpV4_RCAN",
+realesrgan_anime = StarterModel(
+    name="RealESRGAN_x4plus_anime_6B",
     base=BaseModelType.Any,
-    source="https://github.com/Kim2091/Kim2091-Models/releases/download/2x-AnimeSharpV4/2x-AnimeSharpV4_RCAN.safetensors",
-    description="A 2x upscaling model (optimized for anime images).",
+    source="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth",
+    description="A Real-ESRGAN 4x upscaling model (optimized for anime images).",
     type=ModelType.SpandrelImageToImage,
 )
-
 realesrgan_x4 = StarterModel(
     name="RealESRGAN_x4plus",
     base=BaseModelType.Any,
@@ -749,7 +732,7 @@ STARTER_MODELS: list[StarterModel] = [
     t2i_lineart_sdxl,
     t2i_sketch_sdxl,
     realesrgan_x4,
-    animesharp_v4_rcan,
+    realesrgan_anime,
     realesrgan_x2,
     swinir,
     t5_base_encoder,
@@ -760,8 +743,6 @@ STARTER_MODELS: list[StarterModel] = [
     llava_onevision,
     flux_fill,
     cogview4,
-    flux_krea,
-    flux_krea_quantized,
 ]
 
 sd1_bundle: list[StarterModel] = [
@@ -813,7 +794,6 @@ flux_bundle: list[StarterModel] = [
     flux_redux,
     flux_fill,
     flux_kontext_quantized,
-    flux_krea_quantized,
 ]
 
 STARTER_BUNDLES: dict[str, StarterModelBundle] = {

invokeai/backend/model_manager/util/model_util.py

@@ -8,12 +8,8 @@ import picklescan.scanner as pscan
 import safetensors
 import torch
 
-from invokeai.app.services.config.config_default import get_config
 from invokeai.backend.model_manager.taxonomy import ClipVariantType
 from invokeai.backend.quantization.gguf.loaders import gguf_sd_loader
-from invokeai.backend.util.logging import InvokeAILogger
-
-logger = InvokeAILogger.get_logger()
 
 
 def _fast_safetensors_reader(path: str) -> Dict[str, torch.Tensor]:
@@ -63,21 +59,9 @@ def read_checkpoint_meta(path: Union[str, Path], scan: bool = True) -> Dict[str,
         if scan:
             scan_result = pscan.scan_file_path(path)
             if scan_result.infected_files != 0:
-                if get_config().unsafe_disable_picklescan:
-                    logger.warning(
-                        f"The model {path} is potentially infected by malware, but picklescan is disabled. "
-                        "Proceeding with caution."
-                    )
-                else:
-                    raise RuntimeError(f"The model {path} is potentially infected by malware. Aborting import.")
+                raise Exception(f"The model at {path} is potentially infected by malware. Aborting import.")
             if scan_result.scan_err:
-                if get_config().unsafe_disable_picklescan:
-                    logger.warning(
-                        f"Error scanning the model at {path} for malware, but picklescan is disabled. "
-                        "Proceeding with caution."
-                    )
-                else:
-                    raise RuntimeError(f"Error scanning the model at {path} for malware. Aborting import.")
+                raise Exception(f"Error scanning model at {path} for malware. Aborting import.")
 
         checkpoint = torch.load(path, map_location=torch.device("meta"))
     return checkpoint

invokeai/frontend/web/.storybook/preview.tsx

@@ -26,7 +26,7 @@ i18n.use(initReactI18next).init({
   returnNull: false,
 });
 
-const store = createStore();
+const store = createStore({ driver: { getItem: () => {}, setItem: () => {} }, persistThrottle: 2000 });
 $store.set(store);
 $baseUrl.set('http://localhost:9090');
 

invokeai/frontend/web/knip.ts

@@ -17,7 +17,6 @@ const config: KnipConfig = {
     'src/app/store/use-debounced-app-selector.ts',
   ],
   ignoreBinaries: ['only-allow'],
-  ignoreDependencies: ['magic-string'],
   paths: {
     'public/*': ['public/*'],
   },

invokeai/frontend/web/package.json

@@ -63,7 +63,6 @@
     "framer-motion": "^11.10.0",
     "i18next": "^25.3.2",
     "i18next-http-backend": "^3.0.2",
-    "idb-keyval": "6.2.1",
     "jsondiffpatch": "^0.7.3",
     "konva": "^9.3.22",
     "linkify-react": "^4.3.1",
@@ -139,7 +138,6 @@
     "eslint-plugin-unused-imports": "^4.1.4",
     "globals": "^16.3.0",
     "knip": "^5.61.3",
-    "magic-string": "^0.30.17",
     "openapi-types": "^12.1.3",
     "openapi-typescript": "^7.6.1",
     "prettier": "^3.5.3",

invokeai/frontend/web/pnpm-lock.yaml

@@ -80,9 +80,6 @@ importers:
       i18next-http-backend:
         specifier: ^3.0.2
         version: 3.0.2
-      idb-keyval:
-        specifier: 6.2.1
-        version: 6.2.1
       jsondiffpatch:
         specifier: ^0.7.3
         version: 0.7.3
@@ -291,9 +288,6 @@ importers:
       knip:
         specifier: ^5.61.3
         version: 5.61.3(@types/node@22.16.0)(typescript@5.8.3)
-      magic-string:
-        specifier: ^0.30.17
-        version: 0.30.17
       openapi-types:
         specifier: ^12.1.3
         version: 12.1.3
@@ -2778,9 +2772,6 @@ packages:
       typescript:
         optional: true
 
-  idb-keyval@6.2.1:
-    resolution: {integrity: sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==}
-
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -7275,8 +7266,6 @@ snapshots:
     optionalDependencies:
       typescript: 5.8.3
 
-  idb-keyval@6.2.1: {}
-
   ieee754@1.2.1: {}
 
   ignore@5.3.2: {}

invokeai/frontend/web/public/locales/de.json

@@ -1470,6 +1470,7 @@
     "ui": {
         "tabs": {
             "queue": "Warteschlange",
+            "generation": "Erzeugung",
             "gallery": "Galerie",
             "models": "Modelle",
             "upscaling": "Hochskalierung",

invokeai/frontend/web/public/locales/en.json

@@ -610,10 +610,6 @@
                 "title": "Toggle Non-Raster Layers",
                 "desc": "Show or hide all non-raster layer categories (Control Layers, Inpaint Masks, Regional Guidance)."
             },
-            "fitBboxToLayers": {
-                "title": "Fit Bbox To Layers",
-                "desc": "Automatically adjust the generation bounding box to fit visible layers"
-            },
             "fitBboxToMasks": {
                 "title": "Fit Bbox To Masks",
                 "desc": "Automatically adjust the generation bounding box to fit visible inpaint masks"
@@ -1239,7 +1235,7 @@
             "modelIncompatibleScaledBboxWidth": "Scaled bbox width is {{width}} but {{model}} requires multiple of {{multiple}}",
             "modelIncompatibleScaledBboxHeight": "Scaled bbox height is {{height}} but {{model}} requires multiple of {{multiple}}",
             "fluxModelMultipleControlLoRAs": "Can only use 1 Control LoRA at a time",
-            "fluxKontextMultipleReferenceImages": "Can only use 1 Reference Image at a time with FLUX Kontext via BFL API",
+            "fluxKontextMultipleReferenceImages": "Can only use 1 Reference Image at a time with Flux Kontext",
             "canvasIsFiltering": "Canvas is busy (filtering)",
             "canvasIsTransforming": "Canvas is busy (transforming)",
             "canvasIsRasterizing": "Canvas is busy (rasterizing)",
@@ -2070,8 +2066,6 @@
         "asControlLayer": "As $t(controlLayers.controlLayer)",
         "asControlLayerResize": "As $t(controlLayers.controlLayer) (Resize)",
         "referenceImage": "Reference Image",
-        "maxRefImages": "Max Ref Images",
-        "useAsReferenceImage": "Use as Reference Image",
         "regionalReferenceImage": "Regional Reference Image",
         "globalReferenceImage": "Global Reference Image",
         "sendingToCanvas": "Staging Generations on Canvas",
@@ -2539,7 +2533,7 @@
     },
     "ui": {
         "tabs": {
-            "generate": "Generate",
+            "generation": "Generation",
             "canvas": "Canvas",
             "workflows": "Workflows",
             "workflowsTab": "$t(ui.tabs.workflows) $t(common.tab)",
@@ -2550,12 +2544,6 @@
             "upscalingTab": "$t(ui.tabs.upscaling) $t(common.tab)",
             "gallery": "Gallery"
         },
-        "panels": {
-            "launchpad": "Launchpad",
-            "workflowEditor": "Workflow Editor",
-            "imageViewer": "Image Viewer",
-            "canvas": "Canvas"
-        },
         "launchpad": {
             "workflowsTitle": "Go deep with Workflows.",
             "upscalingTitle": "Upscale and add detail.",
@@ -2563,28 +2551,6 @@
             "generateTitle": "Generate images from text prompts.",
             "modelGuideText": "Want to learn what prompts work best for each model?",
             "modelGuideLink": "Check out our Model Guide.",
-            "createNewWorkflowFromScratch": "Create a new Workflow from scratch",
-            "browseAndLoadWorkflows": "Browse and load existing workflows",
-            "addStyleRef": {
-                "title": "Add a Style Reference",
-                "description": "Add an image to transfer its look."
-            },
-            "editImage": {
-                "title": "Edit Image",
-                "description": "Add an image to refine."
-            },
-            "generateFromText": {
-                "title": "Generate from Text",
-                "description": "Enter a prompt and Invoke."
-            },
-            "useALayoutImage": {
-                "title": "Use a Layout Image",
-                "description": "Add an image to control composition."
-            },
-            "generate": {
-                "canvasCalloutTitle": "Looking to get more control, edit, and iterate on your images?",
-                "canvasCalloutLink": "Navigate to Canvas for more capabilities."
-            },
             "workflows": {
                 "description": "Workflows are reusable templates that automate image generation tasks, allowing you to quickly perform complex operations and get consistent results.",
                 "learnMoreLink": "Learn more about creating workflows",
@@ -2621,13 +2587,6 @@
                 "upscaleModel": "Upscale Model",
                 "model": "Model",
                 "scale": "Scale",
-                "creativityAndStructure": {
-                    "title": "Creativity & Structure Defaults",
-                    "conservative": "Conservative",
-                    "balanced": "Balanced",
-                    "creative": "Creative",
-                    "artistic": "Artistic"
-                },
                 "helpText": {
                     "promptAdvice": "When upscaling, use a prompt that describes the medium and style. Avoid describing specific content details in the image.",
                     "styleAdvice": "Upscaling works best with the general style of your image."
@@ -2672,8 +2631,10 @@
     "whatsNew": {
         "whatsNewInInvoke": "What's New in Invoke",
         "items": [
-            "Studio state is saved to the server, allowing you to continue your work on any device.",
-            "Support for multiple reference images for FLUX Kontext (local model only)."
+            "New setting to send all Canvas generations directly to the Gallery.",
+            "New Invert Mask (Shift+V) and Fit BBox to Mask (Shift+B) capabilities.",
+            "Expanded support for Model Thumbnails and configurations.",
+            "Various other quality of life updates and fixes"
         ],
         "readReleaseNotes": "Read Release Notes",
         "watchRecentReleaseVideos": "Watch Recent Release Videos",

invokeai/frontend/web/public/locales/es.json

@@ -399,6 +399,7 @@
     "ui": {
         "tabs": {
             "canvas": "Lienzo",
+            "generation": "Generación",
             "queue": "Cola",
             "workflows": "Flujos de trabajo",
             "models": "Modelos",

invokeai/frontend/web/public/locales/fr.json

@@ -1820,6 +1820,7 @@
             "upscaling": "Agrandissement",
             "gallery": "Galerie",
             "upscalingTab": "$t(ui.tabs.upscaling) $t(common.tab)",
+            "generation": "Génération",
             "workflows": "Workflows",
             "workflowsTab": "$t(ui.tabs.workflows) $t(common.tab)",
             "models": "Modèles",

invokeai/frontend/web/public/locales/it.json

@@ -798,7 +798,7 @@
             "modelIncompatibleScaledBboxWidth": "La larghezza scalata del riquadro è {{width}} ma {{model}} richiede multipli di {{multiple}}",
             "modelIncompatibleScaledBboxHeight": "L'altezza scalata del riquadro è {{height}} ma {{model}} richiede multipli di {{multiple}}",
             "modelDisabledForTrial": "La generazione con {{modelName}} non è disponibile per gli account di prova. Accedi alle impostazioni del tuo account per effettuare l'upgrade.",
-            "fluxKontextMultipleReferenceImages": "È possibile utilizzare solo 1 immagine di riferimento alla volta con FLUX Kontext tramite BFL API",
+            "fluxKontextMultipleReferenceImages": "È possibile utilizzare solo 1 immagine di riferimento alla volta con Flux Kontext",
             "promptExpansionResultPending": "Accetta o ignora il risultato dell'espansione del prompt",
             "promptExpansionPending": "Espansione del prompt in corso"
         },
@@ -1173,8 +1173,8 @@
             "layeringStrategy": "Strategia livelli",
             "longestPath": "Percorso più lungo",
             "layoutDirection": "Direzione schema",
-            "layoutDirectionRight": "A destra",
-            "layoutDirectionDown": "In basso",
+            "layoutDirectionRight": "Orizzontale",
+            "layoutDirectionDown": "Verticale",
             "alignment": "Allineamento nodi",
             "alignmentUL": "In alto a sinistra",
             "alignmentDL": "In basso a sinistra",
@@ -1728,7 +1728,7 @@
         "structure": {
             "heading": "Struttura",
             "paragraphs": [
-                "La struttura determina quanto l'immagine finale rispecchierà lo schema dell'originale. Un valore struttura basso permette cambiamenti significativi, mentre un valore struttura alto conserva la composizione e lo schema originali."
+                "La struttura determina quanto l'immagine finale rispecchierà il layout dell'originale. Un valore struttura basso permette cambiamenti significativi, mentre un valore struttura alto conserva la composizione e lo schema originali."
             ]
         },
         "fluxDevLicense": {
@@ -2495,12 +2495,11 @@
             "off": "Spento"
         },
         "invertMask": "Inverti maschera",
-        "fitBboxToMasks": "Adatta il riquadro di delimitazione alle maschere",
-        "maxRefImages": "Max Immagini di rif.to",
-        "useAsReferenceImage": "Usa come immagine di riferimento"
+        "fitBboxToMasks": "Adatta il riquadro di delimitazione alle maschere"
     },
     "ui": {
         "tabs": {
+            "generation": "Generazione",
             "canvas": "Tela",
             "workflows": "Flussi di lavoro",
             "workflowsTab": "$t(ui.tabs.workflows) $t(common.tab)",
@@ -2509,8 +2508,7 @@
             "queue": "Coda",
             "upscaling": "Amplia",
             "upscalingTab": "$t(ui.tabs.upscaling) $t(common.tab)",
-            "gallery": "Galleria",
-            "generate": "Genera"
+            "gallery": "Galleria"
         },
         "launchpad": {
             "workflowsTitle": "Approfondisci i flussi di lavoro.",
@@ -2558,43 +2556,8 @@
                 "helpText": {
                     "promptAdvice": "Durante l'ampliamento, utilizza un prompt che descriva il mezzo e lo stile. Evita di descrivere dettagli specifici del contenuto dell'immagine.",
                     "styleAdvice": "L'ampliamento funziona meglio con lo stile generale dell'immagine."
-                },
-                "creativityAndStructure": {
-                    "title": "Creatività e struttura predefinite",
-                    "conservative": "Conservativo",
-                    "balanced": "Bilanciato",
-                    "creative": "Creativo",
-                    "artistic": "Artistico"
                 }
-            },
-            "createNewWorkflowFromScratch": "Crea un nuovo flusso di lavoro da zero",
-            "browseAndLoadWorkflows": "Sfoglia e carica i flussi di lavoro esistenti",
-            "addStyleRef": {
-                "title": "Aggiungi un riferimento di stile",
-                "description": "Aggiungi un'immagine per trasferirne l'aspetto."
-            },
-            "editImage": {
-                "title": "Modifica immagine",
-                "description": "Aggiungi un'immagine da perfezionare."
-            },
-            "generateFromText": {
-                "title": "Genera da testo",
-                "description": "Inserisci un prompt e genera."
-            },
-            "useALayoutImage": {
-                "description": "Aggiungi un'immagine per controllare la composizione.",
-                "title": "Usa una immagine guida"
-            },
-            "generate": {
-                "canvasCalloutTitle": "Vuoi avere più controllo, modificare e affinare le tue immagini?",
-                "canvasCalloutLink": "Per ulteriori funzionalità, vai su Tela."
             }
-        },
-        "panels": {
-            "launchpad": "Rampa di lancio",
-            "workflowEditor": "Editor del flusso di lavoro",
-            "imageViewer": "Visualizzatore immagini",
-            "canvas": "Tela"
         }
     },
     "upscaling": {
@@ -2685,8 +2648,10 @@
         "watchRecentReleaseVideos": "Guarda i video su questa versione",
         "watchUiUpdatesOverview": "Guarda le novità dell'interfaccia",
         "items": [
-            "Lo stato dello studio viene salvato sul server, consentendoti di continuare a lavorare su qualsiasi dispositivo.",
-            "Supporto per più immagini di riferimento per FLUX Kontext (solo modello locale)."
+            "Nuova impostazione per inviare tutte le generazioni della Tela direttamente alla Galleria.",
+            "Nuove funzionalità Inverti maschera (Maiusc+V) e Adatta il Riquadro di delimitazione alla maschera (Maiusc+B).",
+            "Supporto esteso per miniature e configurazioni dei modelli.",
+            "Vari altri aggiornamenti e correzioni per la qualità della vita"
         ]
     },
     "system": {

invokeai/frontend/web/public/locales/ja.json

@@ -1783,6 +1783,7 @@
             "workflows": "ワークフロー",
             "models": "モデル",
             "gallery": "ギャラリー",
+            "generation": "生成",
             "workflowsTab": "$t(ui.tabs.workflows) $t(common.tab)",
             "modelsTab": "$t(ui.tabs.models) $t(common.tab)",
             "upscaling": "アップスケーリング",

invokeai/frontend/web/public/locales/ru.json

@@ -1931,6 +1931,7 @@
     },
     "ui": {
         "tabs": {
+            "generation": "Генерация",
             "canvas": "Холст",
             "workflowsTab": "$t(ui.tabs.workflows) $t(common.tab)",
             "models": "Модели",

invokeai/frontend/web/public/locales/vi.json

@@ -299,7 +299,7 @@
         "pruneTooltip": "Cắt bớt {{item_count}} mục đã hoàn tất",
         "pruneSucceeded": "Đã cắt bớt {{item_count}} mục đã hoàn tất khỏi hàng",
         "clearTooltip": "Huỷ Và Dọn Dẹp Tất Cả Mục",
-        "clearQueueAlertDialog": "Dọn dẹp hàng đợi sẽ ngay lập tức huỷ tất cả mục đang xử lý và làm sạch hàng hoàn toàn. Bộ lọc đang chờ xử lý sẽ bị huỷ bỏ và Vùng Dựng Canva sẽ được khởi động lại.",
+        "clearQueueAlertDialog": "Dọn dẹp hàng đợi sẽ ngay lập tức huỷ tất cả mục đang xử lý và làm sạch hàng hoàn toàn. Bộ lọc đang chờ xử lý sẽ bị huỷ bỏ.",
         "session": "Phiên",
         "item": "Mục",
         "resumeFailed": "Có Vấn Đề Khi Tiếp Tục Bộ Xử Lý",
@@ -343,14 +343,13 @@
         "retrySucceeded": "Mục Đã Thử Lại",
         "retryFailed": "Có Vấn Đề Khi Thử Lại Mục",
         "retryItem": "Thử Lại Mục",
-        "credits": "Nguồn",
-        "cancelAllExceptCurrent": "Huỷ Bỏ Tất Cả Ngoại Trừ Mục Hiện Tại"
+        "credits": "Nguồn"
     },
     "hotkeys": {
         "canvas": {
             "fitLayersToCanvas": {
                 "title": "Xếp Vừa Layers Vào Canvas",
-                "desc": "Căn chỉnh để góc nhìn vừa vặn với tất cả layer nhìn thấy dược."
+                "desc": "Căn chỉnh để góc nhìn vừa vặn với tất cả layer."
             },
             "setZoomTo800Percent": {
                 "desc": "Phóng to canvas lên 800%.",
@@ -474,24 +473,6 @@
             "toggleNonRasterLayers": {
                 "title": "Bật/Tắt Layer Không Thuộc Dạng Raster",
                 "desc": "Hiện hoặc ẩn tất cả layer không thuộc dạng raster (Layer Điều Khiển Được, Lớp Phủ Inpaint, Chỉ Dẫn Khu Vực)."
-            },
-            "invertMask": {
-                "title": "Đảo Ngược Lớp Phủ",
-                "desc": "Đảo ngược lớp phủ inpaint được chọn, tạo một lớp phủ mới với độ trong suốt đối nghịch."
-            },
-            "fitBboxToMasks": {
-                "title": "Xếp Vừa Hộp Giới Hạn Vào Lớp Phủ",
-                "desc": "Tự động điểu chỉnh hộp giới hạn tạo sinh vừa vặn vào lớp phủ inpaint nhìn thấy được"
-            },
-            "applySegmentAnything": {
-                "title": "Áp Dụng Segment Anything",
-                "desc": "Áp dụng lớp phủ Segment Anything hiện tại.",
-                "key": "enter"
-            },
-            "cancelSegmentAnything": {
-                "title": "Huỷ Segment Anything",
-                "desc": "Huỷ hoạt động Segment Anything hiện tại.",
-                "key": "esc"
             }
         },
         "workflows": {
@@ -621,10 +602,6 @@
             "clearSelection": {
                 "desc": "Xoá phần lựa chọn hiện tại nếu có.",
                 "title": "Xoá Phần Lựa Chọn"
-            },
-            "starImage": {
-                "title": "Dấu/Huỷ Sao Hình Ảnh",
-                "desc": "Đánh dấu sao hoặc huỷ đánh dấu sao ảnh được chọn."
             }
         },
         "app": {
@@ -684,11 +661,6 @@
             "selectModelsTab": {
                 "desc": "Chọn tab Model (Mô Hình).",
                 "title": "Chọn Tab Model"
-            },
-            "selectGenerateTab": {
-                "title": "Chọn Tab Tạo Sinh",
-                "desc": "Chọn tab Tạo Sinh.",
-                "key": "1"
             }
         },
         "searchHotkeys": "Tìm Phím tắt",
@@ -1118,23 +1090,7 @@
         "unknownField_withName": "Vùng Dữ Liệu Không Rõ \"{{name}}\"",
         "unexpectedField_withName": "Sai Vùng Dữ Liệu \"{{name}}\"",
         "unknownFieldEditWorkflowToFix_withName": "Workflow chứa vùng dữ liệu không rõ \"{{name}}\".\nHãy biên tập workflow để sửa lỗi.",
-        "missingField_withName": "Thiếu Vùng Dữ Liệu \"{{name}}\"",
-        "layout": {
-            "autoLayout": "Bố Cục Tự Động",
-            "layeringStrategy": "Chiến Lược Phân Layer",
-            "networkSimplex": "Network Simplex",
-            "longestPath": "Đường Đi Dài Nhất",
-            "nodeSpacing": "Khoảng Cách Node",
-            "layerSpacing": "Khoảng Cách Layer",
-            "layoutDirection": "Hướng Bố Cục",
-            "layoutDirectionRight": "Phải",
-            "layoutDirectionDown": "Xuống",
-            "alignment": "Căn Chỉnh Node",
-            "alignmentUL": "Trên Cùng Bên Trái",
-            "alignmentDL": "Dưới Cùng Bên Trái",
-            "alignmentUR": "Trên Cùng Bên Phải",
-            "alignmentDR": "Dưới Cùng Bên Phải"
-        }
+        "missingField_withName": "Thiếu Vùng Dữ Liệu \"{{name}}\""
     },
     "popovers": {
         "paramCFGRescaleMultiplier": {
@@ -1641,7 +1597,7 @@
             "modelIncompatibleScaledBboxHeight": "Chiều dài hộp giới hạn theo tỉ lệ là {{height}} nhưng {{model}} yêu cầu bội số của {{multiple}}",
             "modelIncompatibleScaledBboxWidth": "Chiều rộng hộp giới hạn theo tỉ lệ là {{width}} nhưng {{model}} yêu cầu bội số của {{multiple}}",
             "modelDisabledForTrial": "Tạo sinh với {{modelName}} là không thể với tài khoản trial. Vào phần thiết lập tài khoản để nâng cấp.",
-            "fluxKontextMultipleReferenceImages": "Chỉ có thể dùng 1 Ảnh Mẫu cùng lúc với LUX Kontext thông qua BFL API",
+            "fluxKontextMultipleReferenceImages": "Chỉ có thể dùng 1 Ảnh Mẫu cùng lúc với Flux Kontext",
             "promptExpansionPending": "Trong quá trình mở rộng lệnh",
             "promptExpansionResultPending": "Hãy chấp thuận hoặc huỷ bỏ kết quả mở rộng lệnh của bạn"
         },
@@ -2236,11 +2192,7 @@
             "off": "Tắt",
             "switchOnStart": "Khi Bắt Đầu",
             "switchOnFinish": "Khi Kết Thúc"
-        },
-        "fitBboxToMasks": "Xếp Vừa Hộp Giới Hạn Vào Lớp Phủ",
-        "invertMask": "Đảo Ngược Lớp Phủ",
-        "maxRefImages": "Ảnh Mẫu Tối Đa",
-        "useAsReferenceImage": "Dùng Làm Ảnh Mẫu"
+        }
     },
     "stylePresets": {
         "negativePrompt": "Lệnh Tiêu Cực",
@@ -2402,28 +2354,20 @@
         "noValidLayerAdapters": "Không có Layer Adaper Phù Hợp",
         "promptGenerationStarted": "Trình tạo sinh lệnh khởi động",
         "uploadAndPromptGenerationFailed": "Thất bại khi tải lên ảnh để tạo sinh lệnh",
-        "promptExpansionFailed": "Có vấn đề xảy ra. Hãy thử mở rộng lệnh lại.",
-        "maskInverted": "Đã Đảo Ngược Lớp Phủ",
-        "maskInvertFailed": "Thất Bại Khi Đảo Ngược Lớp Phủ",
-        "noVisibleMasks": "Không Có Lớp Phủ Đang Hiển Thị",
-        "noVisibleMasksDesc": "Tạo hoặc bật ít nhất một lớp phủ inpaint để đảo ngược",
-        "noInpaintMaskSelected": "Không Có Lớp Phủ Inpant Được Chọn",
-        "noInpaintMaskSelectedDesc": "Chọn một lớp phủ inpaint để đảo ngược",
-        "invalidBbox": "Hộp Giới Hạn Không Hợp Lệ",
-        "invalidBboxDesc": "Hợp giới hạn có kích thước không hợp lệ"
+        "promptExpansionFailed": "Có vấn đề xảy ra. Hãy thử mở rộng lệnh lại."
     },
     "ui": {
         "tabs": {
             "gallery": "Thư Viện Ảnh",
             "models": "Models",
+            "generation": "Generation (Máy Tạo Sinh)",
             "upscaling": "Upscale (Nâng Cấp Chất Lượng Hình Ảnh)",
             "canvas": "Canvas (Vùng Ảnh)",
             "upscalingTab": "$t(common.tab) $t(ui.tabs.upscaling)",
             "modelsTab": "$t(common.tab) $t(ui.tabs.models)",
             "queue": "Queue (Hàng Đợi)",
             "workflows": "Workflow (Luồng Làm Việc)",
-            "workflowsTab": "$t(common.tab) $t(ui.tabs.workflows)",
-            "generate": "Tạo Sinh"
+            "workflowsTab": "$t(common.tab) $t(ui.tabs.workflows)"
         },
         "launchpad": {
             "workflowsTitle": "Đi sâu hơn với Workflow.",
@@ -2471,43 +2415,8 @@
                     "promptAdvice": "Khi upscale, dùng lệnh để mô tả phương thức và phong cách. Tránh mô tả các chi tiết cụ thể trong ảnh.",
                     "styleAdvice": "Upscale thích hợp nhất cho phong cách chung của ảnh."
                 },
-                "scale": "Kích Thước",
-                "creativityAndStructure": {
-                    "title": "Độ Sáng Tạo & Cấu Trúc Mặc Định",
-                    "conservative": "Bảo toàn",
-                    "balanced": "Cân bằng",
-                    "creative": "Sáng tạo",
-                    "artistic": "Thẩm mỹ"
-                }
-            },
-            "createNewWorkflowFromScratch": "Tạo workflow mới từ đầu",
-            "browseAndLoadWorkflows": "Duyệt và tải workflow có sẵn",
-            "addStyleRef": {
-                "title": "Thêm Phong Cách Mẫu",
-                "description": "Thêm ảnh để chuyển đổi diện mạo của nó."
-            },
-            "editImage": {
-                "title": "Biên Tập Ảnh",
-                "description": "Thêm ảnh để chỉnh sửa."
-            },
-            "generateFromText": {
-                "title": "Tạo Sinh Từ Chữ",
-                "description": "Nhập lệnh vào và Kích Hoạt."
-            },
-            "useALayoutImage": {
-                "title": "Dùng Bố Cục Ảnh",
-                "description": "Thêm ảnh để điều khiển bố cục."
-            },
-            "generate": {
-                "canvasCalloutTitle": "Đang tìm cách để điều khiển, chỉnh sửa, và làm lại ảnh?",
-                "canvasCalloutLink": "Vào Canvas cho nhiều tính năng hơn."
+                "scale": "Kích Thước"
             }
-        },
-        "panels": {
-            "launchpad": "Launchpad",
-            "workflowEditor": "Trình Biên Tập Workflow",
-            "imageViewer": "Trình Xem Ảnh",
-            "canvas": "Canvas"
         }
     },
     "workflows": {
@@ -2679,8 +2588,9 @@
         "watchRecentReleaseVideos": "Xem Video Phát Hành Mới Nhất",
         "watchUiUpdatesOverview": "Xem Tổng Quan Về Những Cập Nhật Cho Giao Diện Người Dùng",
         "items": [
-            "Trạng thái Studio được lưu vào server, giúp bạn tiếp tục công việc ở mọi thiết bị.",
-            "Hỗ trợ nhiều ảnh mẫu cho FLUX KONTEXT (chỉ cho model trên máy)."
+            "Tạo sinh ảnh nhanh hơn với Launchpad và thẻ Tạo Sinh đã cơ bản hoá.",
+            "Biên tập với lệnh bằng Flux Kontext Dev.",
+            "Xuất ra file PSD, ẩn số lượng lớn lớp phủ, sắp xếp model & ảnh — tất cả cho một giao diện đã thiết kế lại để chuyên điều khiển."
         ]
     },
     "upsell": {

invokeai/frontend/web/public/locales/zh-CN.json

@@ -1772,6 +1772,7 @@
     },
     "ui": {
         "tabs": {
+            "generation": "生成",
             "queue": "队列",
             "canvas": "画布",
             "upscaling": "放大中",

invokeai/frontend/web/src/app/components/App.tsx

@@ -2,8 +2,8 @@ import { Box } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { GlobalHookIsolator } from 'app/components/GlobalHookIsolator';
 import { GlobalModalIsolator } from 'app/components/GlobalModalIsolator';
+import { useClearStorage } from 'app/contexts/clear-storage-context';
 import { $didStudioInit, type StudioInitAction } from 'app/hooks/useStudioInitAction';
-import { clearStorage } from 'app/store/enhancers/reduxRemember/driver';
 import type { PartialAppConfig } from 'app/types/invokeai';
 import Loading from 'common/components/Loading/Loading';
 import { AppContent } from 'features/ui/components/AppContent';
@@ -21,12 +21,13 @@ interface Props {
 
 const App = ({ config = DEFAULT_CONFIG, studioInitAction }: Props) => {
   const didStudioInit = useStore($didStudioInit);
+  const clearStorage = useClearStorage();
 
   const handleReset = useCallback(() => {
     clearStorage();
     location.reload();
     return false;
-  }, []);
+  }, [clearStorage]);
 
   return (
     <ThemeLocaleProvider>

invokeai/frontend/web/src/app/components/InvokeAIUI.tsx

@@ -1,11 +1,12 @@
 import 'i18n';
 
 import type { Middleware } from '@reduxjs/toolkit';
+import { ClearStorageProvider } from 'app/contexts/clear-storage-context';
 import type { StudioInitAction } from 'app/hooks/useStudioInitAction';
 import { $didStudioInit } from 'app/hooks/useStudioInitAction';
 import type { LoggingOverrides } from 'app/logging/logger';
 import { $loggingOverrides, configureLogging } from 'app/logging/logger';
-import { addStorageListeners } from 'app/store/enhancers/reduxRemember/driver';
+import { buildStorageApi } from 'app/store/enhancers/reduxRemember/driver';
 import { $accountSettingsLink } from 'app/store/nanostores/accountSettingsLink';
 import { $authToken } from 'app/store/nanostores/authToken';
 import { $baseUrl } from 'app/store/nanostores/baseUrl';
@@ -36,7 +37,7 @@ import {
 import type { WorkflowCategory } from 'features/nodes/types/workflow';
 import type { ToastConfig } from 'features/toast/toast';
 import type { PropsWithChildren, ReactNode } from 'react';
-import React, { lazy, memo, useEffect, useLayoutEffect, useState } from 'react';
+import React, { lazy, memo, useEffect, useLayoutEffect, useMemo } from 'react';
 import { Provider } from 'react-redux';
 import { addMiddleware, resetMiddlewares } from 'redux-dynamic-middlewares';
 import { $socketOptions } from 'services/events/stores';
@@ -71,7 +72,14 @@ interface Props extends PropsWithChildren {
    * If provided, overrides in-app navigation to the model manager
    */
   onClickGoToModelManager?: () => void;
-  storagePersistThrottle?: number;
+  storageConfig?: {
+    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+    getItem: (key: string) => Promise<any>;
+    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+    setItem: (key: string, value: any) => Promise<any>;
+    clear: () => Promise<void>;
+    persistThrottle: number;
+  };
 }
 
 const InvokeAIUI = ({
@@ -98,11 +106,8 @@ const InvokeAIUI = ({
   loggingOverrides,
   onClickGoToModelManager,
   whatsNew,
-  storagePersistThrottle = 2000,
+  storageConfig,
 }: Props) => {
-  const [store, setStore] = useState<ReturnType<typeof createStore> | undefined>(undefined);
-  const [didRehydrate, setDidRehydrate] = useState(false);
-
   useLayoutEffect(() => {
     /*
      * We need to configure logging before anything else happens - useLayoutEffect ensures we set this at the first
@@ -314,38 +319,44 @@ const InvokeAIUI = ({
     };
   }, [isDebugging]);
 
+  const storage = useMemo(() => buildStorageApi(storageConfig), [storageConfig]);
+
   useEffect(() => {
-    const onRehydrated = () => {
-      setDidRehydrate(true);
+    const storageCleanup = storage.registerListeners();
+    return () => {
+      storageCleanup();
     };
-    const store = createStore({ persist: true, persistThrottle: storagePersistThrottle, onRehydrated });
-    setStore(store);
+  }, [storage]);
+
+  const store = useMemo(() => {
+    return createStore({
+      driver: storage.reduxRememberDriver,
+      persistThrottle: storageConfig?.persistThrottle ?? 2000,
+    });
+  }, [storage.reduxRememberDriver, storageConfig?.persistThrottle]);
+
+  useEffect(() => {
     $store.set(store);
     if (import.meta.env.MODE === 'development') {
       window.$store = $store;
     }
-    const removeStorageListeners = addStorageListeners();
     return () => {
-      removeStorageListeners();
-      setStore(undefined);
       $store.set(undefined);
       if (import.meta.env.MODE === 'development') {
         window.$store = undefined;
       }
     };
-  }, [storagePersistThrottle]);
-
-  if (!store || !didRehydrate) {
-    return <Loading />;
-  }
+  }, [store]);
 
   return (
     <React.StrictMode>
-      <Provider store={store}>
-        <React.Suspense fallback={<Loading />}>
-          <App config={config} studioInitAction={studioInitAction} />
-        </React.Suspense>
-      </Provider>
+      <ClearStorageProvider value={storage.clearStorage}>
+        <Provider store={store}>
+          <React.Suspense fallback={<Loading />}>
+            <App config={config} studioInitAction={studioInitAction} />
+          </React.Suspense>
+        </Provider>
+      </ClearStorageProvider>
     </React.StrictMode>
   );
 };

invokeai/frontend/web/src/app/contexts/clear-storage-context.tsx

@@ -0,0 +1,10 @@
+import { createContext, useContext } from 'react';
+
+const ClearStorageContext = createContext<() => void>(() => {});
+
+export const ClearStorageProvider = ClearStorageContext.Provider;
+
+export const useClearStorage = () => {
+  const context = useContext(ClearStorageContext);
+  return context;
+};

invokeai/frontend/web/src/app/logging/logger.ts

@@ -93,7 +93,5 @@ export const configureLogging = (
     localStorage.setItem('ROARR_FILTER', filter);
   }
 
-  const styleOutput = localStorage.getItem('ROARR_STYLE_OUTPUT') === 'false' ? false : true;
-
-  ROARR.write = createLogWriter({ styleOutput });
+  ROARR.write = createLogWriter();
 };

invokeai/frontend/web/src/app/store/enhancers/reduxRemember/driver.ts

@@ -1,209 +1,243 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import { logger } from 'app/logging/logger';
 import { StorageError } from 'app/store/enhancers/reduxRemember/errors';
-import { $authToken } from 'app/store/nanostores/authToken';
 import { $projectId } from 'app/store/nanostores/projectId';
-import { $queueId } from 'app/store/nanostores/queueId';
-import type { UseStore } from 'idb-keyval';
-import { createStore as idbCreateStore, del as idbDel, get as idbGet } from 'idb-keyval';
-import type { Driver } from 'redux-remember';
-import { serializeError } from 'serialize-error';
-import { buildV1Url, getBaseUrl } from 'services/api';
-import type { JsonObject } from 'type-fest';
+import type { Driver as ReduxRememberDriver } from 'redux-remember';
+import { getBaseUrl } from 'services/api';
+import { buildAppInfoUrl } from 'services/api/endpoints/appInfo';
 
 const log = logger('system');
 
-const getUrl = (endpoint: 'get_by_key' | 'set_by_key' | 'delete', key?: string) => {
-  const baseUrl = getBaseUrl();
-  const query: Record<string, string> = {};
-  if (key) {
-    query['key'] = key;
-  }
+const buildOSSServerBackedDriver = (): {
+  reduxRememberDriver: ReduxRememberDriver;
+  clearStorage: () => Promise<void>;
+  registerListeners: () => () => void;
+} => {
+  // Persistence happens per slice. To track when persistence is in progress, maintain a ref count, incrementing
+  // it when a slice is being persisted and decrementing it when the persistence is done.
+  let persistRefCount = 0;
 
-  const path = buildV1Url(`client_state/${$queueId.get()}/${endpoint}`, query);
-  const url = `${baseUrl}/${path}`;
-  return url;
-};
+  // Keep track of the last persisted state for each key to avoid unnecessary network requests.
+  //
+  // `redux-remember` persists individual slices of state, so we can implicity denylist a slice by not giving it a
+  // persist config.
+  //
+  // However, we may need to avoid persisting individual _fields_ of a slice. `redux-remember` does not provide a
+  // way to do this directly.
+  //
+  // To accomplish this, we add a layer of logic on top of the `redux-remember`. In the state serializer function
+  // provided to `redux-remember`, we can omit certain fields from the state that we do not want to persist. See
+  // the implementation in `store.ts` for this logic.
+  //
+  // This logic is unknown to `redux-remember`. When an omitted field changes, it will still attempt to persist the
+  // whole slice, even if the final, _serialized_ slice value is unchanged.
+  //
+  // To avoid unnecessary network requests, we keep track of the last persisted state for each key. If the value to
+  // be persisted is the same as the last persisted value, we can skip the network request.
+  const lastPersistedState = new Map<string, unknown>();
 
-const getHeaders = () => {
-  const headers = new Headers();
-  const authToken = $authToken.get();
-  const projectId = $projectId.get();
-  if (authToken) {
-    headers.set('Authorization', `Bearer ${authToken}`);
-  }
-  if (projectId) {
-    headers.set('project-id', projectId);
-  }
-  return headers;
-};
-
-// Persistence happens per slice. To track when persistence is in progress, maintain a ref count, incrementing
-// it when a slice is being persisted and decrementing it when the persistence is done.
-let persistRefCount = 0;
-
-// Keep track of the last persisted state for each key to avoid unnecessary network requests.
-//
-// `redux-remember` persists individual slices of state, so we can implicity denylist a slice by not giving it a
-// persist config.
-//
-// However, we may need to avoid persisting individual _fields_ of a slice. `redux-remember` does not provide a
-// way to do this directly.
-//
-// To accomplish this, we add a layer of logic on top of the `redux-remember`. In the state serializer function
-// provided to `redux-remember`, we can omit certain fields from the state that we do not want to persist. See
-// the implementation in `store.ts` for this logic.
-//
-// This logic is unknown to `redux-remember`. When an omitted field changes, it will still attempt to persist the
-// whole slice, even if the final, _serialized_ slice value is unchanged.
-//
-// To avoid unnecessary network requests, we keep track of the last persisted state for each key in this map.
-// If the value to be persisted is the same as the last persisted value, we will skip the network request.
-const lastPersistedState = new Map<string, string | undefined>();
-
-// As of v6.3.0, we use server-backed storage for client state. This replaces the previous IndexedDB-based storage,
-// which was implemented using `idb-keyval`.
-//
-// To facilitate a smooth transition, we implement a migration strategy that attempts to retrieve values from IndexedDB
-// and persist them to the new server-backed storage. This is done on a best-effort basis.
-
-// These constants were used in the previous IndexedDB-based storage implementation.
-const IDB_DB_NAME = 'invoke';
-const IDB_STORE_NAME = 'invoke-store';
-const IDB_STORAGE_PREFIX = '@@invokeai-';
-
-// Lazy store creation
-let _idbKeyValStore: UseStore | null = null;
-const getIdbKeyValStore = () => {
-  if (_idbKeyValStore === null) {
-    _idbKeyValStore = idbCreateStore(IDB_DB_NAME, IDB_STORE_NAME);
-  }
-  return _idbKeyValStore;
-};
-
-const getIdbKey = (key: string) => {
-  return `${IDB_STORAGE_PREFIX}${key}`;
-};
-
-const getItem = async (key: string) => {
-  try {
-    const url = getUrl('get_by_key', key);
-    const headers = getHeaders();
-    const res = await fetch(url, { method: 'GET', headers });
-    if (!res.ok) {
-      throw new Error(`Response status: ${res.status}`);
+  const getUrl = (key?: string) => {
+    const baseUrl = getBaseUrl();
+    const query: Record<string, string> = {};
+    if (key) {
+      query['key'] = key;
     }
-    const value = await res.json();
+    const path = buildAppInfoUrl('client_state', query);
+    const url = `${baseUrl}/${path}`;
+    return url;
+  };
 
-    // Best-effort migration from IndexedDB to the new storage system
-    log.trace({ key, value }, 'Server-backed storage value retrieved');
-
-    if (!value) {
-      const idbKey = getIdbKey(key);
+  const reduxRememberDriver: ReduxRememberDriver = {
+    getItem: async (key) => {
       try {
-        // It's a bit tricky to query IndexedDB directly to check if value exists, so we use `idb-keyval` to do it.
-        // Thing is, `idb-keyval` requires you to create a store to query it. End result - we are creating a store
-        // even if we don't use it for anything besides checking if the key is present.
-        const idbKeyValStore = getIdbKeyValStore();
-        const idbValue = await idbGet(idbKey, idbKeyValStore);
-        if (idbValue) {
-          log.debug(
-            { key, idbKey, idbValue },
-            'No value in server-backed storage, but found value in IndexedDB - attempting migration'
-          );
-          await idbDel(idbKey, idbKeyValStore);
-          await setItem(key, idbValue);
-          log.debug({ key, idbKey, idbValue }, 'Migration successful');
-          return idbValue;
+        const url = getUrl(key);
+        const res = await fetch(url, { method: 'GET' });
+        if (!res.ok) {
+          throw new Error(`Response status: ${res.status}`);
         }
-      } catch (error) {
-        // Just log if IndexedDB retrieval fails - this is a best-effort migration.
-        log.debug(
-          { key, idbKey, error: serializeError(error) } as JsonObject,
-          'Error checking for or migrating from IndexedDB'
-        );
+        const text = await res.text();
+        if (!lastPersistedState.get(key)) {
+          lastPersistedState.set(key, text);
+        }
+        return JSON.parse(text);
+      } catch (originalError) {
+        throw new StorageError({
+          key,
+          projectId: $projectId.get(),
+          originalError,
+        });
+      }
+    },
+    setItem: async (key, value) => {
+      try {
+        persistRefCount++;
+        if (lastPersistedState.get(key) === value) {
+          log.trace(`Skipping persist for key "${key}" as value is unchanged.`);
+          return value;
+        }
+        const url = getUrl(key);
+        const headers = new Headers({
+          'Content-Type': 'application/json',
+        });
+        const res = await fetch(url, { method: 'POST', headers, body: value });
+        if (!res.ok) {
+          throw new Error(`Response status: ${res.status}`);
+        }
+
+        lastPersistedState.set(key, value);
+        return value;
+      } catch (originalError) {
+        throw new StorageError({
+          key,
+          value,
+          projectId: $projectId.get(),
+          originalError,
+        });
+      } finally {
+        persistRefCount--;
+        if (persistRefCount < 0) {
+          log.trace('Persist ref count is negative, resetting to 0');
+          persistRefCount = 0;
+        }
+      }
+    },
+  };
+
+  const clearStorage = async () => {
+    try {
+      persistRefCount++;
+      const url = getUrl();
+      const res = await fetch(url, { method: 'DELETE' });
+      if (!res.ok) {
+        throw new Error(`Response status: ${res.status}`);
+      }
+    } catch {
+      log.error('Failed to reset client state');
+    } finally {
+      persistRefCount--;
+      lastPersistedState.clear();
+      if (persistRefCount < 0) {
+        log.trace('Persist ref count is negative, resetting to 0');
+        persistRefCount = 0;
       }
     }
+  };
 
-    lastPersistedState.set(key, value);
-    log.trace({ key, last: lastPersistedState.get(key), next: value }, `Getting state for ${key}`);
-    return value;
-  } catch (originalError) {
-    throw new StorageError({
-      key,
-      projectId: $projectId.get(),
-      originalError,
-    });
-  }
+  const registerListeners = () => {
+    const onBeforeUnload = (e: BeforeUnloadEvent) => {
+      if (persistRefCount > 0) {
+        e.preventDefault();
+      }
+    };
+    window.addEventListener('beforeunload', onBeforeUnload);
+
+    return () => {
+      window.removeEventListener('beforeunload', onBeforeUnload);
+    };
+  };
+
+  return { reduxRememberDriver, clearStorage, registerListeners };
 };
 
-const setItem = async (key: string, value: string) => {
-  try {
-    persistRefCount++;
-    if (lastPersistedState.get(key) === value) {
-      log.trace(
-        { key, last: lastPersistedState.get(key), next: value },
-        `Skipping persist for ${key} as value is unchanged`
-      );
-      return value;
-    }
-    log.trace({ key, last: lastPersistedState.get(key), next: value }, `Persisting state for ${key}`);
-    const url = getUrl('set_by_key', key);
-    const headers = getHeaders();
-    const res = await fetch(url, { method: 'POST', headers, body: value });
-    if (!res.ok) {
-      throw new Error(`Response status: ${res.status}`);
-    }
-    const resultValue = await res.json();
-    lastPersistedState.set(key, resultValue);
-    return resultValue;
-  } catch (originalError) {
-    throw new StorageError({
-      key,
-      value,
-      projectId: $projectId.get(),
-      originalError,
-    });
-  } finally {
-    persistRefCount--;
-    if (persistRefCount < 0) {
-      log.trace('Persist ref count is negative, resetting to 0');
-      persistRefCount = 0;
-    }
-  }
-};
+const buildCustomDriver = (api: {
+  getItem: (key: string) => Promise<any>;
+  setItem: (key: string, value: any) => Promise<any>;
+  clear: () => Promise<void>;
+}): {
+  reduxRememberDriver: ReduxRememberDriver;
+  clearStorage: () => Promise<void>;
+  registerListeners: () => () => void;
+} => {
+  // See the comment in `buildOSSServerBackedDriver` for an explanation of this variable.
+  let persistRefCount = 0;
 
-export const reduxRememberDriver: Driver = { getItem, setItem };
+  // See the comment in `buildOSSServerBackedDriver` for an explanation of this variable.
+  const lastPersistedState = new Map<string, unknown>();
 
-export const clearStorage = async () => {
-  try {
-    persistRefCount++;
-    const url = getUrl('delete');
-    const headers = getHeaders();
-    const res = await fetch(url, { method: 'POST', headers });
-    if (!res.ok) {
-      throw new Error(`Response status: ${res.status}`);
-    }
-  } catch {
-    log.error('Failed to reset client state');
-  } finally {
-    persistRefCount--;
-    lastPersistedState.clear();
-    if (persistRefCount < 0) {
-      log.trace('Persist ref count is negative, resetting to 0');
-      persistRefCount = 0;
-    }
-  }
-};
+  const reduxRememberDriver: ReduxRememberDriver = {
+    getItem: async (key) => {
+      try {
+        log.trace(`Getting client state for key "${key}"`);
+        return await api.getItem(key);
+      } catch (originalError) {
+        throw new StorageError({
+          key,
+          projectId: $projectId.get(),
+          originalError,
+        });
+      }
+    },
+    setItem: async (key, value) => {
+      try {
+        persistRefCount++;
 
-export const addStorageListeners = () => {
-  const onBeforeUnload = (e: BeforeUnloadEvent) => {
-    if (persistRefCount > 0) {
-      e.preventDefault();
+        if (lastPersistedState.get(key) === value) {
+          log.trace(`Skipping setting client state for key "${key}" as value is unchanged`);
+          return value;
+        }
+        log.trace(`Setting client state for key "${key}", ${value}`);
+        await api.setItem(key, value);
+        lastPersistedState.set(key, value);
+        return value;
+      } catch (originalError) {
+        throw new StorageError({
+          key,
+          value,
+          projectId: $projectId.get(),
+          originalError,
+        });
+      } finally {
+        persistRefCount--;
+        if (persistRefCount < 0) {
+          log.trace('Persist ref count is negative, resetting to 0');
+          persistRefCount = 0;
+        }
+      }
+    },
+  };
+
+  const clearStorage = async () => {
+    try {
+      persistRefCount++;
+      log.trace('Clearing client state');
+      await api.clear();
+    } catch {
+      log.error('Failed to clear client state');
+    } finally {
+      persistRefCount--;
+      lastPersistedState.clear();
+      if (persistRefCount < 0) {
+        log.trace('Persist ref count is negative, resetting to 0');
+        persistRefCount = 0;
+      }
     }
   };
-  window.addEventListener('beforeunload', onBeforeUnload);
 
-  return () => {
-    window.removeEventListener('beforeunload', onBeforeUnload);
+  const registerListeners = () => {
+    const onBeforeUnload = (e: BeforeUnloadEvent) => {
+      if (persistRefCount > 0) {
+        e.preventDefault();
+      }
+    };
+    window.addEventListener('beforeunload', onBeforeUnload);
+
+    return () => {
+      window.removeEventListener('beforeunload', onBeforeUnload);
+    };
   };
+
+  return { reduxRememberDriver, clearStorage, registerListeners };
+};
+
+export const buildStorageApi = (api?: {
+  getItem: (key: string) => Promise<any>;
+  setItem: (key: string, value: any) => Promise<any>;
+  clear: () => Promise<void>;
+}) => {
+  if (api) {
+    return buildCustomDriver(api);
+  } else {
+    return buildOSSServerBackedDriver();
+  }
 };

invokeai/frontend/web/src/app/store/enhancers/reduxRemember/errors.ts

@@ -33,9 +33,8 @@ export class StorageError extends Error {
   }
 }
 
-const log = logger('system');
-
 export const errorHandler = (err: PersistError | RehydrateError) => {
+  const log = logger('system');
   if (err instanceof PersistError) {
     log.error({ error: serializeError(err) }, 'Problem persisting state');
   } else if (err instanceof RehydrateError) {

invokeai/frontend/web/src/app/store/store.ts

@@ -1,5 +1,5 @@
 import type { ThunkDispatch, TypedStartListening, UnknownAction } from '@reduxjs/toolkit';
-import { addListener, combineReducers, configureStore, createAction, createListenerMiddleware } from '@reduxjs/toolkit';
+import { addListener, combineReducers, configureStore, createListenerMiddleware } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import { errorHandler } from 'app/store/enhancers/reduxRemember/errors';
 import { addAdHocPostProcessingRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/addAdHocPostProcessingRequestedListener';
@@ -40,15 +40,14 @@ import { systemSliceConfig } from 'features/system/store/systemSlice';
 import { uiSliceConfig } from 'features/ui/store/uiSlice';
 import { diff } from 'jsondiffpatch';
 import dynamicMiddlewares from 'redux-dynamic-middlewares';
-import type { SerializeFunction, UnserializeFunction } from 'redux-remember';
-import { REMEMBER_REHYDRATED, rememberEnhancer, rememberReducer } from 'redux-remember';
+import type { Driver, SerializeFunction, UnserializeFunction } from 'redux-remember';
+import { rememberEnhancer, rememberReducer } from 'redux-remember';
 import undoable, { newHistory } from 'redux-undo';
 import { serializeError } from 'serialize-error';
 import { api } from 'services/api';
 import { authToastMiddleware } from 'services/api/authToastMiddleware';
 import type { JsonObject } from 'type-fest';
 
-import { reduxRememberDriver } from './enhancers/reduxRemember/driver';
 import { actionSanitizer } from './middleware/devtools/actionSanitizer';
 import { actionsDenylist } from './middleware/devtools/actionsDenylist';
 import { stateSanitizer } from './middleware/devtools/stateSanitizer';
@@ -128,10 +127,9 @@ const unserialize: UnserializeFunction = (data, key) => {
   let state;
   try {
     const initialState = getInitialState();
-    const parsed = JSON.parse(data);
 
     // strip out old keys
-    const stripped = pick(deepClone(parsed), keys(initialState));
+    const stripped = pick(deepClone(data), keys(initialState));
     /*
      * Merge in initial state as default values, covering any missing keys. You might be tempted to use _.defaultsDeep,
      * but that merges arrays by index and partial objects by key. Using an identity function as the customizer results
@@ -143,7 +141,7 @@ const unserialize: UnserializeFunction = (data, key) => {
 
     log.debug(
       {
-        persistedData: parsed as JsonObject,
+        persistedData: data as JsonObject,
         rehydratedData: migrated as JsonObject,
         diff: diff(data, migrated) as JsonObject,
       },
@@ -184,8 +182,8 @@ const PERSISTED_KEYS = Object.values(SLICE_CONFIGS)
   .filter((sliceConfig) => !!sliceConfig.persistConfig)
   .map((sliceConfig) => sliceConfig.slice.reducerPath);
 
-export const createStore = (options?: { persist?: boolean; persistThrottle?: number; onRehydrated?: () => void }) => {
-  const store = configureStore({
+export const createStore = (reduxRememberOptions: { driver: Driver; persistThrottle: number }) =>
+  configureStore({
     reducer: rememberedRootReducer,
     middleware: (getDefaultMiddleware) =>
       getDefaultMiddleware({
@@ -197,23 +195,19 @@ export const createStore = (options?: { persist?: boolean; persistThrottle?: num
         .concat(api.middleware)
         .concat(dynamicMiddlewares)
         .concat(authToastMiddleware)
-        // .concat(getDebugLoggerMiddleware({ withDiff: true, withNextState: true }))
+        // .concat(getDebugLoggerMiddleware())
         .prepend(listenerMiddleware.middleware),
     enhancers: (getDefaultEnhancers) => {
       const enhancers = getDefaultEnhancers();
-      if (options?.persist) {
-        return enhancers.prepend(
-          rememberEnhancer(reduxRememberDriver, PERSISTED_KEYS, {
-            persistThrottle: options?.persistThrottle ?? 2000,
-            serialize,
-            unserialize,
-            prefix: '',
-            errorHandler,
-          })
-        );
-      } else {
-        return enhancers;
-      }
+      return enhancers.prepend(
+        rememberEnhancer(reduxRememberOptions.driver, PERSISTED_KEYS, {
+          persistThrottle: reduxRememberOptions.persistThrottle,
+          serialize,
+          unserialize,
+          prefix: '',
+          errorHandler,
+        })
+      );
     },
     devTools: {
       actionSanitizer,
@@ -228,18 +222,6 @@ export const createStore = (options?: { persist?: boolean; persistThrottle?: num
     },
   });
 
-  // Once-off listener to support waiting for rehydration before rendering the app
-  startAppListening({
-    actionCreator: createAction(REMEMBER_REHYDRATED),
-    effect: (action, { unsubscribe }) => {
-      unsubscribe();
-      options?.onRehydrated?.();
-    },
-  });
-
-  return store;
-};
-
 export type AppStore = ReturnType<typeof createStore>;
 export type RootState = ReturnType<AppStore['getState']>;
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */

invokeai/frontend/web/src/common/components/SessionMenuItems.tsx

@@ -1,9 +1,9 @@
 import { MenuItem } from '@invoke-ai/ui-library';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { allEntitiesDeleted, inpaintMaskAdded } from 'features/controlLayers/store/canvasSlice';
+import { useAppDispatch } from 'app/store/storeHooks';
+import { canvasReset } from 'features/controlLayers/store/actions';
+import { inpaintMaskAdded } from 'features/controlLayers/store/canvasSlice';
 import { $canvasManager } from 'features/controlLayers/store/ephemeral';
 import { paramsReset } from 'features/controlLayers/store/paramsSlice';
-import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiArrowsCounterClockwiseBold } from 'react-icons/pi';
@@ -11,10 +11,9 @@ import { PiArrowsCounterClockwiseBold } from 'react-icons/pi';
 export const SessionMenuItems = memo(() => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const tab = useAppSelector(selectActiveTab);
 
   const resetCanvasLayers = useCallback(() => {
-    dispatch(allEntitiesDeleted());
+    dispatch(canvasReset());
     dispatch(inpaintMaskAdded({ isSelected: true, isBookmarked: true }));
     $canvasManager.get()?.stage.fitBboxToStage();
   }, [dispatch]);
@@ -23,16 +22,12 @@ export const SessionMenuItems = memo(() => {
   }, [dispatch]);
   return (
     <>
-      {tab === 'canvas' && (
-        <MenuItem icon={<PiArrowsCounterClockwiseBold />} onClick={resetCanvasLayers}>
-          {t('controlLayers.resetCanvasLayers')}
-        </MenuItem>
-      )}
-      {(tab === 'canvas' || tab === 'generate') && (
-        <MenuItem icon={<PiArrowsCounterClockwiseBold />} onClick={resetGenerationSettings}>
-          {t('controlLayers.resetGenerationSettings')}
-        </MenuItem>
-      )}
+      <MenuItem icon={<PiArrowsCounterClockwiseBold />} onClick={resetCanvasLayers}>
+        {t('controlLayers.resetCanvasLayers')}
+      </MenuItem>
+      <MenuItem icon={<PiArrowsCounterClockwiseBold />} onClick={resetGenerationSettings}>
+        {t('controlLayers.resetGenerationSettings')}
+      </MenuItem>
     </>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImageImage.tsx

@@ -1,20 +1,15 @@
 import { Flex } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { skipToken } from '@reduxjs/toolkit/query';
-import { useAppSelector, useAppStore } from 'app/store/storeHooks';
 import { UploadImageIconButton } from 'common/hooks/useImageUploadButton';
-import { bboxSizeOptimized, bboxSizeRecalled } from 'features/controlLayers/store/canvasSlice';
-import { useCanvasIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
-import { sizeOptimized, sizeRecalled } from 'features/controlLayers/store/paramsSlice';
 import type { ImageWithDims } from 'features/controlLayers/store/types';
 import type { setGlobalReferenceImageDndTarget, setRegionalGuidanceReferenceImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
 import { DndImage } from 'features/dnd/DndImage';
 import { DndImageIcon } from 'features/dnd/DndImageIcon';
-import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memo, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiArrowCounterClockwiseBold, PiRulerBold } from 'react-icons/pi';
+import { PiArrowCounterClockwiseBold } from 'react-icons/pi';
 import { useGetImageDTOQuery } from 'services/api/endpoints/images';
 import type { ImageDTO } from 'services/api/types';
 import { $isConnected } from 'services/events/stores';
@@ -34,10 +29,7 @@ export const RefImageImage = memo(
     dndTargetData,
   }: Props<T>) => {
     const { t } = useTranslation();
-    const store = useAppStore();
     const isConnected = useStore($isConnected);
-    const tab = useAppSelector(selectActiveTab);
-    const isStaging = useCanvasIsStaging();
     const { currentData: imageDTO, isError } = useGetImageDTOQuery(image?.image_name ?? skipToken);
     const handleResetControlImage = useCallback(() => {
       onChangeImage(null);
@@ -56,20 +48,6 @@ export const RefImageImage = memo(
       [onChangeImage]
     );
 
-    const recallSizeAndOptimize = useCallback(() => {
-      if (!imageDTO || (tab === 'canvas' && isStaging)) {
-        return;
-      }
-      const { width, height } = imageDTO;
-      if (tab === 'canvas') {
-        store.dispatch(bboxSizeRecalled({ width, height }));
-        store.dispatch(bboxSizeOptimized());
-      } else if (tab === 'generate') {
-        store.dispatch(sizeRecalled({ width, height }));
-        store.dispatch(sizeOptimized());
-      }
-    }, [imageDTO, isStaging, store, tab]);
-
     return (
       <Flex position="relative" w="full" h="full" alignItems="center" data-error={!imageDTO && !image?.image_name}>
         {!imageDTO && (
@@ -91,14 +69,6 @@ export const RefImageImage = memo(
                 tooltip={t('common.reset')}
               />
             </Flex>
-            <Flex position="absolute" flexDir="column" bottom={2} insetInlineEnd={2} gap={1}>
-              <DndImageIcon
-                onClick={recallSizeAndOptimize}
-                icon={<PiRulerBold size={16} />}
-                tooltip={t('parameters.useSize')}
-                isDisabled={!imageDTO || (tab === 'canvas' && isStaging)}
-              />
-            </Flex>
           </>
         )}
         <DndDropTarget dndTarget={dndTarget} dndTargetData={dndTargetData} label={t('gallery.drop')} />

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImageList.tsx

@@ -63,7 +63,6 @@ RefImageList.displayName = 'RefImageList';
 const dndTargetData = addGlobalReferenceImageDndTarget.getData();
 
 const MaxRefImages = memo(() => {
-  const { t } = useTranslation();
   return (
     <Button
       position="relative"
@@ -76,7 +75,7 @@ const MaxRefImages = memo(() => {
       borderRadius="base"
       isDisabled
     >
-      {t('controlLayers.maxRefImages')}
+      Max Ref Images
     </Button>
   );
 });
@@ -84,7 +83,6 @@ MaxRefImages.displayName = 'MaxRefImages';
 
 const AddRefImageDropTargetAndButton = memo(() => {
   const { dispatch, getState } = useAppStore();
-  const { t } = useTranslation();
   const tab = useAppSelector(selectActiveTab);
 
   const uploadOptions = useMemo(
@@ -116,7 +114,7 @@ const AddRefImageDropTargetAndButton = memo(() => {
         leftIcon={<PiUploadBold />}
         {...uploadApi.getUploadButtonProps()}
       >
-        {t('controlLayers.referenceImage')}
+        Reference Image
         <input {...uploadApi.getUploadInputProps()} />
         <DndDropTarget label="Drop" dndTarget={addGlobalReferenceImageDndTarget} dndTargetData={dndTargetData} />
       </Button>

invokeai/frontend/web/src/features/controlLayers/components/Toolbar/CanvasToolbarFitBboxToLayersButton.tsx

@@ -1,8 +1,6 @@
 import { IconButton } from '@invoke-ai/ui-library';
-import { useIsRegionFocused } from 'common/hooks/focus';
 import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
-import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiResizeBold } from 'react-icons/pi';
@@ -11,23 +9,9 @@ export const CanvasToolbarFitBboxToLayersButton = memo(() => {
   const { t } = useTranslation();
   const canvasManager = useCanvasManager();
   const isBusy = useCanvasIsBusy();
-  const isCanvasFocused = useIsRegionFocused('canvas');
-
   const onClick = useCallback(() => {
     canvasManager.tool.tools.bbox.fitToLayers();
-    canvasManager.stage.fitLayersToStage();
-  }, [canvasManager.tool.tools.bbox, canvasManager.stage]);
-
-  useRegisteredHotkeys({
-    id: 'fitBboxToLayers',
-    category: 'canvas',
-    callback: () => {
-      canvasManager.tool.tools.bbox.fitToLayers();
-      canvasManager.stage.fitLayersToStage();
-    },
-    options: { enabled: isCanvasFocused && !isBusy, preventDefault: true },
-    dependencies: [isCanvasFocused, isBusy],
-  });
+  }, [canvasManager.tool.tools.bbox]);
 
   return (
     <IconButton

invokeai/frontend/web/src/features/controlLayers/konva/CanvasStateApiModule.ts

@@ -319,14 +319,6 @@ export class CanvasStateApiModule extends CanvasModuleBase {
   getPositionGridSize = (): number => {
     const snapToGrid = this.getSettings().snapToGrid;
     if (!snapToGrid) {
-      const overrideSnap = this.$ctrlKey.get() || this.$metaKey.get();
-      if (overrideSnap) {
-        const useFine = this.$shiftKey.get();
-        if (useFine) {
-          return 8;
-        }
-        return 64;
-      }
       return 1;
     }
     const useFine = this.$ctrlKey.get() || this.$metaKey.get();

invokeai/frontend/web/src/features/controlLayers/store/canvasSlice.ts

@@ -1091,15 +1091,6 @@ const slice = createSlice({
 
       syncScaledSize(state);
     },
-    bboxSizeRecalled: (state, action: PayloadAction<{ width: number; height: number }>) => {
-      const { width, height } = action.payload;
-      const gridSize = getGridSize(state.bbox.modelBase);
-      state.bbox.rect.width = Math.max(roundDownToMultiple(width, gridSize), 64);
-      state.bbox.rect.height = Math.max(roundDownToMultiple(height, gridSize), 64);
-      state.bbox.aspectRatio.value = state.bbox.rect.width / state.bbox.rect.height;
-      state.bbox.aspectRatio.id = 'Free';
-      state.bbox.aspectRatio.isLocked = true;
-    },
     bboxAspectRatioLockToggled: (state) => {
       state.bbox.aspectRatio.isLocked = !state.bbox.aspectRatio.isLocked;
       syncScaledSize(state);
@@ -1628,7 +1619,6 @@ export const {
   entityArrangedToBack,
   entityOpacityChanged,
   entitiesReordered,
-  allEntitiesDeleted,
   allEntitiesOfTypeIsHiddenToggled,
   allNonRasterLayersIsHiddenToggled,
   // bbox
@@ -1636,7 +1626,6 @@ export const {
   bboxScaledWidthChanged,
   bboxScaledHeightChanged,
   bboxScaleMethodChanged,
-  bboxSizeRecalled,
   bboxWidthChanged,
   bboxHeightChanged,
   bboxAspectRatioLockToggled,

invokeai/frontend/web/src/features/controlLayers/store/paramsSlice.ts

@@ -241,15 +241,6 @@ const slice = createSlice({
     },
 
     //#region Dimensions
-    sizeRecalled: (state, action: PayloadAction<{ width: number; height: number }>) => {
-      const { width, height } = action.payload;
-      const gridSize = getGridSize(state.model?.base);
-      state.dimensions.rect.width = Math.max(roundDownToMultiple(width, gridSize), 64);
-      state.dimensions.rect.height = Math.max(roundDownToMultiple(height, gridSize), 64);
-      state.dimensions.aspectRatio.value = state.dimensions.rect.width / state.dimensions.rect.height;
-      state.dimensions.aspectRatio.id = 'Free';
-      state.dimensions.aspectRatio.isLocked = true;
-    },
     widthChanged: (state, action: PayloadAction<{ width: number; updateAspectRatio?: boolean; clamp?: boolean }>) => {
       const { width, updateAspectRatio, clamp } = action.payload;
       const gridSize = getGridSize(state.model?.base);
@@ -378,16 +369,14 @@ const slice = createSlice({
 const resetState = (state: ParamsState): ParamsState => {
   // When a new session is requested, we need to keep the current model selections, plus dependent state
   // like VAE precision. Everything else gets reset to default.
-  const oldState = deepClone(state);
   const newState = getInitialParamsState();
-  newState.dimensions = oldState.dimensions;
-  newState.model = oldState.model;
-  newState.vae = oldState.vae;
-  newState.fluxVAE = oldState.fluxVAE;
-  newState.vaePrecision = oldState.vaePrecision;
-  newState.t5EncoderModel = oldState.t5EncoderModel;
-  newState.clipEmbedModel = oldState.clipEmbedModel;
-  newState.refinerModel = oldState.refinerModel;
+  newState.model = state.model;
+  newState.vae = state.vae;
+  newState.fluxVAE = state.fluxVAE;
+  newState.vaePrecision = state.vaePrecision;
+  newState.t5EncoderModel = state.t5EncoderModel;
+  newState.clipEmbedModel = state.clipEmbedModel;
+  newState.refinerModel = state.refinerModel;
   return newState;
 };
 
@@ -438,7 +427,6 @@ export const {
   modelChanged,
 
   // Dimensions
-  sizeRecalled,
   widthChanged,
   heightChanged,
   aspectRatioLockToggled,

invokeai/frontend/web/src/features/controlLayers/store/types.ts

@@ -1,5 +1,6 @@
 import { deepClone } from 'common/util/deepClone';
 import type { CanvasEntityAdapter } from 'features/controlLayers/konva/CanvasEntity/types';
+import type { ProgressImage } from 'features/nodes/types/common';
 import { zMainModelBase, zModelIdentifierField } from 'features/nodes/types/common';
 import {
   zParameterCanvasCoherenceMode,
@@ -413,6 +414,8 @@ export const zLoRA = z.object({
 });
 export type LoRA = z.infer<typeof zLoRA>;
 
+export type EphemeralProgressImage = { sessionId: string; image: ProgressImage };
+
 export const zAspectRatioID = z.enum(['Free', '21:9', '16:9', '3:2', '4:3', '1:1', '3:4', '2:3', '9:16', '9:21']);
 export type AspectRatioID = z.infer<typeof zAspectRatioID>;
 export const isAspectRatioID = (v: unknown): v is AspectRatioID => zAspectRatioID.safeParse(v).success;

invokeai/frontend/web/src/features/dnd/DndImageIcon.tsx

@@ -27,7 +27,6 @@ export const DndImageIcon = memo((props: Props) => {
   return (
     <IconButton
       onClick={onClick}
-      tooltip={tooltip}
       aria-label={tooltip}
       icon={icon}
       variant="link"

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardEditableTitle.tsx

@@ -53,7 +53,6 @@ export const BoardEditableTitle = memo(({ board, isSelected }: Props) => {
           color={isSelected ? 'base.100' : 'base.300'}
           onDoubleClick={editable.startEditing}
           cursor="text"
-          noOfLines={1}
         >
           {editable.value}
         </Text>

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardTooltip.tsx

@@ -37,7 +37,6 @@ export const BoardTooltip = ({ board }: Props) => {
         />
       )}
       <Flex flexDir="column" alignItems="center">
-        {board && <Text fontWeight="semibold">{board.board_name}</Text>}
         <Text noOfLines={1}>
           {t('boards.imagesWithCount', { count: imagesTotal })}, {t('boards.assetsWithCount', { count: assetsTotal })}
         </Text>

invokeai/frontend/web/src/features/gallery/components/BoardsListPanelContent.tsx

@@ -59,7 +59,7 @@ export const BoardsPanel = memo(() => {
             onClick={collapsibleApi.toggle}
             leftIcon={isCollapsed ? <PiCaretDownBold /> : <PiCaretUpBold />}
           >
-            {t('boards.boards')}
+            Boards
           </Button>
         </Flex>
         <Flex>

invokeai/frontend/web/src/features/gallery/components/Gallery.tsx

@@ -75,7 +75,6 @@ export const GalleryPanel = memo(() => {
           variant="ghost"
           onClick={collapsibleApi.toggle}
           leftIcon={isCollapsed ? <PiCaretDownBold /> : <PiCaretUpBold />}
-          noOfLines={1}
         >
           {boardName}
         </Button>

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewCanvasFromImageSubMenu.tsx

@@ -2,7 +2,6 @@ import { Menu, MenuButton, MenuItem, MenuList } from '@invoke-ai/ui-library';
 import { useAppStore } from 'app/store/storeHooks';
 import { SubMenuButtonContent, useSubMenu } from 'common/hooks/useSubMenu';
 import { useCanvasIsBusySafe } from 'features/controlLayers/hooks/useCanvasIsBusy';
-import { useCanvasIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
 import { newCanvasFromImage } from 'features/imageActions/actions';
 import { toast } from 'features/toast/toast';
@@ -18,7 +17,6 @@ export const ImageMenuItemNewCanvasFromImageSubMenu = memo(() => {
   const store = useAppStore();
   const imageDTO = useImageDTOContext();
   const isBusy = useCanvasIsBusySafe();
-  const isStaging = useCanvasIsStaging();
 
   const onClickNewCanvasWithRasterLayerFromImage = useCallback(async () => {
     const { dispatch, getState } = store;
@@ -99,31 +97,27 @@ export const ImageMenuItemNewCanvasFromImageSubMenu = memo(() => {
           <SubMenuButtonContent label={t('controlLayers.newCanvasFromImage')} />
         </MenuButton>
         <MenuList {...subMenu.menuListProps}>
-          <MenuItem
-            icon={<PiFileBold />}
-            onClickCapture={onClickNewCanvasWithRasterLayerFromImage}
-            isDisabled={isStaging || isBusy}
-          >
+          <MenuItem icon={<PiFileBold />} onClickCapture={onClickNewCanvasWithRasterLayerFromImage} isDisabled={isBusy}>
             {t('controlLayers.asRasterLayer')}
           </MenuItem>
           <MenuItem
             icon={<PiFileBold />}
             onClickCapture={onClickNewCanvasWithRasterLayerFromImageWithResize}
-            isDisabled={isStaging || isBusy}
+            isDisabled={isBusy}
           >
             {t('controlLayers.asRasterLayerResize')}
           </MenuItem>
           <MenuItem
             icon={<PiFileBold />}
             onClickCapture={onClickNewCanvasWithControlLayerFromImage}
-            isDisabled={isStaging || isBusy}
+            isDisabled={isBusy}
           >
             {t('controlLayers.asControlLayer')}
           </MenuItem>
           <MenuItem
             icon={<PiFileBold />}
             onClickCapture={onClickNewCanvasWithControlLayerFromImageWithResize}
-            isDisabled={isStaging || isBusy}
+            isDisabled={isBusy}
           >
             {t('controlLayers.asControlLayerResize')}
           </MenuItem>

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemUseAsRefImage.tsx

@@ -28,7 +28,7 @@ export const ImageMenuItemUseAsRefImage = memo(() => {
 
   return (
     <MenuItem icon={<PiImageBold />} onClickCapture={onClickNewGlobalReferenceImageFromImage}>
-      {t('controlLayers.useAsReferenceImage')}
+      Use as Reference Image
     </MenuItem>
   );
 });

invokeai/frontend/web/src/features/gallery/components/ImageViewer/CompareToolbar.tsx

@@ -60,7 +60,7 @@ export const CompareToolbar = memo(() => {
   useRegisteredHotkeys({ id: 'nextComparisonMode', category: 'viewer', callback: nextMode, dependencies: [nextMode] });
 
   return (
-    <Flex w="full" justifyContent="center" h={8}>
+    <Flex w="full" px={2} gap={2} bg="base.750" borderTopRadius="base" h={12}>
       <Flex flex={1} justifyContent="center">
         <Flex marginInlineEnd="auto" alignItems="center">
           <IconButton
@@ -85,7 +85,7 @@ export const CompareToolbar = memo(() => {
         </Flex>
       </Flex>
       <Flex flex={1} justifyContent="center">
-        <ButtonGroup size="sm" variant="outline" alignItems="center">
+        <ButtonGroup variant="outline" alignItems="center">
           <Button
             flexShrink={0}
             onClick={setComparisonModeSlider}
@@ -117,7 +117,6 @@ export const CompareToolbar = memo(() => {
             </Flex>
           </Tooltip>
           <Button
-            size="sm"
             variant="link"
             alignSelf="stretch"
             px={2}

invokeai/frontend/web/src/features/gallery/components/ImageViewer/GenerationProgressPanel.tsx

@@ -0,0 +1,15 @@
+import { Flex } from '@invoke-ai/ui-library';
+import { ProgressImage } from 'features/gallery/components/ImageViewer/ProgressImage';
+import { memo } from 'react';
+
+import { ProgressIndicator } from './ProgressIndicator';
+
+export const GenerationProgressPanel = memo(() => {
+  return (
+    <Flex position="relative" flexDir="column" w="full" h="full" overflow="hidden">
+      <ProgressImage />
+      <ProgressIndicator position="absolute" top={6} right={6} size={8} />
+    </Flex>
+  );
+});
+GenerationProgressPanel.displayName = 'GenerationProgressPanel';

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageComparison.tsx

@@ -1,36 +1,32 @@
-import { Box, Divider, Flex } from '@invoke-ai/ui-library';
+import { Box, Flex } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
-import { debounce } from 'es-toolkit';
-import type { ComparisonWrapperProps } from 'features/gallery/components/ImageViewer/common';
-import { selectImageToCompare } from 'features/gallery/components/ImageViewer/common';
+import type { ComparisonProps } from 'features/gallery/components/ImageViewer/common';
 import { CompareToolbar } from 'features/gallery/components/ImageViewer/CompareToolbar';
 import { ImageComparisonDroppable } from 'features/gallery/components/ImageViewer/ImageComparisonDroppable';
 import { ImageComparisonHover } from 'features/gallery/components/ImageViewer/ImageComparisonHover';
 import { ImageComparisonSideBySide } from 'features/gallery/components/ImageViewer/ImageComparisonSideBySide';
 import { ImageComparisonSlider } from 'features/gallery/components/ImageViewer/ImageComparisonSlider';
-import { selectComparisonMode, selectLastSelectedImage } from 'features/gallery/store/gallerySelectors';
-import { memo, useCallback, useLayoutEffect, useRef, useState } from 'react';
-import { useImageDTO } from 'services/api/endpoints/images';
+import { selectComparisonMode } from 'features/gallery/store/gallerySelectors';
+import { memo } from 'react';
+import { useMeasure } from 'react-use';
 import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
 
-const ImageComparisonContent = memo(({ firstImage, secondImage, rect }: ComparisonWrapperProps) => {
+const ImageComparisonContent = memo(({ firstImage, secondImage, containerDims }: ComparisonProps) => {
   const comparisonMode = useAppSelector(selectComparisonMode);
 
-  if (!firstImage || !secondImage) {
-    return null;
-  }
-
   if (comparisonMode === 'slider') {
-    return <ImageComparisonSlider firstImage={firstImage} secondImage={secondImage} rect={rect} />;
+    return <ImageComparisonSlider firstImage={firstImage} secondImage={secondImage} containerDims={containerDims} />;
   }
 
   if (comparisonMode === 'side-by-side') {
-    return <ImageComparisonSideBySide firstImage={firstImage} secondImage={secondImage} rect={rect} />;
+    return (
+      <ImageComparisonSideBySide firstImage={firstImage} secondImage={secondImage} containerDims={containerDims} />
+    );
   }
 
   if (comparisonMode === 'hover') {
-    return <ImageComparisonHover firstImage={firstImage} secondImage={secondImage} rect={rect} />;
+    return <ImageComparisonHover firstImage={firstImage} secondImage={secondImage} containerDims={containerDims} />;
   }
 
   assert<Equals<never, typeof comparisonMode>>(false);
@@ -38,51 +34,16 @@ const ImageComparisonContent = memo(({ firstImage, secondImage, rect }: Comparis
 
 ImageComparisonContent.displayName = 'ImageComparisonContent';
 
-export const ImageComparison = memo(() => {
-  const lastSelectedImageName = useAppSelector(selectLastSelectedImage);
-  const lastSelectedImageDTO = useImageDTO(lastSelectedImageName);
-  const comparisonImageName = useAppSelector(selectImageToCompare);
-  const comparisonImageDTO = useImageDTO(comparisonImageName);
-
-  const [rect, setRect] = useState<DOMRect | null>(null);
-  const ref = useRef<HTMLDivElement | null>(null);
-
-  // Ref callback runs synchronously when the DOM node is attached, ensuring we have a measurement before
-  // the comparison content is rendered.
-  const measureNode = useCallback((node: HTMLDivElement) => {
-    if (node) {
-      ref.current = node;
-      const boundingRect = node.getBoundingClientRect();
-      setRect(boundingRect);
-    }
-  }, []);
-
-  useLayoutEffect(() => {
-    const el = ref.current;
-    if (!el) {
-      return;
-    }
-    const measureRect = debounce(() => {
-      const boundingRect = el.getBoundingClientRect();
-      setRect(boundingRect);
-    }, 300);
-    const observer = new ResizeObserver(measureRect);
-    observer.observe(el);
-    return () => {
-      observer.disconnect();
-    };
-  }, []);
+export const ImageComparison = memo(({ firstImage, secondImage }: Omit<ComparisonProps, 'containerDims'>) => {
+  const [containerRef, containerDims] = useMeasure<HTMLDivElement>();
 
   return (
-    <Flex flexDir="column" w="full" h="full" overflow="hidden" gap={2} position="relative">
+    <Flex flexDir="column" w="full" h="full" position="relative">
       <CompareToolbar />
-      <Divider />
-      <Flex w="full" h="full" position="relative">
-        <Box ref={measureNode} w="full" h="full" overflow="hidden">
-          <ImageComparisonContent firstImage={lastSelectedImageDTO} secondImage={comparisonImageDTO} rect={rect} />
-        </Box>
-        <ImageComparisonDroppable />
-      </Flex>
+      <Box ref={containerRef} w="full" h="full" p={2} overflow="hidden">
+        <ImageComparisonContent firstImage={firstImage} secondImage={secondImage} containerDims={containerDims} />
+      </Box>
+      <ImageComparisonDroppable />
     </Flex>
   );
 });

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageComparisonHover.tsx

@@ -11,16 +11,14 @@ import { memo, useMemo, useRef } from 'react';
 import type { ComparisonProps } from './common';
 import { fitDimsToContainer, getSecondImageDims } from './common';
 
-export const ImageComparisonHover = memo(({ firstImage, secondImage, rect }: ComparisonProps) => {
+export const ImageComparisonHover = memo(({ firstImage, secondImage, containerDims }: ComparisonProps) => {
   const comparisonFit = useAppSelector(selectComparisonFit);
   const imageContainerRef = useRef<HTMLDivElement>(null);
   const mouseOver = useBoolean(false);
-  const fittedDims = useMemo<Dimensions>(() => {
-    if (!rect) {
-      return { width: 0, height: 0 };
-    }
-    return fitDimsToContainer(rect, firstImage);
-  }, [firstImage, rect]);
+  const fittedDims = useMemo<Dimensions>(
+    () => fitDimsToContainer(containerDims, firstImage),
+    [containerDims, firstImage]
+  );
   const compareImageDims = useMemo<Dimensions>(
     () => getSecondImageDims(comparisonFit, fittedDims, firstImage, secondImage),
     [comparisonFit, fittedDims, firstImage, secondImage]

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageComparisonSlider.tsx

@@ -19,7 +19,7 @@ const HANDLE_HITBOX_PX = `${HANDLE_HITBOX}px`;
 const HANDLE_INNER_LEFT_PX = `${HANDLE_HITBOX / 2 - HANDLE_WIDTH / 2}px`;
 const HANDLE_LEFT_INITIAL_PX = `calc(${INITIAL_POS} - ${HANDLE_HITBOX / 2}px)`;
 
-export const ImageComparisonSlider = memo(({ firstImage, secondImage, rect }: ComparisonProps) => {
+export const ImageComparisonSlider = memo(({ firstImage, secondImage, containerDims }: ComparisonProps) => {
   const comparisonFit = useAppSelector(selectComparisonFit);
 
   // How far the handle is from the left - this will be a CSS calculation that takes into account the handle width
@@ -33,12 +33,10 @@ export const ImageComparisonSlider = memo(({ firstImage, secondImage, rect }: Co
   const rafRef = useRef<number | null>(null);
   const lastMoveTimeRef = useRef<number>(0);
 
-  const fittedDims = useMemo<Dimensions>(() => {
-    if (!rect) {
-      return { width: 0, height: 0 };
-    }
-    return fitDimsToContainer(rect, firstImage);
-  }, [firstImage, rect]);
+  const fittedDims = useMemo<Dimensions>(
+    () => fitDimsToContainer(containerDims, firstImage),
+    [containerDims, firstImage]
+  );
 
   const compareImageDims = useMemo<Dimensions>(
     () => getSecondImageDims(comparisonFit, fittedDims, firstImage, secondImage),

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageViewer.tsx

@@ -1,36 +1,42 @@
-import { Divider, Flex } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
-import { setComparisonImageDndTarget } from 'features/dnd/dnd';
-import { DndDropTarget } from 'features/dnd/DndDropTarget';
+import { selectImageToCompare } from 'features/gallery/components/ImageViewer/common';
 import { CurrentImagePreview } from 'features/gallery/components/ImageViewer/CurrentImagePreview';
+import { ImageComparison } from 'features/gallery/components/ImageViewer/ImageComparison';
 import { selectLastSelectedImage } from 'features/gallery/store/gallerySelectors';
 import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { useImageDTO } from 'services/api/endpoints/images';
 
-import { ViewerToolbar } from './ViewerToolbar';
+// type Props = {
+//   closeButton?: ReactNode;
+// };
 
-const dndTargetData = setComparisonImageDndTarget.getData();
+// const useFocusRegionOptions = {
+//   focusOnMount: true,
+// };
+
+// const FOCUS_REGION_STYLES: SystemStyleObject = {
+//   display: 'flex',
+//   width: 'full',
+//   height: 'full',
+//   position: 'absolute',
+//   flexDirection: 'column',
+//   inset: 0,
+//   alignItems: 'center',
+//   justifyContent: 'center',
+//   overflow: 'hidden',
+// };
 
 export const ImageViewer = memo(() => {
-  const { t } = useTranslation();
-
   const lastSelectedImageName = useAppSelector(selectLastSelectedImage);
   const lastSelectedImageDTO = useImageDTO(lastSelectedImageName);
-  return (
-    <Flex flexDir="column" w="full" h="full" overflow="hidden" gap={2} position="relative">
-      <ViewerToolbar />
-      <Divider />
-      <Flex w="full" h="full" position="relative">
-        <CurrentImagePreview imageDTO={lastSelectedImageDTO} />
-        <DndDropTarget
-          dndTarget={setComparisonImageDndTarget}
-          dndTargetData={dndTargetData}
-          label={t('gallery.selectForCompare')}
-        />
-      </Flex>
-    </Flex>
-  );
+  const comparisonImageName = useAppSelector(selectImageToCompare);
+  const comparisonImageDTO = useImageDTO(comparisonImageName);
+
+  if (lastSelectedImageDTO && comparisonImageDTO) {
+    return <ImageComparison firstImage={lastSelectedImageDTO} secondImage={comparisonImageDTO} />;
+  }
+
+  return <CurrentImagePreview imageDTO={lastSelectedImageDTO} />;
 });
 
 ImageViewer.displayName = 'ImageViewer';

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageViewerPanel.tsx

@@ -1,24 +1,42 @@
-import { createSelector } from '@reduxjs/toolkit';
+import { Divider, Flex } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
+import type { SetComparisonImageDndTargetData } from 'features/dnd/dnd';
+import { setComparisonImageDndTarget } from 'features/dnd/dnd';
+import { DndDropTarget } from 'features/dnd/DndDropTarget';
 import { selectImageToCompare, selectLastSelectedImage } from 'features/gallery/store/gallerySelectors';
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { ImageViewerContextProvider } from './context';
-import { ImageComparison } from './ImageComparison';
 import { ImageViewer } from './ImageViewer';
-
-const selectIsComparing = createSelector(
-  [selectLastSelectedImage, selectImageToCompare],
-  (lastSelectedImage, imageToCompare) => !!lastSelectedImage && !!imageToCompare
-);
+import { ViewerToolbar } from './ViewerToolbar';
 
 export const ImageViewerPanel = memo(() => {
-  const isComparing = useAppSelector(selectIsComparing);
+  const { t } = useTranslation();
+  const lastSelectedImage = useAppSelector(selectLastSelectedImage);
+  const imageToCompare = useAppSelector(selectImageToCompare);
+
+  // Only show drop target when we have a selected image but no comparison image yet
+  const shouldShowDropTarget = lastSelectedImage && !imageToCompare;
+
+  const dndTargetData = useMemo<SetComparisonImageDndTargetData>(() => setComparisonImageDndTarget.getData(), []);
 
   return (
     <ImageViewerContextProvider>
-      {!isComparing && <ImageViewer />}
-      {isComparing && <ImageComparison />}
+      <Flex flexDir="column" w="full" h="full" overflow="hidden" gap={2} position="relative">
+        <ViewerToolbar />
+        <Divider />
+        <Flex w="full" h="full" position="relative">
+          <ImageViewer />
+          {shouldShowDropTarget && (
+            <DndDropTarget
+              dndTarget={setComparisonImageDndTarget}
+              dndTargetData={dndTargetData}
+              label={t('gallery.selectForCompare')}
+            />
+          )}
+        </Flex>
+      </Flex>
     </ImageViewerContextProvider>
   );
 });

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ProgressImage.tsx

@@ -0,0 +1,82 @@
+import type { SystemStyleObject } from '@invoke-ai/ui-library';
+import { Badge, Flex, Image } from '@invoke-ai/ui-library';
+import { useStore } from '@nanostores/react';
+import { createSelector } from '@reduxjs/toolkit';
+import { useAppSelector } from 'app/store/storeHooks';
+import { IAINoContentFallback } from 'common/components/IAIImageFallback';
+import { selectSystemSlice } from 'features/system/store/systemSlice';
+import { memo, useMemo } from 'react';
+import { PiPulseBold } from 'react-icons/pi';
+import { useIsGenerationInProgress } from 'services/api/endpoints/queue';
+import { $lastProgressImage } from 'services/events/stores';
+
+const selectShouldAntialiasProgressImage = createSelector(
+  selectSystemSlice,
+  (system) => system.shouldAntialiasProgressImage
+);
+
+export const ProgressImage = memo(() => {
+  const isGenerationInProgress = useIsGenerationInProgress();
+  const progressImage = useStore($lastProgressImage);
+  const shouldAntialiasProgressImage = useAppSelector(selectShouldAntialiasProgressImage);
+
+  const sx = useMemo<SystemStyleObject>(
+    () => ({
+      imageRendering: shouldAntialiasProgressImage ? 'auto' : 'pixelated',
+    }),
+    [shouldAntialiasProgressImage]
+  );
+
+  if (!isGenerationInProgress) {
+    return (
+      <Flex width="full" height="full" alignItems="center" justifyContent="center">
+        <IAINoContentFallback icon={PiPulseBold} label="No Generation in Progress" />
+      </Flex>
+    );
+  }
+
+  if (!progressImage) {
+    return (
+      <Flex width="full" height="full" position="relative" minW={0} minH={0}>
+        <Badge
+          position="absolute"
+          top={2}
+          left={2}
+          color="base.300"
+          borderColor="base.700"
+          borderWidth={1}
+          bg="base.900"
+          opacity="0.8"
+          fontSize="sm"
+          fontWeight="semibold"
+          zIndex="docked"
+          pointerEvents="none"
+          borderRadius="base"
+        >
+          Waiting for Image
+        </Badge>
+      </Flex>
+    );
+  }
+
+  return (
+    <Flex width="full" height="full" alignItems="center" justifyContent="center" minW={0} minH={0}>
+      <Image
+        src={progressImage.dataURL}
+        width={progressImage.width}
+        height={progressImage.height}
+        draggable={false}
+        data-testid="progress-image"
+        objectFit="contain"
+        maxWidth="full"
+        maxHeight="full"
+        borderRadius="base"
+        sx={sx}
+        minH={0}
+        minW={0}
+      />
+    </Flex>
+  );
+});
+
+ProgressImage.displayName = 'ProgressImage';

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ProgressIndicator.tsx

@@ -0,0 +1,38 @@
+import type { CircularProgressProps, SystemStyleObject } from '@invoke-ai/ui-library';
+import { CircularProgress, Tooltip } from '@invoke-ai/ui-library';
+import { useStore } from '@nanostores/react';
+import { memo } from 'react';
+import { useIsGenerationInProgress } from 'services/api/endpoints/queue';
+import { $lastProgressEvent, formatProgressMessage } from 'services/events/stores';
+
+const circleStyles: SystemStyleObject = {
+  circle: {
+    transitionProperty: 'none',
+    transitionDuration: '0s',
+  },
+};
+
+export const ProgressIndicator = memo((props: CircularProgressProps) => {
+  const isGenerationInProgress = useIsGenerationInProgress();
+  const lastProgressEvent = useStore($lastProgressEvent);
+  if (!isGenerationInProgress) {
+    return null;
+  }
+  if (!lastProgressEvent) {
+    return null;
+  }
+  return (
+    <Tooltip label={formatProgressMessage(lastProgressEvent)}>
+      <CircularProgress
+        size="14px"
+        color="invokeBlue.500"
+        thickness={14}
+        isIndeterminate={!lastProgressEvent || lastProgressEvent.percentage === null}
+        value={lastProgressEvent?.percentage ? lastProgressEvent.percentage * 100 : undefined}
+        sx={circleStyles}
+        {...props}
+      />
+    </Tooltip>
+  );
+});
+ProgressIndicator.displayName = 'ProgressMessage';

invokeai/frontend/web/src/features/gallery/components/ImageViewer/common.ts

@@ -7,16 +7,10 @@ import type { ImageDTO } from 'services/api/types';
 
 export const DROP_SHADOW = 'drop-shadow(0px 0px 4px rgb(0, 0, 0)) drop-shadow(0px 0px 4px rgba(0, 0, 0, 0.3))';
 
-export type ComparisonWrapperProps = {
-  firstImage: ImageDTO | null;
-  secondImage: ImageDTO | null;
-  rect: DOMRect | null;
-};
-
 export type ComparisonProps = {
   firstImage: ImageDTO;
   secondImage: ImageDTO;
-  rect: DOMRect | null;
+  containerDims: Dimensions;
 };
 
 export const fitDimsToContainer = (containerDims: Dimensions, imageDims: Dimensions): Dimensions => {

invokeai/frontend/web/src/features/gallery/components/ImageViewer/context.tsx

@@ -1,16 +1,13 @@
 import { useStore } from '@nanostores/react';
-import { logger } from 'app/logging/logger';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectAutoSwitch } from 'features/gallery/store/gallerySelectors';
 import type { ProgressImage as ProgressImageType } from 'features/nodes/types/common';
-import { LRUCache } from 'lru-cache';
 import { type Atom, atom, computed } from 'nanostores';
 import type { PropsWithChildren } from 'react';
 import { createContext, memo, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import type { S } from 'services/api/types';
 import { $socket } from 'services/events/stores';
 import { assert } from 'tsafe';
-import type { JsonObject } from 'type-fest';
 
 type ImageViewerContextValue = {
   $progressEvent: Atom<S['InvocationProgressEvent'] | null>;
@@ -21,17 +18,12 @@ type ImageViewerContextValue = {
 
 const ImageViewerContext = createContext<ImageViewerContextValue | null>(null);
 
-const log = logger('events');
-
 export const ImageViewerContextProvider = memo((props: PropsWithChildren) => {
   const socket = useStore($socket);
   const autoSwitch = useAppSelector(selectAutoSwitch);
   const $progressEvent = useState(() => atom<S['InvocationProgressEvent'] | null>(null))[0];
   const $progressImage = useState(() => atom<ProgressImageType | null>(null))[0];
   const $hasProgressImage = useState(() => computed($progressImage, (progressImage) => progressImage !== null))[0];
-  // We can have race conditions where we receive a progress event for a queue item that has already finished. Easiest
-  // way to handle this is to keep track of finished queue items in a cache and ignore progress events for those.
-  const [finishedQueueItemIds] = useState(() => new LRUCache<number, boolean>({ max: 200 }));
 
   useEffect(() => {
     if (!socket) {
@@ -39,13 +31,6 @@ export const ImageViewerContextProvider = memo((props: PropsWithChildren) => {
     }
 
     const onInvocationProgress = (data: S['InvocationProgressEvent']) => {
-      if (finishedQueueItemIds.has(data.item_id)) {
-        log.trace(
-          { data } as JsonObject,
-          `Received InvocationProgressEvent event for already-finished queue item ${data.item_id}`
-        );
-        return;
-      }
       $progressEvent.set(data);
       if (data.image) {
         $progressImage.set(data.image);
@@ -57,7 +42,7 @@ export const ImageViewerContextProvider = memo((props: PropsWithChildren) => {
     return () => {
       socket.off('invocation_progress', onInvocationProgress);
     };
-  }, [$progressEvent, $progressImage, finishedQueueItemIds, socket]);
+  }, [$progressEvent, $progressImage, socket]);
 
   useEffect(() => {
     if (!socket) {
@@ -65,28 +50,12 @@ export const ImageViewerContextProvider = memo((props: PropsWithChildren) => {
     }
 
     const onQueueItemStatusChanged = (data: S['QueueItemStatusChangedEvent']) => {
-      if (finishedQueueItemIds.has(data.item_id)) {
-        log.trace(
-          { data } as JsonObject,
-          `Received QueueItemStatusChangedEvent event for already-finished queue item ${data.item_id}`
-        );
-        return;
-      }
-      if (data.status === 'completed' || data.status === 'canceled' || data.status === 'failed') {
-        finishedQueueItemIds.set(data.item_id, true);
-        // Completed queue items have the progress event cleared by the onLoadImage callback. This allows the viewer to
-        // create the illusion of the progress image "resolving" into the final image. If we cleared the progress image
-        // now, there would be a flicker where the progress image disappears before the final image appears, and the
-        // last-selected gallery image should be shown for a brief moment.
-        //
-        // When gallery auto-switch is disabled, we do not need to create this illusion, because we are not going to
-        // switch to the final image automatically. In this case, we clear the progress image immediately.
-        //
-        // We also clear the progress image if the queue item is canceled or failed, as there is no final image to show.
-        if (data.status === 'canceled' || data.status === 'failed' || !autoSwitch) {
-          $progressEvent.set(null);
-          $progressImage.set(null);
-        }
+      // When auto-switch is enabled, we will get a load event as we switch to the new image. This in turn clears the progress image,
+      // creating the illusion of the progress image turning into the new image.
+      // But when auto-switch is disabled, we won't get that load event, so we need to clear the progress image manually.
+      if (data.origin === 'canvas' || !autoSwitch) {
+        $progressEvent.set(null);
+        $progressImage.set(null);
       }
     };
 
@@ -95,7 +64,7 @@ export const ImageViewerContextProvider = memo((props: PropsWithChildren) => {
     return () => {
       socket.off('queue_item_status_changed', onQueueItemStatusChanged);
     };
-  }, [$progressEvent, $progressImage, autoSwitch, finishedQueueItemIds, socket]);
+  }, [$progressEvent, $progressImage, autoSwitch, socket]);
 
   const onLoadImage = useCallback(() => {
     $progressEvent.set(null);

invokeai/frontend/web/src/features/gallery/components/NewGallery.tsx

@@ -59,7 +59,7 @@ const ImageAtPosition = memo(({ imageName }: { index: number; imageName: string
   imagesApi.endpoints.getImageDTO.useQuerySubscription(imageName, { skip: isUninitialized });
 
   if (!imageDTO) {
-    return <GalleryImagePlaceholder data-image-name={imageName} />;
+    return <GalleryImagePlaceholder />;
   }
 
   return <GalleryImage imageDTO={imageDTO} />;

invokeai/frontend/web/src/features/gallery/hooks/useEditImage.ts

@@ -1,6 +1,5 @@
 import { useAppStore } from 'app/store/storeHooks';
 import { useCanvasManagerSafe } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
-import { useCanvasIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { newCanvasFromImage } from 'features/imageActions/actions';
 import { toast } from 'features/toast/toast';
 import { navigationApi } from 'features/ui/layouts/navigation-api';
@@ -14,17 +13,13 @@ export const useEditImage = (imageDTO?: ImageDTO | null) => {
 
   const { getState, dispatch } = useAppStore();
   const canvasManager = useCanvasManagerSafe();
-  const isStaging = useCanvasIsStaging();
 
   const isEnabled = useMemo(() => {
     if (!imageDTO) {
       return false;
     }
-    if (isStaging) {
-      return false;
-    }
     return true;
-  }, [imageDTO, isStaging]);
+  }, [imageDTO]);
 
   const edit = useCallback(async () => {
     if (!imageDTO) {

invokeai/frontend/web/src/features/gallery/store/types.ts

@@ -3,9 +3,8 @@ import z from 'zod';
 
 const zGalleryView = z.enum(['images', 'assets']);
 export type GalleryView = z.infer<typeof zGalleryView>;
-const zBoardId = z.string();
-// TS hack to get autocomplete for "none" but accept any string
-export type BoardId = 'none' | (string & {});
+const zBoardId = z.union([z.literal('none'), z.intersection(z.string(), z.record(z.never(), z.never()))]);
+export type BoardId = z.infer<typeof zBoardId>;
 const zComparisonMode = z.enum(['slider', 'side-by-side', 'hover']);
 export type ComparisonMode = z.infer<typeof zComparisonMode>;
 const zComparisonFit = z.enum(['contain', 'fill']);

invokeai/frontend/web/src/features/nodes/components/flow/nodes/CurrentImage/CurrentImageNode.tsx

@@ -6,7 +6,7 @@ import { IAINoContentFallback } from 'common/components/IAIImageFallback';
 import { DndImage } from 'features/dnd/DndImage';
 import NextPrevImageButtons from 'features/gallery/components/NextPrevImageButtons';
 import { selectLastSelectedImage } from 'features/gallery/store/gallerySelectors';
-import NonInvocationNodeWrapper from 'features/nodes/components/flow/nodes/common/NonInvocationNodeWrapper';
+import NodeWrapper from 'features/nodes/components/flow/nodes/common/NodeWrapper';
 import { DRAG_HANDLE_CLASSNAME } from 'features/nodes/types/constants';
 import type { AnimationProps } from 'framer-motion';
 import { motion } from 'framer-motion';
@@ -58,14 +58,13 @@ const Wrapper = (props: PropsWithChildren<{ nodeProps: NodeProps }>) => {
   }, []);
   const { t } = useTranslation();
   return (
-    <NonInvocationNodeWrapper nodeId={props.nodeProps.id} selected={props.nodeProps.selected} width={384}>
+    <NodeWrapper nodeId={props.nodeProps.id} selected={props.nodeProps.selected} width={384}>
       <Flex
         onMouseEnter={handleMouseEnter}
         onMouseLeave={handleMouseLeave}
         className={DRAG_HANDLE_CLASSNAME}
         position="relative"
         flexDirection="column"
-        aspectRatio="1/1"
       >
         <Flex layerStyle="nodeHeader" borderTopRadius="base" alignItems="center" justifyContent="center" h={8}>
           <Text fontSize="sm" fontWeight="semibold" color="base.200">
@@ -81,7 +80,7 @@ const Wrapper = (props: PropsWithChildren<{ nodeProps: NodeProps }>) => {
           )}
         </Flex>
       </Flex>
-    </NonInvocationNodeWrapper>
+    </NodeWrapper>
   );
 };
 

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/context.tsx

@@ -3,7 +3,7 @@ import type { Selector } from '@reduxjs/toolkit';
 import { createSelector } from '@reduxjs/toolkit';
 import type { RootState } from 'app/store/store';
 import { $templates } from 'features/nodes/store/nodesSlice';
-import { selectEdges, selectNodeFieldElements, selectNodes } from 'features/nodes/store/selectors';
+import { selectEdges, selectNodes } from 'features/nodes/store/selectors';
 import type { InvocationNode, InvocationTemplate } from 'features/nodes/types/invocation';
 import { getNeedsUpdate } from 'features/nodes/util/node/nodeUpdate';
 import type { PropsWithChildren } from 'react';
@@ -27,7 +27,6 @@ type InvocationNodeContextValue = {
   buildSelectOutputFieldTemplateSafe: (
     fieldName: string
   ) => Selector<RootState, InvocationTemplate['outputs'][string] | null>;
-  buildSelectIsInputFieldAddedToForm: (fieldName: string) => Selector<RootState, boolean>;
 
   selectNodeOrThrow: Selector<RootState, InvocationNode>;
   selectNodeDataOrThrow: Selector<RootState, InvocationNode['data']>;
@@ -182,15 +181,6 @@ export const InvocationNodeContextProvider = memo(({ nodeId, children }: PropsWi
         })
       );
 
-    const buildSelectIsInputFieldAddedToForm = (fieldName: string) =>
-      getSelectorFromCache(cache, `buildSelectIsInputFieldAddedToForm-${fieldName}`, () =>
-        createSelector(selectNodeFieldElements, (nodeFieldElements) => {
-          return nodeFieldElements.some(
-            (el) => el.data.fieldIdentifier.nodeId === nodeId && el.data.fieldIdentifier.fieldName === fieldName
-          );
-        })
-      );
-
     const selectNodeNeedsUpdate = getSelectorFromCache(cache, 'selectNodeNeedsUpdate', () =>
       createSelector([selectNodeDataSafe, selectNodeTemplateSafe], (data, template) => {
         if (!data || !template) {
@@ -212,7 +202,6 @@ export const InvocationNodeContextProvider = memo(({ nodeId, children }: PropsWi
       buildSelectInputFieldSafe,
       buildSelectInputFieldTemplateSafe,
       buildSelectOutputFieldTemplateSafe,
-      buildSelectIsInputFieldAddedToForm,
 
       selectNodeOrThrow,
       selectNodeDataOrThrow,

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldTitle.tsx

@@ -1,5 +1,5 @@
 import type { SystemStyleObject } from '@invoke-ai/ui-library';
-import { Icon, Input, Text, Tooltip } from '@invoke-ai/ui-library';
+import { Input, Text, Tooltip } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
 import { useEditable } from 'common/hooks/useEditable';
 import { InputFieldTooltipContent } from 'features/nodes/components/flow/nodes/Invocation/fields/InputFieldTooltipContent';
@@ -8,7 +8,6 @@ import {
   useIsConnectionInProgress,
   useIsConnectionStartField,
 } from 'features/nodes/hooks/useFieldConnectionState';
-import { useInputFieldIsAddedToForm } from 'features/nodes/hooks/useInputFieldIsAddedToForm';
 import { useInputFieldIsConnected } from 'features/nodes/hooks/useInputFieldIsConnected';
 import { useInputFieldTemplateTitleOrThrow } from 'features/nodes/hooks/useInputFieldTemplateTitleOrThrow';
 import { useInputFieldUserTitleSafe } from 'features/nodes/hooks/useInputFieldUserTitleSafe';
@@ -17,13 +16,9 @@ import { HANDLE_TOOLTIP_OPEN_DELAY, NO_FIT_ON_DOUBLE_CLICK_CLASS } from 'feature
 import type { MouseEvent } from 'react';
 import { memo, useCallback, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiLinkBold } from 'react-icons/pi';
 
 const labelSx: SystemStyleObject = {
   p: 0,
-  display: 'flex',
-  gap: 1,
-  alignItems: 'center',
   fontWeight: 'semibold',
   textAlign: 'left',
   color: 'base.300',
@@ -33,9 +28,6 @@ const labelSx: SystemStyleObject = {
   '&[data-is-invalid="true"]': {
     color: 'error.300',
   },
-  '&[data-is-added-to-form="true"]': {
-    color: 'blue.300',
-  },
   '&[data-is-disabled="true"]': {
     opacity: 0.5,
   },
@@ -55,7 +47,6 @@ export const InputFieldTitle = memo((props: Props) => {
   const fieldTemplateTitle = useInputFieldTemplateTitleOrThrow(fieldName);
   const { t } = useTranslation();
   const isConnected = useInputFieldIsConnected(fieldName);
-  const isAddedToForm = useInputFieldIsAddedToForm(fieldName);
   const isConnectionStartField = useIsConnectionStartField(nodeId, fieldName, 'target');
   const isConnectionInProgress = useIsConnectionInProgress();
   const connectionError = useConnectionErrorTKey(nodeId, fieldName, 'target');
@@ -102,11 +93,9 @@ export const InputFieldTitle = memo((props: Props) => {
           noOfLines={1}
           data-is-invalid={isInvalid}
           data-is-disabled={isDisabled}
-          data-is-added-to-form={isAddedToForm}
           onDoubleClick={onDoubleClick}
         >
           {editable.value}
-          {isAddedToForm && <Icon as={PiLinkBold} color="blue.200" ml={1} />}
         </Text>
       </Tooltip>
     );

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/InputFieldTooltipContent.tsx

@@ -2,7 +2,6 @@ import { Flex, ListItem, Text, UnorderedList } from '@invoke-ai/ui-library';
 import { startCase } from 'es-toolkit/compat';
 import { useInputFieldErrors } from 'features/nodes/hooks/useInputFieldErrors';
 import { useInputFieldInstance } from 'features/nodes/hooks/useInputFieldInstance';
-import { useInputFieldIsAddedToForm } from 'features/nodes/hooks/useInputFieldIsAddedToForm';
 import { useInputFieldTemplateOrThrow } from 'features/nodes/hooks/useInputFieldTemplateOrThrow';
 import { useFieldTypeName } from 'features/nodes/hooks/usePrettyFieldType';
 import { memo, useMemo } from 'react';
@@ -20,7 +19,6 @@ export const InputFieldTooltipContent = memo(({ fieldName }: Props) => {
   const fieldTemplate = useInputFieldTemplateOrThrow(fieldName);
   const fieldTypeName = useFieldTypeName(fieldTemplate.type);
   const fieldErrors = useInputFieldErrors(fieldName);
-  const isAddedToForm = useInputFieldIsAddedToForm(fieldName);
 
   const fieldTitle = useMemo(() => {
     if (fieldInstance.label && fieldTemplate.title) {
@@ -36,10 +34,7 @@ export const InputFieldTooltipContent = memo(({ fieldName }: Props) => {
 
   return (
     <Flex flexDir="column">
-      <Text fontWeight="semibold">
-        {fieldTitle}
-        {isAddedToForm && ' (added to form)'}
-      </Text>
+      <Text fontWeight="semibold">{fieldTitle}</Text>
       <Text opacity={0.7} fontStyle="oblique 5deg">
         {fieldTemplate.description}
       </Text>

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Notes/NotesNode.tsx

@@ -3,8 +3,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import type { Node, NodeProps } from '@xyflow/react';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import NodeCollapseButton from 'features/nodes/components/flow/nodes/common/NodeCollapseButton';
-import NonInvocationNodeTitle from 'features/nodes/components/flow/nodes/common/NonInvocationNodeTitle';
-import NonInvocationNodeWrapper from 'features/nodes/components/flow/nodes/common/NonInvocationNodeWrapper';
+import NodeTitle from 'features/nodes/components/flow/nodes/common/NodeTitle';
+import NodeWrapper from 'features/nodes/components/flow/nodes/common/NodeWrapper';
 import { notesNodeValueChanged } from 'features/nodes/store/nodesSlice';
 import { selectNodes } from 'features/nodes/store/selectors';
 import { NO_DRAG_CLASS, NO_PAN_CLASS } from 'features/nodes/types/constants';
@@ -34,7 +34,7 @@ const NotesNode = (props: NodeProps<Node<NotesNodeData>>) => {
   }
 
   return (
-    <NonInvocationNodeWrapper nodeId={nodeId} selected={selected}>
+    <NodeWrapper nodeId={nodeId} selected={selected}>
       <Flex
         layerStyle="nodeHeader"
         borderTopRadius="base"
@@ -44,7 +44,7 @@ const NotesNode = (props: NodeProps<Node<NotesNodeData>>) => {
         h={8}
       >
         <NodeCollapseButton nodeId={nodeId} isOpen={isOpen} />
-        <NonInvocationNodeTitle nodeId={nodeId} title="Notes" />
+        <NodeTitle nodeId={nodeId} title="Notes" />
         <Box minW={8} />
       </Flex>
       {isOpen && (
@@ -73,7 +73,7 @@ const NotesNode = (props: NodeProps<Node<NotesNodeData>>) => {
           </Flex>
         </>
       )}
-    </NonInvocationNodeWrapper>
+    </NodeWrapper>
   );
 };
 

invokeai/frontend/web/src/features/nodes/components/flow/nodes/common/NodeWrapper.tsx

@@ -1,4 +1,4 @@
-import type { ChakraProps } from '@invoke-ai/ui-library';
+import type { ChakraProps, SystemStyleObject } from '@invoke-ai/ui-library';
 import { Box, useGlobalMenuClose } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useInvocationNodeContext } from 'features/nodes/components/flow/nodes/Invocation/context';
@@ -12,8 +12,6 @@ import { zNodeStatus } from 'features/nodes/types/invocation';
 import type { MouseEvent, PropsWithChildren } from 'react';
 import { memo, useCallback } from 'react';
 
-import { containerSx, inProgressSx, shadowsSx } from './shared';
-
 type NodeWrapperProps = PropsWithChildren & {
   nodeId: string;
   selected: boolean;
@@ -21,6 +19,100 @@ type NodeWrapperProps = PropsWithChildren & {
   isMissingTemplate?: boolean;
 };
 
+// Certain CSS transitions are disabled as a performance optimization - they can cause massive slowdowns in large
+// workflows even when the animations are GPU-accelerated CSS.
+
+const containerSx: SystemStyleObject = {
+  h: 'full',
+  position: 'relative',
+  borderRadius: 'base',
+  transitionProperty: 'none',
+  cursor: 'grab',
+  '--border-color': 'var(--invoke-colors-base-500)',
+  '--border-color-selected': 'var(--invoke-colors-blue-300)',
+  '--header-bg-color': 'var(--invoke-colors-base-900)',
+  '&[data-status="warning"]': {
+    '--border-color': 'var(--invoke-colors-warning-500)',
+    '--border-color-selected': 'var(--invoke-colors-warning-500)',
+    '--header-bg-color': 'var(--invoke-colors-warning-700)',
+  },
+  '&[data-status="error"]': {
+    '--border-color': 'var(--invoke-colors-error-500)',
+    '--border-color-selected': 'var(--invoke-colors-error-500)',
+    '--header-bg-color': 'var(--invoke-colors-error-700)',
+  },
+  // The action buttons are hidden by default and shown on hover
+  '& .node-selection-overlay': {
+    display: 'block',
+    position: 'absolute',
+    top: 0,
+    insetInlineEnd: 0,
+    bottom: 0,
+    insetInlineStart: 0,
+    borderRadius: 'base',
+    transitionProperty: 'none',
+    pointerEvents: 'none',
+    shadow: '0 0 0 1px var(--border-color)',
+  },
+  '&[data-is-mouse-over-node="true"] .node-selection-overlay': {
+    display: 'block',
+  },
+  '&[data-is-mouse-over-form-field="true"] .node-selection-overlay': {
+    display: 'block',
+    bg: 'invokeBlueAlpha.100',
+  },
+  _hover: {
+    '& .node-selection-overlay': {
+      display: 'block',
+      shadow: '0 0 0 1px var(--border-color-selected)',
+    },
+    '&[data-is-selected="true"] .node-selection-overlay': {
+      display: 'block',
+      shadow: '0 0 0 2px var(--border-color-selected)',
+    },
+  },
+  '&[data-is-selected="true"] .node-selection-overlay': {
+    display: 'block',
+    shadow: '0 0 0 2px var(--border-color-selected)',
+  },
+  '&[data-is-editor-locked="true"]': {
+    '& *': {
+      cursor: 'not-allowed',
+      pointerEvents: 'none',
+    },
+  },
+};
+
+const shadowsSx: SystemStyleObject = {
+  position: 'absolute',
+  top: 0,
+  insetInlineEnd: 0,
+  bottom: 0,
+  insetInlineStart: 0,
+  borderRadius: 'base',
+  pointerEvents: 'none',
+  zIndex: -1,
+  shadow: 'var(--invoke-shadows-xl), var(--invoke-shadows-base), var(--invoke-shadows-base)',
+};
+
+const inProgressSx: SystemStyleObject = {
+  position: 'absolute',
+  top: 0,
+  insetInlineEnd: 0,
+  bottom: 0,
+  insetInlineStart: 0,
+  borderRadius: 'md',
+  pointerEvents: 'none',
+  transitionProperty: 'none',
+  opacity: 0.7,
+  zIndex: -1,
+  display: 'none',
+  shadow: '0 0 0 2px var(--invoke-colors-yellow-400), 0 0 20px 2px var(--invoke-colors-orange-700)',
+  '&[data-is-in-progress="true"]': {
+    display: 'block',
+  },
+};
+
 const NodeWrapper = (props: NodeWrapperProps) => {
   const { nodeId, width, children, isMissingTemplate, selected } = props;
   const ctx = useInvocationNodeContext();

invokeai/frontend/web/src/features/nodes/components/flow/nodes/common/NonInvocationNodeTitle.tsx

@@ -1,69 +0,0 @@
-import { Flex, Input, Text } from '@invoke-ai/ui-library';
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { useEditable } from 'common/hooks/useEditable';
-import { nodeLabelChanged } from 'features/nodes/store/nodesSlice';
-import { selectNodes } from 'features/nodes/store/selectors';
-import { NO_FIT_ON_DOUBLE_CLICK_CLASS } from 'features/nodes/types/constants';
-import { memo, useCallback, useMemo, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
-
-type Props = {
-  nodeId: string;
-  title: string;
-};
-
-const NonInvocationNodeTitle = ({ nodeId, title }: Props) => {
-  const dispatch = useAppDispatch();
-  const selectNodeLabel = useMemo(
-    () =>
-      createSelector(selectNodes, (nodes) => {
-        const node = nodes.find((n) => n.id === nodeId);
-        return node?.data?.label ?? '';
-      }),
-    [nodeId]
-  );
-  const label = useAppSelector(selectNodeLabel);
-  const { t } = useTranslation();
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  const onChange = useCallback(
-    (label: string) => {
-      dispatch(nodeLabelChanged({ nodeId, label }));
-    },
-    [dispatch, nodeId]
-  );
-
-  const editable = useEditable({
-    value: label || title || t('nodes.problemSettingTitle'),
-    defaultValue: title || t('nodes.problemSettingTitle'),
-    onChange,
-    inputRef,
-  });
-
-  return (
-    <Flex overflow="hidden" w="full" h="full" alignItems="center" justifyContent="center">
-      {!editable.isEditing && (
-        <Text
-          className={NO_FIT_ON_DOUBLE_CLICK_CLASS}
-          fontWeight="semibold"
-          color="base.200"
-          onDoubleClick={editable.startEditing}
-          noOfLines={1}
-        >
-          {editable.value}
-        </Text>
-      )}
-      {editable.isEditing && (
-        <Input
-          ref={inputRef}
-          {...editable.inputProps}
-          variant="outline"
-          _focusVisible={{ borderRadius: 'base', h: 'unset' }}
-        />
-      )}
-    </Flex>
-  );
-};
-
-export default memo(NonInvocationNodeTitle);

invokeai/frontend/web/src/features/nodes/components/flow/nodes/common/NonInvocationNodeWrapper.tsx

@@ -1,80 +0,0 @@
-import type { ChakraProps } from '@invoke-ai/ui-library';
-import { Box, useGlobalMenuClose } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
-import { useIsWorkflowEditorLocked } from 'features/nodes/hooks/useIsWorkflowEditorLocked';
-import { useMouseOverNode } from 'features/nodes/hooks/useMouseOverNode';
-import { useNodeExecutionState } from 'features/nodes/hooks/useNodeExecutionState';
-import { useZoomToNode } from 'features/nodes/hooks/useZoomToNode';
-import { selectNodeOpacity } from 'features/nodes/store/workflowSettingsSlice';
-import { DRAG_HANDLE_CLASSNAME, NO_FIT_ON_DOUBLE_CLICK_CLASS, NODE_WIDTH } from 'features/nodes/types/constants';
-import { zNodeStatus } from 'features/nodes/types/invocation';
-import type { MouseEvent, PropsWithChildren } from 'react';
-import { memo, useCallback } from 'react';
-
-import { containerSx, inProgressSx, shadowsSx } from './shared';
-
-type NonInvocationNodeWrapperProps = PropsWithChildren & {
-  nodeId: string;
-  selected: boolean;
-  width?: ChakraProps['w'];
-};
-
-const NonInvocationNodeWrapper = (props: NonInvocationNodeWrapperProps) => {
-  const { nodeId, width, children, selected } = props;
-  const mouseOverNode = useMouseOverNode(nodeId);
-  const zoomToNode = useZoomToNode(nodeId);
-  const isLocked = useIsWorkflowEditorLocked();
-
-  const executionState = useNodeExecutionState(nodeId);
-  const isInProgress = executionState?.status === zNodeStatus.enum.IN_PROGRESS;
-
-  const opacity = useAppSelector(selectNodeOpacity);
-  const globalMenu = useGlobalMenuClose();
-
-  const onDoubleClick = useCallback(
-    (e: MouseEvent) => {
-      if (!(e.target instanceof HTMLElement)) {
-        // We have to manually narrow the type here thanks to a TS quirk
-        return;
-      }
-      if (
-        e.target instanceof HTMLInputElement ||
-        e.target instanceof HTMLTextAreaElement ||
-        e.target instanceof HTMLSelectElement ||
-        e.target instanceof HTMLButtonElement ||
-        e.target instanceof HTMLAnchorElement
-      ) {
-        // Don't fit the view if the user is editing a text field, select, button, or link
-        return;
-      }
-      if (e.target.closest(`.${NO_FIT_ON_DOUBLE_CLICK_CLASS}`) !== null) {
-        // This target is marked as not fitting the view on double click
-        return;
-      }
-      zoomToNode();
-    },
-    [zoomToNode]
-  );
-
-  return (
-    <Box
-      onClick={globalMenu.onCloseGlobal}
-      onDoubleClick={onDoubleClick}
-      onMouseOver={mouseOverNode.handleMouseOver}
-      onMouseOut={mouseOverNode.handleMouseOut}
-      className={DRAG_HANDLE_CLASSNAME}
-      sx={containerSx}
-      width={width || NODE_WIDTH}
-      opacity={opacity}
-      data-is-editor-locked={isLocked}
-      data-is-selected={selected}
-    >
-      <Box sx={shadowsSx} />
-      <Box sx={inProgressSx} data-is-in-progress={isInProgress} />
-      {children}
-      <Box className="node-selection-overlay" />
-    </Box>
-  );
-};
-
-export default memo(NonInvocationNodeWrapper);

invokeai/frontend/web/src/features/nodes/components/flow/nodes/common/shared.ts

@@ -1,95 +0,0 @@
-// Certain CSS transitions are disabled as a performance optimization - they can cause massive slowdowns in large
-// workflows even when the animations are GPU-accelerated CSS.
-
-import type { SystemStyleObject } from '@invoke-ai/ui-library';
-
-export const containerSx: SystemStyleObject = {
-  h: 'full',
-  position: 'relative',
-  borderRadius: 'base',
-  transitionProperty: 'none',
-  cursor: 'grab',
-  '--border-color': 'var(--invoke-colors-base-500)',
-  '--border-color-selected': 'var(--invoke-colors-blue-300)',
-  '--header-bg-color': 'var(--invoke-colors-base-900)',
-  '&[data-status="warning"]': {
-    '--border-color': 'var(--invoke-colors-warning-500)',
-    '--border-color-selected': 'var(--invoke-colors-warning-500)',
-    '--header-bg-color': 'var(--invoke-colors-warning-700)',
-  },
-  '&[data-status="error"]': {
-    '--border-color': 'var(--invoke-colors-error-500)',
-    '--border-color-selected': 'var(--invoke-colors-error-500)',
-    '--header-bg-color': 'var(--invoke-colors-error-700)',
-  },
-  // The action buttons are hidden by default and shown on hover
-  '& .node-selection-overlay': {
-    display: 'block',
-    position: 'absolute',
-    top: 0,
-    insetInlineEnd: 0,
-    bottom: 0,
-    insetInlineStart: 0,
-    borderRadius: 'base',
-    transitionProperty: 'none',
-    pointerEvents: 'none',
-    shadow: '0 0 0 1px var(--border-color)',
-  },
-  '&[data-is-mouse-over-node="true"] .node-selection-overlay': {
-    display: 'block',
-  },
-  '&[data-is-mouse-over-form-field="true"] .node-selection-overlay': {
-    display: 'block',
-    bg: 'invokeBlueAlpha.100',
-  },
-  _hover: {
-    '& .node-selection-overlay': {
-      display: 'block',
-      shadow: '0 0 0 1px var(--border-color-selected)',
-    },
-    '&[data-is-selected="true"] .node-selection-overlay': {
-      display: 'block',
-      shadow: '0 0 0 2px var(--border-color-selected)',
-    },
-  },
-  '&[data-is-selected="true"] .node-selection-overlay': {
-    display: 'block',
-    shadow: '0 0 0 2px var(--border-color-selected)',
-  },
-  '&[data-is-editor-locked="true"]': {
-    '& *': {
-      cursor: 'not-allowed',
-      pointerEvents: 'none',
-    },
-  },
-};
-
-export const shadowsSx: SystemStyleObject = {
-  position: 'absolute',
-  top: 0,
-  insetInlineEnd: 0,
-  bottom: 0,
-  insetInlineStart: 0,
-  borderRadius: 'base',
-  pointerEvents: 'none',
-  zIndex: -1,
-  shadow: 'var(--invoke-shadows-xl), var(--invoke-shadows-base), var(--invoke-shadows-base)',
-};
-
-export const inProgressSx: SystemStyleObject = {
-  position: 'absolute',
-  top: 0,
-  insetInlineEnd: 0,
-  bottom: 0,
-  insetInlineStart: 0,
-  borderRadius: 'md',
-  pointerEvents: 'none',
-  transitionProperty: 'none',
-  opacity: 0.7,
-  zIndex: -1,
-  display: 'none',
-  shadow: '0 0 0 2px var(--invoke-colors-yellow-400), 0 0 20px 2px var(--invoke-colors-orange-700)',
-  '&[data-is-in-progress="true"]': {
-    display: 'block',
-  },
-};

invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx

@@ -35,7 +35,7 @@ const CleanEditorContent = () => {
           <Flex flexDir="column" alignItems="flex-start" gap={2}>
             <Heading size="sm">{t('nodes.newWorkflow')}</Heading>
             <Text color="base.300" fontSize="sm">
-              {t('ui.launchpad.createNewWorkflowFromScratch')}
+              Create a new workflow from scratch
             </Text>
           </Flex>
         </LaunchpadButton>
@@ -44,7 +44,7 @@ const CleanEditorContent = () => {
           <Flex flexDir="column" alignItems="flex-start" gap={2}>
             <Heading size="sm">{t('nodes.loadWorkflow')}</Heading>
             <Text color="base.300" fontSize="sm">
-              {t('ui.launchpad.browseAndLoadWorkflows')}
+              Browse and load existing workflows
             </Text>
           </Flex>
         </LaunchpadButton>

invokeai/frontend/web/src/features/nodes/components/sidePanel/workflow/PublishWorkflowPanelContent.tsx

@@ -18,7 +18,6 @@ import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableCon
 import { withResultAsync } from 'common/util/result';
 import { parseify } from 'common/util/serialize';
 import { ExternalLink } from 'features/gallery/components/ImageViewer/NoContentForViewer';
-import { InvocationNodeContextProvider } from 'features/nodes/components/flow/nodes/Invocation/context';
 import { NodeFieldElementOverlay } from 'features/nodes/components/sidePanel/builder/NodeFieldElementEditMode';
 import { useDoesWorkflowHaveUnsavedChanges } from 'features/nodes/components/sidePanel/workflow/IsolatedWorkflowBuilderWatcher';
 import {
@@ -90,11 +89,7 @@ const OutputFields = memo(() => {
           {t('workflows.builder.noOutputNodeSelected')}
         </Text>
       )}
-      {outputNodeId && (
-        <InvocationNodeContextProvider nodeId={outputNodeId}>
-          <OutputFieldsContent outputNodeId={outputNodeId} />
-        </InvocationNodeContextProvider>
-      )}
+      {outputNodeId && <OutputFieldsContent outputNodeId={outputNodeId} />}
     </Flex>
   );
 });
@@ -132,11 +127,7 @@ const PublishableInputFields = memo(() => {
       <Text fontWeight="semibold">{t('workflows.builder.publishedWorkflowInputs')}</Text>
       <Divider />
       {inputs.publishable.map(({ nodeId, fieldName }) => {
-        return (
-          <InvocationNodeContextProvider nodeId={nodeId} key={`${nodeId}-${fieldName}`}>
-            <NodeInputFieldPreview nodeId={nodeId} fieldName={fieldName} />
-          </InvocationNodeContextProvider>
-        );
+        return <NodeInputFieldPreview key={`${nodeId}-${fieldName}`} nodeId={nodeId} fieldName={fieldName} />;
       })}
     </Flex>
   );
@@ -158,11 +149,7 @@ const UnpublishableInputFields = memo(() => {
       </Text>
       <Divider />
       {inputs.unpublishable.map(({ nodeId, fieldName }) => {
-        return (
-          <InvocationNodeContextProvider nodeId={nodeId} key={`${nodeId}-${fieldName}`}>
-            <NodeInputFieldPreview key={`${nodeId}-${fieldName}`} nodeId={nodeId} fieldName={fieldName} />
-          </InvocationNodeContextProvider>
-        );
+        return <NodeInputFieldPreview key={`${nodeId}-${fieldName}`} nodeId={nodeId} fieldName={fieldName} />;
       })}
     </Flex>
   );

invokeai/frontend/web/src/features/nodes/hooks/useAutoLayout.ts

@@ -1,6 +1,6 @@
 import { graphlib, layout } from '@dagrejs/dagre';
 import type { Edge, NodePositionChange } from '@xyflow/react';
-import { useAppSelector, useAppStore } from 'app/store/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { nodesChanged } from 'features/nodes/store/nodesSlice';
 import { selectEdges, selectNodes } from 'features/nodes/store/selectors';
 import {
@@ -36,7 +36,9 @@ const getNodeWidth = (node: AnyNode): number => {
 };
 
 export const useAutoLayout = (): (() => void) => {
-  const store = useAppStore();
+  const dispatch = useAppDispatch();
+  const nodes = useAppSelector(selectNodes);
+  const edges = useAppSelector(selectEdges);
   const nodeSpacing = useAppSelector(selectNodeSpacing);
   const layerSpacing = useAppSelector(selectLayerSpacing);
   const layeringStrategy = useAppSelector(selectLayeringStrategy);
@@ -44,9 +46,6 @@ export const useAutoLayout = (): (() => void) => {
   const nodeAlignment = useAppSelector(selectNodeAlignment);
 
   const autoLayout = useCallback(() => {
-    const state = store.getState();
-    const nodes = selectNodes(state);
-    const edges = selectEdges(state);
     // We'll do graph layout using dagre, then convert the results to reactflow position changes
     const g = new graphlib.Graph();
 
@@ -132,8 +131,8 @@ export const useAutoLayout = (): (() => void) => {
       return { id: node.id, type: 'position', position: newPosition };
     });
 
-    store.dispatch(nodesChanged(positionChanges));
-  }, [layerSpacing, layeringStrategy, layoutDirection, nodeAlignment, nodeSpacing, store]);
+    dispatch(nodesChanged(positionChanges));
+  }, [dispatch, edges, nodes, nodeSpacing, layerSpacing, layeringStrategy, layoutDirection, nodeAlignment]);
 
   return autoLayout;
 };

invokeai/frontend/web/src/features/nodes/hooks/useInputFieldIsAddedToForm.ts

@@ -1,9 +0,0 @@
-import { useAppSelector } from 'app/store/storeHooks';
-import { useInvocationNodeContext } from 'features/nodes/components/flow/nodes/Invocation/context';
-import { useMemo } from 'react';
-
-export const useInputFieldIsAddedToForm = (fieldName: string) => {
-  const ctx = useInvocationNodeContext();
-  const selector = useMemo(() => ctx.buildSelectIsInputFieldAddedToForm(fieldName), [ctx, fieldName]);
-  return useAppSelector(selector);
-};

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildChatGPT4oGraph.ts

@@ -133,8 +133,6 @@ export const buildChatGPT4oGraph = async (arg: GraphBuilderArg): Promise<GraphBu
       g.upsertMetadata(selectCanvasMetadata(state));
     }
 
-    g.setMetadataReceivingNode(gptImage);
-
     return {
       g,
       positivePrompt,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildFLUXGraph.ts

@@ -5,7 +5,6 @@ import { selectRefImagesSlice } from 'features/controlLayers/store/refImagesSlic
 import { selectCanvasMetadata, selectCanvasSlice } from 'features/controlLayers/store/selectors';
 import { isFluxKontextReferenceImageConfig } from 'features/controlLayers/store/types';
 import { getGlobalReferenceImageWarnings } from 'features/controlLayers/store/validators';
-import { zImageField } from 'features/nodes/types/common';
 import { addFLUXFill } from 'features/nodes/util/graph/generation/addFLUXFill';
 import { addFLUXLoRAs } from 'features/nodes/util/graph/generation/addFLUXLoRAs';
 import { addFLUXReduxes } from 'features/nodes/util/graph/generation/addFLUXRedux';
@@ -155,20 +154,22 @@ export const buildFLUXGraph = async (arg: GraphBuilderArg): Promise<GraphBuilder
       .filter((entity) => isFluxKontextReferenceImageConfig(entity.config))
       .filter((entity) => getGlobalReferenceImageWarnings(entity, model).length === 0);
 
-    if (validFLUXKontextConfigs.length > 0) {
-      const kontextConcatenator = g.addNode({
-        id: getPrefixedId('flux_kontext_image_prep'),
-        type: 'flux_kontext_image_prep',
-        images: validFLUXKontextConfigs.map(({ config }) => zImageField.parse(config.image)),
-      });
+    // FLUX Kontext supports only a single conditioning image - we'll just take the first one.
+    // In the future, we can explore concatenating multiple conditioning images in image or latent space.
+    const firstValidFLUXKontextConfig = validFLUXKontextConfigs[0];
+
+    if (firstValidFLUXKontextConfig) {
+      const { image } = firstValidFLUXKontextConfig.config;
+
+      assert(image, 'getGlobalReferenceImageWarnings checks if the image is there, this should never raise');
+
       const kontextConditioning = g.addNode({
         type: 'flux_kontext',
         id: getPrefixedId('flux_kontext'),
+        image,
       });
-      g.addEdge(kontextConcatenator, 'image', kontextConditioning, 'image');
       g.addEdge(kontextConditioning, 'kontext_cond', denoise, 'kontext_conditioning');
-
-      g.upsertMetadata({ ref_images: [validFLUXKontextConfigs] }, 'merge');
+      g.upsertMetadata({ ref_images: [firstValidFLUXKontextConfig] }, 'merge');
     }
   }
 

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildFluxKontextGraph.ts

@@ -4,7 +4,8 @@ import { selectMainModelConfig } from 'features/controlLayers/store/paramsSlice'
 import { selectRefImagesSlice } from 'features/controlLayers/store/refImagesSlice';
 import { isFluxKontextAspectRatioID, isFluxKontextReferenceImageConfig } from 'features/controlLayers/store/types';
 import { getGlobalReferenceImageWarnings } from 'features/controlLayers/store/validators';
-import { zImageField, zModelIdentifierField } from 'features/nodes/types/common';
+import type { ImageField } from 'features/nodes/types/common';
+import { zModelIdentifierField } from 'features/nodes/types/common';
 import { Graph } from 'features/nodes/util/graph/generation/Graph';
 import {
   getOriginalAndScaledSizesForTextToImage,
@@ -38,63 +39,34 @@ export const buildFluxKontextGraph = (arg: GraphBuilderArg): GraphBuilderReturn
   const validRefImages = refImages.entities
     .filter((entity) => entity.isEnabled)
     .filter((entity) => isFluxKontextReferenceImageConfig(entity.config))
-    .filter((entity) => getGlobalReferenceImageWarnings(entity, model).length === 0);
+    .filter((entity) => getGlobalReferenceImageWarnings(entity, model).length === 0)
+    .toReversed(); // sends them in order they are displayed in the list
+
+  let input_image: ImageField | undefined = undefined;
+
+  if (validRefImages[0]) {
+    assert(validRefImages.length === 1, 'Flux Kontext can have at most one reference image');
+
+    assert(validRefImages[0].config.image, 'Image is required for reference image');
+    input_image = {
+      image_name: validRefImages[0].config.image.image_name,
+    };
+  }
 
   const g = new Graph(getPrefixedId('flux_kontext_txt2img_graph'));
   const positivePrompt = g.addNode({
     id: getPrefixedId('positive_prompt'),
     type: 'string',
   });
-
-  let fluxKontextImage;
-
-  if (validRefImages.length > 0) {
-    if (validRefImages.length === 1) {
-      // Single reference image - use it directly
-      const firstImage = validRefImages[0]?.config.image;
-      assert(firstImage, 'First image should exist when validRefImages.length > 0');
-
-      fluxKontextImage = g.addNode({
-        // @ts-expect-error: These nodes are not available in the OSS application
-        type: 'flux_kontext_edit_image',
-        model: zModelIdentifierField.parse(model),
-        aspect_ratio: aspectRatio.id,
-        prompt_upsampling: true,
-        input_image: {
-          image_name: firstImage.image_name,
-        },
-        ...selectCanvasOutputFields(state),
-      });
-    } else {
-      // Multiple reference images - use concatenation
-      const kontextConcatenator = g.addNode({
-        id: getPrefixedId('flux_kontext_image_prep'),
-        type: 'flux_kontext_image_prep',
-        images: validRefImages.map(({ config }) => zImageField.parse(config.image)),
-      });
-
-      fluxKontextImage = g.addNode({
-        // @ts-expect-error: These nodes are not available in the OSS application
-        type: 'flux_kontext_edit_image',
-        model: zModelIdentifierField.parse(model),
-        aspect_ratio: aspectRatio.id,
-        prompt_upsampling: true,
-
-        ...selectCanvasOutputFields(state),
-      });
-      // @ts-expect-error: These nodes are not available in the OSS application
-      g.addEdge(kontextConcatenator, 'image', fluxKontextImage, 'input_image');
-    }
-  } else {
-    fluxKontextImage = g.addNode({
-      // @ts-expect-error: These nodes are not available in the OSS application
-      type: 'flux_kontext_generate_image',
-      model: zModelIdentifierField.parse(model),
-      aspect_ratio: aspectRatio.id,
-      prompt_upsampling: true,
-      ...selectCanvasOutputFields(state),
-    });
-  }
+  const fluxKontextImage = g.addNode({
+    // @ts-expect-error: These nodes are not available in the OSS application
+    type: input_image ? 'flux_kontext_edit_image' : 'flux_kontext_generate_image',
+    model: zModelIdentifierField.parse(model),
+    aspect_ratio: aspectRatio.id,
+    input_image,
+    prompt_upsampling: true,
+    ...selectCanvasOutputFields(state),
+  });
 
   g.addEdge(
     positivePrompt,
@@ -104,19 +76,11 @@ export const buildFluxKontextGraph = (arg: GraphBuilderArg): GraphBuilderReturn
     'positive_prompt'
   );
   g.addEdgeToMetadata(positivePrompt, 'value', 'positive_prompt');
-
   g.upsertMetadata({
     model: Graph.getModelMetadataField(model),
     width: originalSize.width,
     height: originalSize.height,
   });
-
-  if (validRefImages.length > 0) {
-    g.upsertMetadata({ ref_images: [validRefImages] }, 'merge');
-  }
-
-  g.setMetadataReceivingNode(fluxKontextImage);
-
   return {
     g,
     positivePrompt,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImagen3Graph.ts

@@ -67,8 +67,6 @@ export const buildImagen3Graph = (arg: GraphBuilderArg): GraphBuilderReturn => {
     model: Graph.getModelMetadataField(model),
   });
 
-  g.setMetadataReceivingNode(imagen3);
-
   return {
     g,
     positivePrompt,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImagen4Graph.ts

@@ -66,8 +66,6 @@ export const buildImagen4Graph = (arg: GraphBuilderArg): GraphBuilderReturn => {
     model: Graph.getModelMetadataField(model),
   });
 
-  g.setMetadataReceivingNode(imagen4);
-
   return {
     g,
     positivePrompt,

invokeai/frontend/web/src/features/queue/components/QueueCountBadge.tsx

@@ -28,24 +28,13 @@ export const QueueCountBadge = memo(({ targetRef }: Props) => {
     }
 
     const cb = () => {
-      // If the parent element is not visible, we do not want to show the badge. This can be tricky to reliably
-      // determine. The best way I've found is to check the bounding rect of the target and its parent.
-      const badgeElRect = target.getBoundingClientRect();
-      const parentElRect = parent.getBoundingClientRect();
-      if (
-        badgeElRect.x === 0 ||
-        badgeElRect.y === 0 ||
-        badgeElRect.width === 0 ||
-        badgeElRect.height === 0 ||
-        parentElRect.x === 0 ||
-        parentElRect.y === 0 ||
-        parentElRect.width === 0 ||
-        parentElRect.height === 0
-      ) {
+      const { x, y } = target.getBoundingClientRect();
+      if (x === 0 || y === 0) {
+        // If the target is not visible, do not show the badge
         setBadgePos(null);
         return;
       }
-      setBadgePos({ x: `${badgeElRect.x - 7}px`, y: `${badgeElRect.y - 5}px` });
+      setBadgePos({ x: `${x - 7}px`, y: `${y - 5}px` });
     };
 
     const resizeObserver = new ResizeObserver(cb);

invokeai/frontend/web/src/features/queue/store/readiness.ts

@@ -278,6 +278,15 @@ const getReasonsWhyCannotEnqueueGenerateTab = (arg: {
   }
 
   const enabledRefImages = refImages.entities.filter(({ isEnabled }) => isEnabled);
+  const referenceImageCount = enabledRefImages.length;
+
+  // Flux Kontext only supports 1x Reference Image at a time.
+  if (
+    (model?.base === 'flux-kontext' || (model?.base === 'flux' && model?.name?.toLowerCase().includes('kontext'))) &&
+    referenceImageCount > 1
+  ) {
+    reasons.push({ content: i18n.t('parameters.invoke.fluxKontextMultipleReferenceImages') });
+  }
 
   enabledRefImages.forEach((entity, i) => {
     const layerNumber = i + 1;
@@ -627,6 +636,15 @@ const getReasonsWhyCannotEnqueueCanvasTab = (arg: {
   });
 
   const enabledRefImages = refImages.entities.filter(({ isEnabled }) => isEnabled);
+  const referenceImageCount = enabledRefImages.length;
+
+  // Flux Kontext only supports 1x Reference Image at a time.
+  if (
+    (model?.base === 'flux-kontext' || (model?.base === 'flux' && model?.name?.toLowerCase().includes('kontext'))) &&
+    referenceImageCount > 1
+  ) {
+    reasons.push({ content: i18n.t('parameters.invoke.fluxKontextMultipleReferenceImages') });
+  }
 
   enabledRefImages.forEach((entity, i) => {
     const layerNumber = i + 1;

invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts

@@ -103,7 +103,6 @@ export const useHotkeyData = (): HotkeysData => {
     addHotkey('canvas', 'setFillToWhite', ['d']);
     addHotkey('canvas', 'fitLayersToCanvas', ['mod+0']);
     addHotkey('canvas', 'fitBboxToCanvas', ['mod+shift+0']);
-    addHotkey('canvas', 'fitBboxToLayers', ['shift+n']);
     addHotkey('canvas', 'setZoomTo100Percent', ['mod+1']);
     addHotkey('canvas', 'setZoomTo200Percent', ['mod+2']);
     addHotkey('canvas', 'setZoomTo400Percent', ['mod+3']);

invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx

@@ -14,7 +14,7 @@ import {
   Switch,
   Text,
 } from '@invoke-ai/ui-library';
-import { clearStorage } from 'app/store/enhancers/reduxRemember/driver';
+import { useClearStorage } from 'app/contexts/clear-storage-context';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
@@ -115,6 +115,8 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps)
     dispatch(shouldConfirmOnNewSessionToggled());
   }, [dispatch]);
 
+  const clearStorage = useClearStorage();
+
   useEffect(() => {
     if (settingsModal.isTrue && Boolean(config?.shouldShowClearIntermediates)) {
       refetchIntermediatesCount();
@@ -125,7 +127,7 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps)
     clearStorage();
     settingsModal.setFalse();
     refreshModal.setTrue();
-  }, [settingsModal, refreshModal]);
+  }, [clearStorage, settingsModal, refreshModal]);
 
   const handleChangeShouldConfirmOnDelete = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {

invokeai/frontend/web/src/features/ui/components/VerticalNavBar.tsx

@@ -42,7 +42,7 @@ export const VerticalNavBar = memo(() => {
     <Flex flexDir="column" alignItems="center" py={6} ps={4} pe={2} gap={4} minW={0} flexShrink={0}>
       <InvokeAILogoComponent />
       <Flex gap={6} pt={6} h="full" flexDir="column">
-        {withGenerateTab && <TabButton tab="generate" icon={<PiTextAaBold />} label={t('ui.tabs.generate')} />}
+        {withGenerateTab && <TabButton tab="generate" icon={<PiTextAaBold />} label="Generate" />}
         {withCanvasTab && <TabButton tab="canvas" icon={<PiBoundingBoxBold />} label={t('ui.tabs.canvas')} />}
         {withUpscalingTab && <TabButton tab="upscaling" icon={<PiFrameCornersBold />} label={t('ui.tabs.upscaling')} />}
         {withWorkflowsTab && <TabButton tab="workflows" icon={<PiFlowArrowBold />} label={t('ui.tabs.workflows')} />}

invokeai/frontend/web/src/features/ui/layouts/GenerateLaunchpadPanel.tsx

@@ -1,7 +1,6 @@
 import { Alert, Button, Flex, Grid, Text } from '@invoke-ai/ui-library';
 import { navigationApi } from 'features/ui/layouts/navigation-api';
 import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { InitialStateMainModelPicker } from './InitialStateMainModelPicker';
 import { LaunchpadAddStyleReference } from './LaunchpadAddStyleReference';
@@ -9,18 +8,17 @@ import { LaunchpadContainer } from './LaunchpadContainer';
 import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton';
 
 export const GenerateLaunchpadPanel = memo(() => {
-  const { t } = useTranslation();
   const newCanvasSession = useCallback(() => {
     navigationApi.switchToTab('canvas');
   }, []);
 
   return (
-    <LaunchpadContainer heading={t('ui.launchpad.generateTitle')}>
+    <LaunchpadContainer heading="Generate images from text prompts.">
       <Grid gridTemplateColumns="1fr 1fr" gap={8}>
         <InitialStateMainModelPicker />
         <Flex flexDir="column" gap={2} justifyContent="center">
           <Text>
-            {t('ui.launchpad.modelGuideText')}{' '}
+            Want to learn what prompts work best for each model?{' '}
             <Button
               as="a"
               variant="link"
@@ -29,7 +27,7 @@ export const GenerateLaunchpadPanel = memo(() => {
               rel="noopener noreferrer"
               size="sm"
             >
-              {t('ui.launchpad.modelGuideLink')}
+              Check out our Model Guide.
             </Button>
           </Text>
         </Flex>
@@ -38,10 +36,10 @@ export const GenerateLaunchpadPanel = memo(() => {
       <LaunchpadAddStyleReference />
       <Alert status="info" borderRadius="base" flexDir="column" gap={2} overflow="unset">
         <Text fontSize="md" fontWeight="semibold">
-          {t('ui.launchpad.generate.canvasCalloutTitle')}
+          Looking to get more control, edit, and iterate on your images?
         </Text>
         <Button variant="link" onClick={newCanvasSession}>
-          {t('ui.launchpad.generate.canvasCalloutLink')}
+          Navigate to Canvas for more capabilities.
         </Button>
       </Alert>
     </LaunchpadContainer>

invokeai/frontend/web/src/features/ui/layouts/LaunchpadAddStyleReference.tsx

@@ -4,18 +4,16 @@ import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
 import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks';
 import { refImageAdded } from 'features/controlLayers/store/refImagesSlice';
 import { imageDTOToImageWithDims } from 'features/controlLayers/store/util';
-import { addGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
+import { addGlobalReferenceImageDndTarget, newCanvasFromImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
 import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton';
 import { memo, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 import { PiUploadBold, PiUserCircleGearBold } from 'react-icons/pi';
 import type { ImageDTO } from 'services/api/types';
 
 const dndTargetData = addGlobalReferenceImageDndTarget.getData();
 
 export const LaunchpadAddStyleReference = memo((props: { extraAction?: () => void }) => {
-  const { t } = useTranslation();
   const { dispatch, getState } = useAppStore();
 
   const uploadOptions = useMemo(
@@ -38,14 +36,14 @@ export const LaunchpadAddStyleReference = memo((props: { extraAction?: () => voi
     <LaunchpadButton {...uploadApi.getUploadButtonProps()} position="relative" gap={8}>
       <Icon as={PiUserCircleGearBold} boxSize={8} color="base.500" />
       <Flex flexDir="column" alignItems="flex-start" gap={2}>
-        <Heading size="sm">{t('ui.launchpad.addStyleRef.title')}</Heading>
-        <Text>{t('ui.launchpad.addStyleRef.description')}</Text>
+        <Heading size="sm">Add a Style Reference</Heading>
+        <Text color="base.300">Add an image to transfer its look.</Text>
       </Flex>
       <Flex position="absolute" right={3} bottom={3}>
         <PiUploadBold />
         <input {...uploadApi.getUploadInputProps()} />
       </Flex>
-      <DndDropTarget dndTarget={addGlobalReferenceImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
+      <DndDropTarget dndTarget={newCanvasFromImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
     </LaunchpadButton>
   );
 });

invokeai/frontend/web/src/features/ui/layouts/LaunchpadEditImageButton.tsx

@@ -1,13 +1,11 @@
 import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
 import { useAppStore } from 'app/store/storeHooks';
 import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { useCanvasIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { newCanvasFromImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
 import { newCanvasFromImage } from 'features/imageActions/actions';
 import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton';
 import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 import { PiPencilBold, PiUploadBold } from 'react-icons/pi';
 import type { ImageDTO } from 'services/api/types';
 
@@ -16,9 +14,7 @@ const NEW_CANVAS_OPTIONS = { type: 'raster_layer', withInpaintMask: true } as co
 const dndTargetData = newCanvasFromImageDndTarget.getData(NEW_CANVAS_OPTIONS);
 
 export const LaunchpadEditImageButton = memo((props: { extraAction?: () => void }) => {
-  const { t } = useTranslation();
   const { getState, dispatch } = useAppStore();
-  const isStaging = useCanvasIsStaging();
 
   const onUpload = useCallback(
     (imageDTO: ImageDTO) => {
@@ -30,22 +26,17 @@ export const LaunchpadEditImageButton = memo((props: { extraAction?: () => void
   const uploadApi = useImageUploadButton({ allowMultiple: false, onUpload });
 
   return (
-    <LaunchpadButton {...uploadApi.getUploadButtonProps()} position="relative" gap={8} isDisabled={isStaging}>
+    <LaunchpadButton {...uploadApi.getUploadButtonProps()} position="relative" gap={8}>
       <Icon as={PiPencilBold} boxSize={8} color="base.500" />
       <Flex flexDir="column" alignItems="flex-start" gap={2}>
-        <Heading size="sm">{t('ui.launchpad.editImage.title')}</Heading>
-        <Text>{t('ui.launchpad.editImage.description')}</Text>
+        <Heading size="sm">Edit Image</Heading>
+        <Text color="base.300">Add an image to refine.</Text>
       </Flex>
       <Flex position="absolute" right={3} bottom={3}>
         <PiUploadBold />
         <input {...uploadApi.getUploadInputProps()} />
       </Flex>
-      <DndDropTarget
-        dndTarget={newCanvasFromImageDndTarget}
-        dndTargetData={dndTargetData}
-        label="Drop"
-        isDisabled={isStaging}
-      />
+      <DndDropTarget dndTarget={newCanvasFromImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
     </LaunchpadButton>
   );
 });

invokeai/frontend/web/src/features/ui/layouts/LaunchpadGenerateFromTextButton.tsx

@@ -1,10 +1,6 @@
 import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
-import { useCanvasIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton';
-import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 import { PiCursorTextBold, PiTextAaBold } from 'react-icons/pi';
 
 const focusOnPrompt = () => {
@@ -16,20 +12,16 @@ const focusOnPrompt = () => {
 };
 
 export const LaunchpadGenerateFromTextButton = memo((props: { extraAction?: () => void }) => {
-  const { t } = useTranslation();
-  const tab = useAppSelector(selectActiveTab);
-  const isStaging = useCanvasIsStaging();
-
   const onClick = useCallback(() => {
     focusOnPrompt();
     props.extraAction?.();
   }, [props]);
   return (
-    <LaunchpadButton onClick={onClick} position="relative" gap={8} isDisabled={tab === 'canvas' && isStaging}>
+    <LaunchpadButton onClick={onClick} position="relative" gap={8}>
       <Icon as={PiTextAaBold} boxSize={8} color="base.500" />
       <Flex flexDir="column" alignItems="flex-start" gap={2}>
-        <Heading size="sm">{t('ui.launchpad.generateFromText.title')}</Heading>
-        <Text>{t('ui.launchpad.generateFromText.description')}</Text>
+        <Heading size="sm">Generate from Text</Heading>
+        <Text color="base.300">Enter a prompt and Invoke.</Text>
       </Flex>
       <Flex position="absolute" right={3} bottom={3}>
         <PiCursorTextBold />