[fix] 가구 매핑 수정 및 스낵바 동작 개선

.gitignore

@@ -56,4 +56,5 @@ node_modules/
 AGENTS.md
 
 .pnpm-store/
-.serena/
+.serena/
+.npm-cache/

src/layout/RootLayout.tsx

@@ -1,15 +1,44 @@
-import { Outlet } from 'react-router-dom';
+import { useEffect } from 'react';
 
+import { Outlet, useLocation } from 'react-router-dom';
+
+import { ROUTES } from '@/routes/paths';
 import { useScrollToTop } from '@/shared/hooks/useScrollToTop';
 
+import { OBJ365_MODEL_PATH } from '@pages/generate/constants/detection';
+import { preloadONNXModel } from '@pages/generate/hooks/useOnnxModel';
+
+const GENERATE_WARMUP_PATHS = [
+  ROUTES.GENERATE,
+  ROUTES.GENERATE_RESULT,
+  ROUTES.GENERATE_START,
+  ROUTES.IMAGE_SETUP,
+];
+
 function RootLayout() {
   // 라우트/쿼리/해시/키 변화와 초기 마운트 시 스크롤 최상단으로 이동
   useScrollToTop();
+  useGenerateWarmup();
   return (
     <div>
       <Outlet />
     </div>
   );
 }
 
