fix 1:1 ratio (#8127)

Co-authored-by: Mary Hipp <maryhipp@Marys-Air.lan>

.gitignore

@@ -180,7 +180,6 @@ cython_debug/
 # Scratch folder
 .scratch/
 .vscode/
-.zed/
 
 # source installer files
 installer/*zip

invokeai/app/api/routers/images.py

@@ -99,9 +99,7 @@ async def upload_image(
             raise HTTPException(status_code=400, detail="Invalid resize_to format or size")
 
         try:
-            # heuristic_resize_fast expects an RGB or RGBA image
-            pil_rgba = pil_image.convert("RGBA")
-            np_image = pil_to_np(pil_rgba)
+            np_image = pil_to_np(pil_image)
             np_image = heuristic_resize_fast(np_image, (resize_dims.width, resize_dims.height))
             pil_image = np_to_pil(np_image)
         except Exception:

invokeai/app/api/routers/session_queue.py

@@ -14,14 +14,13 @@ from invokeai.app.services.session_queue.session_queue_common import (
     CancelByBatchIDsResult,
     CancelByDestinationResult,
     ClearResult,
-    DeleteAllExceptCurrentResult,
-    DeleteByDestinationResult,
     EnqueueBatchResult,
     FieldIdentifier,
     PruneResult,
     RetryItemsResult,
     SessionQueueCountsByDestination,
     SessionQueueItem,
+    SessionQueueItemDTO,
     SessionQueueStatus,
 )
 from invokeai.app.services.shared.pagination import CursorPaginatedResults
@@ -69,7 +68,7 @@ async def enqueue_batch(
     "/{queue_id}/list",
     operation_id="list_queue_items",
     responses={
-        200: {"model": CursorPaginatedResults[SessionQueueItem]},
+        200: {"model": CursorPaginatedResults[SessionQueueItemDTO]},
     },
 )
 async def list_queue_items(
@@ -78,36 +77,11 @@ async def list_queue_items(
     status: Optional[QUEUE_ITEM_STATUS] = Query(default=None, description="The status of items to fetch"),
     cursor: Optional[int] = Query(default=None, description="The pagination cursor"),
     priority: int = Query(default=0, description="The pagination cursor priority"),
-    destination: Optional[str] = Query(default=None, description="The destination of queue items to fetch"),
-) -> CursorPaginatedResults[SessionQueueItem]:
-    """Gets cursor-paginated queue items"""
+) -> CursorPaginatedResults[SessionQueueItemDTO]:
+    """Gets all queue items (without graphs)"""
 
     return ApiDependencies.invoker.services.session_queue.list_queue_items(
-        queue_id=queue_id,
-        limit=limit,
-        status=status,
-        cursor=cursor,
-        priority=priority,
-        destination=destination,
-    )
-
-
-@session_queue_router.get(
-    "/{queue_id}/list_all",
-    operation_id="list_all_queue_items",
-    responses={
-        200: {"model": list[SessionQueueItem]},
-    },
-)
-async def list_all_queue_items(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-    destination: Optional[str] = Query(default=None, description="The destination of queue items to fetch"),
-) -> list[SessionQueueItem]:
-    """Gets all queue items"""
-
-    return ApiDependencies.invoker.services.session_queue.list_all_queue_items(
-        queue_id=queue_id,
-        destination=destination,
+        queue_id=queue_id, limit=limit, status=status, cursor=cursor, priority=priority
     )
 
 
@@ -147,18 +121,6 @@ async def cancel_all_except_current(
     return ApiDependencies.invoker.services.session_queue.cancel_all_except_current(queue_id=queue_id)
 
 
-@session_queue_router.put(
-    "/{queue_id}/delete_all_except_current",
-    operation_id="delete_all_except_current",
-    responses={200: {"model": DeleteAllExceptCurrentResult}},
-)
-async def delete_all_except_current(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-) -> DeleteAllExceptCurrentResult:
-    """Immediately deletes all queue items except in-processing items"""
-    return ApiDependencies.invoker.services.session_queue.delete_all_except_current(queue_id=queue_id)
-
-
 @session_queue_router.put(
     "/{queue_id}/cancel_by_batch_ids",
     operation_id="cancel_by_batch_ids",
@@ -307,18 +269,6 @@ async def get_queue_item(
     return ApiDependencies.invoker.services.session_queue.get_queue_item(item_id)
 
 
-@session_queue_router.delete(
-    "/{queue_id}/i/{item_id}",
-    operation_id="delete_queue_item",
-)
-async def delete_queue_item(
-    queue_id: str = Path(description="The queue id to perform this operation on"),
-    item_id: int = Path(description="The queue item to delete"),
-) -> None:
-    """Deletes a queue item"""
-    ApiDependencies.invoker.services.session_queue.delete_queue_item(item_id)
-
-
 @session_queue_router.put(
     "/{queue_id}/i/{item_id}/cancel",
     operation_id="cancel_queue_item",
@@ -348,18 +298,3 @@ async def counts_by_destination(
     return ApiDependencies.invoker.services.session_queue.get_counts_by_destination(
         queue_id=queue_id, destination=destination
     )
-
-
-@session_queue_router.delete(
-    "/{queue_id}/d/{destination}",
-    operation_id="delete_by_destination",
-    responses={200: {"model": DeleteByDestinationResult}},
-)
-async def delete_by_destination(
-    queue_id: str = Path(description="The queue id to query"),
-    destination: str = Path(description="The destination to query"),
-) -> DeleteByDestinationResult:
-    """Deletes all items with the given destination"""
-    return ApiDependencies.invoker.services.session_queue.delete_by_destination(
-        queue_id=queue_id, destination=destination
-    )

invokeai/app/api_app.py

@@ -158,7 +158,7 @@ web_root_path = Path(list(web_dir.__path__)[0])
 try:
     app.mount("/", NoCacheStaticFiles(directory=Path(web_root_path, "dist"), html=True), name="ui")
 except RuntimeError:
-    logger.warning(f"No UI found at {web_root_path}/dist, skipping UI mount")
+    logger.warn(f"No UI found at {web_root_path}/dist, skipping UI mount")
 app.mount(
     "/static", NoCacheStaticFiles(directory=Path(web_root_path, "static/")), name="static"
 )  # docs favicon is in here

invokeai/app/invocations/baseinvocation.py

@@ -499,7 +499,7 @@ def validate_fields(model_fields: dict[str, FieldInfo], model_type: str) -> None
 
         ui_type = field.json_schema_extra.get("ui_type", None)
         if isinstance(ui_type, str) and ui_type.startswith("DEPRECATED_"):
-            logger.warning(f'"UIType.{ui_type.split("_")[-1]}" is deprecated, ignoring')
+            logger.warn(f'"UIType.{ui_type.split("_")[-1]}" is deprecated, ignoring')
             field.json_schema_extra.pop("ui_type")
     return None
 
@@ -615,7 +615,7 @@ def invocation(
                 raise InvalidVersionError(f'Invalid version string for node "{invocation_type}": "{version}"') from e
             uiconfig["version"] = version
         else:
-            logger.warning(f'No version specified for node "{invocation_type}", using "1.0.0"')
+            logger.warn(f'No version specified for node "{invocation_type}", using "1.0.0"')
             uiconfig["version"] = "1.0.0"
 
         cls.UIConfig = UIConfigBase(**uiconfig)

invokeai/app/invocations/compel.py

@@ -114,13 +114,6 @@ class CompelInvocation(BaseInvocation):
 
             c, _options = compel.build_conditioning_tensor_for_conjunction(conjunction)
 
-        del compel
-        del patched_tokenizer
-        del tokenizer
-        del ti_manager
-        del text_encoder
-        del text_encoder_info
-
         c = c.detach().to("cpu")
 
         conditioning_data = ConditioningFieldData(conditionings=[BasicConditioningInfo(embeds=c)])
@@ -229,10 +222,7 @@ class SDXLPromptInvocationBase:
             else:
                 c_pooled = None
 
-        del compel
-        del patched_tokenizer
         del tokenizer
-        del ti_manager
         del text_encoder
         del text_encoder_info
 

invokeai/app/invocations/fields.py

@@ -64,6 +64,7 @@ class UIType(str, Enum, metaclass=MetaEnum):
     Imagen3Model = "Imagen3ModelField"
     Imagen4Model = "Imagen4ModelField"
     ChatGPT4oModel = "ChatGPT4oModelField"
+    FluxKontextModel = "FluxKontextModelField"
     # endregion
 
     # region Misc Field Types
@@ -437,7 +438,7 @@ class WithWorkflow:
     workflow = None
 
     def __init_subclass__(cls) -> None:
-        logger.warning(
+        logger.warn(
             f"{cls.__module__.split('.')[0]}.{cls.__name__}: WithWorkflow is deprecated. Use `context.workflow` to access the workflow."
         )
         super().__init_subclass__()
@@ -578,7 +579,7 @@ def InputField(
 
     if default_factory is not _Unset and default_factory is not None:
         default = default_factory()
-        logger.warning('"default_factory" is not supported, calling it now to set "default"')
+        logger.warn('"default_factory" is not supported, calling it now to set "default"')
 
     # These are the args we may wish pass to the pydantic `Field()` function
     field_args = {

invokeai/app/services/config/config_default.py

@@ -24,6 +24,7 @@ from invokeai.frontend.cli.arg_parser import InvokeAIArgs
 INIT_FILE = Path("invokeai.yaml")
 DB_FILE = Path("invokeai.db")
 LEGACY_INIT_FILE = Path("invokeai.init")
+DEVICE = Literal["auto", "cpu", "cuda", "cuda:1", "mps"]
 PRECISION = Literal["auto", "float16", "bfloat16", "float32"]
 ATTENTION_TYPE = Literal["auto", "normal", "xformers", "sliced", "torch-sdp"]
 ATTENTION_SLICE_SIZE = Literal["auto", "balanced", "max", 1, 2, 3, 4, 5, 6, 7, 8]
@@ -92,7 +93,7 @@ class InvokeAIAppConfig(BaseSettings):
         vram: DEPRECATED: This setting is no longer used. It has been replaced by `max_cache_vram_gb`, but most users will not need to use this config since automatic cache size limits should work well in most cases. This config setting will be removed once the new model cache behavior is stable.
         lazy_offload: DEPRECATED: This setting is no longer used. Lazy-offloading is enabled by default. This config setting will be removed once the new model cache behavior is stable.
         pytorch_cuda_alloc_conf: Configure the Torch CUDA memory allocator. This will impact peak reserved VRAM usage and performance. Setting to "backend:cudaMallocAsync" works well on many systems. The optimal configuration is highly dependent on the system configuration (device type, VRAM, CUDA driver version, etc.), so must be tuned experimentally.
-        device: Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `mps`, `cuda:N` (where N is a device number)
+        device: Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `cuda:1`, `mps`
         precision: Floating point precision. `float16` will consume half the memory of `float32` but produce slightly lower-quality images. The `auto` setting will guess the proper precision based on your video card and operating system.<br>Valid values: `auto`, `float16`, `bfloat16`, `float32`
         sequential_guidance: Whether to calculate guidance in serial instead of in parallel, lowering memory requirements.
         attention_type: Attention type.<br>Valid values: `auto`, `normal`, `xformers`, `sliced`, `torch-sdp`
@@ -175,7 +176,7 @@ class InvokeAIAppConfig(BaseSettings):
     pytorch_cuda_alloc_conf: Optional[str] = Field(default=None,            description="Configure the Torch CUDA memory allocator. This will impact peak reserved VRAM usage and performance. Setting to \"backend:cudaMallocAsync\" works well on many systems. The optimal configuration is highly dependent on the system configuration (device type, VRAM, CUDA driver version, etc.), so must be tuned experimentally.")
 
     # DEVICE
-    device:                      str = Field(default="auto",                description="Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `mps`, `cuda:N` (where N is a device number)", pattern=r"^(auto|cpu|mps|cuda(:\d+)?)$")
+    device:                      DEVICE = Field(default="auto",             description="Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.")
     precision:                PRECISION = Field(default="auto",             description="Floating point precision. `float16` will consume half the memory of `float32` but produce slightly lower-quality images. The `auto` setting will guess the proper precision based on your video card and operating system.")
 
     # GENERATION

invokeai/app/services/image_records/image_records_sqlite.py

@@ -196,13 +196,9 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
         # Search term condition
         if search_term:
             query_conditions += """--sql
-            AND (
-                images.metadata LIKE ?
-                OR images.created_at LIKE ?
-            )
+            AND images.metadata LIKE ?
             """
             query_params.append(f"%{search_term.lower()}%")
-            query_params.append(f"%{search_term.lower()}%")
 
         if starred_first:
             query_pagination = f"""--sql

invokeai/app/services/images/images_default.py

@@ -78,7 +78,7 @@ class ImageService(ImageServiceABC):
                         board_id=board_id, image_name=image_name
                     )
                 except Exception as e:
-                    self.__invoker.services.logger.warning(f"Failed to add image to board {board_id}: {str(e)}")
+                    self.__invoker.services.logger.warn(f"Failed to add image to board {board_id}: {str(e)}")
             self.__invoker.services.image_files.save(
                 image_name=image_name, image=image, metadata=metadata, workflow=workflow, graph=graph
             )

invokeai/app/services/model_install/model_install_default.py

@@ -148,7 +148,7 @@ class ModelInstallService(ModelInstallServiceBase):
     def _clear_pending_jobs(self) -> None:
         for job in self.list_jobs():
             if not job.in_terminal_state:
-                self._logger.warning(f"Cancelling job {job.id}")
+                self._logger.warning("Cancelling job {job.id}")
                 self.cancel_job(job)
         while True:
             try:

invokeai/app/services/session_processor/session_processor_default.py

@@ -1,4 +1,3 @@
-import gc
 import traceback
 from contextlib import suppress
 from threading import BoundedSemaphore, Thread
@@ -440,12 +439,6 @@ class DefaultSessionProcessor(SessionProcessorBase):
                         poll_now_event.wait(self._polling_interval)
                         continue
 
-                    # GC-ing here can reduce peak memory usage of the invoke process by freeing allocated memory blocks.
-                    # Most queue items take seconds to execute, so the relative cost of a GC is very small.
-                    # Python will never cede allocated memory back to the OS, so anything we can do to reduce the peak
-                    # allocation is well worth it.
-                    gc.collect()
-
                     self._invoker.services.logger.info(
                         f"Executing queue item {self._queue_item.item_id}, session {self._queue_item.session_id}"
                     )

invokeai/app/services/session_queue/session_queue_base.py

@@ -10,8 +10,6 @@ from invokeai.app.services.session_queue.session_queue_common import (
     CancelByDestinationResult,
     CancelByQueueIDResult,
     ClearResult,
-    DeleteAllExceptCurrentResult,
-    DeleteByDestinationResult,
     EnqueueBatchResult,
     IsEmptyResult,
     IsFullResult,
@@ -19,6 +17,7 @@ from invokeai.app.services.session_queue.session_queue_common import (
     RetryItemsResult,
     SessionQueueCountsByDestination,
     SessionQueueItem,
+    SessionQueueItemDTO,
     SessionQueueStatus,
 )
 from invokeai.app.services.shared.graph import GraphExecutionState
@@ -93,11 +92,6 @@ class SessionQueueBase(ABC):
         """Cancels a session queue item"""
         pass
 
-    @abstractmethod
-    def delete_queue_item(self, item_id: int) -> None:
-        """Deletes a session queue item"""
-        pass
-
     @abstractmethod
     def fail_queue_item(
         self, item_id: int, error_type: str, error_message: str, error_traceback: str
@@ -115,11 +109,6 @@ class SessionQueueBase(ABC):
         """Cancels all queue items with the given batch destination"""
         pass
 
-    @abstractmethod
-    def delete_by_destination(self, queue_id: str, destination: str) -> DeleteByDestinationResult:
-        """Deletes all queue items with the given batch destination"""
-        pass
-
     @abstractmethod
     def cancel_by_queue_id(self, queue_id: str) -> CancelByQueueIDResult:
         """Cancels all queue items with matching queue ID"""
@@ -130,11 +119,6 @@ class SessionQueueBase(ABC):
         """Cancels all queue items except in-progress items"""
         pass
 
-    @abstractmethod
-    def delete_all_except_current(self, queue_id: str) -> DeleteAllExceptCurrentResult:
-        """Deletes all queue items except in-progress items"""
-        pass
-
     @abstractmethod
     def list_queue_items(
         self,
@@ -143,20 +127,10 @@ class SessionQueueBase(ABC):
         priority: int,
         cursor: Optional[int] = None,
         status: Optional[QUEUE_ITEM_STATUS] = None,
-        destination: Optional[str] = None,
-    ) -> CursorPaginatedResults[SessionQueueItem]:
+    ) -> CursorPaginatedResults[SessionQueueItemDTO]:
         """Gets a page of session queue items"""
         pass
 
-    @abstractmethod
-    def list_all_queue_items(
-        self,
-        queue_id: str,
-        destination: Optional[str] = None,
-    ) -> list[SessionQueueItem]:
-        """Gets all queue items that match the given parameters"""
-        pass
-
     @abstractmethod
     def get_queue_item(self, item_id: int) -> SessionQueueItem:
         """Gets a session queue item by ID"""

invokeai/app/services/session_queue/session_queue_common.py

@@ -205,9 +205,10 @@ class FieldIdentifier(BaseModel):
     kind: Literal["input", "output"] = Field(description="The kind of field")
     node_id: str = Field(description="The ID of the node")
     field_name: str = Field(description="The name of the field")
+    user_label: str | None = Field(description="The user label of the field, if any")
 
 
-class SessionQueueItem(BaseModel):
+class SessionQueueItemWithoutGraph(BaseModel):
     """Session queue item without the full graph. Used for serialization."""
 
     item_id: int = Field(description="The identifier of the session queue item")
@@ -251,7 +252,42 @@ class SessionQueueItem(BaseModel):
         default=None,
         description="The ID of the published workflow associated with this queue item",
     )
+    api_input_fields: Optional[list[FieldIdentifier]] = Field(
+        default=None, description="The fields that were used as input to the API"
+    )
+    api_output_fields: Optional[list[FieldIdentifier]] = Field(
+        default=None, description="The nodes that were used as output from the API"
+    )
     credits: Optional[float] = Field(default=None, description="The total credits used for this queue item")
+
+    @classmethod
+    def queue_item_dto_from_dict(cls, queue_item_dict: dict) -> "SessionQueueItemDTO":
+        # must parse these manually
+        queue_item_dict["field_values"] = get_field_values(queue_item_dict)
+        return SessionQueueItemDTO(**queue_item_dict)
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "required": [
+                "item_id",
+                "status",
+                "batch_id",
+                "queue_id",
+                "session_id",
+                "priority",
+                "session_id",
+                "created_at",
+                "updated_at",
+            ]
+        }
+    )
+
+
+class SessionQueueItemDTO(SessionQueueItemWithoutGraph):
+    pass
+
+
+class SessionQueueItem(SessionQueueItemWithoutGraph):
     session: GraphExecutionState = Field(description="The fully-populated session to be executed")
     workflow: Optional[WorkflowWithoutID] = Field(
         default=None, description="The workflow associated with this queue item"
@@ -362,18 +398,6 @@ class CancelByDestinationResult(CancelByBatchIDsResult):
     pass
 
 
-class DeleteByDestinationResult(BaseModel):
-    """Result of deleting by a destination"""
-
-    deleted: int = Field(..., description="Number of queue items deleted")
-
-
-class DeleteAllExceptCurrentResult(DeleteByDestinationResult):
-    """Result of deleting all except current"""
-
-    pass
-
-
 class CancelByQueueIDResult(CancelByBatchIDsResult):
     """Result of canceling by queue id"""
 

invokeai/app/services/session_queue/session_queue_sqlite.py

@@ -17,8 +17,6 @@ from invokeai.app.services.session_queue.session_queue_common import (
     CancelByDestinationResult,
     CancelByQueueIDResult,
     ClearResult,
-    DeleteAllExceptCurrentResult,
-    DeleteByDestinationResult,
     EnqueueBatchResult,
     IsEmptyResult,
     IsFullResult,
@@ -26,6 +24,7 @@ from invokeai.app.services.session_queue.session_queue_common import (
     RetryItemsResult,
     SessionQueueCountsByDestination,
     SessionQueueItem,
+    SessionQueueItemDTO,
     SessionQueueItemNotFoundError,
     SessionQueueStatus,
     ValueToInsertTuple,
@@ -47,6 +46,10 @@ class SqliteSessionQueue(SessionQueueBase):
             clear_result = self.clear(DEFAULT_QUEUE_ID)
             if clear_result.deleted > 0:
                 self.__invoker.services.logger.info(f"Cleared all {clear_result.deleted} queue items")
+        else:
+            prune_result = self.prune(DEFAULT_QUEUE_ID)
+            if prune_result.deleted > 0:
+                self.__invoker.services.logger.info(f"Pruned {prune_result.deleted} finished queue items")
 
     def __init__(self, db: SqliteDatabase) -> None:
         super().__init__()
@@ -101,7 +104,11 @@ class SqliteSessionQueue(SessionQueueBase):
         return cast(Union[int, None], cursor.fetchone()[0]) or 0
 
     async def enqueue_batch(self, queue_id: str, batch: Batch, prepend: bool) -> EnqueueBatchResult:
+        return await asyncio.to_thread(self._enqueue_batch, queue_id, batch, prepend)
+
+    def _enqueue_batch(self, queue_id: str, batch: Batch, prepend: bool) -> EnqueueBatchResult:
         try:
+            cursor = self._conn.cursor()
             # TODO: how does this work in a multi-user scenario?
             current_queue_size = self._get_current_queue_size(queue_id)
             max_queue_size = self.__invoker.services.configuration.max_queue_size
@@ -111,12 +118,8 @@ class SqliteSessionQueue(SessionQueueBase):
             if prepend:
                 priority = self._get_highest_priority(queue_id) + 1
 
-            requested_count = await asyncio.to_thread(
-                calc_session_count,
-                batch=batch,
-            )
-            values_to_insert = await asyncio.to_thread(
-                prepare_values_to_insert,
+            requested_count = calc_session_count(batch)
+            values_to_insert = prepare_values_to_insert(
                 queue_id=queue_id,
                 batch=batch,
                 priority=priority,
@@ -124,16 +127,19 @@ class SqliteSessionQueue(SessionQueueBase):
             )
             enqueued_count = len(values_to_insert)
 
-            with self._conn:
-                cursor = self._conn.cursor()
-                cursor.executemany(
-                    """--sql
-                    INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin, destination, retried_from_item_id)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                    """,
-                    values_to_insert,
-                )
+            if requested_count > enqueued_count:
+                values_to_insert = values_to_insert[:max_new_queue_items]
+
+            cursor.executemany(
+                """--sql
+                INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin, destination, retried_from_item_id)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                """,
+                values_to_insert,
+            )
+            self._conn.commit()
         except Exception:
+            self._conn.rollback()
             raise
         enqueue_result = EnqueueBatchResult(
             queue_id=queue_id,
@@ -214,19 +220,6 @@ class SqliteSessionQueue(SessionQueueBase):
     ) -> SessionQueueItem:
         try:
             cursor = self._conn.cursor()
-            cursor.execute(
-                """--sql
-                SELECT status FROM session_queue WHERE item_id = ?
-                """,
-                (item_id,),
-            )
-            row = cursor.fetchone()
-            if row is None:
-                raise SessionQueueItemNotFoundError(f"No queue item with id {item_id}")
-            current_status = row[0]
-            # Only update if not already finished (completed, failed or canceled)
-            if current_status in ("completed", "failed", "canceled"):
-                return self.get_queue_item(item_id)
             cursor.execute(
                 """--sql
                 UPDATE session_queue
@@ -338,27 +331,6 @@ class SqliteSessionQueue(SessionQueueBase):
         queue_item = self._set_queue_item_status(item_id=item_id, status="canceled")
         return queue_item
 
-    def delete_queue_item(self, item_id: int) -> None:
-        """Deletes a session queue item"""
-        try:
-            self.cancel_queue_item(item_id)
-        except SessionQueueItemNotFoundError:
-            pass
-        try:
-            cursor = self._conn.cursor()
-            cursor.execute(
-                """--sql
-                DELETE
-                FROM session_queue
-                WHERE item_id = ?
-                """,
-                (item_id,),
-            )
-            self._conn.commit()
-        except Exception:
-            self._conn.rollback()
-            raise
-
     def complete_queue_item(self, item_id: int) -> SessionQueueItem:
         queue_item = self._set_queue_item_status(item_id=item_id, status="completed")
         return queue_item
@@ -456,71 +428,6 @@ class SqliteSessionQueue(SessionQueueBase):
             raise
         return CancelByDestinationResult(canceled=count)
 
-    def delete_by_destination(self, queue_id: str, destination: str) -> DeleteByDestinationResult:
-        try:
-            cursor = self._conn.cursor()
-            current_queue_item = self.get_current(queue_id)
-            if current_queue_item is not None and current_queue_item.destination == destination:
-                self.cancel_queue_item(current_queue_item.item_id)
-            params = (queue_id, destination)
-            cursor.execute(
-                """--sql
-                SELECT COUNT(*)
-                FROM session_queue
-                WHERE
-                  queue_id = ?
-                  AND destination = ?;
-                """,
-                params,
-            )
-            count = cursor.fetchone()[0]
-            cursor.execute(
-                """--sql
-                DELETE
-                FROM session_queue
-                WHERE
-                  queue_id = ?
-                  AND destination = ?;
-                """,
-                params,
-            )
-            self._conn.commit()
-        except Exception:
-            self._conn.rollback()
-            raise
-        return DeleteByDestinationResult(deleted=count)
-
-    def delete_all_except_current(self, queue_id: str) -> DeleteAllExceptCurrentResult:
-        try:
-            cursor = self._conn.cursor()
-            where = """--sql
-                WHERE
-                  queue_id == ?
-                  AND status == 'pending'
-                """
-            cursor.execute(
-                f"""--sql
-                SELECT COUNT(*)
-                FROM session_queue
-                {where};
-                """,
-                (queue_id,),
-            )
-            count = cursor.fetchone()[0]
-            cursor.execute(
-                f"""--sql
-                DELETE
-                FROM session_queue
-                {where};
-                """,
-                (queue_id,),
-            )
-            self._conn.commit()
-        except Exception:
-            self._conn.rollback()
-            raise
-        return DeleteAllExceptCurrentResult(deleted=count)
-
     def cancel_by_queue_id(self, queue_id: str) -> CancelByQueueIDResult:
         try:
             cursor = self._conn.cursor()
@@ -636,12 +543,26 @@ class SqliteSessionQueue(SessionQueueBase):
         priority: int,
         cursor: Optional[int] = None,
         status: Optional[QUEUE_ITEM_STATUS] = None,
-        destination: Optional[str] = None,
-    ) -> CursorPaginatedResults[SessionQueueItem]:
+    ) -> CursorPaginatedResults[SessionQueueItemDTO]:
         cursor_ = self._conn.cursor()
         item_id = cursor
         query = """--sql
-            SELECT *
+            SELECT item_id,
+                status,
+                priority,
+                field_values,
+                error_type,
+                error_message,
+                error_traceback,
+                created_at,
+                updated_at,
+                completed_at,
+                started_at,
+                session_id,
+                batch_id,
+                queue_id,
+                origin,
+                destination
             FROM session_queue
             WHERE queue_id = ?
         """
@@ -653,12 +574,6 @@ class SqliteSessionQueue(SessionQueueBase):
                 """
             params.append(status)
 
-        if destination is not None:
-            query += """---sql
-                AND destination = ?
-            """
-            params.append(destination)
-
         if item_id is not None:
             query += """--sql
                 AND (priority < ?) OR (priority = ? AND item_id > ?)
@@ -674,7 +589,7 @@ class SqliteSessionQueue(SessionQueueBase):
         params.append(limit + 1)
         cursor_.execute(query, params)
         results = cast(list[sqlite3.Row], cursor_.fetchall())
-        items = [SessionQueueItem.queue_item_from_dict(dict(result)) for result in results]
+        items = [SessionQueueItemDTO.queue_item_dto_from_dict(dict(result)) for result in results]
         has_more = False
         if len(items) > limit:
             # remove the extra item
@@ -682,37 +597,6 @@ class SqliteSessionQueue(SessionQueueBase):
             has_more = True
         return CursorPaginatedResults(items=items, limit=limit, has_more=has_more)
 
-    def list_all_queue_items(
-        self,
-        queue_id: str,
-        destination: Optional[str] = None,
-    ) -> list[SessionQueueItem]:
-        """Gets all queue items that match the given parameters"""
-        cursor_ = self._conn.cursor()
-        query = """--sql
-            SELECT *
-            FROM session_queue
-            WHERE queue_id = ?
-        """
-        params: list[Union[str, int]] = [queue_id]
-
-        if destination is not None:
-            query += """---sql
-                AND destination = ?
-            """
-            params.append(destination)
-
-        query += """--sql
-            ORDER BY
-                priority DESC,
-                item_id ASC
-            ;
-            """
-        cursor_.execute(query, params)
-        results = cast(list[sqlite3.Row], cursor_.fetchall())
-        items = [SessionQueueItem.queue_item_from_dict(dict(result)) for result in results]
-        return items
-
     def get_queue_status(self, queue_id: str) -> SessionQueueStatus:
         cursor = self._conn.cursor()
         cursor.execute(

invokeai/app/services/shared/graph.py

@@ -7,7 +7,6 @@ from typing import Any, Optional, TypeVar, Union, get_args, get_origin, get_type
 import networkx as nx
 from pydantic import (
     BaseModel,
-    ConfigDict,
     GetCoreSchemaHandler,
     GetJsonSchemaHandler,
     ValidationError,
@@ -788,22 +787,6 @@ class GraphExecutionState(BaseModel):
         default_factory=dict,
     )
 
-    model_config = ConfigDict(
-        json_schema_extra={
-            "required": [
-                "id",
-                "graph",
-                "execution_graph",
-                "executed",
-                "executed_history",
-                "results",
-                "errors",
-                "prepared_source_mapping",
-                "source_prepared_mapping",
-            ]
-        }
-    )
-
     @field_validator("graph")
     def graph_is_valid(cls, v: Graph):
         """Validates that the graph is valid"""

invokeai/backend/ip_adapter/README.md

@@ -42,5 +42,4 @@ IP-Adapters:
 - [InvokeAI/ip_adapter_plus_sd15](https://huggingface.co/InvokeAI/ip_adapter_plus_sd15)
 - [InvokeAI/ip_adapter_plus_face_sd15](https://huggingface.co/InvokeAI/ip_adapter_plus_face_sd15)
 - [InvokeAI/ip_adapter_sdxl](https://huggingface.co/InvokeAI/ip_adapter_sdxl)
-- [InvokeAI/ip_adapter_sdxl_vit_h](https://huggingface.co/InvokeAI/ip_adapter_sdxl_vit_h)
-- [InvokeAI/ip-adapter-plus_sdxl_vit-h](https://huggingface.co/InvokeAI/ip-adapter-plus_sdxl_vit-h)
+- [InvokeAI/ip_adapter_sdxl_vit_h](https://huggingface.co/InvokeAI/ip_adapter_sdxl_vit_h)

invokeai/backend/model_manager/config.py

@@ -296,7 +296,7 @@ class LoRAConfigBase(ABC, BaseModel):
         from invokeai.backend.patches.lora_conversions.formats import flux_format_from_state_dict
 
         sd = mod.load_state_dict(mod.path)
-        value = flux_format_from_state_dict(sd, mod.metadata())
+        value = flux_format_from_state_dict(sd)
         mod.cache[key] = value
         return value
 

invokeai/backend/model_manager/load/model_loaders/lora.py

@@ -20,10 +20,6 @@ from invokeai.backend.model_manager.taxonomy import (
     ModelType,
     SubModelType,
 )
-from invokeai.backend.patches.lora_conversions.flux_aitoolkit_lora_conversion_utils import (
-    is_state_dict_likely_in_flux_aitoolkit_format,
-    lora_model_from_flux_aitoolkit_state_dict,
-)
 from invokeai.backend.patches.lora_conversions.flux_control_lora_utils import (
     is_state_dict_likely_flux_control,
     lora_model_from_flux_control_state_dict,
@@ -96,8 +92,6 @@ class LoRALoader(ModelLoader):
                     model = lora_model_from_flux_onetrainer_state_dict(state_dict=state_dict)
                 elif is_state_dict_likely_flux_control(state_dict=state_dict):
                     model = lora_model_from_flux_control_state_dict(state_dict=state_dict)
-                elif is_state_dict_likely_in_flux_aitoolkit_format(state_dict=state_dict):
-                    model = lora_model_from_flux_aitoolkit_state_dict(state_dict=state_dict)
                 else:
                     raise ValueError(f"LoRA model is in unsupported FLUX format: {config.format}")
             else:

invokeai/backend/model_manager/starter_models.py

@@ -297,15 +297,6 @@ ip_adapter_sdxl = StarterModel(
     dependencies=[ip_adapter_sdxl_image_encoder],
     previous_names=["IP Adapter SDXL"],
 )
-ip_adapter_plus_sdxl = StarterModel(
-    name="Precise Reference (IP Adapter Plus ViT-H)",
-    base=BaseModelType.StableDiffusionXL,
-    source="https://huggingface.co/InvokeAI/ip-adapter-plus_sdxl_vit-h/resolve/main/ip-adapter-plus_sdxl_vit-h.safetensors",
-    description="References images with a higher degree of precision.",
-    type=ModelType.IPAdapter,
-    dependencies=[ip_adapter_sdxl_image_encoder],
-    previous_names=["IP Adapter Plus SDXL"],
-)
 ip_adapter_flux = StarterModel(
     name="Standard Reference (XLabs FLUX IP-Adapter v2)",
     base=BaseModelType.Flux,
@@ -681,7 +672,6 @@ STARTER_MODELS: list[StarterModel] = [
     ip_adapter_plus_sd1,
     ip_adapter_plus_face_sd1,
     ip_adapter_sdxl,
-    ip_adapter_plus_sdxl,
     ip_adapter_flux,
     qr_code_cnet_sd1,
     qr_code_cnet_sdxl,
@@ -754,7 +744,6 @@ sdxl_bundle: list[StarterModel] = [
     juggernaut_sdxl,
     sdxl_fp16_vae_fix,
     ip_adapter_sdxl,
-    ip_adapter_plus_sdxl,
     canny_sdxl,
     depth_sdxl,
     softedge_sdxl,

invokeai/backend/model_manager/taxonomy.py

@@ -29,6 +29,7 @@ class BaseModelType(str, Enum):
     Imagen3 = "imagen3"
     Imagen4 = "imagen4"
     ChatGPT4o = "chatgpt-4o"
+    FluxKontext = "flux-kontext"
 
 
 class ModelType(str, Enum):
@@ -137,7 +138,6 @@ class FluxLoRAFormat(str, Enum):
     Kohya = "flux.kohya"
     OneTrainer = "flux.onetrainer"
     Control = "flux.control"
-    AIToolkit = "flux.aitoolkit"
 
 
 AnyVariant: TypeAlias = Union[ModelVariantType, ClipVariantType, None]

invokeai/backend/model_patcher.py

@@ -46,10 +46,6 @@ class ModelPatcher:
         text_encoder: Union[CLIPTextModel, CLIPTextModelWithProjection],
         ti_list: List[Tuple[str, TextualInversionModelRaw]],
     ) -> Iterator[Tuple[CLIPTokenizer, TextualInversionManager]]:
-        if len(ti_list) == 0:
-            yield tokenizer, TextualInversionManager(tokenizer)
-            return
-
         init_tokens_count = None
         new_tokens_added = None
 

invokeai/backend/patches/lora_conversions/flux_aitoolkit_lora_conversion_utils.py

@@ -1,63 +0,0 @@
-import json
-from dataclasses import dataclass, field
-from typing import Any
-
-import torch
-
-from invokeai.backend.patches.layers.base_layer_patch import BaseLayerPatch
-from invokeai.backend.patches.layers.utils import any_lora_layer_from_state_dict
-from invokeai.backend.patches.lora_conversions.flux_diffusers_lora_conversion_utils import _group_by_layer
-from invokeai.backend.patches.lora_conversions.flux_lora_constants import FLUX_LORA_TRANSFORMER_PREFIX
-from invokeai.backend.patches.model_patch_raw import ModelPatchRaw
-from invokeai.backend.util import InvokeAILogger
-
-
-def is_state_dict_likely_in_flux_aitoolkit_format(state_dict: dict[str, Any], metadata: dict[str, Any] = None) -> bool:
-    if metadata:
-        try:
-            software = json.loads(metadata.get("software", "{}"))
-        except json.JSONDecodeError:
-            return False
-        return software.get("name") == "ai-toolkit"
-    # metadata got lost somewhere
-    return any("diffusion_model" == k.split(".", 1)[0] for k in state_dict.keys())
-
-
-@dataclass
-class GroupedStateDict:
-    transformer: dict[str, Any] = field(default_factory=dict)
-    # might also grow CLIP and T5 submodels
-
-
-def _group_state_by_submodel(state_dict: dict[str, Any]) -> GroupedStateDict:
-    logger = InvokeAILogger.get_logger()
-    grouped = GroupedStateDict()
-    for key, value in state_dict.items():
-        submodel_name, param_name = key.split(".", 1)
-        match submodel_name:
-            case "diffusion_model":
-                grouped.transformer[param_name] = value
-            case _:
-                logger.warning(f"Unexpected submodel name: {submodel_name}")
-    return grouped
-
-
-def _rename_peft_lora_keys(state_dict: dict[str, torch.Tensor]) -> dict[str, torch.Tensor]:
-    """Renames keys from the PEFT LoRA format to the InvokeAI format."""
-    renamed_state_dict = {}
-    for key, value in state_dict.items():
-        renamed_key = key.replace(".lora_A.", ".lora_down.").replace(".lora_B.", ".lora_up.")
-        renamed_state_dict[renamed_key] = value
-    return renamed_state_dict
-
-
-def lora_model_from_flux_aitoolkit_state_dict(state_dict: dict[str, torch.Tensor]) -> ModelPatchRaw:
-    state_dict = _rename_peft_lora_keys(state_dict)
-    by_layer = _group_by_layer(state_dict)
-    by_model = _group_state_by_submodel(by_layer)
-
-    layers: dict[str, BaseLayerPatch] = {}
-    for layer_key, layer_state_dict in by_model.transformer.items():
-        layers[FLUX_LORA_TRANSFORMER_PREFIX + layer_key] = any_lora_layer_from_state_dict(layer_state_dict)
-
-    return ModelPatchRaw(layers=layers)

invokeai/backend/patches/lora_conversions/formats.py

@@ -1,7 +1,4 @@
 from invokeai.backend.model_manager.taxonomy import FluxLoRAFormat
-from invokeai.backend.patches.lora_conversions.flux_aitoolkit_lora_conversion_utils import (
-    is_state_dict_likely_in_flux_aitoolkit_format,
-)
 from invokeai.backend.patches.lora_conversions.flux_control_lora_utils import is_state_dict_likely_flux_control
 from invokeai.backend.patches.lora_conversions.flux_diffusers_lora_conversion_utils import (
     is_state_dict_likely_in_flux_diffusers_format,
@@ -14,7 +11,7 @@ from invokeai.backend.patches.lora_conversions.flux_onetrainer_lora_conversion_u
 )
 
 
-def flux_format_from_state_dict(state_dict: dict, metadata: dict | None = None) -> FluxLoRAFormat | None:
+def flux_format_from_state_dict(state_dict):
     if is_state_dict_likely_in_flux_kohya_format(state_dict):
         return FluxLoRAFormat.Kohya
     elif is_state_dict_likely_in_flux_onetrainer_format(state_dict):
@@ -23,7 +20,5 @@ def flux_format_from_state_dict(state_dict: dict, metadata: dict | None = None)
         return FluxLoRAFormat.Diffusers
     elif is_state_dict_likely_flux_control(state_dict):
         return FluxLoRAFormat.Control
-    elif is_state_dict_likely_in_flux_aitoolkit_format(state_dict, metadata):
-        return FluxLoRAFormat.AIToolkit
     else:
         return None

invokeai/frontend/web/.eslintrc.js

@@ -9,8 +9,7 @@ module.exports = {
     // https://github.com/qdanik/eslint-plugin-path
     'path/no-relative-imports': ['error', { maxDepth: 0 }],
     // https://github.com/edvardchen/eslint-plugin-i18next/blob/HEAD/docs/rules/no-literal-string.md
-    // TODO: ENABLE THIS RULE BEFORE v6.0.0
-    // 'i18next/no-literal-string': 'error',
+    'i18next/no-literal-string': 'error',
     // https://eslint.org/docs/latest/rules/no-console
     'no-console': 'error',
     // https://eslint.org/docs/latest/rules/no-promise-executor-return

invokeai/frontend/web/knip.ts

@@ -3,8 +3,6 @@ import type { KnipConfig } from 'knip';
 const config: KnipConfig = {
   project: ['src/**/*.{ts,tsx}!'],
   ignore: [
-    // TODO(psyche): temporarily ignored all files for test build purposes
-    'src/**',
     // This file is only used during debugging
     'src/app/store/middleware/debugLoggerMiddleware.ts',
     // Autogenerated types - shouldn't ever touch these

invokeai/frontend/web/package.json

@@ -60,16 +60,15 @@
     "@fontsource-variable/inter": "^5.2.5",
     "@invoke-ai/ui-library": "^0.0.46",
     "@nanostores/react": "^1.0.0",
-    "@reduxjs/toolkit": "2.8.2",
+    "@reduxjs/toolkit": "2.7.0",
     "@roarr/browser-log-writer": "^1.3.0",
     "@xyflow/react": "^12.6.0",
     "async-mutex": "^0.5.0",
     "chakra-react-select": "^4.9.2",
     "cmdk": "^1.1.1",
     "compare-versions": "^6.1.1",
-    "dockview": "^4.3.1",
     "filesize": "^10.1.6",
-    "fracturedjsonjs": "^4.1.0",
+    "fracturedjsonjs": "^4.0.2",
     "framer-motion": "^11.10.0",
     "i18next": "^25.0.1",
     "i18next-http-backend": "^3.0.2",

invokeai/frontend/web/pnpm-lock.yaml

@@ -30,8 +30,8 @@ dependencies:
     specifier: ^1.0.0
     version: 1.0.0(nanostores@1.0.1)(react@18.3.1)
   '@reduxjs/toolkit':
-    specifier: 2.8.2
-    version: 2.8.2(react-redux@9.2.0)(react@18.3.1)
+    specifier: 2.7.0
+    version: 2.7.0(react-redux@9.2.0)(react@18.3.1)
   '@roarr/browser-log-writer':
     specifier: ^1.3.0
     version: 1.3.0
@@ -50,15 +50,12 @@ dependencies:
   compare-versions:
     specifier: ^6.1.1
     version: 6.1.1
-  dockview:
-    specifier: ^4.3.1
-    version: 4.3.1(react@18.3.1)
   filesize:
     specifier: ^10.1.6
     version: 10.1.6
   fracturedjsonjs:
-    specifier: ^4.1.0
-    version: 4.1.0
+    specifier: ^4.0.2
+    version: 4.0.2
   framer-motion:
     specifier: ^11.10.0
     version: 11.10.0(react-dom@18.3.1)(react@18.3.1)
@@ -2164,8 +2161,8 @@ packages:
       - supports-color
     dev: true
 
-  /@reduxjs/toolkit@2.8.2(react-redux@9.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-MYlOhQ0sLdw4ud48FoC5w0dH9VfWQjtCjreKwYTT3l+r427qYC5Y8PihNutepr8XrNaBUDQo9khWUwQxZaqt5A==}
+  /@reduxjs/toolkit@2.7.0(react-redux@9.2.0)(react@18.3.1):
+    resolution: {integrity: sha512-XVwolG6eTqwV0N8z/oDlN93ITCIGIop6leXlGJI/4EKy+0POYkR+ABHRSdGXY+0MQvJBP8yAzh+EYFxTuvmBiQ==}
     peerDependencies:
       react: ^16.9.0 || ^17.0.0 || ^18 || ^19
       react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
@@ -4495,19 +4492,6 @@ packages:
     resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
     dev: false
 
-  /dockview-core@4.3.1:
-    resolution: {integrity: sha512-cjGIXKc1wtHHkeKisuDLNt3HSHCVzvabxm1K9Auna27A9T3QR7ISOiTJyEUKUPllkcztFYBut0vwnnvwLnPAuQ==}
-    dev: false
-
-  /dockview@4.3.1(react@18.3.1):
-    resolution: {integrity: sha512-D4SvZPs1GJxGUBPkrehlKNGsWlSDaBiPuSYI+IEXnZ7b2bCUs1/h954sVs7xyykqEW3r6TkPKLWdTR/47Q7/QQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    dependencies:
-      dockview-core: 4.3.1
-      react: 18.3.1
-    dev: false
-
   /doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
@@ -5296,8 +5280,8 @@ packages:
       signal-exit: 4.1.0
     dev: true
 
-  /fracturedjsonjs@4.1.0:
-    resolution: {integrity: sha512-qy6LPA8OOiiyRHt5/sNKDayD7h5r3uHmHxSOLbBsgtU/hkt5vOVWOR51MdfDbeCNfj7k/dKCRbXYm8FBAJcgWQ==}
+  /fracturedjsonjs@4.0.2:
+    resolution: {integrity: sha512-+vGJH9wK0EEhbbn50V2sOebLRaar1VL3EXr02kxchIwpkhQk0ItrPjIOtYPYuU9hNFpVzxjrPgzjtMJih+ae4A==}
     dev: false
 
   /framer-motion@10.18.0(react-dom@18.3.1)(react@18.3.1):

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

@@ -1147,6 +1147,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",
             "canvasIsFiltering": "Canvas is busy (filtering)",
             "canvasIsTransforming": "Canvas is busy (transforming)",
             "canvasIsRasterizing": "Canvas is busy (rasterizing)",
@@ -1337,6 +1338,7 @@
         "fluxFillIncompatibleWithT2IAndI2I": "FLUX Fill is not compatible with Text to Image or Image to Image. Use other FLUX models for these tasks.",
         "imagenIncompatibleGenerationMode": "Google {{model}} supports Text to Image only. Use other models for Image to Image, Inpainting and Outpainting tasks.",
         "chatGPT4oIncompatibleGenerationMode": "ChatGPT 4o supports Text to Image and Image to Image only. Use other models Inpainting and Outpainting tasks.",
+        "fluxKontextIncompatibleGenerationMode": "Flux Kontext supports Text to Image only. Use other models for Image to Image, Inpainting and Outpainting tasks.",
         "problemUnpublishingWorkflow": "Problem Unpublishing Workflow",
         "problemUnpublishingWorkflowDescription": "There was a problem unpublishing the workflow. Please try again.",
         "workflowUnpublished": "Workflow Unpublished"
@@ -2015,9 +2017,7 @@
         "resetGenerationSettings": "Reset Generation Settings",
         "replaceCurrent": "Replace Current",
         "controlLayerEmptyState": "<UploadButton>Upload an image</UploadButton>, drag an image from the <GalleryButton>gallery</GalleryButton> onto this layer, <PullBboxButton>pull the bounding box into this layer</PullBboxButton>, or draw on the canvas to get started.",
-        "referenceImageEmptyStateWithCanvasOptions": "<UploadButton>Upload an image</UploadButton>, drag an image from the <GalleryButton>gallery</GalleryButton> onto this Reference Image or <PullBboxButton>pull the bounding box into this Reference Image</PullBboxButton> to get started.",
-        "referenceImageEmptyState": "<UploadButton>Upload an image</UploadButton> or drag an image from the <GalleryButton>gallery</GalleryButton> onto this Reference Image to get started.",
-        "uploadOrDragAnImage": "Drag an image from the gallery or <UploadButton>upload an image</UploadButton>.",
+        "referenceImageEmptyState": "<UploadButton>Upload an image</UploadButton>, drag an image from the <GalleryButton>gallery</GalleryButton> onto this layer, or <PullBboxButton>pull the bounding box into this layer</PullBboxButton> to get started.",
         "imageNoise": "Image Noise",
         "denoiseLimit": "Denoise Limit",
         "warnings": {

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

@@ -3,7 +3,7 @@ import { useStore } from '@nanostores/react';
 import { GlobalHookIsolator } from 'app/components/GlobalHookIsolator';
 import { GlobalModalIsolator } from 'app/components/GlobalModalIsolator';
 import type { StudioInitAction } from 'app/hooks/useStudioInitAction';
-import { $globalIsLoading } from 'app/store/nanostores/globalIsLoading';
+import { $didStudioInit } from 'app/hooks/useStudioInitAction';
 import type { PartialAppConfig } from 'app/types/invokeai';
 import Loading from 'common/components/Loading/Loading';
 import { useClearStorage } from 'common/hooks/useClearStorage';
@@ -20,7 +20,7 @@ interface Props {
 }
 
 const App = ({ config = DEFAULT_CONFIG, studioInitAction }: Props) => {
-  const globalIsLoading = useStore($globalIsLoading);
+  const didStudioInit = useStore($didStudioInit);
   const clearStorage = useClearStorage();
 
   const handleReset = useCallback(() => {
@@ -33,7 +33,7 @@ const App = ({ config = DEFAULT_CONFIG, studioInitAction }: Props) => {
     <ErrorBoundary onReset={handleReset} FallbackComponent={AppErrorBoundaryFallback}>
       <Box id="invoke-app-wrapper" w="100dvw" h="100dvh" position="relative" overflow="hidden">
         <AppContent />
-        {globalIsLoading && <Loading />}
+        {!didStudioInit && <Loading />}
       </Box>
       <GlobalHookIsolator config={config} studioInitAction={studioInitAction} />
       <GlobalModalIsolator />

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

@@ -8,7 +8,6 @@ import { appStarted } from 'app/store/middleware/listenerMiddleware/listeners/ap
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import type { PartialAppConfig } from 'app/types/invokeai';
 import { useFocusRegionWatcher } from 'common/hooks/focus';
-import { useCloseChakraTooltipsOnDragFix } from 'common/hooks/useCloseChakraTooltipsOnDragFix';
 import { useGlobalHotkeys } from 'common/hooks/useGlobalHotkeys';
 import { useDynamicPromptsWatcher } from 'features/dynamicPrompts/hooks/useDynamicPromptsWatcher';
 import { useStarterModelsToast } from 'features/modelManagerV2/hooks/useStarterModelsToast';
@@ -20,11 +19,8 @@ import i18n from 'i18n';
 import { size } from 'lodash-es';
 import { memo, useEffect } from 'react';
 import { useGetOpenAPISchemaQuery } from 'services/api/endpoints/appInfo';
-import { useGetQueueCountsByDestinationQuery } from 'services/api/endpoints/queue';
 import { useSocketIO } from 'services/events/useSocketIO';
 
-const queueCountArg = { destination: 'canvas' };
-
 /**
  * GlobalHookIsolator is a logical component that runs global hooks in an isolated component, so that they do not
  * cause needless re-renders of any other components.
@@ -42,11 +38,6 @@ export const GlobalHookIsolator = memo(
     useGlobalHotkeys();
     useGetOpenAPISchemaQuery();
     useSyncLoggingConfig();
-    useCloseChakraTooltipsOnDragFix();
-
-    // Persistent subscription to the queue counts query - canvas relies on this to know if there are pending
-    // and/or in progress canvas sessions.
-    useGetQueueCountsByDestinationQuery(queueCountArg);
 
     useEffect(() => {
       i18n.changeLanguage(language);

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

@@ -6,7 +6,7 @@ import {
   NewGallerySessionDialog,
 } from 'features/controlLayers/components/NewSessionConfirmationAlertDialog';
 import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
-import { DeleteImageModal } from 'features/deleteImageModal/components/DeleteImageModal';
+import DeleteImageModal from 'features/deleteImageModal/components/DeleteImageModal';
 import { FullscreenDropzone } from 'features/dnd/FullscreenDropzone';
 import { DynamicPromptsModal } from 'features/dynamicPrompts/components/DynamicPromptsPreviewModal';
 import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal';
@@ -15,7 +15,6 @@ import { ShareWorkflowModal } from 'features/nodes/components/sidePanel/workflow
 import { WorkflowLibraryModal } from 'features/nodes/components/sidePanel/workflow/WorkflowLibrary/WorkflowLibraryModal';
 import { CancelAllExceptCurrentQueueItemConfirmationAlertDialog } from 'features/queue/components/CancelAllExceptCurrentQueueItemConfirmationAlertDialog';
 import { ClearQueueConfirmationsAlertDialog } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
-import { DeleteAllExceptCurrentQueueItemConfirmationAlertDialog } from 'features/queue/components/DeleteAllExceptCurrentQueueItemConfirmationAlertDialog';
 import { DeleteStylePresetDialog } from 'features/stylePresets/components/DeleteStylePresetDialog';
 import { StylePresetModal } from 'features/stylePresets/components/StylePresetForm/StylePresetModal';
 import RefreshAfterResetModal from 'features/system/components/SettingsModal/RefreshAfterResetModal';
@@ -40,7 +39,6 @@ export const GlobalModalIsolator = memo(() => {
       <StylePresetModal />
       <WorkflowLibraryModal />
       <CancelAllExceptCurrentQueueItemConfirmationAlertDialog />
-      <DeleteAllExceptCurrentQueueItemConfirmationAlertDialog />
       <ClearQueueConfirmationsAlertDialog />
       <NewWorkflowConfirmationAlertDialog />
       <LoadWorkflowConfirmationAlertDialog />

invokeai/frontend/web/src/app/hooks/useStudioInitAction.ts

@@ -3,10 +3,11 @@ import { useAppStore } from 'app/store/storeHooks';
 import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
 import { withResultAsync } from 'common/util/result';
 import { canvasReset } from 'features/controlLayers/store/actions';
+import { settingsSendToCanvasChanged } from 'features/controlLayers/store/canvasSettingsSlice';
 import { rasterLayerAdded } from 'features/controlLayers/store/canvasSlice';
-import { paramsReset } from 'features/controlLayers/store/paramsSlice';
 import type { CanvasRasterLayerState } from 'features/controlLayers/store/types';
 import { imageDTOToImageObject } from 'features/controlLayers/store/util';
+import { $imageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
 import { sentImageToCanvas } from 'features/gallery/store/actions';
 import { parseAndRecallAllMetadata } from 'features/metadata/util/handlers';
 import { $hasTemplates } from 'features/nodes/store/nodesSlice';
@@ -92,7 +93,10 @@ export const useStudioInitAction = (action?: StudioInitAction) => {
       };
       store.dispatch(canvasReset());
       store.dispatch(rasterLayerAdded({ overrides, isSelected: true }));
+      store.dispatch(settingsSendToCanvasChanged(true));
+      store.dispatch(setActiveTab('canvas'));
       store.dispatch(sentImageToCanvas());
+      $imageViewer.set(false);
       toast({
         title: t('toast.sentToCanvas'),
         status: 'info',
@@ -114,9 +118,9 @@ export const useStudioInitAction = (action?: StudioInitAction) => {
         return;
       }
       const metadata = getImageMetadataResult.value;
-      store.dispatch(canvasReset());
       // This shows a toast
       await parseAndRecallAllMetadata(metadata, true);
+      store.dispatch(setActiveTab('canvas'));
     },
     [store, t]
   );
@@ -160,12 +164,16 @@ export const useStudioInitAction = (action?: StudioInitAction) => {
       switch (destination) {
         case 'generation':
           // Go to the canvas tab, open the image viewer, and enable send-to-gallery mode
-          store.dispatch(paramsReset());
+          store.dispatch(setActiveTab('canvas'));
           store.dispatch(activeTabCanvasRightPanelChanged('gallery'));
+          store.dispatch(settingsSendToCanvasChanged(false));
+          $imageViewer.set(true);
           break;
         case 'canvas':
           // Go to the canvas tab, close the image viewer, and disable send-to-gallery mode
-          store.dispatch(canvasReset());
+          store.dispatch(setActiveTab('canvas'));
+          store.dispatch(settingsSendToCanvasChanged(true));
+          $imageViewer.set(false);
           break;
         case 'workflows':
           // Go to the workflows tab

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts

@@ -1,6 +1,7 @@
 import type { TypedStartListening } from '@reduxjs/toolkit';
 import { addListener, createListenerMiddleware } from '@reduxjs/toolkit';
 import { addAdHocPostProcessingRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/addAdHocPostProcessingRequestedListener';
+import { addStagingListeners } from 'app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener';
 import { addAnyEnqueuedListener } from 'app/store/middleware/listenerMiddleware/listeners/anyEnqueued';
 import { addAppConfigReceivedListener } from 'app/store/middleware/listenerMiddleware/listeners/appConfigReceived';
 import { addAppStartedListener } from 'app/store/middleware/listenerMiddleware/listeners/appStarted';
@@ -9,14 +10,15 @@ import { addDeleteBoardAndImagesFulfilledListener } from 'app/store/middleware/l
 import { addBoardIdSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/boardIdSelected';
 import { addBulkDownloadListeners } from 'app/store/middleware/listenerMiddleware/listeners/bulkDownload';
 import { addEnqueueRequestedLinear } from 'app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear';
-import { addEnsureImageIsSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/ensureImageIsSelectedListener';
 import { addGalleryImageClickedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryImageClicked';
 import { addGalleryOffsetChangedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryOffsetChanged';
 import { addGetOpenAPISchemaListener } from 'app/store/middleware/listenerMiddleware/listeners/getOpenAPISchema';
 import { addImageAddedToBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageAddedToBoard';
+import { addImageDeletionListeners } from 'app/store/middleware/listenerMiddleware/listeners/imageDeletionListeners';
 import { addImageRemovedFromBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageRemovedFromBoard';
 import { addImagesStarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesStarred';
 import { addImagesUnstarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesUnstarred';
+import { addImageToDeleteSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected';
 import { addImageUploadedFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageUploaded';
 import { addModelSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelSelected';
 import { addModelsLoadedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelsLoaded';
@@ -45,7 +47,9 @@ export const addAppListener = addListener.withTypes<RootState, AppDispatch>();
 addImageUploadedFulfilledListener(startAppListening);
 
 // Image deleted
+addImageDeletionListeners(startAppListening);
 addDeleteBoardAndImagesFulfilledListener(startAppListening);
+addImageToDeleteSelectedListener(startAppListening);
 
 // Image starred
 addImagesStarredListener(startAppListening);
@@ -61,6 +65,9 @@ addEnqueueRequestedUpscale(startAppListening);
 addAnyEnqueuedListener(startAppListening);
 addBatchEnqueuedListener(startAppListening);
 
+// Canvas actions
+addStagingListeners(startAppListening);
+
 // Socket.IO
 addSocketConnectedEventListener(startAppListening);
 
@@ -88,5 +95,3 @@ addAppConfigReceivedListener(startAppListening);
 addAdHocPostProcessingRequestedListener(startAppListening);
 
 addSetDefaultSettingsListener(startAppListening);
-
-addEnsureImageIsSelectedListener(startAppListening);

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener.ts

@@ -0,0 +1,46 @@
+import { isAnyOf } from '@reduxjs/toolkit';
+import { logger } from 'app/logging/logger';
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { canvasReset, newSessionRequested } from 'features/controlLayers/store/actions';
+import { stagingAreaReset } from 'features/controlLayers/store/canvasStagingAreaSlice';
+import { toast } from 'features/toast/toast';
+import { t } from 'i18next';
+import { queueApi } from 'services/api/endpoints/queue';
+
+const log = logger('canvas');
+
+const matchCanvasOrStagingAreaReset = isAnyOf(stagingAreaReset, canvasReset, newSessionRequested);
+
+export const addStagingListeners = (startAppListening: AppStartListening) => {
+  startAppListening({
+    matcher: matchCanvasOrStagingAreaReset,
+    effect: async (_, { dispatch }) => {
+      try {
+        const req = dispatch(
+          queueApi.endpoints.cancelByBatchDestination.initiate(
+            { destination: 'canvas' },
+            { fixedCacheKey: 'cancelByBatchOrigin' }
+          )
+        );
+        const { canceled } = await req.unwrap();
+        req.reset();
+
+        if (canceled > 0) {
+          log.debug(`Canceled ${canceled} canvas batches`);
+          toast({
+            id: 'CANCEL_BATCH_SUCCEEDED',
+            title: t('queue.cancelBatchSucceeded'),
+            status: 'success',
+          });
+        }
+      } catch {
+        log.error('Failed to cancel canvas batches');
+        toast({
+          id: 'CANCEL_BATCH_FAILED',
+          title: t('queue.cancelBatchFailed'),
+          status: 'error',
+        });
+      }
+    },
+  });
+};

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts

@@ -1,7 +1,6 @@
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { selectRefImagesSlice } from 'features/controlLayers/store/refImagesSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
-import { getImageUsage } from 'features/deleteImageModal/store/state';
+import { getImageUsage } from 'features/deleteImageModal/store/selectors';
 import { nodeEditorReset } from 'features/nodes/store/nodesSlice';
 import { selectNodesSlice } from 'features/nodes/store/selectors';
 import { selectUpscaleSlice } from 'features/parameters/store/upscaleSlice';
@@ -21,10 +20,9 @@ export const addDeleteBoardAndImagesFulfilledListener = (startAppListening: AppS
       const nodes = selectNodesSlice(state);
       const canvas = selectCanvasSlice(state);
       const upscale = selectUpscaleSlice(state);
-      const refImages = selectRefImagesSlice(state);
 
       deleted_images.forEach((image_name) => {
-        const imageUsage = getImageUsage(nodes, canvas, upscale, refImages, image_name);
+        const imageUsage = getImageUsage(nodes, canvas, upscale, image_name);
 
         if (imageUsage.isNodesImage && !wasNodeEditorReset) {
           dispatch(nodeEditorReset());

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts

@@ -5,17 +5,12 @@ import type { AppStartListening } from 'app/store/middleware/listenerMiddleware'
 import { extractMessageFromAssertionError } from 'common/util/extractMessageFromAssertionError';
 import { withResult, withResultAsync } from 'common/util/result';
 import { parseify } from 'common/util/serialize';
-import {
-  canvasSessionIdCreated,
-  generateSessionIdCreated,
-  selectCanvasSessionId,
-  selectGenerateSessionId,
-} from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { $canvasManager } from 'features/controlLayers/store/ephemeral';
 import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
 import { buildChatGPT4oGraph } from 'features/nodes/util/graph/generation/buildChatGPT4oGraph';
 import { buildCogView4Graph } from 'features/nodes/util/graph/generation/buildCogView4Graph';
 import { buildFLUXGraph } from 'features/nodes/util/graph/generation/buildFLUXGraph';
+import { buildFluxKontextGraph } from 'features/nodes/util/graph/generation/buildFluxKontextGraph';
 import { buildImagen3Graph } from 'features/nodes/util/graph/generation/buildImagen3Graph';
 import { buildImagen4Graph } from 'features/nodes/util/graph/generation/buildImagen4Graph';
 import { buildSD1Graph } from 'features/nodes/util/graph/generation/buildSD1Graph';
@@ -23,7 +18,6 @@ import { buildSD3Graph } from 'features/nodes/util/graph/generation/buildSD3Grap
 import { buildSDXLGraph } from 'features/nodes/util/graph/generation/buildSDXLGraph';
 import { UnsupportedGenerationModeError } from 'features/nodes/util/graph/types';
 import { toast } from 'features/toast/toast';
-import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { serializeError } from 'serialize-error';
 import { enqueueMutationFixedCacheKeyOptions, queueApi } from 'services/api/endpoints/queue';
 import { assert, AssertionError } from 'tsafe';
@@ -37,34 +31,11 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
     actionCreator: enqueueRequestedCanvas,
     effect: async (action, { getState, dispatch }) => {
       log.debug('Enqueue requested');
-
-      const tab = selectActiveTab(getState());
-      let sessionId = null;
-      if (tab === 'generate') {
-        sessionId = selectGenerateSessionId(getState());
-        if (!sessionId) {
-          dispatch(generateSessionIdCreated());
-          sessionId = selectGenerateSessionId(getState());
-        }
-      } else if (tab === 'canvas') {
-        sessionId = selectCanvasSessionId(getState());
-        if (!sessionId) {
-          dispatch(canvasSessionIdCreated());
-          sessionId = selectCanvasSessionId(getState());
-        }
-      } else {
-        log.warn(`Enqueue requested in unsupported tab ${tab}`);
-        return;
-      }
-
       const state = getState();
-      const destination = sessionId;
-      assert(destination !== null);
-
       const { prepend } = action.payload;
 
       const manager = $canvasManager.get();
-      // assert(manager, 'No canvas manager');
+      assert(manager, 'No canvas manager');
 
       const model = state.params.model;
       assert(model, 'No model found in state');
@@ -89,6 +60,8 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
             return await buildImagen4Graph(state, manager);
           case 'chatgpt-4o':
             return await buildChatGPT4oGraph(state, manager);
+          case 'flux-kontext':
+            return await buildFluxKontextGraph(state, manager);
           default:
             assert(false, `No graph builders for base ${base}`);
         }
@@ -117,6 +90,8 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
 
       const { g, seedFieldIdentifier, positivePromptFieldIdentifier } = buildGraphResult.value;
 
+      const destination = state.canvasSettings.sendToCanvas ? 'canvas' : 'gallery';
+
       const prepareBatchResult = withResult(() =>
         prepareLinearUIBatch({
           state,

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/ensureImageIsSelectedListener.ts

@@ -1,16 +0,0 @@
-import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { imageSelected } from 'features/gallery/store/gallerySlice';
-import { imagesApi } from 'services/api/endpoints/images';
-
-export const addEnsureImageIsSelectedListener = (startAppListening: AppStartListening) => {
-  // When we list images, if no images is selected, select the first one.
-  startAppListening({
-    matcher: imagesApi.endpoints.listImages.matchFulfilled,
-    effect: (action, { dispatch, getState }) => {
-      const selection = getState().gallery.selection;
-      if (selection.length === 0) {
-        dispatch(imageSelected(action.payload.items[0] ?? null));
-      }
-    },
-  });
-};

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeletionListeners.ts

@@ -0,0 +1,221 @@
+import { logger } from 'app/logging/logger';
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import type { AppDispatch, RootState } from 'app/store/store';
+import { entityDeleted, referenceImageIPAdapterImageChanged } from 'features/controlLayers/store/canvasSlice';
+import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
+import { getEntityIdentifier } from 'features/controlLayers/store/types';
+import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions';
+import { isModalOpenChanged } from 'features/deleteImageModal/store/slice';
+import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
+import { imageSelected } from 'features/gallery/store/gallerySlice';
+import { fieldImageCollectionValueChanged, fieldImageValueChanged } from 'features/nodes/store/nodesSlice';
+import { isImageFieldCollectionInputInstance, isImageFieldInputInstance } from 'features/nodes/types/field';
+import { isInvocationNode } from 'features/nodes/types/invocation';
+import { forEach, intersectionBy } from 'lodash-es';
+import { imagesApi } from 'services/api/endpoints/images';
+import type { ImageDTO } from 'services/api/types';
+import type { Param0 } from 'tsafe';
+
+const log = logger('gallery');
+
+//TODO(psyche): handle image deletion (canvas staging area?)
+
+// Some utils to delete images from different parts of the app
+const deleteNodesImages = (state: RootState, dispatch: AppDispatch, imageDTO: ImageDTO) => {
+  const actions: Param0<typeof dispatch>[] = [];
+  state.nodes.present.nodes.forEach((node) => {
+    if (!isInvocationNode(node)) {
+      return;
+    }
+
+    forEach(node.data.inputs, (input) => {
+      if (isImageFieldInputInstance(input) && input.value?.image_name === imageDTO.image_name) {
+        actions.push(
+          fieldImageValueChanged({
+            nodeId: node.data.id,
+            fieldName: input.name,
+            value: undefined,
+          })
+        );
+        return;
+      }
+      if (isImageFieldCollectionInputInstance(input)) {
+        actions.push(
+          fieldImageCollectionValueChanged({
+            nodeId: node.data.id,
+            fieldName: input.name,
+            value: input.value?.filter((value) => value?.image_name !== imageDTO.image_name),
+          })
+        );
+      }
+    });
+  });
+
+  actions.forEach(dispatch);
+};
+
+const deleteControlLayerImages = (state: RootState, dispatch: AppDispatch, imageDTO: ImageDTO) => {
+  selectCanvasSlice(state).controlLayers.entities.forEach(({ id, objects }) => {
+    let shouldDelete = false;
+    for (const obj of objects) {
+      if (obj.type === 'image' && obj.image.image_name === imageDTO.image_name) {
+        shouldDelete = true;
+        break;
+      }
+    }
+    if (shouldDelete) {
+      dispatch(entityDeleted({ entityIdentifier: { id, type: 'control_layer' } }));
+    }
+  });
+};
+
+const deleteReferenceImages = (state: RootState, dispatch: AppDispatch, imageDTO: ImageDTO) => {
+  selectCanvasSlice(state).referenceImages.entities.forEach((entity) => {
+    if (entity.ipAdapter.image?.image_name === imageDTO.image_name) {
+      dispatch(referenceImageIPAdapterImageChanged({ entityIdentifier: getEntityIdentifier(entity), imageDTO: null }));
+    }
+  });
+};
+
+const deleteRasterLayerImages = (state: RootState, dispatch: AppDispatch, imageDTO: ImageDTO) => {
+  selectCanvasSlice(state).rasterLayers.entities.forEach(({ id, objects }) => {
+    let shouldDelete = false;
+    for (const obj of objects) {
+      if (obj.type === 'image' && obj.image.image_name === imageDTO.image_name) {
+        shouldDelete = true;
+        break;
+      }
+    }
+    if (shouldDelete) {
+      dispatch(entityDeleted({ entityIdentifier: { id, type: 'raster_layer' } }));
+    }
+  });
+};
+
+export const addImageDeletionListeners = (startAppListening: AppStartListening) => {
+  // Handle single image deletion
+  startAppListening({
+    actionCreator: imageDeletionConfirmed,
+    effect: async (action, { dispatch, getState }) => {
+      const { imageDTOs, imagesUsage } = action.payload;
+
+      if (imageDTOs.length !== 1 || imagesUsage.length !== 1) {
+        // handle multiples in separate listener
+        return;
+      }
+
+      const imageDTO = imageDTOs[0];
+      const imageUsage = imagesUsage[0];
+
+      if (!imageDTO || !imageUsage) {
+        // satisfy noUncheckedIndexedAccess
+        return;
+      }
+
+      try {
+        const state = getState();
+        await dispatch(imagesApi.endpoints.deleteImage.initiate(imageDTO)).unwrap();
+
+        if (state.gallery.selection.some((i) => i.image_name === imageDTO.image_name)) {
+          // The deleted image was a selected image, we need to select the next image
+          const newSelection = state.gallery.selection.filter((i) => i.image_name !== imageDTO.image_name);
+
+          if (newSelection.length > 0) {
+            return;
+          }
+
+          // Get the current list of images and select the same index
+          const baseQueryArgs = selectListImagesQueryArgs(state);
+          const data = imagesApi.endpoints.listImages.select(baseQueryArgs)(state).data;
+
+          if (data) {
+            const deletedImageIndex = data.items.findIndex((i) => i.image_name === imageDTO.image_name);
+            const nextImage = data.items[deletedImageIndex + 1] ?? data.items[0] ?? null;
+            if (nextImage?.image_name === imageDTO.image_name) {
+              // If the next image is the same as the deleted one, it means it was the last image, reset selection
+              dispatch(imageSelected(null));
+            } else {
+              dispatch(imageSelected(nextImage));
+            }
+          }
+        }
+
+        deleteNodesImages(state, dispatch, imageDTO);
+        deleteReferenceImages(state, dispatch, imageDTO);
+        deleteRasterLayerImages(state, dispatch, imageDTO);
+        deleteControlLayerImages(state, dispatch, imageDTO);
+      } catch {
+        // no-op
+      } finally {
+        dispatch(isModalOpenChanged(false));
+      }
+    },
+  });
+
+  // Handle multiple image deletion
+  startAppListening({
+    actionCreator: imageDeletionConfirmed,
+    effect: async (action, { dispatch, getState }) => {
+      const { imageDTOs, imagesUsage } = action.payload;
+
+      if (imageDTOs.length <= 1 || imagesUsage.length <= 1) {
+        // handle singles in separate listener
+        return;
+      }
+
+      try {
+        const state = getState();
+        await dispatch(imagesApi.endpoints.deleteImages.initiate({ imageDTOs })).unwrap();
+
+        if (intersectionBy(state.gallery.selection, imageDTOs, 'image_name').length > 0) {
+          // Some selected images were deleted, need to select the next image
+          const queryArgs = selectListImagesQueryArgs(state);
+          const { data } = imagesApi.endpoints.listImages.select(queryArgs)(state);
+          if (data) {
+            // When we delete multiple images, we clear the selection. Then, the the next time we load images, we will
+            // select the first one. This is handled below in the listener for `imagesApi.endpoints.listImages.matchFulfilled`.
+            dispatch(imageSelected(null));
+          }
+        }
+
+        // We need to reset the features where the image is in use - none of these work if their image(s) don't exist
+
+        imageDTOs.forEach((imageDTO) => {
+          deleteNodesImages(state, dispatch, imageDTO);
+          deleteControlLayerImages(state, dispatch, imageDTO);
+          deleteReferenceImages(state, dispatch, imageDTO);
+          deleteRasterLayerImages(state, dispatch, imageDTO);
+        });
+      } catch {
+        // no-op
+      } finally {
+        dispatch(isModalOpenChanged(false));
+      }
+    },
+  });
+
+  // When we list images, if no images is selected, select the first one.
+  startAppListening({
+    matcher: imagesApi.endpoints.listImages.matchFulfilled,
+    effect: (action, { dispatch, getState }) => {
+      const selection = getState().gallery.selection;
+      if (selection.length === 0) {
+        dispatch(imageSelected(action.payload.items[0] ?? null));
+      }
+    },
+  });
+
+  startAppListening({
+    matcher: imagesApi.endpoints.deleteImage.matchFulfilled,
+    effect: (action) => {
+      log.debug({ imageDTO: action.meta.arg.originalArgs }, 'Image deleted');
+    },
+  });
+
+  startAppListening({
+    matcher: imagesApi.endpoints.deleteImage.matchRejected,
+    effect: (action) => {
+      log.debug({ imageDTO: action.meta.arg.originalArgs }, 'Unable to delete image');
+    },
+  });
+};

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected.ts

@@ -0,0 +1,32 @@
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions';
+import { selectImageUsage } from 'features/deleteImageModal/store/selectors';
+import { imagesToDeleteSelected, isModalOpenChanged } from 'features/deleteImageModal/store/slice';
+
+export const addImageToDeleteSelectedListener = (startAppListening: AppStartListening) => {
+  startAppListening({
+    actionCreator: imagesToDeleteSelected,
+    effect: (action, { dispatch, getState }) => {
+      const imageDTOs = action.payload;
+      const state = getState();
+      const { shouldConfirmOnDelete } = state.system;
+      const imagesUsage = selectImageUsage(getState());
+
+      const isImageInUse =
+        imagesUsage.some((i) => i.isRasterLayerImage) ||
+        imagesUsage.some((i) => i.isControlLayerImage) ||
+        imagesUsage.some((i) => i.isReferenceImage) ||
+        imagesUsage.some((i) => i.isInpaintMaskImage) ||
+        imagesUsage.some((i) => i.isUpscaleImage) ||
+        imagesUsage.some((i) => i.isNodesImage) ||
+        imagesUsage.some((i) => i.isRegionalGuidanceImage);
+
+      if (shouldConfirmOnDelete || isImageInUse) {
+        dispatch(isModalOpenChanged(true));
+        return;
+      }
+
+      dispatch(imageDeletionConfirmed({ imageDTOs, imagesUsage }));
+    },
+  });
+};

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts

@@ -1,7 +1,11 @@
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import type { AppDispatch, RootState } from 'app/store/store';
-import { controlLayerModelChanged, rgRefImageModelChanged } from 'features/controlLayers/store/canvasSlice';
+import {
+  controlLayerModelChanged,
+  referenceImageIPAdapterModelChanged,
+  rgIPAdapterModelChanged,
+} from 'features/controlLayers/store/canvasSlice';
 import { loraDeleted } from 'features/controlLayers/store/lorasSlice';
 import {
   clipEmbedModelSelected,
@@ -11,9 +15,8 @@ import {
   t5EncoderModelSelected,
   vaeSelected,
 } from 'features/controlLayers/store/paramsSlice';
-import { refImageModelChanged, selectRefImagesSlice } from 'features/controlLayers/store/refImagesSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
-import { getEntityIdentifier, isFLUXReduxConfig, isIPAdapterConfig } from 'features/controlLayers/store/types';
+import { getEntityIdentifier } from 'features/controlLayers/store/types';
 import { modelSelected } from 'features/parameters/store/actions';
 import { postProcessingModelChanged, upscaleModelChanged } from 'features/parameters/store/upscaleSlice';
 import {
@@ -207,12 +210,12 @@ const handleControlAdapterModels: ModelHandler = (models, state, dispatch, log)
 
 const handleIPAdapterModels: ModelHandler = (models, state, dispatch, log) => {
   const ipaModels = models.filter(isIPAdapterModelConfig);
-  selectRefImagesSlice(state).entities.forEach((entity) => {
-    if (!isIPAdapterConfig(entity.config)) {
+  selectCanvasSlice(state).referenceImages.entities.forEach((entity) => {
+    if (entity.ipAdapter.type !== 'ip_adapter') {
       return;
     }
 
-    const selectedIPAdapterModel = entity.config.model;
+    const selectedIPAdapterModel = entity.ipAdapter.model;
     // `null` is a valid IP adapter model - no need to do anything.
     if (!selectedIPAdapterModel) {
       return;
@@ -222,16 +225,16 @@ const handleIPAdapterModels: ModelHandler = (models, state, dispatch, log) => {
       return;
     }
     log.debug({ selectedIPAdapterModel }, 'Selected IP adapter model is not available, clearing');
-    dispatch(refImageModelChanged({ id: entity.id, modelConfig: null }));
+    dispatch(referenceImageIPAdapterModelChanged({ entityIdentifier: getEntityIdentifier(entity), modelConfig: null }));
   });
 
   selectCanvasSlice(state).regionalGuidance.entities.forEach((entity) => {
-    entity.referenceImages.forEach(({ id: referenceImageId, config }) => {
-      if (!isIPAdapterConfig(config)) {
+    entity.referenceImages.forEach(({ id: referenceImageId, ipAdapter }) => {
+      if (ipAdapter.type !== 'ip_adapter') {
         return;
       }
 
-      const selectedIPAdapterModel = config.model;
+      const selectedIPAdapterModel = ipAdapter.model;
       // `null` is a valid IP adapter model - no need to do anything.
       if (!selectedIPAdapterModel) {
         return;
@@ -242,7 +245,7 @@ const handleIPAdapterModels: ModelHandler = (models, state, dispatch, log) => {
       }
       log.debug({ selectedIPAdapterModel }, 'Selected IP adapter model is not available, clearing');
       dispatch(
-        rgRefImageModelChanged({ entityIdentifier: getEntityIdentifier(entity), referenceImageId, modelConfig: null })
+        rgIPAdapterModelChanged({ entityIdentifier: getEntityIdentifier(entity), referenceImageId, modelConfig: null })
       );
     });
   });
@@ -251,11 +254,11 @@ const handleIPAdapterModels: ModelHandler = (models, state, dispatch, log) => {
 const handleFLUXReduxModels: ModelHandler = (models, state, dispatch, log) => {
   const fluxReduxModels = models.filter(isFluxReduxModelConfig);
 
-  selectRefImagesSlice(state).entities.forEach((entity) => {
-    if (!isFLUXReduxConfig(entity.config)) {
+  selectCanvasSlice(state).referenceImages.entities.forEach((entity) => {
+    if (entity.ipAdapter.type !== 'flux_redux') {
       return;
     }
-    const selectedFLUXReduxModel = entity.config.model;
+    const selectedFLUXReduxModel = entity.ipAdapter.model;
     // `null` is a valid FLUX Redux model - no need to do anything.
     if (!selectedFLUXReduxModel) {
       return;
@@ -265,16 +268,16 @@ const handleFLUXReduxModels: ModelHandler = (models, state, dispatch, log) => {
       return;
     }
     log.debug({ selectedFLUXReduxModel }, 'Selected FLUX Redux model is not available, clearing');
-    dispatch(refImageModelChanged({ id: entity.id, modelConfig: null }));
+    dispatch(referenceImageIPAdapterModelChanged({ entityIdentifier: getEntityIdentifier(entity), modelConfig: null }));
   });
 
   selectCanvasSlice(state).regionalGuidance.entities.forEach((entity) => {
-    entity.referenceImages.forEach(({ id: referenceImageId, config }) => {
-      if (!isFLUXReduxConfig(config)) {
+    entity.referenceImages.forEach(({ id: referenceImageId, ipAdapter }) => {
+      if (ipAdapter.type !== 'flux_redux') {
         return;
       }
 
-      const selectedFLUXReduxModel = config.model;
+      const selectedFLUXReduxModel = ipAdapter.model;
       // `null` is a valid FLUX Redux model - no need to do anything.
       if (!selectedFLUXReduxModel) {
         return;
@@ -285,7 +288,7 @@ const handleFLUXReduxModels: ModelHandler = (models, state, dispatch, log) => {
       }
       log.debug({ selectedFLUXReduxModel }, 'Selected FLUX Redux model is not available, clearing');
       dispatch(
-        rgRefImageModelChanged({ entityIdentifier: getEntityIdentifier(entity), referenceImageId, modelConfig: null })
+        rgIPAdapterModelChanged({ entityIdentifier: getEntityIdentifier(entity), referenceImageId, modelConfig: null })
       );
     });
   });

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

@@ -1,13 +0,0 @@
-import { $didStudioInit } from 'app/hooks/useStudioInitAction';
-import { atom, computed } from 'nanostores';
-import { flushSync } from 'react-dom';
-
-export const $isLayoutLoading = atom(false);
-export const setIsLayoutLoading = (isLoading: boolean) => {
-  flushSync(() => {
-    $isLayoutLoading.set(isLoading);
-  });
-};
-export const $globalIsLoading = computed([$didStudioInit, $isLayoutLoading], (didStudioInit, isLayoutLoading) => {
-  return !didStudioInit || isLayoutLoading;
-});

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

@@ -8,12 +8,12 @@ import { changeBoardModalSlice } from 'features/changeBoardModal/store/slice';
 import { canvasSettingsPersistConfig, canvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
 import { canvasPersistConfig, canvasSlice, canvasUndoableConfig } from 'features/controlLayers/store/canvasSlice';
 import {
-  canvasSessionSlice,
   canvasStagingAreaPersistConfig,
+  canvasStagingAreaSlice,
 } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { lorasPersistConfig, lorasSlice } from 'features/controlLayers/store/lorasSlice';
 import { paramsPersistConfig, paramsSlice } from 'features/controlLayers/store/paramsSlice';
-import { refImagesPersistConfig, refImagesSlice } from 'features/controlLayers/store/refImagesSlice';
+import { deleteImageModalSlice } from 'features/deleteImageModal/store/slice';
 import { dynamicPromptsPersistConfig, dynamicPromptsSlice } from 'features/dynamicPrompts/store/dynamicPromptsSlice';
 import { galleryPersistConfig, gallerySlice } from 'features/gallery/store/gallerySlice';
 import { hrfPersistConfig, hrfSlice } from 'features/hrf/store/hrfSlice';
@@ -54,6 +54,7 @@ const allReducers = {
   [configSlice.name]: configSlice.reducer,
   [uiSlice.name]: uiSlice.reducer,
   [dynamicPromptsSlice.name]: dynamicPromptsSlice.reducer,
+  [deleteImageModalSlice.name]: deleteImageModalSlice.reducer,
   [changeBoardModalSlice.name]: changeBoardModalSlice.reducer,
   [modelManagerV2Slice.name]: modelManagerV2Slice.reducer,
   [queueSlice.name]: queueSlice.reducer,
@@ -64,10 +65,9 @@ const allReducers = {
   [stylePresetSlice.name]: stylePresetSlice.reducer,
   [paramsSlice.name]: paramsSlice.reducer,
   [canvasSettingsSlice.name]: canvasSettingsSlice.reducer,
-  [canvasSessionSlice.name]: canvasSessionSlice.reducer,
+  [canvasStagingAreaSlice.name]: canvasStagingAreaSlice.reducer,
   [lorasSlice.name]: lorasSlice.reducer,
   [workflowLibrarySlice.name]: workflowLibrarySlice.reducer,
-  [refImagesSlice.name]: refImagesSlice.reducer,
 };
 
 const rootReducer = combineReducers(allReducers);
@@ -113,7 +113,6 @@ const persistConfigs: { [key in keyof typeof allReducers]?: PersistConfig } = {
   [canvasStagingAreaPersistConfig.name]: canvasStagingAreaPersistConfig,
   [lorasPersistConfig.name]: lorasPersistConfig,
   [workflowLibraryPersistConfig.name]: workflowLibraryPersistConfig,
-  [refImagesSlice.name]: refImagesPersistConfig,
 };
 
 const unserialize: UnserializeFunction = (data, key) => {
@@ -176,7 +175,6 @@ export const createStore = (uniqueStoreKey?: string, persist = true) =>
         .concat(api.middleware)
         .concat(dynamicMiddlewares)
         .concat(authToastMiddleware)
-        // .concat(getDebugLoggerMiddleware())
         .prepend(listenerMiddleware.middleware),
     enhancers: (getDefaultEnhancers) => {
       const _enhancers = getDefaultEnhancers().concat(autoBatchEnhancer());
@@ -211,4 +209,3 @@ export type RootState = ReturnType<AppStore['getState']>;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AppThunkDispatch = ThunkDispatch<RootState, any, UnknownAction>;
 export type AppDispatch = ReturnType<typeof createStore>['dispatch'];
-export type AppGetState = ReturnType<typeof createStore>['getState'];

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

@@ -17,7 +17,6 @@ const Loading = () => {
       right={0}
       bottom={0}
       left={0}
-      zIndex={99999}
     >
       <Image src={InvokeLogoWhite} w="8rem" h="8rem" />
       <Spinner

invokeai/frontend/web/src/common/components/OverlayScrollbars/ScrollableContent.tsx

@@ -11,14 +11,13 @@ import { memo, useEffect, useMemo, useState } from 'react';
 
 type Props = PropsWithChildren & {
   maxHeight?: ChakraProps['maxHeight'];
-  maxWidth?: ChakraProps['maxWidth'];
   overflowX?: 'hidden' | 'scroll';
   overflowY?: 'hidden' | 'scroll';
 };
 
 const styles: CSSProperties = { position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 };
 
-const ScrollableContent = ({ children, maxHeight, maxWidth, overflowX = 'hidden', overflowY = 'scroll' }: Props) => {
+const ScrollableContent = ({ children, maxHeight, overflowX = 'hidden', overflowY = 'scroll' }: Props) => {
   const overlayscrollbarsOptions = useMemo(
     () => getOverlayScrollbarsParams({ overflowX, overflowY }).options,
     [overflowX, overflowY]
@@ -45,7 +44,7 @@ const ScrollableContent = ({ children, maxHeight, maxWidth, overflowX = 'hidden'
   }, [os]);
 
   return (
-    <Flex w="full" h="full" maxHeight={maxHeight} maxWidth={maxWidth} position="relative">
+    <Flex w="full" h="full" maxHeight={maxHeight} position="relative">
       <Box position="absolute" top={0} left={0} right={0} bottom={0}>
         <OverlayScrollbarsComponent ref={osRef} style={styles} options={overlayscrollbarsOptions}>
           {children}

invokeai/frontend/web/src/common/hooks/useBoolean.ts

@@ -73,7 +73,7 @@ export const useBoolean = (initialValue: boolean): UseBoolean => {
   };
 };
 
-export type UseDisclosure = {
+type UseDisclosure = {
   isOpen: boolean;
   open: () => void;
   close: () => void;

invokeai/frontend/web/src/common/hooks/useCallbackOnDragEnter.ts

@@ -1,29 +0,0 @@
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
-import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { dropTargetForExternal } from '@atlaskit/pragmatic-drag-and-drop/external/adapter';
-import { useTimeoutCallback } from 'common/hooks/useTimeoutCallback';
-import type { RefObject } from 'react';
-import { useEffect } from 'react';
-
-export const useCallbackOnDragEnter = (cb: () => void, ref: RefObject<HTMLElement>, delay = 300) => {
-  const [run, cancel] = useTimeoutCallback(cb, delay);
-
-  useEffect(() => {
-    const element = ref.current;
-    if (!element) {
-      return;
-    }
-    return combine(
-      dropTargetForElements({
-        element,
-        onDragEnter: run,
-        onDragLeave: cancel,
-      }),
-      dropTargetForExternal({
-        element,
-        onDragEnter: run,
-        onDragLeave: cancel,
-      })
-    );
-  }, [cancel, ref, run]);
-};

invokeai/frontend/web/src/common/hooks/useCloseChakraTooltipsOnDragFix.ts

@@ -1,19 +0,0 @@
-import { useEffect } from 'react';
-
-// Chakra tooltips sometimes open during a drag operation. We can fix it by dispatching an event that chakra listens
-// for to close tooltips. It's reaching into the internals but it seems to work.
-
-const closeEventName = 'chakra-ui:close-tooltip';
-
-export const useCloseChakraTooltipsOnDragFix = () => {
-  useEffect(() => {
-    const closeTooltips = () => {
-      document.dispatchEvent(new window.CustomEvent(closeEventName));
-    };
-    document.addEventListener('drag', closeTooltips);
-
-    return () => {
-      document.removeEventListener('drag', closeTooltips);
-    };
-  }, []);
-};

invokeai/frontend/web/src/common/hooks/useFilterableOutsideClick.ts

@@ -1,165 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-/**
- * Adapted from https://github.com/chakra-ui/chakra-ui/blob/v2/packages/hooks/src/use-outside-click.ts
- *
- * The main change here is to support filtering of outside clicks via a `filter` function.
- *
- * This lets us work around issues with portals and components like popovers, which typically close on an outside click.
- *
- * For example, consider a popover that has a custom drop-down component inside it, which uses a portal to render
- * the drop-down options. The original outside click handler would close the popover when clicking on the drop-down options,
- * because the click is outside the popover - but we expect the popover to stay open in this case.
- *
- * A filter function like this can fix that:
- *
- * ```ts
- * const filter = (el: HTMLElement) => el.className.includes('chakra-portal') || el.id.includes('react-select')
- * ```
- *
- * This ignores clicks on react-select-based drop-downs and Chakra UI portals and is used as the default filter.
- */
-
-import { useCallback, useEffect, useRef } from 'react';
-
-type FilterFunction = (el: HTMLElement | SVGElement) => boolean;
-
-export function useCallbackRef<T extends (...args: any[]) => any>(
-  callback: T | undefined,
-  deps: React.DependencyList = []
-) {
-  const callbackRef = useRef(callback);
-
-  useEffect(() => {
-    callbackRef.current = callback;
-  });
-
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  return useCallback(((...args) => callbackRef.current?.(...args)) as T, deps);
-}
-
-export interface UseOutsideClickProps {
-  /**
-   * Whether the hook is enabled
-   */
-  enabled?: boolean;
-  /**
-   * The reference to a DOM element.
-   */
-  ref: React.RefObject<HTMLElement | null>;
-  /**
-   * Function invoked when a click is triggered outside the referenced element.
-   */
-  handler?: (e: Event) => void;
-  /**
-   * A function that filters the elements that should be considered as outside clicks.
-   *
-   * If omitted, a default filter function that ignores clicks in Chakra UI portals and react-select components is used.
-   */
-  filter?: FilterFunction;
-}
-
-export const DEFAULT_FILTER: FilterFunction = (el) => {
-  if (el instanceof SVGElement) {
-    // SVGElement's type appears to be incorrect. Its className is not a string, which causes `includes` to fail.
-    // Let's assume that SVG elements with a class name are not part of the portal and should not be filtered.
-    return false;
-  }
-  return el.className.includes('chakra-portal') || el.id.includes('react-select');
-};
-
-/**
- * Example, used in components like Dialogs and Popovers, so they can close
- * when a user clicks outside them.
- */
-export function useFilterableOutsideClick(props: UseOutsideClickProps) {
-  const { ref, handler, enabled = true, filter = DEFAULT_FILTER } = props;
-  const savedHandler = useCallbackRef(handler);
-
-  const stateRef = useRef({
-    isPointerDown: false,
-    ignoreEmulatedMouseEvents: false,
-  });
-
-  const state = stateRef.current;
-
-  useEffect(() => {
-    if (!enabled) {
-      return;
-    }
-    const onPointerDown: any = (e: PointerEvent) => {
-      if (isValidEvent(e, ref, filter)) {
-        state.isPointerDown = true;
-      }
-    };
-
-    const onMouseUp: any = (event: MouseEvent) => {
-      if (state.ignoreEmulatedMouseEvents) {
-        state.ignoreEmulatedMouseEvents = false;
-        return;
-      }
-
-      if (state.isPointerDown && handler && isValidEvent(event, ref)) {
-        state.isPointerDown = false;
-        savedHandler(event);
-      }
-    };
-
-    const onTouchEnd = (event: TouchEvent) => {
-      state.ignoreEmulatedMouseEvents = true;
-      if (handler && state.isPointerDown && isValidEvent(event, ref)) {
-        state.isPointerDown = false;
-        savedHandler(event);
-      }
-    };
-
-    const doc = getOwnerDocument(ref.current);
-    doc.addEventListener('mousedown', onPointerDown, true);
-    doc.addEventListener('mouseup', onMouseUp, true);
-    doc.addEventListener('touchstart', onPointerDown, true);
-    doc.addEventListener('touchend', onTouchEnd, true);
-
-    return () => {
-      doc.removeEventListener('mousedown', onPointerDown, true);
-      doc.removeEventListener('mouseup', onMouseUp, true);
-      doc.removeEventListener('touchstart', onPointerDown, true);
-      doc.removeEventListener('touchend', onTouchEnd, true);
-    };
-  }, [handler, ref, savedHandler, state, enabled, filter]);
-}
-
-function isValidEvent(event: Event, ref: React.RefObject<HTMLElement | null>, filter?: FilterFunction): boolean {
-  const target = (event.composedPath?.()[0] ?? event.target) as HTMLElement;
-
-  if (target) {
-    const doc = getOwnerDocument(target);
-    if (!doc.contains(target)) {
-      return false;
-    }
-  }
-
-  if (ref.current?.contains(target)) {
-    return false;
-  }
-
-  // This is the main logic change from the original hook.
-  if (filter) {
-    // Check if the click is inside an element matching the filter.
-    // This is used for portal-awareness or other general exclusion cases.
-    let currentElement: HTMLElement | null = target;
-    // Traverse up the DOM tree from the target element.
-    while (currentElement && currentElement !== document.body) {
-      if (filter(currentElement)) {
-        return false;
-      }
-      currentElement = currentElement.parentElement;
-    }
-  }
-
-  // If the click is not inside the ref and not inside a portal, it's a valid outside click.
-  return true;
-}
-
-function getOwnerDocument(node?: Element | null): Document {
-  return node?.ownerDocument ?? document;
-}

invokeai/frontend/web/src/common/hooks/useGlobalHotkeys.ts

@@ -1,6 +1,6 @@
 import { useAppDispatch } from 'app/store/storeHooks';
+import { useCancelCurrentQueueItem } from 'features/queue/hooks/useCancelCurrentQueueItem';
 import { useClearQueue } from 'features/queue/hooks/useClearQueue';
-import { useDeleteCurrentQueueItem } from 'features/queue/hooks/useDeleteCurrentQueueItem';
 import { useInvoke } from 'features/queue/hooks/useInvoke';
 import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
@@ -35,39 +35,34 @@ export const useGlobalHotkeys = () => {
     dependencies: [queue],
   });
 
-  const deleteCurrentQueueItem = useDeleteCurrentQueueItem();
+  const {
+    cancelQueueItem,
+    isDisabled: isDisabledCancelQueueItem,
+    isLoading: isLoadingCancelQueueItem,
+  } = useCancelCurrentQueueItem();
 
   useRegisteredHotkeys({
     id: 'cancelQueueItem',
     category: 'app',
-    callback: deleteCurrentQueueItem.trigger,
+    callback: cancelQueueItem,
     options: {
-      enabled: !deleteCurrentQueueItem.isDisabled && !deleteCurrentQueueItem.isLoading,
+      enabled: !isDisabledCancelQueueItem && !isLoadingCancelQueueItem,
       preventDefault: true,
     },
-    dependencies: [deleteCurrentQueueItem],
+    dependencies: [cancelQueueItem, isDisabledCancelQueueItem, isLoadingCancelQueueItem],
   });
 
-  const clearQueue = useClearQueue();
+  const { clearQueue, isDisabled: isDisabledClearQueue, isLoading: isLoadingClearQueue } = useClearQueue();
 
   useRegisteredHotkeys({
     id: 'clearQueue',
     category: 'app',
-    callback: clearQueue.trigger,
+    callback: clearQueue,
     options: {
-      enabled: !clearQueue.isDisabled && !clearQueue.isLoading,
+      enabled: !isDisabledClearQueue && !isLoadingClearQueue,
       preventDefault: true,
     },
-    dependencies: [clearQueue],
-  });
-
-  useRegisteredHotkeys({
-    id: 'selectGenerateTab',
-    category: 'app',
-    callback: () => {
-      dispatch(setActiveTab('generate'));
-    },
-    dependencies: [dispatch],
+    dependencies: [clearQueue, isDisabledClearQueue, isLoadingClearQueue],
   });
 
   useRegisteredHotkeys({

invokeai/frontend/web/src/common/hooks/useImageUploadButton.tsx

@@ -1,11 +1,11 @@
-import type { ButtonProps, IconButtonProps, SystemStyleObject } from '@invoke-ai/ui-library';
-import { Button, IconButton } from '@invoke-ai/ui-library';
+import type { IconButtonProps, SystemStyleObject } from '@invoke-ai/ui-library';
+import { IconButton } from '@invoke-ai/ui-library';
 import { logger } from 'app/logging/logger';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectAutoAddBoardId } from 'features/gallery/store/gallerySelectors';
 import { selectIsClientSideUploadEnabled } from 'features/system/store/configSlice';
 import { toast } from 'features/toast/toast';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import type { FileRejection } from 'react-dropzone';
 import { useDropzone } from 'react-dropzone';
 import { useTranslation } from 'react-i18next';
@@ -163,63 +163,32 @@ const sx = {
   },
 } satisfies SystemStyleObject;
 
-export const UploadImageIconButton = memo(
-  ({
-    isDisabled = false,
-    onUpload,
-    isError = false,
-    ...rest
-  }: {
-    onUpload?: (imageDTO: ImageDTO) => void;
-    isError?: boolean;
-  } & SetOptional<IconButtonProps, 'aria-label'>) => {
-    const uploadApi = useImageUploadButton({ isDisabled, allowMultiple: false, onUpload });
-    return (
-      <>
-        <IconButton
-          aria-label="Upload image"
-          variant="outline"
-          sx={sx}
-          data-error={isError}
-          icon={<PiUploadBold />}
-          isLoading={uploadApi.request.isLoading}
-          {...rest}
-          {...uploadApi.getUploadButtonProps()}
-        />
-        <input {...uploadApi.getUploadInputProps()} />
-      </>
-    );
-  }
-);
-UploadImageIconButton.displayName = 'UploadImageIconButton';
-
-type UploadImageButtonProps = {
+export const UploadImageButton = ({
+  isDisabled = false,
+  onUpload,
+  isError = false,
+  ...rest
+}: {
   onUpload?: (imageDTO: ImageDTO) => void;
   isError?: boolean;
-} & ButtonProps;
-
-const UploadImageButton = memo((props: UploadImageButtonProps) => {
-  const { children, isDisabled = false, onUpload, isError = false, ...rest } = props;
+} & SetOptional<IconButtonProps, 'aria-label'>) => {
   const uploadApi = useImageUploadButton({ isDisabled, allowMultiple: false, onUpload });
   return (
     <>
-      <Button
+      <IconButton
         aria-label="Upload image"
         variant="outline"
         sx={sx}
         data-error={isError}
-        rightIcon={<PiUploadBold />}
+        icon={<PiUploadBold />}
         isLoading={uploadApi.request.isLoading}
         {...rest}
         {...uploadApi.getUploadButtonProps()}
-      >
-        {children ?? 'Upload'}
-      </Button>
+      />
       <input {...uploadApi.getUploadInputProps()} />
     </>
   );
-});
-UploadImageButton.displayName = 'UploadImageButton';
+};
 
 export const UploadMultipleImageButton = ({
   isDisabled = false,

invokeai/frontend/web/src/common/hooks/useRelatedGroupedModelCombobox.ts

@@ -1,18 +1,12 @@
 import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { EMPTY_ARRAY } from 'app/store/constants';
-import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
-import { useAppSelector } from 'app/store/storeHooks';
 import type { GroupBase } from 'chakra-react-select';
-import { selectLoRAsSlice } from 'features/controlLayers/store/lorasSlice';
-import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
-import { uniq } from 'lodash-es';
-import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useGetRelatedModelIdsBatchQuery } from 'services/api/endpoints/modelRelationships';
 import type { AnyModelConfig } from 'services/api/types';
 
 import { useGroupedModelCombobox } from './useGroupedModelCombobox';
+import { useRelatedModelKeys } from './useRelatedModelKeys';
+import { useSelectedModelKeys } from './useSelectedModelKeys';
 
 type UseRelatedGroupedModelComboboxArg<T extends AnyModelConfig> = {
   modelConfigs: T[];
@@ -35,32 +29,6 @@ type UseRelatedGroupedModelComboboxReturn = {
   noOptionsMessage: () => string;
 };
 
-const selectSelectedModelKeys = createMemoizedSelector(selectParamsSlice, selectLoRAsSlice, (params, loras) => {
-  const keys: string[] = [];
-  const main = params.model;
-  const vae = params.vae;
-  const refiner = params.refinerModel;
-  const controlnet = params.controlLora;
-
-  if (main) {
-    keys.push(main.key);
-  }
-  if (vae) {
-    keys.push(vae.key);
-  }
-  if (refiner) {
-    keys.push(refiner.key);
-  }
-  if (controlnet) {
-    keys.push(controlnet.key);
-  }
-  for (const { model } of loras.loras) {
-    keys.push(model.key);
-  }
-
-  return uniq(keys);
-});
-
 export function useRelatedGroupedModelCombobox<T extends AnyModelConfig>({
   modelConfigs,
   selectedModel,
@@ -71,15 +39,9 @@ export function useRelatedGroupedModelCombobox<T extends AnyModelConfig>({
 }: UseRelatedGroupedModelComboboxArg<T>): UseRelatedGroupedModelComboboxReturn {
   const { t } = useTranslation();
 
-  const selectedKeys = useAppSelector(selectSelectedModelKeys);
-  const { relatedKeys } = useGetRelatedModelIdsBatchQuery(selectedKeys, {
-    selectFromResult: ({ data }) => {
-      if (!data) {
-        return { relatedKeys: EMPTY_ARRAY };
-      }
-      return { relatedKeys: data };
-    },
-  });
+  const selectedKeys = useSelectedModelKeys();
+
+  const relatedKeys = useRelatedModelKeys(selectedKeys);
 
   // Base grouped options
   const base = useGroupedModelCombobox({
@@ -91,42 +53,40 @@ export function useRelatedGroupedModelCombobox<T extends AnyModelConfig>({
     groupByType,
   });
 
-  const options = useMemo(() => {
-    if (relatedKeys.length === 0) {
-      return base.options;
-    }
+  // If no related models selected, just return base
+  if (relatedKeys.size === 0) {
+    return base;
+  }
 
-    const relatedOptions: ComboboxOption[] = [];
-    const updatedGroups: GroupBase<ComboboxOption>[] = [];
+  const relatedOptions: ComboboxOption[] = [];
+  const updatedGroups: GroupBase<ComboboxOption>[] = [];
 
-    for (const group of base.options) {
-      const remainingOptions: ComboboxOption[] = [];
+  for (const group of base.options) {
+    const remainingOptions: ComboboxOption[] = [];
 
-      for (const option of group.options) {
-        if (relatedKeys.includes(option.value)) {
-          relatedOptions.push({ ...option, label: `* ${option.label}` });
-        } else {
-          remainingOptions.push(option);
-        }
-      }
-
-      if (remainingOptions.length > 0) {
-        updatedGroups.push({
-          label: group.label,
-          options: remainingOptions,
-        });
+    for (const option of group.options) {
+      if (relatedKeys.has(option.value)) {
+        relatedOptions.push({ ...option, label: `* ${option.label}` });
+      } else {
+        remainingOptions.push(option);
       }
     }
 
-    if (relatedOptions.length > 0) {
-      return [{ label: t('modelManager.relatedModels'), options: relatedOptions }, ...updatedGroups];
-    } else {
-      return updatedGroups;
+    if (remainingOptions.length > 0) {
+      updatedGroups.push({
+        label: group.label,
+        options: remainingOptions,
+      });
     }
-  }, [base.options, relatedKeys, t]);
+  }
+
+  const finalOptions: GroupBase<ComboboxOption>[] =
+    relatedOptions.length > 0
+      ? [{ label: t('modelManager.relatedModels'), options: relatedOptions }, ...updatedGroups]
+      : updatedGroups;
 
   return {
     ...base,
-    options,
+    options: finalOptions,
   };
 }

invokeai/frontend/web/src/common/hooks/useRelatedModelKeys.ts

@@ -0,0 +1,14 @@
+import { useMemo } from 'react';
+import { useGetRelatedModelIdsBatchQuery } from 'services/api/endpoints/modelRelationships';
+
+/**
+ * Fetches related model keys for a given set of selected model keys.
+ * Returns a Set<string> for fast lookup.
+ */
+export const useRelatedModelKeys = (selectedKeys: Set<string>) => {
+  const { data: related = [] } = useGetRelatedModelIdsBatchQuery([...selectedKeys], {
+    skip: selectedKeys.size === 0,
+  });
+
+  return useMemo(() => new Set(related), [related]);
+};

invokeai/frontend/web/src/common/hooks/useSelectedModelKeys.ts

@@ -0,0 +1,34 @@
+import { useAppSelector } from 'app/store/storeHooks';
+
+/**
+ * Gathers all currently selected model keys from parameters and loras.
+ * This includes the main model, VAE, refiner model, controlnet, and loras.
+ */
+export const useSelectedModelKeys = () => {
+  return useAppSelector((state) => {
+    const keys = new Set<string>();
+    const main = state.params.model;
+    const vae = state.params.vae;
+    const refiner = state.params.refinerModel;
+    const controlnet = state.params.controlLora;
+    const loras = state.loras.loras.map((l) => l.model);
+
+    if (main) {
+      keys.add(main.key);
+    }
+    if (vae) {
+      keys.add(vae.key);
+    }
+    if (refiner) {
+      keys.add(refiner.key);
+    }
+    if (controlnet) {
+      keys.add(controlnet.key);
+    }
+    for (const lora of loras) {
+      keys.add(lora.key);
+    }
+
+    return keys;
+  });
+};

invokeai/frontend/web/src/common/hooks/useTimeoutCallback.ts

@@ -1,21 +0,0 @@
-import { useCallback, useMemo, useRef } from 'react';
-
-export const useTimeoutCallback = (callback: () => void, delay: number, onCancel?: () => void) => {
-  const timeoutRef = useRef<number | null>(null);
-  const cancel = useCallback(() => {
-    if (timeoutRef.current !== null) {
-      window.clearTimeout(timeoutRef.current);
-      timeoutRef.current = null;
-      onCancel?.();
-    }
-  }, [onCancel]);
-  const callWithTimeout = useCallback(() => {
-    cancel();
-    timeoutRef.current = window.setTimeout(() => {
-      callback();
-      timeoutRef.current = null;
-    }, delay);
-  }, [callback, cancel, delay]);
-  const api = useMemo(() => [callWithTimeout, cancel] as const, [callWithTimeout, cancel]);
-  return api;
-};

invokeai/frontend/web/src/common/util/zodUtils.ts

@@ -1,10 +0,0 @@
-import type { z } from 'zod';
-
-/**
- * Helper to create a type guard from a zod schema. The type guard will infer the schema's TS type.
- * @param schema The zod schema to create a type guard from.
- * @returns A type guard function for the schema.
- */
-export const buildZodTypeGuard = <T extends z.ZodTypeAny>(schema: T) => {
-  return (val: unknown): val is z.infer<T> => schema.safeParse(val).success;
-};

invokeai/frontend/web/src/features/controlLayers/components/AdvancedSession/AdvancedSession.tsx

@@ -1,182 +0,0 @@
-import type { SystemStyleObject } from '@invoke-ai/ui-library';
-import {
-  ContextMenu,
-  Divider,
-  Flex,
-  IconButton,
-  Menu,
-  MenuButton,
-  MenuList,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-} from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
-import { FocusRegionWrapper } from 'common/components/FocusRegionWrapper';
-import { CanvasAlertsInvocationProgress } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress';
-import { CanvasAlertsPreserveMask } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsPreserveMask';
-import { CanvasAlertsSelectedEntityStatus } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSelectedEntityStatus';
-import { CanvasContextMenuGlobalMenuItems } from 'features/controlLayers/components/CanvasContextMenu/CanvasContextMenuGlobalMenuItems';
-import { CanvasContextMenuSelectedEntityMenuItems } from 'features/controlLayers/components/CanvasContextMenu/CanvasContextMenuSelectedEntityMenuItems';
-import { CanvasDropArea } from 'features/controlLayers/components/CanvasDropArea';
-import { Filter } from 'features/controlLayers/components/Filters/Filter';
-import { CanvasHUD } from 'features/controlLayers/components/HUD/CanvasHUD';
-import { InvokeCanvasComponent } from 'features/controlLayers/components/InvokeCanvasComponent';
-import { SelectObject } from 'features/controlLayers/components/SelectObject/SelectObject';
-import { CanvasSessionContextProvider } from 'features/controlLayers/components/SimpleSession/context';
-import { GenerateLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel';
-import { StagingAreaItemsList } from 'features/controlLayers/components/SimpleSession/StagingAreaItemsList';
-import { StagingAreaToolbar } from 'features/controlLayers/components/StagingArea/StagingAreaToolbar';
-import { CanvasToolbar } from 'features/controlLayers/components/Toolbar/CanvasToolbar';
-import { Transform } from 'features/controlLayers/components/Transform/Transform';
-import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
-import { selectDynamicGrid, selectShowHUD } from 'features/controlLayers/store/canvasSettingsSlice';
-import { ImageViewer } from 'features/gallery/components/ImageViewer/ImageViewer';
-import { ViewerToolbar } from 'features/gallery/components/ImageViewer/ViewerToolbar';
-import { memo, useCallback } from 'react';
-import { PiDotsThreeOutlineVerticalFill } from 'react-icons/pi';
-
-const FOCUS_REGION_STYLES: SystemStyleObject = {
-  width: 'full',
-  height: 'full',
-};
-
-const MenuContent = memo(() => {
-  return (
-    <CanvasManagerProviderGate>
-      <MenuList>
-        <CanvasContextMenuSelectedEntityMenuItems />
-        <CanvasContextMenuGlobalMenuItems />
-      </MenuList>
-    </CanvasManagerProviderGate>
-  );
-});
-MenuContent.displayName = 'MenuContent';
-
-const canvasBgSx = {
-  position: 'relative',
-  w: 'full',
-  h: 'full',
-  borderRadius: 'base',
-  overflow: 'hidden',
-  bg: 'base.900',
-  '&[data-dynamic-grid="true"]': {
-    bg: 'base.850',
-  },
-};
-
-export const AdvancedSession = memo(({ id }: { id: string | null }) => {
-  const dynamicGrid = useAppSelector(selectDynamicGrid);
-  const showHUD = useAppSelector(selectShowHUD);
-
-  const renderMenu = useCallback(() => {
-    return <MenuContent />;
-  }, []);
-
-  return (
-    <Tabs w="full" h="full">
-      <TabList>
-        <Tab>Welcome</Tab>
-        <Tab>Workspace</Tab>
-        <Tab>Viewer</Tab>
-      </TabList>
-      <TabPanels w="full" h="full">
-        <TabPanel w="full" h="full" justifyContent="center">
-          <GenerateLaunchpadPanel />
-        </TabPanel>
-        <TabPanel w="full" h="full">
-          <FocusRegionWrapper region="canvas" sx={FOCUS_REGION_STYLES}>
-            <Flex
-              tabIndex={-1}
-              borderRadius="base"
-              position="relative"
-              flexDirection="column"
-              height="full"
-              width="full"
-              gap={2}
-              alignItems="center"
-              justifyContent="center"
-              overflow="hidden"
-            >
-              <CanvasManagerProviderGate>
-                <CanvasToolbar />
-              </CanvasManagerProviderGate>
-              <Divider />
-              <ContextMenu<HTMLDivElement> renderMenu={renderMenu} withLongPress={false}>
-                {(ref) => (
-                  <Flex ref={ref} sx={canvasBgSx} data-dynamic-grid={dynamicGrid}>
-                    <InvokeCanvasComponent />
-                    <CanvasManagerProviderGate>
-                      <Flex
-                        position="absolute"
-                        flexDir="column"
-                        top={1}
-                        insetInlineStart={1}
-                        pointerEvents="none"
-                        gap={2}
-                        alignItems="flex-start"
-                      >
-                        {showHUD && <CanvasHUD />}
-                        <CanvasAlertsSelectedEntityStatus />
-                        <CanvasAlertsPreserveMask />
-                        <CanvasAlertsInvocationProgress />
-                      </Flex>
-                      <Flex position="absolute" top={1} insetInlineEnd={1}>
-                        <Menu>
-                          <MenuButton as={IconButton} icon={<PiDotsThreeOutlineVerticalFill />} colorScheme="base" />
-                          <MenuContent />
-                        </Menu>
-                      </Flex>
-                    </CanvasManagerProviderGate>
-                  </Flex>
-                )}
-              </ContextMenu>
-              {id !== null && (
-                <CanvasManagerProviderGate>
-                  <CanvasSessionContextProvider type="advanced" id={id}>
-                    <Flex
-                      position="absolute"
-                      flexDir="column"
-                      bottom={4}
-                      gap={2}
-                      align="center"
-                      justify="center"
-                      left={4}
-                      right={4}
-                    >
-                      <Flex position="relative" maxW="full" w="full" h={108}>
-                        <StagingAreaItemsList />
-                      </Flex>
-                      <Flex gap={2}>
-                        <StagingAreaToolbar />
-                      </Flex>
-                    </Flex>
-                  </CanvasSessionContextProvider>
-                </CanvasManagerProviderGate>
-              )}
-              <Flex position="absolute" bottom={4}>
-                <CanvasManagerProviderGate>
-                  <Filter />
-                  <Transform />
-                  <SelectObject />
-                </CanvasManagerProviderGate>
-              </Flex>
-              <CanvasManagerProviderGate>
-                <CanvasDropArea />
-              </CanvasManagerProviderGate>
-            </Flex>
-          </FocusRegionWrapper>
-        </TabPanel>
-        <TabPanel w="full" h="full">
-          <Flex flexDir="column" w="full" h="full">
-            <ViewerToolbar />
-            <ImageViewer />
-          </Flex>
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
-  );
-});
-AdvancedSession.displayName = 'AdvancedSession';

invokeai/frontend/web/src/features/controlLayers/components/CanvasAddEntityButtons.tsx

@@ -2,10 +2,11 @@ import { Button, Flex, Heading } from '@invoke-ai/ui-library';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
 import {
   useAddControlLayer,
+  useAddGlobalReferenceImage,
   useAddInpaintMask,
-  useAddNewRegionalGuidanceWithARefImage,
   useAddRasterLayer,
   useAddRegionalGuidance,
+  useAddRegionalReferenceImage,
 } from 'features/controlLayers/hooks/addLayerHooks';
 import { useIsEntityTypeEnabled } from 'features/controlLayers/hooks/useIsEntityTypeEnabled';
 import { memo } from 'react';
@@ -18,7 +19,9 @@ export const CanvasAddEntityButtons = memo(() => {
   const addRegionalGuidance = useAddRegionalGuidance();
   const addRasterLayer = useAddRasterLayer();
   const addControlLayer = useAddControlLayer();
-  const addRegionalReferenceImage = useAddNewRegionalGuidanceWithARefImage();
+  const addGlobalReferenceImage = useAddGlobalReferenceImage();
+  const addRegionalReferenceImage = useAddRegionalReferenceImage();
+  const isReferenceImageEnabled = useIsEntityTypeEnabled('reference_image');
   const isRegionalGuidanceEnabled = useIsEntityTypeEnabled('regional_guidance');
   const isControlLayerEnabled = useIsEntityTypeEnabled('control_layer');
   const isInpaintLayerEnabled = useIsEntityTypeEnabled('inpaint_mask');
@@ -26,6 +29,21 @@ export const CanvasAddEntityButtons = memo(() => {
   return (
     <Flex w="full" h="full" justifyContent="center" gap={4}>
       <Flex position="relative" flexDir="column" gap={4} top="20%">
+        <Flex flexDir="column" justifyContent="flex-start" gap={2}>
+          <Heading size="xs">{t('controlLayers.global')}</Heading>
+          <InformationalPopover feature="globalReferenceImage">
+            <Button
+              size="sm"
+              variant="ghost"
+              justifyContent="flex-start"
+              leftIcon={<PiPlusBold />}
+              onClick={addGlobalReferenceImage}
+              isDisabled={!isReferenceImageEnabled}
+            >
+              {t('controlLayers.globalReferenceImage')}
+            </Button>
+          </InformationalPopover>
+        </Flex>
         <Flex flexDir="column" gap={2}>
           <Heading size="xs">{t('controlLayers.regional')}</Heading>
           <InformationalPopover feature="inpainting">

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress.tsx

@@ -6,11 +6,11 @@ import { selectIsLocal } from 'features/system/store/configSlice';
 import { selectSystemShouldShowInvocationProgressDetail } from 'features/system/store/systemSlice';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { $lastProgressMessage } from 'services/events/stores';
+import { $invocationProgressMessage } from 'services/events/stores';
 
 const CanvasAlertsInvocationProgressContentLocal = memo(() => {
   const { t } = useTranslation();
-  const invocationProgressMessage = useStore($lastProgressMessage);
+  const invocationProgressMessage = useStore($invocationProgressMessage);
 
   if (!invocationProgressMessage) {
     return null;

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsSendingTo.tsx

@@ -0,0 +1,146 @@
+import { Alert, AlertDescription, AlertIcon, AlertTitle, Button, Flex } from '@invoke-ai/ui-library';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { useBoolean } from 'common/hooks/useBoolean';
+import { selectIsStaging } from 'features/controlLayers/store/canvasStagingAreaSlice';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
+import { useCurrentDestination } from 'features/queue/hooks/useCurrentDestination';
+import { selectActiveTab } from 'features/ui/store/uiSelectors';
+import { activeTabCanvasRightPanelChanged, setActiveTab } from 'features/ui/store/uiSlice';
+import { AnimatePresence, motion } from 'framer-motion';
+import type { PropsWithChildren, ReactNode } from 'react';
+import { useCallback, useMemo } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+const ActivateImageViewerButton = (props: PropsWithChildren) => {
+  const imageViewer = useImageViewer();
+  const dispatch = useAppDispatch();
+  const onClick = useCallback(() => {
+    imageViewer.open();
+    dispatch(activeTabCanvasRightPanelChanged('gallery'));
+  }, [imageViewer, dispatch]);
+  return (
+    <Button onClick={onClick} size="sm" variant="link" color="base.50">
+      {props.children}
+    </Button>
+  );
+};
+
+export const CanvasAlertsSendingToGallery = () => {
+  const { t } = useTranslation();
+  const destination = useCurrentDestination();
+  const tab = useAppSelector(selectActiveTab);
+  const isVisible = useMemo(() => {
+    // This alert should only be visible when the destination is gallery and the tab is canvas
+    if (tab !== 'canvas') {
+      return false;
+    }
+    if (!destination) {
+      return false;
+    }
+
+    return destination === 'gallery';
+  }, [destination, tab]);
+
+  return (
+    <AlertWrapper
+      title={t('controlLayers.sendingToGallery')}
+      description={
+        <Trans i18nKey="controlLayers.viewProgressInViewer" components={{ Btn: <ActivateImageViewerButton /> }} />
+      }
+      isVisible={isVisible}
+    />
+  );
+};
+
+const ActivateCanvasButton = (props: PropsWithChildren) => {
+  const dispatch = useAppDispatch();
+  const imageViewer = useImageViewer();
+  const onClick = useCallback(() => {
+    dispatch(setActiveTab('canvas'));
+    dispatch(activeTabCanvasRightPanelChanged('layers'));
+    imageViewer.close();
+  }, [dispatch, imageViewer]);
+  return (
+    <Button onClick={onClick} size="sm" variant="link" color="base.50">
+      {props.children}
+    </Button>
+  );
+};
+
+export const CanvasAlertsSendingToCanvas = () => {
+  const { t } = useTranslation();
+  const destination = useCurrentDestination();
+  const isStaging = useAppSelector(selectIsStaging);
+  const tab = useAppSelector(selectActiveTab);
+  const isVisible = useMemo(() => {
+    // When we are on a non-canvas tab, and the current generation's destination is not the canvas, we don't show the alert
+    // For example, on the workflows tab, when the destinatin is gallery, we don't show the alert
+    if (tab !== 'canvas' && destination !== 'canvas') {
+      return false;
+    }
+    if (isStaging) {
+      return true;
+    }
+
+    if (!destination) {
+      return false;
+    }
+
+    return destination === 'canvas';
+  }, [destination, isStaging, tab]);
+
+  return (
+    <AlertWrapper
+      title={t('controlLayers.sendingToCanvas')}
+      description={
+        <Trans i18nKey="controlLayers.viewProgressOnCanvas" components={{ Btn: <ActivateCanvasButton /> }} />
+      }
+      isVisible={isVisible}
+    />
+  );
+};
+
+const AlertWrapper = ({
+  title,
+  description,
+  isVisible,
+}: {
+  title: ReactNode;
+  description: ReactNode;
+  isVisible: boolean;
+}) => {
+  const isHovered = useBoolean(false);
+
+  return (
+    <AnimatePresence>
+      {(isVisible || isHovered.isTrue) && (
+        <motion.div
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 1, transition: { duration: 0.1, ease: 'easeOut' } }}
+          exit={{
+            opacity: 0,
+            transition: { duration: 0.1, delay: !isHovered.isTrue ? 1 : 0.1, ease: 'easeIn' },
+          }}
+          onMouseEnter={isHovered.setTrue}
+          onMouseLeave={isHovered.setFalse}
+        >
+          <Alert
+            status="warning"
+            flexDir="column"
+            pointerEvents="auto"
+            borderRadius="base"
+            fontSize="sm"
+            shadow="md"
+            w="fit-content"
+          >
+            <Flex w="full" alignItems="center">
+              <AlertIcon />
+              <AlertTitle>{title}</AlertTitle>
+            </Flex>
+            <AlertDescription>{description}</AlertDescription>
+          </Alert>
+        </motion.div>
+      )}
+    </AnimatePresence>
+  );
+};

invokeai/frontend/web/src/features/controlLayers/components/CanvasContextMenu/CanvasContextMenuSelectedEntityMenuItems.tsx

@@ -2,8 +2,8 @@ import { MenuGroup } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { ControlLayerMenuItems } from 'features/controlLayers/components/ControlLayer/ControlLayerMenuItems';
 import { InpaintMaskMenuItems } from 'features/controlLayers/components/InpaintMask/InpaintMaskMenuItems';
+import { IPAdapterMenuItems } from 'features/controlLayers/components/IPAdapter/IPAdapterMenuItems';
 import { RasterLayerMenuItems } from 'features/controlLayers/components/RasterLayer/RasterLayerMenuItems';
-import { IPAdapterMenuItems } from 'features/controlLayers/components/RefImage/IPAdapterMenuItems';
 import { RegionalGuidanceMenuItems } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems';
 import { CanvasEntityStateGate } from 'features/controlLayers/contexts/CanvasEntityStateGate';
 import {

invokeai/frontend/web/src/features/controlLayers/components/CanvasDropArea.tsx

@@ -2,6 +2,7 @@ import { Grid, GridItem } from '@invoke-ai/ui-library';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import { newCanvasEntityFromImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -12,11 +13,19 @@ const addControlLayerFromImageDndTargetData = newCanvasEntityFromImageDndTarget.
 const addRegionalGuidanceReferenceImageFromImageDndTargetData = newCanvasEntityFromImageDndTarget.getData({
   type: 'regional_guidance_with_reference_image',
 });
+const addGlobalReferenceImageFromImageDndTargetData = newCanvasEntityFromImageDndTarget.getData({
+  type: 'reference_image',
+});
 
 export const CanvasDropArea = memo(() => {
   const { t } = useTranslation();
+  const imageViewer = useImageViewer();
   const isBusy = useCanvasIsBusy();
 
+  if (imageViewer.isOpen) {
+    return null;
+  }
+
   return (
     <>
       <Grid
@@ -54,6 +63,14 @@ export const CanvasDropArea = memo(() => {
             isDisabled={isBusy}
           />
         </GridItem>
+        <GridItem position="relative">
+          <DndDropTarget
+            dndTarget={newCanvasEntityFromImageDndTarget}
+            dndTargetData={addGlobalReferenceImageFromImageDndTargetData}
+            label={t('controlLayers.canvasContextMenu.newGlobalReferenceImage')}
+            isDisabled={isBusy}
+          />
+        </GridItem>
       </Grid>
     </>
   );

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/CanvasEntityGroupList.tsx

@@ -14,6 +14,7 @@ import { useEntityTypeInformationalPopover } from 'features/controlLayers/hooks/
 import { useEntityTypeTitle } from 'features/controlLayers/hooks/useEntityTypeTitle';
 import { entitiesReordered } from 'features/controlLayers/store/canvasSlice';
 import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
+import { isRenderableEntityType } from 'features/controlLayers/store/types';
 import { singleCanvasEntityDndSource } from 'features/dnd/dnd';
 import { triggerPostMoveFlash } from 'features/dnd/util';
 import type { PropsWithChildren } from 'react';
@@ -164,8 +165,8 @@ export const CanvasEntityGroupList = memo(({ isSelected, type, children, entityI
 
           <Spacer />
         </Flex>
-        <CanvasEntityMergeVisibleButton type={type} />
-        <CanvasEntityTypeIsHiddenToggle type={type} />
+        {isRenderableEntityType(type) && <CanvasEntityMergeVisibleButton type={type} />}
+        {isRenderableEntityType(type) && <CanvasEntityTypeIsHiddenToggle type={type} />}
         <CanvasEntityAddOfTypeButton type={type} />
       </Flex>
       <Collapse in={collapse.isTrue} style={fixTooltipCloseOnScrollStyles}>

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/CanvasEntityList.tsx

@@ -2,6 +2,7 @@ import { Flex } from '@invoke-ai/ui-library';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import { ControlLayerEntityList } from 'features/controlLayers/components/ControlLayer/ControlLayerEntityList';
 import { InpaintMaskList } from 'features/controlLayers/components/InpaintMask/InpaintMaskList';
+import { IPAdapterList } from 'features/controlLayers/components/IPAdapter/IPAdapterList';
 import { RasterLayerEntityList } from 'features/controlLayers/components/RasterLayer/RasterLayerEntityList';
 import { RegionalGuidanceEntityList } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceEntityList';
 import { memo } from 'react';
@@ -10,6 +11,7 @@ export const CanvasEntityList = memo(() => {
   return (
     <ScrollableContent>
       <Flex flexDir="column" gap={2} data-testid="control-layers-layer-list" w="full" h="full">
+        <IPAdapterList />
         <InpaintMaskList />
         <RegionalGuidanceEntityList />
         <ControlLayerEntityList />

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListGlobalActionBarAddLayerMenu.tsx

@@ -1,10 +1,11 @@
 import { IconButton, Menu, MenuButton, MenuGroup, MenuItem, MenuList } from '@invoke-ai/ui-library';
 import {
   useAddControlLayer,
+  useAddGlobalReferenceImage,
   useAddInpaintMask,
-  useAddNewRegionalGuidanceWithARefImage,
   useAddRasterLayer,
   useAddRegionalGuidance,
+  useAddRegionalReferenceImage,
 } from 'features/controlLayers/hooks/addLayerHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import { useIsEntityTypeEnabled } from 'features/controlLayers/hooks/useIsEntityTypeEnabled';
@@ -15,11 +16,13 @@ import { PiPlusBold } from 'react-icons/pi';
 export const EntityListGlobalActionBarAddLayerMenu = memo(() => {
   const { t } = useTranslation();
   const isBusy = useCanvasIsBusy();
+  const addGlobalReferenceImage = useAddGlobalReferenceImage();
   const addInpaintMask = useAddInpaintMask();
   const addRegionalGuidance = useAddRegionalGuidance();
-  const addRegionalReferenceImage = useAddNewRegionalGuidanceWithARefImage();
+  const addRegionalReferenceImage = useAddRegionalReferenceImage();
   const addRasterLayer = useAddRasterLayer();
   const addControlLayer = useAddControlLayer();
+  const isReferenceImageEnabled = useIsEntityTypeEnabled('reference_image');
   const isRegionalGuidanceEnabled = useIsEntityTypeEnabled('regional_guidance');
   const isControlLayerEnabled = useIsEntityTypeEnabled('control_layer');
   const isInpaintLayerEnabled = useIsEntityTypeEnabled('inpaint_mask');
@@ -38,6 +41,11 @@ export const EntityListGlobalActionBarAddLayerMenu = memo(() => {
         isDisabled={isBusy}
       />
       <MenuList>
+        <MenuGroup title={t('controlLayers.global')}>
+          <MenuItem icon={<PiPlusBold />} onClick={addGlobalReferenceImage} isDisabled={!isReferenceImageEnabled}>
+            {t('controlLayers.globalReferenceImage')}
+          </MenuItem>
+        </MenuGroup>
         <MenuGroup title={t('controlLayers.regional')}>
           <MenuItem icon={<PiPlusBold />} onClick={addInpaintMask} isDisabled={!isInpaintLayerEnabled}>
             {t('controlLayers.inpaintMask')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarOpacity.tsx

@@ -22,6 +22,7 @@ import {
   selectEntity,
   selectSelectedEntityIdentifier,
 } from 'features/controlLayers/store/selectors';
+import { isRenderableEntity } from 'features/controlLayers/store/types';
 import { clamp, round } from 'lodash-es';
 import type { KeyboardEvent } from 'react';
 import { memo, useCallback, useEffect, useState } from 'react';
@@ -69,6 +70,9 @@ const selectOpacity = createSelector(selectCanvasSlice, (canvas) => {
   if (!selectedEntity) {
     return 1; // fallback to 100% opacity
   }
+  if (!isRenderableEntity(selectedEntity)) {
+    return 1; // fallback to 100% opacity
+  }
   // Opacity is a float from 0-1, but we want to display it as a percentage
   return selectedEntity.opacity;
 });
@@ -130,7 +134,11 @@ export const EntityListSelectedEntityActionBarOpacity = memo(() => {
 
   return (
     <Popover>
-      <FormControl w="min-content" gap={2} isDisabled={selectedEntityIdentifier === null}>
+      <FormControl
+        w="min-content"
+        gap={2}
+        isDisabled={selectedEntityIdentifier === null || selectedEntityIdentifier.type === 'reference_image'}
+      >
         <FormLabel m={0}>{t('controlLayers.opacity')}</FormLabel>
         <PopoverAnchor>
           <NumberInput
@@ -159,7 +167,7 @@ export const EntityListSelectedEntityActionBarOpacity = memo(() => {
                 position="absolute"
                 insetInlineEnd={0}
                 h="full"
-                isDisabled={selectedEntityIdentifier === null}
+                isDisabled={selectedEntityIdentifier === null || selectedEntityIdentifier.type === 'reference_image'}
               />
             </PopoverTrigger>
           </NumberInput>
@@ -177,7 +185,7 @@ export const EntityListSelectedEntityActionBarOpacity = memo(() => {
             marks={marks}
             formatValue={formatSliderValue}
             alwaysShowMarks
-            isDisabled={selectedEntityIdentifier === null}
+            isDisabled={selectedEntityIdentifier === null || selectedEntityIdentifier.type === 'reference_image'}
           />
         </PopoverBody>
       </PopoverContent>

invokeai/frontend/web/src/features/controlLayers/components/CanvasLayersPanelContent.tsx

@@ -1,20 +1,25 @@
-import { Divider, Flex } from '@invoke-ai/ui-library';
+import { Divider, Flex, type SystemStyleObject } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
+import { FocusRegionWrapper } from 'common/components/FocusRegionWrapper';
 import { CanvasAddEntityButtons } from 'features/controlLayers/components/CanvasAddEntityButtons';
 import { CanvasEntityList } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityList';
 import { EntityListSelectedEntityActionBar } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar';
-import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { selectHasEntities } from 'features/controlLayers/store/selectors';
 import { memo } from 'react';
 
 import { ParamDenoisingStrength } from './ParamDenoisingStrength';
 
-export const CanvasLayersPanel = memo(() => {
+const FOCUS_REGION_STYLES: SystemStyleObject = {
+  width: 'full',
+  height: 'full',
+};
+
+export const CanvasLayersPanelContent = memo(() => {
   const hasEntities = useAppSelector(selectHasEntities);
 
   return (
-    <CanvasManagerProviderGate>
-      <Flex flexDir="column" gap={2} w="full" h="full" p={2}>
+    <FocusRegionWrapper region="layers" sx={FOCUS_REGION_STYLES}>
+      <Flex flexDir="column" gap={2} w="full" h="full">
         <EntityListSelectedEntityActionBar />
         <Divider py={0} />
         <ParamDenoisingStrength />
@@ -22,8 +27,8 @@ export const CanvasLayersPanel = memo(() => {
         {!hasEntities && <CanvasAddEntityButtons />}
         {hasEntities && <CanvasEntityList />}
       </Flex>
-    </CanvasManagerProviderGate>
+    </FocusRegionWrapper>
   );
 });
 
-CanvasLayersPanel.displayName = 'CanvasLayersPanel';
+CanvasLayersPanelContent.displayName = 'CanvasLayersPanelContent';

invokeai/frontend/web/src/features/controlLayers/components/CanvasMainPanelContent.tsx

@@ -0,0 +1,140 @@
+import {
+  ContextMenu,
+  Flex,
+  IconButton,
+  Menu,
+  MenuButton,
+  MenuList,
+  type SystemStyleObject,
+} from '@invoke-ai/ui-library';
+import { useAppSelector } from 'app/store/storeHooks';
+import { FocusRegionWrapper } from 'common/components/FocusRegionWrapper';
+import { CanvasAlertsPreserveMask } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsPreserveMask';
+import { CanvasAlertsSelectedEntityStatus } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSelectedEntityStatus';
+import { CanvasAlertsSendingToGallery } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSendingTo';
+import { CanvasBusySpinner } from 'features/controlLayers/components/CanvasBusySpinner';
+import { CanvasContextMenuGlobalMenuItems } from 'features/controlLayers/components/CanvasContextMenu/CanvasContextMenuGlobalMenuItems';
+import { CanvasContextMenuSelectedEntityMenuItems } from 'features/controlLayers/components/CanvasContextMenu/CanvasContextMenuSelectedEntityMenuItems';
+import { CanvasDropArea } from 'features/controlLayers/components/CanvasDropArea';
+import { Filter } from 'features/controlLayers/components/Filters/Filter';
+import { CanvasHUD } from 'features/controlLayers/components/HUD/CanvasHUD';
+import { InvokeCanvasComponent } from 'features/controlLayers/components/InvokeCanvasComponent';
+import { SelectObject } from 'features/controlLayers/components/SelectObject/SelectObject';
+import { StagingAreaIsStagingGate } from 'features/controlLayers/components/StagingArea/StagingAreaIsStagingGate';
+import { StagingAreaToolbar } from 'features/controlLayers/components/StagingArea/StagingAreaToolbar';
+import { CanvasToolbar } from 'features/controlLayers/components/Toolbar/CanvasToolbar';
+import { Transform } from 'features/controlLayers/components/Transform/Transform';
+import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
+import { selectDynamicGrid, selectShowHUD } from 'features/controlLayers/store/canvasSettingsSlice';
+import { GatedImageViewer } from 'features/gallery/components/ImageViewer/ImageViewer';
+import { memo, useCallback } from 'react';
+import { PiDotsThreeOutlineVerticalFill } from 'react-icons/pi';
+
+import { CanvasAlertsInvocationProgress } from './CanvasAlerts/CanvasAlertsInvocationProgress';
+
+const FOCUS_REGION_STYLES: SystemStyleObject = {
+  width: 'full',
+  height: 'full',
+};
+
+const MenuContent = () => {
+  return (
+    <CanvasManagerProviderGate>
+      <MenuList>
+        <CanvasContextMenuSelectedEntityMenuItems />
+        <CanvasContextMenuGlobalMenuItems />
+      </MenuList>
+    </CanvasManagerProviderGate>
+  );
+};
+
+export const CanvasMainPanelContent = memo(() => {
+  const dynamicGrid = useAppSelector(selectDynamicGrid);
+  const showHUD = useAppSelector(selectShowHUD);
+
+  const renderMenu = useCallback(() => {
+    return <MenuContent />;
+  }, []);
+
+  return (
+    <FocusRegionWrapper region="canvas" sx={FOCUS_REGION_STYLES}>
+      <Flex
+        tabIndex={-1}
+        borderRadius="base"
+        position="relative"
+        flexDirection="column"
+        height="full"
+        width="full"
+        gap={2}
+        alignItems="center"
+        justifyContent="center"
+        overflow="hidden"
+      >
+        <CanvasManagerProviderGate>
+          <CanvasToolbar />
+        </CanvasManagerProviderGate>
+        <ContextMenu<HTMLDivElement> renderMenu={renderMenu} withLongPress={false}>
+          {(ref) => (
+            <Flex
+              ref={ref}
+              position="relative"
+              w="full"
+              h="full"
+              bg={dynamicGrid ? 'base.850' : 'base.900'}
+              borderRadius="base"
+              overflow="hidden"
+            >
+              <InvokeCanvasComponent />
+              <CanvasManagerProviderGate>
+                <Flex
+                  position="absolute"
+                  flexDir="column"
+                  top={1}
+                  insetInlineStart={1}
+                  pointerEvents="none"
+                  gap={2}
+                  alignItems="flex-start"
+                >
+                  {showHUD && <CanvasHUD />}
+                  <CanvasAlertsSelectedEntityStatus />
+                  <CanvasAlertsPreserveMask />
+                  <CanvasAlertsSendingToGallery />
+                  <CanvasAlertsInvocationProgress />
+                </Flex>
+                <Flex position="absolute" top={1} insetInlineEnd={1}>
+                  <Menu>
+                    <MenuButton as={IconButton} icon={<PiDotsThreeOutlineVerticalFill />} colorScheme="base" />
+                    <MenuContent />
+                  </Menu>
+                </Flex>
+                <Flex position="absolute" bottom={4} insetInlineEnd={4}>
+                  <CanvasBusySpinner />
+                </Flex>
+              </CanvasManagerProviderGate>
+            </Flex>
+          )}
+        </ContextMenu>
+        <Flex position="absolute" bottom={4} gap={2} align="center" justify="center">
+          <CanvasManagerProviderGate>
+            <StagingAreaIsStagingGate>
+              <StagingAreaToolbar />
+            </StagingAreaIsStagingGate>
+          </CanvasManagerProviderGate>
+        </Flex>
+        <Flex position="absolute" bottom={4}>
+          <CanvasManagerProviderGate>
+            <Filter />
+            <Transform />
+            <SelectObject />
+          </CanvasManagerProviderGate>
+        </Flex>
+        <CanvasManagerProviderGate>
+          <CanvasDropArea />
+        </CanvasManagerProviderGate>
+        <GatedImageViewer />
+      </Flex>
+    </FocusRegionWrapper>
+  );
+});
+
+CanvasMainPanelContent.displayName = 'CanvasMainPanelContent';

invokeai/frontend/web/src/features/controlLayers/components/CanvasRightPanel.tsx

@@ -0,0 +1,272 @@
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
+import { dropTargetForElements, monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
+import { dropTargetForExternal, monitorForExternal } from '@atlaskit/pragmatic-drag-and-drop/external/adapter';
+import { Box, Button, Spacer, Tab, TabList, TabPanel, TabPanels, Tabs } from '@invoke-ai/ui-library';
+import { useAppDispatch, useAppSelector, useAppStore } from 'app/store/storeHooks';
+import { CanvasLayersPanelContent } from 'features/controlLayers/components/CanvasLayersPanelContent';
+import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
+import { selectEntityCountActive } from 'features/controlLayers/store/selectors';
+import { multipleImageDndSource, singleImageDndSource } from 'features/dnd/dnd';
+import { DndDropOverlay } from 'features/dnd/DndDropOverlay';
+import type { DndTargetState } from 'features/dnd/types';
+import GalleryPanelContent from 'features/gallery/components/GalleryPanelContent';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
+import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
+import { selectActiveTabCanvasRightPanel } from 'features/ui/store/uiSelectors';
+import { activeTabCanvasRightPanelChanged } from 'features/ui/store/uiSlice';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+export const CanvasRightPanel = memo(() => {
+  const { t } = useTranslation();
+  const activeTab = useAppSelector(selectActiveTabCanvasRightPanel);
+  const imageViewer = useImageViewer();
+  const dispatch = useAppDispatch();
+
+  const tabIndex = useMemo(() => {
+    if (activeTab === 'gallery') {
+      return 1;
+    } else {
+      return 0;
+    }
+  }, [activeTab]);
+
+  const onClickViewerToggleButton = useCallback(() => {
+    if (activeTab !== 'gallery') {
+      dispatch(activeTabCanvasRightPanelChanged('gallery'));
+    }
+    imageViewer.toggle();
+  }, [imageViewer, activeTab, dispatch]);
+
+  const onChangeTab = useCallback(
+    (index: number) => {
+      if (index === 0) {
+        dispatch(activeTabCanvasRightPanelChanged('layers'));
+      } else {
+        dispatch(activeTabCanvasRightPanelChanged('gallery'));
+      }
+    },
+    [dispatch]
+  );
+
+  useRegisteredHotkeys({
+    id: 'toggleViewer',
+    category: 'viewer',
+    callback: imageViewer.toggle,
+    dependencies: [imageViewer],
+  });
+
+  return (
+    <Tabs index={tabIndex} onChange={onChangeTab} w="full" h="full" display="flex" flexDir="column">
+      <TabList alignItems="center">
+        <PanelTabs />
+        <Spacer />
+        <Button size="sm" variant="ghost" onClick={onClickViewerToggleButton}>
+          {imageViewer.isOpen ? t('gallery.closeViewer') : t('gallery.openViewer')}
+        </Button>
+      </TabList>
+      <TabPanels w="full" h="full">
+        <TabPanel w="full" h="full" p={0} pt={3}>
+          <CanvasManagerProviderGate>
+            <CanvasLayersPanelContent />
+          </CanvasManagerProviderGate>
+        </TabPanel>
+        <TabPanel w="full" h="full" p={0} pt={3}>
+          <GalleryPanelContent />
+        </TabPanel>
+      </TabPanels>
+    </Tabs>
+  );
+});
+
+CanvasRightPanel.displayName = 'CanvasRightPanel';
+
+const PanelTabs = memo(() => {
+  const { t } = useTranslation();
+  const store = useAppStore();
+  const activeEntityCount = useAppSelector(selectEntityCountActive);
+  const [layersTabDndState, setLayersTabDndState] = useState<DndTargetState>('idle');
+  const [galleryTabDndState, setGalleryTabDndState] = useState<DndTargetState>('idle');
+  const layersTabRef = useRef<HTMLDivElement>(null);
+  const galleryTabRef = useRef<HTMLDivElement>(null);
+  const timeoutRef = useRef<number | null>(null);
+
+  const layersTabLabel = useMemo(() => {
+    if (activeEntityCount === 0) {
+      return t('controlLayers.layer_other');
+    }
+    return `${t('controlLayers.layer_other')} (${activeEntityCount})`;
+  }, [activeEntityCount, t]);
+
+  useEffect(() => {
+    if (!layersTabRef.current) {
+      return;
+    }
+
+    const getIsOnLayersTab = () => selectActiveTabCanvasRightPanel(store.getState()) === 'layers';
+
+    const onDragEnter = () => {
+      // If we are already on the layers tab, do nothing
+      if (getIsOnLayersTab()) {
+        return;
+      }
+
+      // Else set the state to active and switch to the layers tab after a timeout
+      setLayersTabDndState('over');
+      timeoutRef.current = window.setTimeout(() => {
+        timeoutRef.current = null;
+        store.dispatch(activeTabCanvasRightPanelChanged('layers'));
+        // When we switch tabs, the other tab should be pending
+        setLayersTabDndState('idle');
+        setGalleryTabDndState('potential');
+      }, 300);
+    };
+    const onDragLeave = () => {
+      // Set the state to idle or pending depending on the current tab
+      if (getIsOnLayersTab()) {
+        setLayersTabDndState('idle');
+      } else {
+        setLayersTabDndState('potential');
+      }
+      // Abort the tab switch if it hasn't happened yet
+      if (timeoutRef.current !== null) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+    const onDragStart = () => {
+      // Set the state to pending when a drag starts
+      setLayersTabDndState('potential');
+    };
+    return combine(
+      dropTargetForElements({
+        element: layersTabRef.current,
+        onDragEnter,
+        onDragLeave,
+      }),
+      monitorForElements({
+        canMonitor: ({ source }) => {
+          if (!singleImageDndSource.typeGuard(source.data) && !multipleImageDndSource.typeGuard(source.data)) {
+            return false;
+          }
+          // Only monitor if we are not already on the gallery tab
+          return !getIsOnLayersTab();
+        },
+        onDragStart,
+      }),
+      dropTargetForExternal({
+        element: layersTabRef.current,
+        onDragEnter,
+        onDragLeave,
+      }),
+      monitorForExternal({
+        canMonitor: () => !getIsOnLayersTab(),
+        onDragStart,
+      })
+    );
+  }, [store]);
+
+  useEffect(() => {
+    if (!galleryTabRef.current) {
+      return;
+    }
+
+    const getIsOnGalleryTab = () => selectActiveTabCanvasRightPanel(store.getState()) === 'gallery';
+
+    const onDragEnter = () => {
+      // If we are already on the gallery tab, do nothing
+      if (getIsOnGalleryTab()) {
+        return;
+      }
+
+      // Else set the state to active and switch to the gallery tab after a timeout
+      setGalleryTabDndState('over');
+      timeoutRef.current = window.setTimeout(() => {
+        timeoutRef.current = null;
+        store.dispatch(activeTabCanvasRightPanelChanged('gallery'));
+        // When we switch tabs, the other tab should be pending
+        setGalleryTabDndState('idle');
+        setLayersTabDndState('potential');
+      }, 300);
+    };
+
+    const onDragLeave = () => {
+      // Set the state to idle or pending depending on the current tab
+      if (getIsOnGalleryTab()) {
+        setGalleryTabDndState('idle');
+      } else {
+        setGalleryTabDndState('potential');
+      }
+      // Abort the tab switch if it hasn't happened yet
+      if (timeoutRef.current !== null) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+
+    const onDragStart = () => {
+      // Set the state to pending when a drag starts
+      setGalleryTabDndState('potential');
+    };
+
+    return combine(
+      dropTargetForElements({
+        element: galleryTabRef.current,
+        onDragEnter,
+        onDragLeave,
+      }),
+      monitorForElements({
+        canMonitor: ({ source }) => {
+          if (!singleImageDndSource.typeGuard(source.data) && !multipleImageDndSource.typeGuard(source.data)) {
+            return false;
+          }
+          // Only monitor if we are not already on the gallery tab
+          return !getIsOnGalleryTab();
+        },
+        onDragStart,
+      }),
+      dropTargetForExternal({
+        element: galleryTabRef.current,
+        onDragEnter,
+        onDragLeave,
+      }),
+      monitorForExternal({
+        canMonitor: () => !getIsOnGalleryTab(),
+        onDragStart,
+      })
+    );
+  }, [store]);
+
+  useEffect(() => {
+    const onDrop = () => {
+      // Reset the dnd state when a drop happens
+      setGalleryTabDndState('idle');
+      setLayersTabDndState('idle');
+    };
+    const cleanup = combine(monitorForElements({ onDrop }), monitorForExternal({ onDrop }));
+
+    return () => {
+      cleanup();
+      if (timeoutRef.current !== null) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+  }, []);
+
+  return (
+    <>
+      <Tab ref={layersTabRef} position="relative" w={32}>
+        <Box as="span" w="full">
+          {layersTabLabel}
+        </Box>
+        <DndDropOverlay dndState={layersTabDndState} withBackdrop={false} />
+      </Tab>
+      <Tab ref={galleryTabRef} position="relative" w={32}>
+        <Box as="span" w="full">
+          {t('gallery.gallery')}
+        </Box>
+        <DndDropOverlay dndState={galleryTabDndState} withBackdrop={false} />
+      </Tab>
+    </>
+  );
+});
+
+PanelTabs.displayName = 'PanelTabs';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/CLIPVisionModel.tsx

@@ -22,7 +22,7 @@ type Props = {
   onChange: (clipVisionModel: CLIPVisionModelV2) => void;
 };
 
-export const IPAdapterCLIPVisionModel = memo(({ model, onChange }: Props) => {
+export const CLIPVisionModel = memo(({ model, onChange }: Props) => {
   const { t } = useTranslation();
 
   const _onChangeCLIPVisionModel = useCallback<ComboboxOnChange>(
@@ -58,4 +58,4 @@ export const IPAdapterCLIPVisionModel = memo(({ model, onChange }: Props) => {
   );
 });
 
-IPAdapterCLIPVisionModel.displayName = 'IPAdapterCLIPVisionModel';
+CLIPVisionModel.displayName = 'CLIPVisionModel';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/GlobalReferenceImageModel.tsx

@@ -12,7 +12,7 @@ type Props = {
   onChangeModel: (modelConfig: IPAdapterModelConfig | FLUXReduxModelConfig | ApiModelConfig) => void;
 };
 
-export const RefImageModel = memo(({ modelKey, onChangeModel }: Props) => {
+export const GlobalReferenceImageModel = memo(({ modelKey, onChangeModel }: Props) => {
   const { t } = useTranslation();
   const currentBaseModel = useAppSelector(selectBase);
   const [modelConfigs, { isLoading }] = useGlobalReferenceImageModels();
@@ -47,7 +47,7 @@ export const RefImageModel = memo(({ modelKey, onChangeModel }: Props) => {
 
   return (
     <Tooltip label={selectedModel?.description}>
-      <FormControl isInvalid={!value || currentBaseModel !== selectedModel?.base} w="full" minW={0}>
+      <FormControl isInvalid={!value || currentBaseModel !== selectedModel?.base} w="full">
         <Combobox
           options={options}
           placeholder={t('common.placeholderSelectAModel')}
@@ -60,4 +60,4 @@ export const RefImageModel = memo(({ modelKey, onChangeModel }: Props) => {
   );
 });
 
-RefImageModel.displayName = 'RefImageModel';
+GlobalReferenceImageModel.displayName = 'GlobalReferenceImageModel';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapter.tsx

@@ -0,0 +1,35 @@
+import { Spacer } from '@invoke-ai/ui-library';
+import { CanvasEntityContainer } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityContainer';
+import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
+import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
+import { IPAdapterSettings } from 'features/controlLayers/components/IPAdapter/IPAdapterSettings';
+import { CanvasEntityStateGate } from 'features/controlLayers/contexts/CanvasEntityStateGate';
+import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
+import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
+import { memo, useMemo } from 'react';
+
+type Props = {
+  id: string;
+};
+
+export const IPAdapter = memo(({ id }: Props) => {
+  const entityIdentifier = useMemo<CanvasEntityIdentifier>(() => ({ id, type: 'reference_image' }), [id]);
+
+  return (
+    <EntityIdentifierContext.Provider value={entityIdentifier}>
+      <CanvasEntityStateGate entityIdentifier={entityIdentifier}>
+        <CanvasEntityContainer>
+          <CanvasEntityHeader ps={4} py={5}>
+            <CanvasEntityEditableTitle />
+            <Spacer />
+            <CanvasEntityHeaderCommonActions />
+          </CanvasEntityHeader>
+          <IPAdapterSettings />
+        </CanvasEntityContainer>
+      </CanvasEntityStateGate>
+    </EntityIdentifierContext.Provider>
+  );
+});
+
+IPAdapter.displayName = 'IPAdapter';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterImagePreview.tsx

@@ -1,7 +1,7 @@
 import { Flex } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { skipToken } from '@reduxjs/toolkit/query';
-import { UploadImageIconButton } from 'common/hooks/useImageUploadButton';
+import { UploadImageButton } from 'common/hooks/useImageUploadButton';
 import type { ImageWithDims } from 'features/controlLayers/store/types';
 import type { setGlobalReferenceImageDndTarget, setRegionalGuidanceReferenceImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
@@ -21,7 +21,7 @@ type Props<T extends typeof setGlobalReferenceImageDndTarget | typeof setRegiona
   dndTargetData: ReturnType<T['getData']>;
 };
 
-export const RefImageImage = memo(
+export const IPAdapterImagePreview = memo(
   <T extends typeof setGlobalReferenceImageDndTarget | typeof setRegionalGuidanceReferenceImageDndTarget>({
     image,
     onChangeImage,
@@ -51,7 +51,7 @@ export const RefImageImage = memo(
     return (
       <Flex position="relative" w="full" h="full" alignItems="center" data-error={!imageDTO && !image?.image_name}>
         {!imageDTO && (
-          <UploadImageIconButton
+          <UploadImageButton
             w="full"
             h="full"
             isError={!imageDTO && !image?.image_name}
@@ -77,4 +77,4 @@ export const RefImageImage = memo(
   }
 );
 
-RefImageImage.displayName = 'RefImageImage';
+IPAdapterImagePreview.displayName = 'IPAdapterImagePreview';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterList.tsx

@@ -0,0 +1,37 @@
+/* eslint-disable i18next/no-literal-string */
+import { createSelector } from '@reduxjs/toolkit';
+import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
+import { useAppSelector } from 'app/store/storeHooks';
+import { CanvasEntityGroupList } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityGroupList';
+import { IPAdapter } from 'features/controlLayers/components/IPAdapter/IPAdapter';
+import { selectCanvasSlice, selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
+import { getEntityIdentifier } from 'features/controlLayers/store/types';
+import { memo } from 'react';
+
+const selectEntityIdentifiers = createMemoizedSelector(selectCanvasSlice, (canvas) => {
+  return canvas.referenceImages.entities.map(getEntityIdentifier).toReversed();
+});
+const selectIsSelected = createSelector(selectSelectedEntityIdentifier, (selectedEntityIdentifier) => {
+  return selectedEntityIdentifier?.type === 'reference_image';
+});
+
+export const IPAdapterList = memo(() => {
+  const isSelected = useAppSelector(selectIsSelected);
+  const entityIdentifiers = useAppSelector(selectEntityIdentifiers);
+
+  if (entityIdentifiers.length === 0) {
+    return null;
+  }
+
+  if (entityIdentifiers.length > 0) {
+    return (
+      <CanvasEntityGroupList type="reference_image" isSelected={isSelected} entityIdentifiers={entityIdentifiers}>
+        {entityIdentifiers.map((entityIdentifiers) => (
+          <IPAdapter key={entityIdentifiers.id} id={entityIdentifiers.id} />
+        ))}
+      </CanvasEntityGroupList>
+    );
+  }
+});
+
+IPAdapterList.displayName = 'IPAdapterList';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterMenuItemPullBbox.tsx

@@ -1,5 +1,5 @@
 import { MenuItem } from '@invoke-ai/ui-library';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
+import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import { usePullBboxIntoGlobalReferenceImage } from 'features/controlLayers/hooks/saveCanvasHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import { memo } from 'react';
@@ -8,8 +8,8 @@ import { PiBoundingBoxBold } from 'react-icons/pi';
 
 export const IPAdapterMenuItemPullBbox = memo(() => {
   const { t } = useTranslation();
-  const id = useRefImageIdContext();
-  const pullBboxIntoIPAdapter = usePullBboxIntoGlobalReferenceImage(id);
+  const entityIdentifier = useEntityIdentifierContext('reference_image');
+  const pullBboxIntoIPAdapter = usePullBboxIntoGlobalReferenceImage(entityIdentifier);
   const isBusy = useCanvasIsBusy();
 
   return (

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterMenuItems.tsx

@@ -3,7 +3,7 @@ import { IconMenuItemGroup } from 'common/components/IconMenuItem';
 import { CanvasEntityMenuItemsArrange } from 'features/controlLayers/components/common/CanvasEntityMenuItemsArrange';
 import { CanvasEntityMenuItemsDelete } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDelete';
 import { CanvasEntityMenuItemsDuplicate } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDuplicate';
-import { IPAdapterMenuItemPullBbox } from 'features/controlLayers/components/RefImage/IPAdapterMenuItemPullBbox';
+import { IPAdapterMenuItemPullBbox } from 'features/controlLayers/components/IPAdapter/IPAdapterMenuItemPullBbox';
 import { memo } from 'react';
 
 export const IPAdapterMenuItems = memo(() => {

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterSettings.tsx

@@ -0,0 +1,180 @@
+import { Flex, IconButton } from '@invoke-ai/ui-library';
+import { createSelector } from '@reduxjs/toolkit';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { BeginEndStepPct } from 'features/controlLayers/components/common/BeginEndStepPct';
+import { CanvasEntitySettingsWrapper } from 'features/controlLayers/components/common/CanvasEntitySettingsWrapper';
+import { Weight } from 'features/controlLayers/components/common/Weight';
+import { CLIPVisionModel } from 'features/controlLayers/components/IPAdapter/CLIPVisionModel';
+import { FLUXReduxImageInfluence } from 'features/controlLayers/components/IPAdapter/FLUXReduxImageInfluence';
+import { GlobalReferenceImageModel } from 'features/controlLayers/components/IPAdapter/GlobalReferenceImageModel';
+import { IPAdapterMethod } from 'features/controlLayers/components/IPAdapter/IPAdapterMethod';
+import { IPAdapterSettingsEmptyState } from 'features/controlLayers/components/IPAdapter/IPAdapterSettingsEmptyState';
+import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
+import { usePullBboxIntoGlobalReferenceImage } from 'features/controlLayers/hooks/saveCanvasHooks';
+import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
+import {
+  referenceImageIPAdapterBeginEndStepPctChanged,
+  referenceImageIPAdapterCLIPVisionModelChanged,
+  referenceImageIPAdapterFLUXReduxImageInfluenceChanged,
+  referenceImageIPAdapterImageChanged,
+  referenceImageIPAdapterMethodChanged,
+  referenceImageIPAdapterModelChanged,
+  referenceImageIPAdapterWeightChanged,
+} from 'features/controlLayers/store/canvasSlice';
+import { selectIsFLUX } from 'features/controlLayers/store/paramsSlice';
+import { selectCanvasSlice, selectEntity, selectEntityOrThrow } from 'features/controlLayers/store/selectors';
+import type {
+  CanvasEntityIdentifier,
+  CLIPVisionModelV2,
+  FLUXReduxImageInfluence as FLUXReduxImageInfluenceType,
+  IPMethodV2,
+} from 'features/controlLayers/store/types';
+import type { SetGlobalReferenceImageDndTargetData } from 'features/dnd/dnd';
+import { setGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
+import { memo, useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PiBoundingBoxBold } from 'react-icons/pi';
+import type { ApiModelConfig, FLUXReduxModelConfig, ImageDTO, IPAdapterModelConfig } from 'services/api/types';
+
+import { IPAdapterImagePreview } from './IPAdapterImagePreview';
+
+const buildSelectIPAdapter = (entityIdentifier: CanvasEntityIdentifier<'reference_image'>) =>
+  createSelector(
+    selectCanvasSlice,
+    (canvas) => selectEntityOrThrow(canvas, entityIdentifier, 'IPAdapterSettings').ipAdapter
+  );
+
+const IPAdapterSettingsContent = memo(() => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const entityIdentifier = useEntityIdentifierContext('reference_image');
+  const selectIPAdapter = useMemo(() => buildSelectIPAdapter(entityIdentifier), [entityIdentifier]);
+  const ipAdapter = useAppSelector(selectIPAdapter);
+
+  const onChangeBeginEndStepPct = useCallback(
+    (beginEndStepPct: [number, number]) => {
+      dispatch(referenceImageIPAdapterBeginEndStepPctChanged({ entityIdentifier, beginEndStepPct }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeWeight = useCallback(
+    (weight: number) => {
+      dispatch(referenceImageIPAdapterWeightChanged({ entityIdentifier, weight }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeIPMethod = useCallback(
+    (method: IPMethodV2) => {
+      dispatch(referenceImageIPAdapterMethodChanged({ entityIdentifier, method }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeFLUXReduxImageInfluence = useCallback(
+    (imageInfluence: FLUXReduxImageInfluenceType) => {
+      dispatch(referenceImageIPAdapterFLUXReduxImageInfluenceChanged({ entityIdentifier, imageInfluence }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeModel = useCallback(
+    (modelConfig: IPAdapterModelConfig | FLUXReduxModelConfig | ApiModelConfig) => {
+      dispatch(referenceImageIPAdapterModelChanged({ entityIdentifier, modelConfig }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeCLIPVisionModel = useCallback(
+    (clipVisionModel: CLIPVisionModelV2) => {
+      dispatch(referenceImageIPAdapterCLIPVisionModelChanged({ entityIdentifier, clipVisionModel }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const onChangeImage = useCallback(
+    (imageDTO: ImageDTO | null) => {
+      dispatch(referenceImageIPAdapterImageChanged({ entityIdentifier, imageDTO }));
+    },
+    [dispatch, entityIdentifier]
+  );
+
+  const dndTargetData = useMemo<SetGlobalReferenceImageDndTargetData>(
+    () => setGlobalReferenceImageDndTarget.getData({ entityIdentifier }, ipAdapter.image?.image_name),
+    [entityIdentifier, ipAdapter.image?.image_name]
+  );
+  const pullBboxIntoIPAdapter = usePullBboxIntoGlobalReferenceImage(entityIdentifier);
+  const isBusy = useCanvasIsBusy();
+
+  const isFLUX = useAppSelector(selectIsFLUX);
+
+  return (
+    <CanvasEntitySettingsWrapper>
+      <Flex flexDir="column" gap={2} position="relative" w="full">
+        <Flex gap={2} alignItems="center" w="full">
+          <GlobalReferenceImageModel modelKey={ipAdapter.model?.key ?? null} onChangeModel={onChangeModel} />
+          {ipAdapter.type === 'ip_adapter' && (
+            <CLIPVisionModel model={ipAdapter.clipVisionModel} onChange={onChangeCLIPVisionModel} />
+          )}
+          <IconButton
+            onClick={pullBboxIntoIPAdapter}
+            isDisabled={isBusy}
+            variant="ghost"
+            aria-label={t('controlLayers.pullBboxIntoReferenceImage')}
+            tooltip={t('controlLayers.pullBboxIntoReferenceImage')}
+            icon={<PiBoundingBoxBold />}
+          />
+        </Flex>
+        <Flex gap={2} w="full">
+          {ipAdapter.type === 'ip_adapter' && (
+            <Flex flexDir="column" gap={2} w="full">
+              {!isFLUX && <IPAdapterMethod method={ipAdapter.method} onChange={onChangeIPMethod} />}
+              <Weight weight={ipAdapter.weight} onChange={onChangeWeight} />
+              <BeginEndStepPct beginEndStepPct={ipAdapter.beginEndStepPct} onChange={onChangeBeginEndStepPct} />
+            </Flex>
+          )}
+          {ipAdapter.type === 'flux_redux' && (
+            <Flex flexDir="column" gap={2} w="full" alignItems="flex-start">
+              <FLUXReduxImageInfluence
+                imageInfluence={ipAdapter.imageInfluence ?? 'lowest'}
+                onChange={onChangeFLUXReduxImageInfluence}
+              />
+            </Flex>
+          )}
+          <Flex alignItems="center" justifyContent="center" h={32} w={32} aspectRatio="1/1" flexGrow={1}>
+            <IPAdapterImagePreview
+              image={ipAdapter.image}
+              onChangeImage={onChangeImage}
+              dndTarget={setGlobalReferenceImageDndTarget}
+              dndTargetData={dndTargetData}
+            />
+          </Flex>
+        </Flex>
+      </Flex>
+    </CanvasEntitySettingsWrapper>
+  );
+});
+
+IPAdapterSettingsContent.displayName = 'IPAdapterSettingsContent';
+
+const buildSelectIPAdapterHasImage = (entityIdentifier: CanvasEntityIdentifier<'reference_image'>) =>
+  createSelector(selectCanvasSlice, (canvas) => {
+    const referenceImage = selectEntity(canvas, entityIdentifier);
+    return !!referenceImage && referenceImage.ipAdapter.image !== null;
+  });
+
+export const IPAdapterSettings = memo(() => {
+  const entityIdentifier = useEntityIdentifierContext('reference_image');
+
+  const selectIPAdapterHasImage = useMemo(() => buildSelectIPAdapterHasImage(entityIdentifier), [entityIdentifier]);
+  const hasImage = useAppSelector(selectIPAdapterHasImage);
+
+  if (!hasImage) {
+    return <IPAdapterSettingsEmptyState />;
+  }
+
+  return <IPAdapterSettingsContent />;
+});
+
+IPAdapterSettings.displayName = 'IPAdapterSettings';

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapterSettingsEmptyState.tsx

@@ -1,7 +1,7 @@
 import { Button, Flex, Text } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
 import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
+import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import { usePullBboxIntoGlobalReferenceImage } from 'features/controlLayers/hooks/saveCanvasHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import type { SetGlobalReferenceImageDndTargetData } from 'features/dnd/dnd';
@@ -13,26 +13,26 @@ import { memo, useCallback, useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import type { ImageDTO } from 'services/api/types';
 
-export const RefImageNoImageStateWithCanvasOptions = memo(() => {
+export const IPAdapterSettingsEmptyState = memo(() => {
   const { t } = useTranslation();
-  const id = useRefImageIdContext();
+  const entityIdentifier = useEntityIdentifierContext('reference_image');
   const dispatch = useAppDispatch();
   const isBusy = useCanvasIsBusy();
   const onUpload = useCallback(
     (imageDTO: ImageDTO) => {
-      setGlobalReferenceImage({ imageDTO, id, dispatch });
+      setGlobalReferenceImage({ imageDTO, entityIdentifier, dispatch });
     },
-    [dispatch, id]
+    [dispatch, entityIdentifier]
   );
   const uploadApi = useImageUploadButton({ onUpload, allowMultiple: false });
   const onClickGalleryButton = useCallback(() => {
     dispatch(activeTabCanvasRightPanelChanged('gallery'));
   }, [dispatch]);
-  const pullBboxIntoIPAdapter = usePullBboxIntoGlobalReferenceImage(id);
+  const pullBboxIntoIPAdapter = usePullBboxIntoGlobalReferenceImage(entityIdentifier);
 
   const dndTargetData = useMemo<SetGlobalReferenceImageDndTargetData>(
-    () => setGlobalReferenceImageDndTarget.getData({ id }),
-    [id]
+    () => setGlobalReferenceImageDndTarget.getData({ entityIdentifier }),
+    [entityIdentifier]
   );
 
   const components = useMemo(
@@ -53,7 +53,7 @@ export const RefImageNoImageStateWithCanvasOptions = memo(() => {
   return (
     <Flex flexDir="column" gap={3} position="relative" w="full" p={4}>
       <Text textAlign="center" color="base.300">
-        <Trans i18nKey="controlLayers.referenceImageEmptyStateWithCanvasOptions" components={components} />
+        <Trans i18nKey="controlLayers.referenceImageEmptyState" components={components} />
       </Text>
       <input {...uploadApi.getUploadInputProps()} />
       <DndDropTarget
@@ -66,4 +66,4 @@ export const RefImageNoImageStateWithCanvasOptions = memo(() => {
   );
 });
 
-RefImageNoImageStateWithCanvasOptions.displayName = 'RefImageNoImageStateWithCanvasOptions';
+IPAdapterSettingsEmptyState.displayName = 'IPAdapterSettingsEmptyState';

invokeai/frontend/web/src/features/controlLayers/components/NewSessionConfirmationAlertDialog.tsx

@@ -2,7 +2,8 @@ import { Checkbox, ConfirmationAlertDialog, Flex, FormControl, FormLabel, Text }
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
 import { buildUseBoolean } from 'common/hooks/useBoolean';
-import { canvasSessionReset, generateSessionReset } from 'features/controlLayers/store/canvasStagingAreaSlice';
+import { newCanvasSessionRequested, newGallerySessionRequested } from 'features/controlLayers/store/actions';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
 import {
   selectSystemShouldConfirmOnNewSession,
   shouldConfirmOnNewSessionToggled,
@@ -16,13 +17,15 @@ const [useNewCanvasSessionDialog] = buildUseBoolean(false);
 
 export const useNewGallerySession = () => {
   const dispatch = useAppDispatch();
+  const imageViewer = useImageViewer();
   const shouldConfirmOnNewSession = useAppSelector(selectSystemShouldConfirmOnNewSession);
   const newSessionDialog = useNewGallerySessionDialog();
 
   const newGallerySessionImmediate = useCallback(() => {
-    dispatch(generateSessionReset());
+    dispatch(newGallerySessionRequested());
+    imageViewer.open();
     dispatch(activeTabCanvasRightPanelChanged('gallery'));
-  }, [dispatch]);
+  }, [dispatch, imageViewer]);
 
   const newGallerySessionWithDialog = useCallback(() => {
     if (shouldConfirmOnNewSession) {
@@ -37,13 +40,15 @@ export const useNewGallerySession = () => {
 
 export const useNewCanvasSession = () => {
   const dispatch = useAppDispatch();
+  const imageViewer = useImageViewer();
   const shouldConfirmOnNewSession = useAppSelector(selectSystemShouldConfirmOnNewSession);
   const newSessionDialog = useNewCanvasSessionDialog();
 
   const newCanvasSessionImmediate = useCallback(() => {
-    dispatch(canvasSessionReset());
+    dispatch(newCanvasSessionRequested());
+    imageViewer.close();
     dispatch(activeTabCanvasRightPanelChanged('layers'));
-  }, [dispatch]);
+  }, [dispatch, imageViewer]);
 
   const newCanvasSessionWithDialog = useCallback(() => {
     if (shouldConfirmOnNewSession) {

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

@@ -1,238 +0,0 @@
-import type { SystemStyleObject } from '@invoke-ai/ui-library';
-import {
-  Divider,
-  Flex,
-  Icon,
-  IconButton,
-  Image,
-  Popover,
-  PopoverAnchor,
-  PopoverArrow,
-  PopoverBody,
-  PopoverContent,
-  Portal,
-  Skeleton,
-  Text,
-} from '@invoke-ai/ui-library';
-import { skipToken } from '@reduxjs/toolkit/query';
-import { POPPER_MODIFIERS } from 'common/components/InformationalPopover/constants';
-import type { UseDisclosure } from 'common/hooks/useBoolean';
-import { useDisclosure } from 'common/hooks/useBoolean';
-import { DEFAULT_FILTER, useFilterableOutsideClick } from 'common/hooks/useFilterableOutsideClick';
-import { RefImageHeader } from 'features/controlLayers/components/RefImage/RefImageHeader';
-import { RefImageSettings } from 'features/controlLayers/components/RefImage/RefImageSettings';
-import { useRefImageEntity } from 'features/controlLayers/components/RefImage/useRefImageEntity';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import { isIPAdapterConfig } from 'features/controlLayers/store/types';
-import { round } from 'lodash-es';
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { PiExclamationMarkBold, PiImageBold } from 'react-icons/pi';
-import { useGetImageDTOQuery } from 'services/api/endpoints/images';
-
-// There is some awkwardness here with closing the popover when clicking outside of it, related to Chakra's
-// handling of refs, portals, outside clicks, and a race condition with framer-motion animations that can leave
-// the popover closed when its internal state is still open.
-//
-// We have to manually manage the popover open state to work around the race condition, and then have to do special
-// handling to close the popover when clicking outside of it.
-
-// We have to reach outside react to identify the popover trigger element instead of using refs, thanks to how Chakra
-// handles refs for PopoverAnchor internally. Maybe there is some way to merge them but I couldn't figure it out.
-const getRefImagePopoverTriggerId = (id: string) => `ref-image-popover-trigger-${id}`;
-
-export const RefImage = memo(() => {
-  const id = useRefImageIdContext();
-  const ref = useRef<HTMLDivElement>(null);
-  const disclosure = useDisclosure(false);
-  // This filter prevents the popover from closing when clicking on a sibling portal element, like the dropdown menu
-  // inside the ref image settings popover. It also prevents the popover from closing when clicking on the popover's
-  // own trigger element.
-  const filter = useCallback(
-    (el: HTMLElement | SVGElement) => {
-      return DEFAULT_FILTER(el) || el.id === getRefImagePopoverTriggerId(id);
-    },
-    [id]
-  );
-  useFilterableOutsideClick({ ref, handler: disclosure.close, filter });
-
-  return (
-    <Popover
-      // The popover contains a react-select component, which uses a portal to render its options. This portal
-      // is itself not lazy. As a result, if we do not unmount the popover when it is closed, the react-select
-      // component still exists but is invisible, and intercepts clicks!
-      isLazy
-      lazyBehavior="unmount"
-      isOpen={disclosure.isOpen}
-      closeOnBlur={false}
-      modifiers={POPPER_MODIFIERS}
-    >
-      <Thumbnail disclosure={disclosure} />
-      <Portal>
-        <PopoverContent ref={ref} w={400}>
-          <PopoverArrow />
-          <PopoverBody>
-            <Flex flexDir="column" gap={2} w="full" h="full">
-              <RefImageHeader />
-              <Divider />
-              <RefImageSettings />
-            </Flex>
-          </PopoverBody>
-        </PopoverContent>
-      </Portal>
-    </Popover>
-  );
-});
-RefImage.displayName = 'RefImage';
-
-const baseSx: SystemStyleObject = {
-  opacity: 0.7,
-  transitionProperty: 'opacity',
-  transitionDuration: 'normal',
-  position: 'relative',
-  _hover: {
-    opacity: 1,
-  },
-  '&[data-is-open="true"]': {
-    opacity: 1,
-  },
-  '&[data-is-error="true"]': {
-    borderColor: 'error.500',
-    borderWidth: 2,
-  },
-};
-
-const weightDisplaySx: SystemStyleObject = {
-  pointerEvents: 'none',
-  transitionProperty: 'opacity',
-  transitionDuration: 'normal',
-  opacity: 0,
-  '&[data-visible="true"]': {
-    opacity: 1,
-  },
-};
-
-const getImageSxWithWeight = (weight: number): SystemStyleObject => {
-  const fillPercentage = Math.max(0, Math.min(100, weight * 100));
-
-  return {
-    ...baseSx,
-    _after: {
-      content: '""',
-      position: 'absolute',
-      inset: 0,
-      background: `linear-gradient(to top, transparent ${fillPercentage}%, rgba(0, 0, 0, 0.8) ${fillPercentage}%)`,
-      pointerEvents: 'none',
-      borderRadius: 'base',
-    },
-  };
-};
-
-const Thumbnail = memo(({ disclosure }: { disclosure: UseDisclosure }) => {
-  const id = useRefImageIdContext();
-  const entity = useRefImageEntity(id);
-  const [showWeightDisplay, setShowWeightDisplay] = useState(false);
-  const { data: imageDTO } = useGetImageDTOQuery(entity.config.image?.image_name ?? skipToken);
-
-  const sx = useMemo(() => {
-    if (!isIPAdapterConfig(entity.config)) {
-      return baseSx;
-    }
-    return getImageSxWithWeight(entity.config.weight);
-  }, [entity.config]);
-
-  useEffect(() => {
-    if (!isIPAdapterConfig(entity.config)) {
-      return;
-    }
-    setShowWeightDisplay(true);
-    const timeout = window.setTimeout(() => {
-      setShowWeightDisplay(false);
-    }, 1000);
-    return () => {
-      window.clearTimeout(timeout);
-    };
-  }, [entity.config]);
-
-  if (!entity.config.image) {
-    return (
-      <PopoverAnchor>
-        <IconButton
-          id={getRefImagePopoverTriggerId(id)}
-          aria-label="Open Reference Image Settings"
-          h="full"
-          variant="ghost"
-          aspectRatio="1/1"
-          borderWidth="2px !important"
-          borderStyle="dashed !important"
-          borderColor="errorAlpha.500"
-          borderRadius="base"
-          icon={<PiImageBold />}
-          colorScheme="error"
-          onClick={disclosure.toggle}
-          flexShrink={0}
-        />
-      </PopoverAnchor>
-    );
-  }
-  return (
-    <PopoverAnchor>
-      <Flex
-        position="relative"
-        borderWidth={1}
-        borderStyle="solid"
-        borderRadius="base"
-        aspectRatio="1/1"
-        maxW="full"
-        maxH="full"
-        flexShrink={0}
-        sx={sx}
-        data-is-open={disclosure.isOpen}
-        data-is-error={!entity.config.model}
-        id={getRefImagePopoverTriggerId(id)}
-        role="button"
-        onClick={disclosure.toggle}
-        cursor="pointer"
-      >
-        <Image
-          src={imageDTO?.thumbnail_url}
-          objectFit="contain"
-          aspectRatio="1/1"
-          height={imageDTO?.height}
-          fallback={<Skeleton h="full" aspectRatio="1/1" />}
-          maxW="full"
-          maxH="full"
-          borderRadius="base"
-        />
-        {isIPAdapterConfig(entity.config) && (
-          <Flex
-            position="absolute"
-            inset={0}
-            fontWeight="semibold"
-            alignItems="center"
-            justifyContent="center"
-            zIndex={1}
-            data-visible={showWeightDisplay}
-            sx={weightDisplaySx}
-          >
-            <Text filter="drop-shadow(0px 0px 4px rgb(0, 0, 0)) drop-shadow(0px 0px 2px rgba(0, 0, 0, 1))">
-              {`${round(entity.config.weight * 100, 2)}%`}
-            </Text>
-          </Flex>
-        )}
-        {!entity.config.model && (
-          <Icon
-            position="absolute"
-            top="50%"
-            left="50%"
-            transform="translateX(-50%) translateY(-50%)"
-            filter="drop-shadow(0px 0px 4px rgb(0, 0, 0)) drop-shadow(0px 0px 2px rgba(0, 0, 0, 1))"
-            color="error.500"
-            boxSize={16}
-            as={PiExclamationMarkBold}
-          />
-        )}
-      </Flex>
-    </PopoverAnchor>
-  );
-});
-Thumbnail.displayName = 'Thumbnail';

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

@@ -1,41 +0,0 @@
-import { Flex, IconButton, Text } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { useRefImageEntity } from 'features/controlLayers/components/RefImage/useRefImageEntity';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import { refImageDeleted } from 'features/controlLayers/store/refImagesSlice';
-import { memo, useCallback } from 'react';
-import { PiTrashBold } from 'react-icons/pi';
-
-export const RefImageHeader = memo(() => {
-  const id = useRefImageIdContext();
-  const dispatch = useAppDispatch();
-  const entity = useRefImageEntity(id);
-  const deleteRefImage = useCallback(() => {
-    dispatch(refImageDeleted({ id }));
-  }, [dispatch, id]);
-
-  return (
-    <Flex justifyContent="space-between" alignItems="center" w="full">
-      {entity.config.image !== null && (
-        <Text fontWeight="semibold" color="base.300">
-          Reference Image
-        </Text>
-      )}
-      {entity.config.image === null && (
-        <Text fontWeight="semibold" color="base.300">
-          No Reference Image Selected
-        </Text>
-      )}
-      <IconButton
-        size="xs"
-        variant="link"
-        alignSelf="stretch"
-        icon={<PiTrashBold />}
-        onClick={deleteRefImage}
-        aria-label="Delete reference image"
-        colorScheme="error"
-      />
-    </Flex>
-  );
-});
-RefImageHeader.displayName = 'RefImageHeader';

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

@@ -1,94 +0,0 @@
-import type { FlexProps } from '@invoke-ai/ui-library';
-import { Button, Flex } from '@invoke-ai/ui-library';
-import { useAppStore } from 'app/store/nanostores/store';
-import { useAppSelector } from 'app/store/storeHooks';
-import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { RefImage } from 'features/controlLayers/components/RefImage/RefImage';
-import { RefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks';
-import { refImageAdded, selectRefImageEntityIds } from 'features/controlLayers/store/refImagesSlice';
-import { imageDTOToImageWithDims } from 'features/controlLayers/store/util';
-import { addGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
-import { DndDropTarget } from 'features/dnd/DndDropTarget';
-import { memo, useMemo } from 'react';
-import { PiUploadBold } from 'react-icons/pi';
-import type { ImageDTO } from 'services/api/types';
-
-export const RefImageList = memo((props: FlexProps) => {
-  const ids = useAppSelector(selectRefImageEntityIds);
-  return (
-    <Flex gap={2} h={16} {...props}>
-      {ids.map((id) => (
-        <RefImageIdContext.Provider key={id} value={id}>
-          <RefImage />
-        </RefImageIdContext.Provider>
-      ))}
-      {ids.length < 5 && <AddRefImageDropTargetAndButton />}
-      {ids.length >= 5 && <MaxRefImages />}
-    </Flex>
-  );
-});
-
-RefImageList.displayName = 'RefImageList';
-
-const dndTargetData = addGlobalReferenceImageDndTarget.getData();
-
-const MaxRefImages = memo(() => {
-  return (
-    <Button
-      position="relative"
-      size="sm"
-      variant="ghost"
-      h="full"
-      w="full"
-      borderWidth="2px !important"
-      borderStyle="dashed !important"
-      borderRadius="base"
-      isDisabled
-    >
-      Max Ref Images
-    </Button>
-  );
-});
-MaxRefImages.displayName = 'MaxRefImages';
-
-const AddRefImageDropTargetAndButton = memo(() => {
-  const { dispatch, getState } = useAppStore();
-
-  const uploadOptions = useMemo(
-    () =>
-      ({
-        onUpload: (imageDTO: ImageDTO) => {
-          const config = getDefaultRefImageConfig(getState);
-          config.image = imageDTOToImageWithDims(imageDTO);
-          dispatch(refImageAdded({ overrides: { config } }));
-        },
-        allowMultiple: false,
-      }) as const,
-    [dispatch, getState]
-  );
-
-  const uploadApi = useImageUploadButton(uploadOptions);
-
-  return (
-    <>
-      <Button
-        position="relative"
-        size="sm"
-        variant="ghost"
-        h="full"
-        w="full"
-        borderWidth="2px !important"
-        borderStyle="dashed !important"
-        borderRadius="base"
-        leftIcon={<PiUploadBold />}
-        {...uploadApi.getUploadButtonProps()}
-      >
-        Reference Image
-        <input {...uploadApi.getUploadInputProps()} />
-        <DndDropTarget label="Drop" dndTarget={addGlobalReferenceImageDndTarget} dndTargetData={dndTargetData} />
-      </Button>
-    </>
-  );
-});
-AddRefImageDropTargetAndButton.displayName = 'AddRefImageDropTargetAndButton';

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

@@ -1,57 +0,0 @@
-import { Button, Flex, Text } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import type { SetGlobalReferenceImageDndTargetData } from 'features/dnd/dnd';
-import { setGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
-import { DndDropTarget } from 'features/dnd/DndDropTarget';
-import { setGlobalReferenceImage } from 'features/imageActions/actions';
-import { activeTabCanvasRightPanelChanged } from 'features/ui/store/uiSlice';
-import { memo, useCallback, useMemo } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import type { ImageDTO } from 'services/api/types';
-
-export const RefImageNoImageState = memo(() => {
-  const { t } = useTranslation();
-  const id = useRefImageIdContext();
-  const dispatch = useAppDispatch();
-  const onUpload = useCallback(
-    (imageDTO: ImageDTO) => {
-      setGlobalReferenceImage({ imageDTO, id, dispatch });
-    },
-    [dispatch, id]
-  );
-  const uploadApi = useImageUploadButton({ onUpload, allowMultiple: false });
-  const onClickGalleryButton = useCallback(() => {
-    dispatch(activeTabCanvasRightPanelChanged('gallery'));
-  }, [dispatch]);
-
-  const dndTargetData = useMemo<SetGlobalReferenceImageDndTargetData>(
-    () => setGlobalReferenceImageDndTarget.getData({ id }),
-    [id]
-  );
-
-  const components = useMemo(
-    () => ({
-      UploadButton: <Button size="sm" variant="link" color="base.300" {...uploadApi.getUploadButtonProps()} />,
-      GalleryButton: <Button onClick={onClickGalleryButton} size="sm" variant="link" color="base.300" />,
-    }),
-    [onClickGalleryButton, uploadApi]
-  );
-
-  return (
-    <Flex flexDir="column" gap={3} position="relative" w="full" p={4}>
-      <Text textAlign="center" color="base.300">
-        <Trans i18nKey="controlLayers.referenceImageEmptyState" components={components} />
-      </Text>
-      <input {...uploadApi.getUploadInputProps()} />
-      <DndDropTarget
-        dndTarget={setGlobalReferenceImageDndTarget}
-        dndTargetData={dndTargetData}
-        label={t('controlLayers.useImage')}
-      />
-    </Flex>
-  );
-});
-
-RefImageNoImageState.displayName = 'RefImageNoImageState';

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

@@ -1,186 +0,0 @@
-import { Flex } from '@invoke-ai/ui-library';
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { BeginEndStepPct } from 'features/controlLayers/components/common/BeginEndStepPct';
-import { FLUXReduxImageInfluence } from 'features/controlLayers/components/common/FLUXReduxImageInfluence';
-import { IPAdapterCLIPVisionModel } from 'features/controlLayers/components/common/IPAdapterCLIPVisionModel';
-import { PullBboxIntoRefImageIconButton } from 'features/controlLayers/components/common/PullBboxIntoRefImageIconButton';
-import { Weight } from 'features/controlLayers/components/common/Weight';
-import { IPAdapterMethod } from 'features/controlLayers/components/RefImage/IPAdapterMethod';
-import { RefImageModel } from 'features/controlLayers/components/RefImage/RefImageModel';
-import { RefImageNoImageState } from 'features/controlLayers/components/RefImage/RefImageNoImageState';
-import { RefImageNoImageStateWithCanvasOptions } from 'features/controlLayers/components/RefImage/RefImageNoImageStateWithCanvasOptions';
-import {
-  CanvasManagerProviderGate,
-  useCanvasManagerSafe,
-} from 'features/controlLayers/contexts/CanvasManagerProviderGate';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import { selectIsFLUX } from 'features/controlLayers/store/paramsSlice';
-import {
-  refImageFLUXReduxImageInfluenceChanged,
-  refImageImageChanged,
-  refImageIPAdapterBeginEndStepPctChanged,
-  refImageIPAdapterCLIPVisionModelChanged,
-  refImageIPAdapterMethodChanged,
-  refImageIPAdapterWeightChanged,
-  refImageModelChanged,
-  selectRefImageEntity,
-  selectRefImageEntityOrThrow,
-  selectRefImagesSlice,
-} from 'features/controlLayers/store/refImagesSlice';
-import type {
-  CLIPVisionModelV2,
-  FLUXReduxImageInfluence as FLUXReduxImageInfluenceType,
-  IPMethodV2,
-} from 'features/controlLayers/store/types';
-import { isFLUXReduxConfig, isIPAdapterConfig } from 'features/controlLayers/store/types';
-import type { SetGlobalReferenceImageDndTargetData } from 'features/dnd/dnd';
-import { setGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
-import { selectActiveTab } from 'features/ui/store/uiSelectors';
-import { memo, useCallback, useMemo } from 'react';
-import type { ApiModelConfig, FLUXReduxModelConfig, ImageDTO, IPAdapterModelConfig } from 'services/api/types';
-
-import { RefImageImage } from './RefImageImage';
-
-const buildSelectConfig = (id: string) =>
-  createSelector(
-    selectRefImagesSlice,
-    (refImages) => selectRefImageEntityOrThrow(refImages, id, 'IPAdapterSettings').config
-  );
-
-const RefImageSettingsContent = memo(() => {
-  const dispatch = useAppDispatch();
-  const id = useRefImageIdContext();
-  const selectConfig = useMemo(() => buildSelectConfig(id), [id]);
-  const config = useAppSelector(selectConfig);
-  const tab = useAppSelector(selectActiveTab);
-
-  const onChangeBeginEndStepPct = useCallback(
-    (beginEndStepPct: [number, number]) => {
-      dispatch(refImageIPAdapterBeginEndStepPctChanged({ id, beginEndStepPct }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeWeight = useCallback(
-    (weight: number) => {
-      dispatch(refImageIPAdapterWeightChanged({ id, weight }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeIPMethod = useCallback(
-    (method: IPMethodV2) => {
-      dispatch(refImageIPAdapterMethodChanged({ id, method }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeFLUXReduxImageInfluence = useCallback(
-    (imageInfluence: FLUXReduxImageInfluenceType) => {
-      dispatch(refImageFLUXReduxImageInfluenceChanged({ id, imageInfluence }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeModel = useCallback(
-    (modelConfig: IPAdapterModelConfig | FLUXReduxModelConfig | ApiModelConfig) => {
-      dispatch(refImageModelChanged({ id, modelConfig }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeCLIPVisionModel = useCallback(
-    (clipVisionModel: CLIPVisionModelV2) => {
-      dispatch(refImageIPAdapterCLIPVisionModelChanged({ id, clipVisionModel }));
-    },
-    [dispatch, id]
-  );
-
-  const onChangeImage = useCallback(
-    (imageDTO: ImageDTO | null) => {
-      dispatch(refImageImageChanged({ id, imageDTO }));
-    },
-    [dispatch, id]
-  );
-
-  const dndTargetData = useMemo<SetGlobalReferenceImageDndTargetData>(
-    () => setGlobalReferenceImageDndTarget.getData({ id }, config.image?.image_name),
-    [id, config.image?.image_name]
-  );
-
-  const isFLUX = useAppSelector(selectIsFLUX);
-
-  return (
-    <Flex flexDir="column" gap={2} position="relative" w="full">
-      <Flex gap={2} alignItems="center" w="full">
-        <RefImageModel modelKey={config.model?.key ?? null} onChangeModel={onChangeModel} />
-        {isIPAdapterConfig(config) && (
-          <IPAdapterCLIPVisionModel model={config.clipVisionModel} onChange={onChangeCLIPVisionModel} />
-        )}
-        {tab === 'canvas' && (
-          <CanvasManagerProviderGate>
-            <PullBboxIntoRefImageIconButton />
-          </CanvasManagerProviderGate>
-        )}
-      </Flex>
-      <Flex gap={2} w="full">
-        {isIPAdapterConfig(config) && (
-          <Flex flexDir="column" gap={2} w="full">
-            {!isFLUX && <IPAdapterMethod method={config.method} onChange={onChangeIPMethod} />}
-            <Weight weight={config.weight} onChange={onChangeWeight} />
-            <BeginEndStepPct beginEndStepPct={config.beginEndStepPct} onChange={onChangeBeginEndStepPct} />
-          </Flex>
-        )}
-        {isFLUXReduxConfig(config) && (
-          <Flex flexDir="column" gap={2} w="full" alignItems="flex-start">
-            <FLUXReduxImageInfluence
-              imageInfluence={config.imageInfluence ?? 'lowest'}
-              onChange={onChangeFLUXReduxImageInfluence}
-            />
-          </Flex>
-        )}
-        <Flex alignItems="center" justifyContent="center" h={32} w={32} aspectRatio="1/1" flexGrow={1}>
-          <RefImageImage
-            image={config.image}
-            onChangeImage={onChangeImage}
-            dndTarget={setGlobalReferenceImageDndTarget}
-            dndTargetData={dndTargetData}
-          />
-        </Flex>
-      </Flex>
-    </Flex>
-  );
-});
-
-RefImageSettingsContent.displayName = 'RefImageSettingsContent';
-
-const buildSelectIPAdapterHasImage = (id: string) =>
-  createSelector(selectRefImagesSlice, (refImages) => {
-    const referenceImage = selectRefImageEntity(refImages, id);
-    return !!referenceImage && referenceImage.config.image !== null;
-  });
-
-export const RefImageSettings = memo(() => {
-  const id = useRefImageIdContext();
-  const tab = useAppSelector(selectActiveTab);
-  const canvasManager = useCanvasManagerSafe();
-  const selectIPAdapterHasImage = useMemo(() => buildSelectIPAdapterHasImage(id), [id]);
-  const hasImage = useAppSelector(selectIPAdapterHasImage);
-
-  if (!hasImage && canvasManager && tab === 'canvas') {
-    return (
-      <CanvasManagerProviderGate>
-        <RefImageNoImageStateWithCanvasOptions />
-      </CanvasManagerProviderGate>
-    );
-  }
-
-  if (!hasImage) {
-    return <RefImageNoImageState />;
-  }
-
-  return <RefImageSettingsContent />;
-});
-
-RefImageSettings.displayName = 'RefImageSettings';

invokeai/frontend/web/src/features/controlLayers/components/RefImage/useRefImageEntity.ts

@@ -1,16 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppSelector } from 'app/store/storeHooks';
-import { selectRefImageEntityOrThrow, selectRefImagesSlice } from 'features/controlLayers/store/refImagesSlice';
-import { useMemo } from 'react';
-
-export const useRefImageEntity = (id: string) => {
-  const selectEntity = useMemo(
-    () =>
-      createSelector(selectRefImagesSlice, (refImages) =>
-        selectRefImageEntityOrThrow(refImages, id, `useRefImageState(${id})`)
-      ),
-    [id]
-  );
-  const entity = useAppSelector(selectEntity);
-  return entity;
-};

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceAddPromptsIPAdapterButtons.tsx

@@ -3,9 +3,9 @@ import { useAppSelector } from 'app/store/storeHooks';
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import {
   buildSelectValidRegionalGuidanceActions,
-  useAddNegativePromptToExistingRegionalGuidance,
-  useAddPositivePromptToExistingRegionalGuidance,
-  useAddRefImageToExistingRegionalGuidance,
+  useAddRegionalGuidanceIPAdapter,
+  useAddRegionalGuidanceNegativePrompt,
+  useAddRegionalGuidancePositivePrompt,
 } from 'features/controlLayers/hooks/addLayerHooks';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -14,9 +14,9 @@ import { PiPlusBold } from 'react-icons/pi';
 export const RegionalGuidanceAddPromptsIPAdapterButtons = () => {
   const entityIdentifier = useEntityIdentifierContext('regional_guidance');
   const { t } = useTranslation();
-  const addRegionalGuidanceIPAdapter = useAddRefImageToExistingRegionalGuidance(entityIdentifier);
-  const addRegionalGuidancePositivePrompt = useAddPositivePromptToExistingRegionalGuidance(entityIdentifier);
-  const addRegionalGuidanceNegativePrompt = useAddNegativePromptToExistingRegionalGuidance(entityIdentifier);
+  const addRegionalGuidanceIPAdapter = useAddRegionalGuidanceIPAdapter(entityIdentifier);
+  const addRegionalGuidancePositivePrompt = useAddRegionalGuidancePositivePrompt(entityIdentifier);
+  const addRegionalGuidanceNegativePrompt = useAddRegionalGuidanceNegativePrompt(entityIdentifier);
 
   const selectValidActions = useMemo(
     () => buildSelectValidRegionalGuidanceActions(entityIdentifier),

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceIPAdapterSettings.tsx

@@ -2,25 +2,25 @@ import { Flex, IconButton, Spacer, Text } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { BeginEndStepPct } from 'features/controlLayers/components/common/BeginEndStepPct';
-import { FLUXReduxImageInfluence } from 'features/controlLayers/components/common/FLUXReduxImageInfluence';
-import { IPAdapterCLIPVisionModel } from 'features/controlLayers/components/common/IPAdapterCLIPVisionModel';
 import { Weight } from 'features/controlLayers/components/common/Weight';
-import { IPAdapterMethod } from 'features/controlLayers/components/RefImage/IPAdapterMethod';
-import { RefImageImage } from 'features/controlLayers/components/RefImage/RefImageImage';
+import { CLIPVisionModel } from 'features/controlLayers/components/IPAdapter/CLIPVisionModel';
+import { FLUXReduxImageInfluence } from 'features/controlLayers/components/IPAdapter/FLUXReduxImageInfluence';
+import { IPAdapterImagePreview } from 'features/controlLayers/components/IPAdapter/IPAdapterImagePreview';
+import { IPAdapterMethod } from 'features/controlLayers/components/IPAdapter/IPAdapterMethod';
+import { RegionalReferenceImageModel } from 'features/controlLayers/components/IPAdapter/RegionalReferenceImageModel';
 import { RegionalGuidanceIPAdapterSettingsEmptyState } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceIPAdapterSettingsEmptyState';
-import { RegionalReferenceImageModel } from 'features/controlLayers/components/RegionalGuidance/RegionalReferenceImageModel';
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import { usePullBboxIntoRegionalGuidanceReferenceImage } from 'features/controlLayers/hooks/saveCanvasHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import {
-  rgRefImageDeleted,
-  rgRefImageFLUXReduxImageInfluenceChanged,
-  rgRefImageImageChanged,
-  rgRefImageIPAdapterBeginEndStepPctChanged,
-  rgRefImageIPAdapterCLIPVisionModelChanged,
-  rgRefImageIPAdapterMethodChanged,
-  rgRefImageIPAdapterWeightChanged,
-  rgRefImageModelChanged,
+  rgIPAdapterBeginEndStepPctChanged,
+  rgIPAdapterCLIPVisionModelChanged,
+  rgIPAdapterDeleted,
+  rgIPAdapterFLUXReduxImageInfluenceChanged,
+  rgIPAdapterImageChanged,
+  rgIPAdapterMethodChanged,
+  rgIPAdapterModelChanged,
+  rgIPAdapterWeightChanged,
 } from 'features/controlLayers/store/canvasSlice';
 import { selectCanvasSlice, selectRegionalGuidanceReferenceImage } from 'features/controlLayers/store/selectors';
 import type {
@@ -46,64 +46,64 @@ const RegionalGuidanceIPAdapterSettingsContent = memo(({ referenceImageId }: Pro
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const onDeleteIPAdapter = useCallback(() => {
-    dispatch(rgRefImageDeleted({ entityIdentifier, referenceImageId }));
+    dispatch(rgIPAdapterDeleted({ entityIdentifier, referenceImageId }));
   }, [dispatch, entityIdentifier, referenceImageId]);
-  const selectConfig = useMemo(
+  const selectIPAdapter = useMemo(
     () =>
       createSelector(selectCanvasSlice, (canvas) => {
         const referenceImage = selectRegionalGuidanceReferenceImage(canvas, entityIdentifier, referenceImageId);
         assert(referenceImage, `Regional Guidance IP Adapter with id ${referenceImageId} not found`);
-        return referenceImage.config;
+        return referenceImage.ipAdapter;
       }),
     [entityIdentifier, referenceImageId]
   );
-  const config = useAppSelector(selectConfig);
+  const ipAdapter = useAppSelector(selectIPAdapter);
 
   const onChangeBeginEndStepPct = useCallback(
     (beginEndStepPct: [number, number]) => {
-      dispatch(rgRefImageIPAdapterBeginEndStepPctChanged({ entityIdentifier, referenceImageId, beginEndStepPct }));
+      dispatch(rgIPAdapterBeginEndStepPctChanged({ entityIdentifier, referenceImageId, beginEndStepPct }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeWeight = useCallback(
     (weight: number) => {
-      dispatch(rgRefImageIPAdapterWeightChanged({ entityIdentifier, referenceImageId, weight }));
+      dispatch(rgIPAdapterWeightChanged({ entityIdentifier, referenceImageId, weight }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeIPMethod = useCallback(
     (method: IPMethodV2) => {
-      dispatch(rgRefImageIPAdapterMethodChanged({ entityIdentifier, referenceImageId, method }));
+      dispatch(rgIPAdapterMethodChanged({ entityIdentifier, referenceImageId, method }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeFLUXReduxImageInfluence = useCallback(
     (imageInfluence: FLUXReduxImageInfluenceType) => {
-      dispatch(rgRefImageFLUXReduxImageInfluenceChanged({ entityIdentifier, referenceImageId, imageInfluence }));
+      dispatch(rgIPAdapterFLUXReduxImageInfluenceChanged({ entityIdentifier, referenceImageId, imageInfluence }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeModel = useCallback(
     (modelConfig: IPAdapterModelConfig | FLUXReduxModelConfig) => {
-      dispatch(rgRefImageModelChanged({ entityIdentifier, referenceImageId, modelConfig }));
+      dispatch(rgIPAdapterModelChanged({ entityIdentifier, referenceImageId, modelConfig }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeCLIPVisionModel = useCallback(
     (clipVisionModel: CLIPVisionModelV2) => {
-      dispatch(rgRefImageIPAdapterCLIPVisionModelChanged({ entityIdentifier, referenceImageId, clipVisionModel }));
+      dispatch(rgIPAdapterCLIPVisionModelChanged({ entityIdentifier, referenceImageId, clipVisionModel }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
 
   const onChangeImage = useCallback(
     (imageDTO: ImageDTO | null) => {
-      dispatch(rgRefImageImageChanged({ entityIdentifier, referenceImageId, imageDTO }));
+      dispatch(rgIPAdapterImageChanged({ entityIdentifier, referenceImageId, imageDTO }));
     },
     [dispatch, entityIdentifier, referenceImageId]
   );
@@ -112,9 +112,9 @@ const RegionalGuidanceIPAdapterSettingsContent = memo(({ referenceImageId }: Pro
     () =>
       setRegionalGuidanceReferenceImageDndTarget.getData(
         { entityIdentifier, referenceImageId },
-        config.image?.image_name
+        ipAdapter.image?.image_name
       ),
-    [entityIdentifier, config.image?.image_name, referenceImageId]
+    [entityIdentifier, ipAdapter.image?.image_name, referenceImageId]
   );
 
   const pullBboxIntoIPAdapter = usePullBboxIntoRegionalGuidanceReferenceImage(entityIdentifier, referenceImageId);
@@ -140,9 +140,9 @@ const RegionalGuidanceIPAdapterSettingsContent = memo(({ referenceImageId }: Pro
       </Flex>
       <Flex flexDir="column" gap={2} position="relative" w="full">
         <Flex gap={2} alignItems="center" w="full">
-          <RegionalReferenceImageModel modelKey={config.model?.key ?? null} onChangeModel={onChangeModel} />
-          {config.type === 'ip_adapter' && (
-            <IPAdapterCLIPVisionModel model={config.clipVisionModel} onChange={onChangeCLIPVisionModel} />
+          <RegionalReferenceImageModel modelKey={ipAdapter.model?.key ?? null} onChangeModel={onChangeModel} />
+          {ipAdapter.type === 'ip_adapter' && (
+            <CLIPVisionModel model={ipAdapter.clipVisionModel} onChange={onChangeCLIPVisionModel} />
           )}
           <IconButton
             onClick={pullBboxIntoIPAdapter}
@@ -154,24 +154,24 @@ const RegionalGuidanceIPAdapterSettingsContent = memo(({ referenceImageId }: Pro
           />
         </Flex>
         <Flex gap={2} w="full">
-          {config.type === 'ip_adapter' && (
+          {ipAdapter.type === 'ip_adapter' && (
             <Flex flexDir="column" gap={2} w="full">
-              <IPAdapterMethod method={config.method} onChange={onChangeIPMethod} />
-              <Weight weight={config.weight} onChange={onChangeWeight} />
-              <BeginEndStepPct beginEndStepPct={config.beginEndStepPct} onChange={onChangeBeginEndStepPct} />
+              <IPAdapterMethod method={ipAdapter.method} onChange={onChangeIPMethod} />
+              <Weight weight={ipAdapter.weight} onChange={onChangeWeight} />
+              <BeginEndStepPct beginEndStepPct={ipAdapter.beginEndStepPct} onChange={onChangeBeginEndStepPct} />
             </Flex>
           )}
-          {config.type === 'flux_redux' && (
+          {ipAdapter.type === 'flux_redux' && (
             <Flex flexDir="column" gap={2} w="full">
               <FLUXReduxImageInfluence
-                imageInfluence={config.imageInfluence ?? 'lowest'}
+                imageInfluence={ipAdapter.imageInfluence ?? 'lowest'}
                 onChange={onChangeFLUXReduxImageInfluence}
               />
             </Flex>
           )}
           <Flex alignItems="center" justifyContent="center" h={32} w={32} aspectRatio="1/1" flexGrow={1}>
-            <RefImageImage
-              image={config.image}
+            <IPAdapterImagePreview
+              image={ipAdapter.image}
               onChangeImage={onChangeImage}
               dndTarget={setRegionalGuidanceReferenceImageDndTarget}
               dndTargetData={dndTargetData}
@@ -191,16 +191,17 @@ const buildSelectIPAdapterHasImage = (
 ) =>
   createSelector(selectCanvasSlice, (canvas) => {
     const referenceImage = selectRegionalGuidanceReferenceImage(canvas, entityIdentifier, referenceImageId);
-    return !!referenceImage && referenceImage.config.image !== null;
+    return !!referenceImage && referenceImage.ipAdapter.image !== null;
   });
 
 export const RegionalGuidanceIPAdapterSettings = memo(({ referenceImageId }: Props) => {
   const entityIdentifier = useEntityIdentifierContext('regional_guidance');
-  const selectHasImage = useMemo(
+
+  const selectIPAdapterHasImage = useMemo(
     () => buildSelectIPAdapterHasImage(entityIdentifier, referenceImageId),
     [entityIdentifier, referenceImageId]
   );
-  const hasImage = useAppSelector(selectHasImage);
+  const hasImage = useAppSelector(selectIPAdapterHasImage);
 
   if (!hasImage) {
     return <RegionalGuidanceIPAdapterSettingsEmptyState referenceImageId={referenceImageId} />;

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceIPAdapterSettingsEmptyState.tsx

@@ -4,7 +4,7 @@ import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import { usePullBboxIntoRegionalGuidanceReferenceImage } from 'features/controlLayers/hooks/saveCanvasHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
-import { rgRefImageDeleted } from 'features/controlLayers/store/canvasSlice';
+import { rgIPAdapterDeleted } from 'features/controlLayers/store/canvasSlice';
 import type { SetRegionalGuidanceReferenceImageDndTargetData } from 'features/dnd/dnd';
 import { setRegionalGuidanceReferenceImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
@@ -35,7 +35,7 @@ export const RegionalGuidanceIPAdapterSettingsEmptyState = memo(({ referenceImag
     dispatch(activeTabCanvasRightPanelChanged('gallery'));
   }, [dispatch]);
   const onDeleteIPAdapter = useCallback(() => {
-    dispatch(rgRefImageDeleted({ entityIdentifier, referenceImageId }));
+    dispatch(rgIPAdapterDeleted({ entityIdentifier, referenceImageId }));
   }, [dispatch, entityIdentifier, referenceImageId]);
   const pullBboxIntoIPAdapter = usePullBboxIntoRegionalGuidanceReferenceImage(entityIdentifier, referenceImageId);
 
@@ -83,7 +83,7 @@ export const RegionalGuidanceIPAdapterSettingsEmptyState = memo(({ referenceImag
       </Flex>
       <Flex alignItems="center" gap={2} p={4}>
         <Text textAlign="center" color="base.300">
-          <Trans i18nKey="controlLayers.referenceImageEmptyStateWithCanvasTab" components={components} />
+          <Trans i18nKey="controlLayers.referenceImageEmptyState" components={components} />
         </Text>
       </Flex>
       <input {...uploadApi.getUploadInputProps()} />

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItemsAddPromptsAndIPAdapter.tsx

@@ -3,9 +3,9 @@ import { useAppSelector } from 'app/store/storeHooks';
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import {
   buildSelectValidRegionalGuidanceActions,
-  useAddNegativePromptToExistingRegionalGuidance,
-  useAddPositivePromptToExistingRegionalGuidance,
-  useAddRefImageToExistingRegionalGuidance,
+  useAddRegionalGuidanceIPAdapter,
+  useAddRegionalGuidanceNegativePrompt,
+  useAddRegionalGuidancePositivePrompt,
 } from 'features/controlLayers/hooks/addLayerHooks';
 import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
 import { memo, useMemo } from 'react';
@@ -15,9 +15,9 @@ export const RegionalGuidanceMenuItemsAddPromptsAndIPAdapter = memo(() => {
   const entityIdentifier = useEntityIdentifierContext('regional_guidance');
   const { t } = useTranslation();
   const isBusy = useCanvasIsBusy();
-  const addRegionalGuidanceIPAdapter = useAddRefImageToExistingRegionalGuidance(entityIdentifier);
-  const addRegionalGuidancePositivePrompt = useAddPositivePromptToExistingRegionalGuidance(entityIdentifier);
-  const addRegionalGuidanceNegativePrompt = useAddNegativePromptToExistingRegionalGuidance(entityIdentifier);
+  const addRegionalGuidanceIPAdapter = useAddRegionalGuidanceIPAdapter(entityIdentifier);
+  const addRegionalGuidancePositivePrompt = useAddRegionalGuidancePositivePrompt(entityIdentifier);
+  const addRegionalGuidanceNegativePrompt = useAddRegionalGuidanceNegativePrompt(entityIdentifier);
   const selectValidActions = useMemo(
     () => buildSelectValidRegionalGuidanceActions(entityIdentifier),
     [entityIdentifier]

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/CanvasLaunchpadPanel.tsx

@@ -1,36 +0,0 @@
-import { Button, Flex, Grid, Heading, Text } from '@invoke-ai/ui-library';
-import { memo } from 'react';
-
-import { InitialStateMainModelPicker } from './InitialStateMainModelPicker';
-import { LaunchpadAddStyleReference } from './LaunchpadAddStyleReference';
-import { LaunchpadEditImageButton } from './LaunchpadEditImageButton';
-import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton';
-import { LaunchpadUseALayoutImageButton } from './LaunchpadUseALayoutImageButton';
-
-export const CanvasLaunchpadPanel = memo(() => {
-  return (
-    <Flex flexDir="column" h="full" w="full" alignItems="center" gap={2}>
-      <Flex flexDir="column" w="full" gap={4} px={14} maxW={768} pt="20vh">
-        <Heading mb={4}>Edit and refine on Canvas.</Heading>
-        <Flex flexDir="column" gap={8}>
-          <Grid gridTemplateColumns="1fr 1fr" gap={8}>
-            <InitialStateMainModelPicker />
-            <Flex flexDir="column" gap={2} justifyContent="center">
-              <Text>
-                Want to learn what prompts work best for each model?{' '}
-                <Button as="a" variant="link" href="#" size="sm">
-                  Check our our Model Guide.
-                </Button>
-              </Text>
-            </Flex>
-          </Grid>
-          <LaunchpadGenerateFromTextButton />
-          <LaunchpadAddStyleReference />
-          <LaunchpadEditImageButton />
-          <LaunchpadUseALayoutImageButton />
-        </Flex>
-      </Flex>
-    </Flex>
-  );
-});
-CanvasLaunchpadPanel.displayName = 'CanvasLaunchpadPanel';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel.tsx

@@ -1,47 +0,0 @@
-import { Alert, Button, Flex, Grid, Heading, Text } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { InitialStateMainModelPicker } from 'features/controlLayers/components/SimpleSession/InitialStateMainModelPicker';
-import { LaunchpadAddStyleReference } from 'features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference';
-import { setActiveTab } from 'features/ui/store/uiSlice';
-import { memo, useCallback } from 'react';
-
-import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton';
-
-export const GenerateLaunchpadPanel = memo(() => {
-  const dispatch = useAppDispatch();
-  const newCanvasSession = useCallback(() => {
-    dispatch(setActiveTab('canvas'));
-  }, [dispatch]);
-
-  return (
-    <Flex flexDir="column" h="full" w="full" alignItems="center" gap={2}>
-      <Flex flexDir="column" w="full" gap={4} px={14} maxW={768} pt="20vh">
-        <Heading mb={4}>Generate images from text prompts.</Heading>
-        <Flex flexDir="column" gap={8}>
-          <Grid gridTemplateColumns="1fr 1fr" gap={8}>
-            <InitialStateMainModelPicker />
-            <Flex flexDir="column" gap={2} justifyContent="center">
-              <Text>
-                Want to learn what prompts work best for each model?{' '}
-                <Button as="a" variant="link" href="#" size="sm">
-                  Check our our Model Guide.
-                </Button>
-              </Text>
-            </Flex>
-          </Grid>
-          <LaunchpadGenerateFromTextButton />
-          <LaunchpadAddStyleReference />
-          <Alert status="info" borderRadius="base" flexDir="column" gap={2} overflow="unset">
-            <Text fontSize="md" fontWeight="semibold">
-              Looking to get more control, edit, and iterate on your images?
-            </Text>
-            <Button variant="link" onClick={newCanvasSession}>
-              Navigate to Canvas for more capabilities.
-            </Button>
-          </Alert>
-        </Flex>
-      </Flex>
-    </Flex>
-  );
-});
-GenerateLaunchpadPanel.displayName = 'GenerateLaunchpad';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/ImageActions.tsx

@@ -1,28 +0,0 @@
-import type { ButtonGroupProps } from '@invoke-ai/ui-library';
-import { Button, ButtonGroup } from '@invoke-ai/ui-library';
-import { useAppStore } from 'app/store/nanostores/store';
-import { newCanvasFromImage } from 'features/imageActions/actions';
-import { memo, useCallback } from 'react';
-import type { ImageDTO } from 'services/api/types';
-
-export const ImageActions = memo(({ imageDTO, ...rest }: { imageDTO: ImageDTO } & ButtonGroupProps) => {
-  const { getState, dispatch } = useAppStore();
-
-  const edit = useCallback(() => {
-    newCanvasFromImage({
-      imageDTO,
-      type: 'raster_layer',
-      withInpaintMask: true,
-      getState,
-      dispatch,
-    });
-  }, [dispatch, getState, imageDTO]);
-  return (
-    <ButtonGroup isAttached={false} size="sm" {...rest}>
-      <Button onClick={edit} tooltip="Edit parts of this image with Inpainting">
-        Edit
-      </Button>
-    </ButtonGroup>
-  );
-});
-ImageActions.displayName = 'ImageActions';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateMainModelPicker.tsx

@@ -1,47 +0,0 @@
-import { Flex, FormControl, FormLabel, Icon } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
-import { ModelPicker } from 'features/parameters/components/ModelPicker';
-import { modelSelected } from 'features/parameters/store/actions';
-import { memo, useCallback, useMemo } from 'react';
-import { MdMoneyOff } from 'react-icons/md';
-import { useMainModels } from 'services/api/hooks/modelsByType';
-import { useSelectedModelConfig } from 'services/api/hooks/useSelectedModelConfig';
-import { type AnyModelConfig, isCheckpointMainModelConfig } from 'services/api/types';
-
-export const InitialStateMainModelPicker = memo(() => {
-  const dispatch = useAppDispatch();
-  const [modelConfigs] = useMainModels();
-  const selectedModelConfig = useSelectedModelConfig();
-  const onChange = useCallback(
-    (modelConfig: AnyModelConfig) => {
-      dispatch(modelSelected(modelConfig));
-    },
-    [dispatch]
-  );
-
-  const isFluxDevSelected = useMemo(
-    () =>
-      selectedModelConfig &&
-      isCheckpointMainModelConfig(selectedModelConfig) &&
-      selectedModelConfig.config_path === 'flux-dev',
-    [selectedModelConfig]
-  );
-
-  return (
-    <FormControl orientation="vertical" alignItems="unset">
-      <FormLabel display="flex" fontSize="md" gap={2}>
-        Select your Model{' '}
-        {isFluxDevSelected && (
-          <InformationalPopover feature="fluxDevLicense" hideDisable={true}>
-            <Flex justifyContent="flex-start">
-              <Icon as={MdMoneyOff} />
-            </Flex>
-          </InformationalPopover>
-        )}
-      </FormLabel>
-      <ModelPicker modelConfigs={modelConfigs} selectedModelConfig={selectedModelConfig} onChange={onChange} grouped />
-    </FormControl>
-  );
-});
-InitialStateMainModelPicker.displayName = 'InitialStateMainModelPicker';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference.tsx

@@ -1,49 +0,0 @@
-import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
-import { useAppStore } from 'app/store/nanostores/store';
-import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton';
-import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks';
-import { refImageAdded } from 'features/controlLayers/store/refImagesSlice';
-import { imageDTOToImageWithDims } from 'features/controlLayers/store/util';
-import { addGlobalReferenceImageDndTarget, newCanvasFromImageDndTarget } from 'features/dnd/dnd';
-import { DndDropTarget } from 'features/dnd/DndDropTarget';
-import { memo, useMemo } from 'react';
-import { PiUploadBold, PiUserCircleGearBold } from 'react-icons/pi';
-import type { ImageDTO } from 'services/api/types';
-
-const dndTargetData = addGlobalReferenceImageDndTarget.getData();
-
-export const LaunchpadAddStyleReference = memo(() => {
-  const { dispatch, getState } = useAppStore();
-
-  const uploadOptions = useMemo(
-    () =>
-      ({
-        onUpload: (imageDTO: ImageDTO) => {
-          const config = getDefaultRefImageConfig(getState);
-          config.image = imageDTOToImageWithDims(imageDTO);
-          dispatch(refImageAdded({ overrides: { config } }));
-        },
-        allowMultiple: false,
-      }) as const,
-    [dispatch, getState]
-  );
-
-  const uploadApi = useImageUploadButton(uploadOptions);
-
-  return (
-    <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">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={newCanvasFromImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
-    </LaunchpadButton>
-  );
-});
-LaunchpadAddStyleReference.displayName = 'LaunchpadAddStyleReference';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadButton.tsx

@@ -1,29 +0,0 @@
-import type { ButtonProps } from '@invoke-ai/ui-library';
-import { Button, forwardRef } from '@invoke-ai/ui-library';
-import { memo } from 'react';
-
-export const LaunchpadButton = memo(
-  forwardRef(({ children, ...rest }: ButtonProps, ref) => {
-    return (
-      <Button
-        ref={ref}
-        variant="outline"
-        display="flex"
-        position="relative"
-        alignItems="center"
-        borderWidth={1}
-        borderRadius="base"
-        p={4}
-        pt={6}
-        gap={2}
-        w="full"
-        h="full"
-        {...rest}
-      >
-        {children}
-      </Button>
-    );
-  })
-);
-
-LaunchpadButton.displayName = 'LaunchpadButton';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadEditImageButton.tsx

@@ -1,42 +0,0 @@
-import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
-import { useAppStore } from 'app/store/nanostores/store';
-import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton';
-import { newCanvasFromImageDndTarget } from 'features/dnd/dnd';
-import { DndDropTarget } from 'features/dnd/DndDropTarget';
-import { newCanvasFromImage } from 'features/imageActions/actions';
-import { memo, useCallback } from 'react';
-import { PiPencilBold, PiUploadBold } from 'react-icons/pi';
-import type { ImageDTO } from 'services/api/types';
-
-const NEW_CANVAS_OPTIONS = { type: 'raster_layer', withInpaintMask: true } as const;
-
-const dndTargetData = newCanvasFromImageDndTarget.getData(NEW_CANVAS_OPTIONS);
-
-export const LaunchpadEditImageButton = memo(() => {
-  const { getState, dispatch } = useAppStore();
-
-  const onUpload = useCallback(
-    (imageDTO: ImageDTO) => {
-      newCanvasFromImage({ imageDTO, getState, dispatch, ...NEW_CANVAS_OPTIONS });
-    },
-    [dispatch, getState]
-  );
-  const uploadApi = useImageUploadButton({ allowMultiple: false, onUpload });
-
-  return (
-    <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">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" />
-    </LaunchpadButton>
-  );
-});
-LaunchpadEditImageButton.displayName = 'LaunchpadEditImageButton';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadGenerateFromTextButton.tsx

@@ -1,28 +0,0 @@
-import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
-import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton';
-import { memo } from 'react';
-import { PiCursorTextBold, PiTextAaBold } from 'react-icons/pi';
-
-const focusOnPrompt = () => {
-  const promptElement = document.getElementById('prompt');
-  if (promptElement instanceof HTMLTextAreaElement) {
-    promptElement.focus();
-    promptElement.select();
-  }
-};
-
-export const LaunchpadGenerateFromTextButton = memo(() => {
-  return (
-    <LaunchpadButton onClick={focusOnPrompt} position="relative" gap={8}>
-      <Icon as={PiTextAaBold} boxSize={8} color="base.500" />
-      <Flex flexDir="column" alignItems="flex-start" gap={2}>
-        <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 />
-      </Flex>
-    </LaunchpadButton>
-  );
-});
-LaunchpadGenerateFromTextButton.displayName = 'LaunchpadGenerateFromTextButton';