dunkeroni
diff --git a/‎invokeai/frontend/web/package.json‎
Lines changed: 1 addition & 0 deletions b/‎invokeai/frontend/web/package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎invokeai/frontend/web/pnpm-lock.yaml‎
Lines changed: 72 additions & 5 deletions b/‎invokeai/frontend/web/pnpm-lock.yaml‎
Lines changed: 72 additions & 5 deletions
diff --git a/‎invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/autoSwitchedSelection.test.ts‎
Lines changed: 73 additions & 0 deletions b/‎invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/autoSwitchedSelection.test.ts‎
Lines changed: 73 additions & 0 deletions
diff --git a/‎invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/autoSwitchedSelection.ts‎
Lines changed: 27 additions & 0 deletions b/‎invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/autoSwitchedSelection.ts‎
Lines changed: 27 additions & 0 deletions
@@ -142,6 +142,7 @@
     "eslint-plugin-storybook": "^10.3.6",
     "eslint-plugin-unused-imports": "^4.4.1",
     "globals": "^16.5.0",
+    "happy-dom": "^20.11.6",
     "knip": "^5.77.4",
     "magic-string": "^0.30.21",
     "openapi-types": "^12.1.3",
 
@@ -0,0 +1,73 @@
+import { configureStore, createListenerMiddleware } from '@reduxjs/toolkit';
+import type { AppStartListening } from 'app/store/store';
+import { autoSwitchedImages } from 'features/gallery/store/autoSwitchedImages';
+import {
+  boardIdSelected,
+  gallerySliceConfig,
+  imageSelected,
+  selectionChanged,
+} from 'features/gallery/store/gallerySlice';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { addAutoSwitchedSelectionListener } from './autoSwitchedSelection';
+
+// A store with the real gallery reducer and the real listener, so the predicate is exercised
+// against actual selection-writing actions rather than a hand-built state pair.
+const buildStore = () => {
+  const listenerMiddleware = createListenerMiddleware();
+  addAutoSwitchedSelectionListener(listenerMiddleware.startListening as unknown as AppStartListening);
+  return configureStore({
+    reducer: { gallery: gallerySliceConfig.slice.reducer },
+    middleware: (getDefaultMiddleware) => getDefaultMiddleware().prepend(listenerMiddleware.middleware),
+  });
+};
+
+describe('addAutoSwitchedSelectionListener', () => {
+  beforeEach(() => {
+    // The marker is a module singleton; drop anything a previous test left on it.
+    autoSwitchedImages.settle(null);
+  });
+
+  it('keeps the marker when the auto-switch selection lands', () => {
+    const store = buildStore();
+    autoSwitchedImages.record('a.png');
+    store.dispatch(imageSelected('a.png'));
+    expect(autoSwitchedImages.consume('a.png')).toBe(true);
+  });
+
+  it('drops the marker once the user selects something else', () => {
+    // The dead click this exists to prevent: the auto-switch to A never rendered because the user
+    // clicked B first, so their later click on A must still get its reveal.
+    const store = buildStore();
+    autoSwitchedImages.record('a.png');
+    store.dispatch(imageSelected('a.png'));
+    store.dispatch(imageSelected('b.png'));
+    store.dispatch(imageSelected('a.png'));
+    expect(autoSwitchedImages.consume('a.png')).toBe(false);
+  });
+
+  it('settles on every action that writes the selection, not just imageSelected', () => {
+    const store = buildStore();
+
+    autoSwitchedImages.record('a.png');
+    store.dispatch(imageSelected('a.png'));
+    store.dispatch(selectionChanged(['b.png']));
+    expect(autoSwitchedImages.consume('a.png')).toBe(false);
+
+    autoSwitchedImages.record('c.png');
+    store.dispatch(imageSelected('c.png'));
+    store.dispatch(boardIdSelected({ boardId: 'other', select: { selection: ['d.png'], galleryView: 'images' } }));
+    expect(autoSwitchedImages.consume('c.png')).toBe(false);
+  });
+
+  it('leaves the marker alone when an action does not move the selection', () => {
+    const store = buildStore();
+    autoSwitchedImages.record('a.png');
+    store.dispatch(imageSelected('a.png'));
+    // Selecting the same item again, and a board switch that carries no selection, must not
+    // discard a marker whose image has not rendered yet.
+    store.dispatch(imageSelected('a.png'));
+    store.dispatch(boardIdSelected({ boardId: 'other' }));
+    expect(autoSwitchedImages.consume('a.png')).toBe(true);
+  });
+});
@@ -0,0 +1,27 @@
+import type { AppStartListening } from 'app/store/store';
+import { autoSwitchedImages } from 'features/gallery/store/autoSwitchedImages';
+import { selectLastSelectedItem } from 'features/gallery/store/gallerySelectors';
+
+/**
+ * Keeps the auto-switch marker scoped to the selection it was recorded for.
+ *
+ * onInvocationComplete records the item it is about to auto-switch to, so the viewer's reveal
+ * effect can tell that handoff apart from a user's gallery click. The marker is only meaningful
+ * while that selection stands: once the selection moves on, the recorded auto-switch will never
+ * render, and leaving the marker behind would make the user's next click on that item read as an
+ * auto-switch and get no reveal.
+ *
+ * Matched by state rather than by action type on purpose — the selection is written by several
+ * reducers (imageSelected, selectionChanged, boardIdSelected, comparedImagesSwapped,
+ * showVirtualBoardsChanged, logout), and a new one added later would silently escape an
+ * action-type list, leaving exactly the stale marker this exists to prevent.
+ */
+export const addAutoSwitchedSelectionListener = (startAppListening: AppStartListening) => {
+  startAppListening({
+    predicate: (_action, currentState, previousState) =>
+      selectLastSelectedItem(currentState) !== selectLastSelectedItem(previousState),
+    effect: (_action, { getState }) => {
+      autoSwitchedImages.settle(selectLastSelectedItem(getState()) ?? null);
+    },
+  });
+};