+function useGenerateWarmup() {
+  const location = useLocation();
+
+  useEffect(() => {
+    const pathname = location.pathname;
+    const shouldWarmup = GENERATE_WARMUP_PATHS.some(
+      (prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`)
+    );
+
+    if (!shouldWarmup) return;
+
+    preloadONNXModel(OBJ365_MODEL_PATH).catch(() => undefined);
+  }, [location.pathname]);
+}
+
 export default RootLayout;

src/pages/generate/GeneratePage.tsx

@@ -7,6 +7,7 @@ import {
 } from 'react-router-dom';
 
 import TitleNavBar from '@/shared/components/navBar/TitleNavBar';
+import { getCanHistoryGoBack } from '@/shared/utils/history';
 
 const GeneratePage = () => {
   const location = useLocation();
@@ -25,8 +26,12 @@ const GeneratePage = () => {
   const handleBackClick = () => {
     if (location.pathname === '/generate/result') {
       if (isFromMypage) {
-        // 마이페이지에서 온 경우 마이페이지로 이동
-        navigate('/mypage');
+        // 마이페이지에서 온 경우 스택이 남아 있으면 실제 이전 화면으로 이동
+        if (getCanHistoryGoBack()) {
+          navigate(-1);
+        } else {
+          navigate('/mypage', { replace: true });
+        }
       } else {
         // 일반 생성 플로우에서는 랜딩페이지로 이동
         navigate('/');

src/pages/generate/constants/furnitureCategoryMapping.ts

@@ -4,7 +4,7 @@ import {
   OBJ365_FURNITURE_INDEX_SET,
 } from '../utils/obj365Furniture';
 
-import type { FurnitureCategory } from '../utils/furnitureCategories';
+import type { CabinetRefinementCategory } from '../utils/cabinetRefinementCategories';
 
 // 허용 FurnitureCategoryCode 목록
 export const FURNITURE_CATEGORY_CODES = [
@@ -48,19 +48,19 @@ const uniqueCodes = (codes: FurnitureCategoryCode[]) => {
 // 모델 최종 라벨을 12개 코드로 단일화하는 매핑(정리본 기반, 불필요 단어 제거)
 const defineLabelMap = (): Record<string, FurnitureCategoryCode[]> => {
   const entries: Array<[string, FurnitureCategoryCode[]]> = [
-    ['Cabinet/shelf', ['DISPLAY_CABINET']], // 12번 기본값, 리파인 실패 시 사용
-    ['Chair', ['SINGLE_SOFA']], // 2
-    ['Desk', ['OFFICE_DESK']], // 9
-    ['Storage box', ['DRAWER']], // 20
-    ['Bench', ['SINGLE_SOFA']], // 24
-    ['Monitor/TV', ['MOVABLE_TV']], // 37
-    ['Stool', ['SINGLE_SOFA']], // 47
-    ['Couch', ['TWO_SEATER_SOFA']], // 50
-    ['Bed', ['SINGLE']], // 75
-    ['Mirror', ['MIRROR']], // 79
-    ['Dining Table', ['DINING_TABLE']], // 98
-    ['Coffee Table', ['SITTING_TABLE']], // 167
-    ['Side Table', ['SITTING_TABLE']], // 168
+    ['Cabinet/shelf', ['DISPLAY_CABINET']], // 12번 OBJ365 'Cabinet/shelf' 기본값 리파인 실패 시 사용
+    // ['Chair', ['SINGLE_SOFA']], // 2번 OBJ365 'Chair' 비활성화
+    ['Desk', ['OFFICE_DESK']], // 9번 OBJ365 'Desk'
+    ['Storage box', ['DRAWER']], // 20번 OBJ365 'Storage box'
+    // ['Bench', ['SINGLE_SOFA']], // 24번 OBJ365 'Bench' 비활성화
+    ['Monitor/TV', ['MOVABLE_TV']], // 37번 OBJ365 'Monitor/TV'
+    // ['Stool', ['SINGLE_SOFA']], // 47번 OBJ365 'Stool' 비활성화
+    ['Couch', ['TWO_SEATER_SOFA', 'SINGLE_SOFA']], // 50번 OBJ365 'Couch' → 2인/1인 겸용
+    ['Bed', ['SINGLE']], // 75번 OBJ365 'Bed'
+    ['Mirror', ['MIRROR']], // 79번 OBJ365 'Mirror'
+    ['Dining Table', ['DINING_TABLE']], // 98번 OBJ365 'Dining Table'
+    ['Coffee Table', ['SITTING_TABLE']], // 167번 OBJ365 'Coffee Table'
+    ['Side Table', ['SITTING_TABLE']], // 168번 OBJ365 'Side Table'
     // ['Nightstand', ['DRAWER']], // 121 (미지원 가구로 비활성화)
   ];
   return entries.reduce<Record<string, FurnitureCategoryCode[]>>(
@@ -77,25 +77,25 @@ const defineLabelMap = (): Record<string, FurnitureCategoryCode[]> => {
 const FINAL_LABEL_MAP = defineLabelMap();
 
 const OBJ365_TO_CODE: Record<number, FurnitureCategoryCode[]> = {
-  2: ['SINGLE_SOFA'],
-  9: ['OFFICE_DESK'],
-  12: ['DISPLAY_CABINET'],
-  20: ['DRAWER'],
-  24: ['SINGLE_SOFA'],
-  37: ['MOVABLE_TV'],
-  47: ['SINGLE_SOFA'],
-  50: ['TWO_SEATER_SOFA'],
-  75: ['SINGLE'],
-  79: ['MIRROR'],
-  98: ['DINING_TABLE'],
-  167: ['SITTING_TABLE'],
-  168: ['SITTING_TABLE'],
+  // 2: ['SINGLE_SOFA'], // OBJ365 'Chair' 비활성화
+  9: ['OFFICE_DESK'], // OBJ365 'Desk'
+  12: ['DISPLAY_CABINET'], // OBJ365 'Cabinet/shelf'
+  20: ['DRAWER'], // OBJ365 'Storage box'
+  // 24: ['SINGLE_SOFA'], // OBJ365 'Bench' 비활성화
+  37: ['MOVABLE_TV'], // OBJ365 'Monitor/TV'
+  // 47: ['SINGLE_SOFA'], // OBJ365 'Stool' 비활성화
+  50: ['TWO_SEATER_SOFA', 'SINGLE_SOFA'], // OBJ365 'Couch' → 2인/1인 겸용
+  75: ['SINGLE'], // OBJ365 'Bed'
+  79: ['MIRROR'], // OBJ365 'Mirror'
+  98: ['DINING_TABLE'], // OBJ365 'Dining Table'
+  167: ['SITTING_TABLE'], // OBJ365 'Coffee Table'
+  168: ['SITTING_TABLE'], // OBJ365 'Side Table'
   // 121: ['DRAWER'], // Nightstand 미지원으로 비활성화
 } as const;
 
 // cabinet 2차 분류 결과 → 12개 코드 매핑
 const CABINET_CATEGORY_TO_CODE: Partial<
-  Record<FurnitureCategory, FurnitureCategoryCode>
+  Record<CabinetRefinementCategory, FurnitureCategoryCode>
 > = {
   lowerCabinet: 'DISPLAY_CABINET',
   // upperCabinet: 'WHITE_BOOKSHELF', // 상부장(upperCabinet)은 2차 cabinet 분류에서 추론 비활성 처리
@@ -123,7 +123,7 @@ const getCodeFromObj365Label = (
 };
 
 const getCodeFromRefinedLabel = (
-  refined: FurnitureCategory | undefined
+  refined: CabinetRefinementCategory | undefined
 ): FurnitureCategoryCode | null => {
   if (!refined) return null;
   return CABINET_CATEGORY_TO_CODE[refined] ?? null;
@@ -132,7 +132,7 @@ const getCodeFromRefinedLabel = (
 export const resolveFurnitureCodes = (input: {
   finalLabel?: string | null;
   obj365Label?: number | null;
-  refinedLabel?: FurnitureCategory;
+  refinedLabel?: CabinetRefinementCategory;
   refinedConfidence?: number;
 }): FurnitureCategoryCode[] => {
   const code = resolveFurnitureCode(input);
@@ -142,7 +142,7 @@ export const resolveFurnitureCodes = (input: {
 export const resolveFurnitureCode = (input: {
   finalLabel?: string | null;
   obj365Label?: number | null;
-  refinedLabel?: FurnitureCategory;
+  refinedLabel?: CabinetRefinementCategory;
   refinedConfidence?: number;
 }): FurnitureCategoryCode | null => {
   // Cabinet/shelf 인데 2차 리파인 결과가 없으면 감지 실패로 간주

src/pages/generate/hooks/furnitureHotspotState.ts

@@ -1,14 +1,14 @@
 import type { Dispatch } from 'react';
 
 import type { Detection as FurnitureDetection } from '@pages/generate/types/detection';
-import type { FurnitureCategory } from '@pages/generate/utils/refineFurnitureDetections';
+import type { CabinetRefinementCategory } from '@pages/generate/utils/refineFurnitureDetections';
 
 // 가구 핫스팟 상태 타입과 reducer 정의
 export type FurnitureHotspot = FurnitureDetection & {
   id: number;
   cx: number;
   cy: number;
-  refinedLabel?: FurnitureCategory;
+  refinedLabel?: CabinetRefinementCategory;
   refinedLabelEn?: string;
   finalLabel: string | null;
   confidence?: number;

src/pages/generate/hooks/useDetectionCache.ts

@@ -0,0 +1,92 @@
+import { useCallback, useEffect, useMemo } from 'react';
+
+import {
+  useDetectionCacheStore,
+  type DetectionCacheEntry,
+} from '@pages/generate/stores/useDetectionCacheStore';
+
+import type { FurnitureCategoryCode } from '@pages/generate/constants/furnitureCategoryMapping';
+import type { FurnitureHotspot } from '@pages/generate/hooks/useFurnitureHotspots';
+import type { ProcessedDetections } from '@pages/generate/types/detection';
+
+export const DETECTION_CACHE_TTL = 30 * 60 * 1000; // 30분
+
+type SavePayload = {
+  processedDetections: ProcessedDetections;
+  hotspots: FurnitureHotspot[];
+  detectedObjects?: FurnitureCategoryCode[];
+};
+
+type UseDetectionCacheOptions = {
+  initialEntry?: DetectionCacheEntry | null;
+};
+
+export function useDetectionCache(
+  imageId: number | null,
+  imageUrl: string,
+  options?: UseDetectionCacheOptions
+) {
+  const initialEntry = options?.initialEntry ?? null;
+  const storeEntry = useDetectionCacheStore((state) =>
+    imageId ? (state.images[imageId] ?? null) : null
+  );
+  const setEntry = useDetectionCacheStore((state) => state.setEntry);
+  const removeEntry = useDetectionCacheStore((state) => state.removeEntry);
+
+  const isExpired = useMemo(() => {
+    if (!storeEntry) return false;
+    if (storeEntry.imageUrl !== imageUrl) return true;
+    return Date.now() - storeEntry.updatedAt > DETECTION_CACHE_TTL;
+  }, [storeEntry, imageUrl]);
+
+  useEffect(() => {
+    if (!imageId || !initialEntry) return;
+    const candidate = initialEntry;
+    if (candidate.imageUrl !== imageUrl) return;
+    if (!storeEntry || candidate.updatedAt > storeEntry.updatedAt) {
+      setEntry(imageId, candidate);
+    }
+  }, [imageId, imageUrl, initialEntry, setEntry, storeEntry]);
+
+  useEffect(() => {
+    if (!imageId || !isExpired) return;
+    removeEntry(imageId);
+  }, [imageId, isExpired, removeEntry]);
+
+  const effectiveEntry = isExpired ? null : storeEntry;
+
+  const prefetchedDetections = effectiveEntry?.processedDetections ?? null;
+
+  const saveEntry = useCallback(
+    ({ processedDetections, hotspots, detectedObjects }: SavePayload) => {
+      if (!imageId) return;
+      setEntry(imageId, {
+        imageUrl,
+        processedDetections,
+        hotspots,
+        detectedObjects,
+      });
+    },
+    [imageId, imageUrl, setEntry]
+  );
+
+  const clearEntry = useCallback(() => {
+    if (!imageId) return;
+    removeEntry(imageId);
+  }, [imageId, removeEntry]);
+
+  return {
+    entry: effectiveEntry,
+    prefetchedDetections,
+    saveEntry,
+    clearEntry,
+  } as const;
+}
+
+export const primeDetectionCacheEntry = (
+  imageId: number,
+  payload: DetectionCacheEntry
+) => {
+  if (!imageId) return;
+  useDetectionCacheStore.getState().setEntry(imageId, payload);
+};