chore: bump version

- Add /nfo-scan-phase endpoint to trigger NFO scan independently
- Move NFO scan out of initial setup into separate post-unresolved phase
- Add phase query param handling for /loading page (?phase=initial, ?phase=nfo)
- Update setup redirect middleware to handle phase-based redirects
- Update auth setup to pass phase=initial to loading page

Docker/VERSION

@@ -1 +1 @@
-v1.4.0
+v1.4.13

Docker/podman-compose.yml

@@ -38,6 +38,7 @@ services:
         condition: service_healthy
     environment:
       - PYTHONUNBUFFERED=1
+      - LOG_LEVEL=DEBUG
     volumes:
       - app-data:/app/data
       - app-logs:/app/logs

Docs/ARCHITECTURE.md

@@ -81,6 +81,7 @@ src/server/
 |   +-- websocket_service.py# WebSocket broadcasting
 |   +-- queue_repository.py # Database persistence
 |   +-- nfo_service.py      # NFO metadata management
+|   +-- setup_service.py    # Series key resolution from folder names
 |   +-- folder_scan_service.py # Daily folder maintenance scan
 +-- models/                 # Pydantic models
 |   +-- auth.py             # Auth request/response models

Docs/CHANGELOG.md

@@ -37,6 +37,17 @@ This changelog follows [Keep a Changelog](https://keepachangelog.com/) principle
 
 ---
 
+## [Unreleased] - 2026-06-05
+
+### Fixed
+
+- **Folder scan series key resolution**: Fixed "Could not resolve series key for folder, skipping" warnings during library setup. `_resolve_key_via_search()` now uses fuzzy title matching instead of exact string comparison.
+    - Added `_normalize_title()` to strip anime suffixes: `(TV)`, `(Anime)`, `(OAD)`, `(OVA)`, `(Special)`, `(Movie)`, `(Spin-Off)`
+    - Added `_titles_match()` using `difflib.SequenceMatcher` with 0.85 similarity threshold for tolerance of minor title variations
+    - Added debug logging for title mismatches and multiple search results
+
+---
+
 ## [1.3.1] - 2026-02-22
 
 ### Added

Docs/NAVIGATION.md

@@ -0,0 +1,206 @@
+# Navigation & Redirect Logic
+
+This document describes the setup flow navigation, covering how users progress from initial setup through to the main application.
+
+## Overview
+
+The application uses a middleware-based redirect system to ensure users complete setup before accessing the main app. The flow involves multiple pages handling setup completion, unresolved folder detection, and initialization.
+
+## Setup Flow
+
+```
+┌─────────────────────────────────────────────────────────────────────┐
+│                         SETUP FLOW                                   │
+├─────────────────────────────────────────────────────────────────────┤
+│                                                                      │
+│   /setup ──► /loading ──► /setup/unresolved ──► /loading ──► /login │
+│        │         │              │                  │                │
+│        │         │              │                  │                │
+│        ▼         ▼              ▼                  ▼                │
+│   (first    (Series Scan +  (has folders)     (all resolved)        │
+│    time)     NFO Scan)         │                                     │
+│                      │        │                                     │
+│                      │        │                                     │
+│                      │        ▼                                     │
+│                      │    [Done button] ──► marks complete         │
+│                      │        │                                     │
+│                      │        ▼                                     │
+│                      │    /loading (NFO phase runs again)           │
+│                      │        │                                     │
+│                      └────────┴─────────────────────────────────────┘
+│                                                                      │
+└─────────────────────────────────────────────────────────────────────┘
+```
+
+**New Navigation Order:**
+1. `/setup` → Initial configuration
+2. `/loading` → Series scan + NFO scan
+3. `/setup/unresolved` → Resolve folders (if any)
+4. `/loading` → NFO scan runs again
+5. `/login` → Authentication
+
+**Key Changes:**
+- After `/setup/unresolved`, the "Done" button marks the phase as complete
+- Revisiting `/setup/unresolved` after completion → redirects to `/loading`
+- `/loading` always goes to `/setup/unresolved` if unresolved folders exist
+- NFO scan runs as a separate phase after series sync during initialization
+
+## Middleware: SetupRedirectMiddleware
+
+**File:** `src/server/middleware/setup_redirect.py`
+
+The middleware intercepts all requests and redirects to `/setup` if:
+- No master password is configured
+- Configuration file is missing or invalid
+
+### Exempt Paths (always accessible)
+
+| Path | Purpose |
+|------|---------|
+| `/setup` | Initial setup page |
+| `/setup/unresolved` | Unresolved folder resolution |
+| `/loading` | Initialization progress page |
+| `/login` | Authentication |
+| `/api/auth/*` | Auth endpoints |
+| `/api/config/*` | Config API |
+| `/api/health` | Health check |
+| `/static/*` | Static assets |
+
+### Middleware Logic
+
+1. **Setup incomplete** → Redirect to `/setup`
+2. **Setup complete, accessing `/setup`** → Redirect to `/login`
+3. **Setup complete, accessing `/loading`** → Allow access (page handles its own redirect)
+4. **Setup complete, accessing `/setup/unresolved`**:
+   - If `unresolved_completed` flag is set → Redirect to `/loading`
+   - Otherwise → Allow access
+5. **API requests during setup** → Return 503 with `setup_url`
+
+## Pages
+
+### 1. Setup Page (`/setup`)
+
+**File:** `src/server/web/templates/setup.html`
+
+Handles initial configuration:
+- Master password creation
+- Anime directory selection
+- Database initialization
+
+**Post-completion flow:**
+- Redirects to `/loading` to begin initialization
+
+### 2. Loading Page (`/loading`)
+
+**File:** `src/server/web/templates/loading.html`
+
+Shows initialization progress via WebSocket:
+- Series scanning
+- Database population
+- Logo/image loading
+
+**Post-initialization flow:**
+```javascript
+async function checkUnresolvedAndProceed() {
+    // Fetch unresolved folders via API
+    const res = await fetch('/api/setup/unresolved', {
+        headers: { 'Authorization': `Bearer ${token}` }
+    });
+    const folders = await res.json();
+    
+    if (folders.length > 0) {
+        // Has unresolved folders → go to resolution page
+        window.location.href = '/setup/unresolved';
+    } else {
+        // No unresolved folders → go to login
+        window.location.href = '/login';
+    }
+}
+```
+
+### 3. Unresolved Folders Page (`/setup/unresolved`)
+
+**File:** `src/server/web/templates/unresolved.html`
+
+Allows manual resolution of folders that couldn't be auto-matched:
+- Shows list of unresolved folders
+- Provides search suggestions
+- Input field for entering provider key
+- Resolve/delete actions
+- **Done button** at top to complete the phase without resolving all folders
+
+**Post-resolution flow:**
+```javascript
+// After clicking "Done" button
+async function handleDone() {
+    // Call API to mark phase as complete
+    await fetch('/api/setup/unresolved/done', { method: 'POST' });
+    // Redirect to loading for final NFO scan
+    window.location.href = '/loading';
+}
+```
+
+**Done button behavior:**
+- Marks all remaining folders as handled
+- Sets `unresolved_completed` flag in config
+- Redirects to `/loading` to run final NFO scan
+- After completion, `/setup/unresolved` becomes inaccessible (redirects to `/loading`)
+
+### 4. Login Page (`/login`)
+
+**File:** `src/server/web/templates/login.html`
+
+Authentication page. After successful login → redirect to `/` (main app).
+
+## API Endpoints
+
+### Unresolved Folders API
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| `GET` | `/api/setup/unresolved` | List all unresolved folders |
+| `GET` | `/api/setup/unresolved/{folder_name}` | Get specific folder details |
+| `POST` | `/api/setup/unresolved/{folder_name}/resolve` | Resolve with provider key |
+| `POST` | `/api/setup/unresolved/{folder_name}/search` | Re-search for matches |
+| `DELETE` | `/api/setup/unresolved/{folder_name}` | Remove folder from tracking |
+| `POST` | `/api/setup/unresolved/done` | Mark unresolved phase as complete |
+
+### Auth API
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| `POST` | `/api/auth/setup` | Create master password |
+| `POST` | `/api/auth/login` | Authenticate |
+| `POST` | `/api/auth/logout` | End session |
+
+## Key Files
+
+| File | Purpose |
+|------|---------|
+| `src/server/middleware/setup_redirect.py` | Redirect middleware |
+| `src/server/controllers/page_controller.py` | Page route handlers |
+| `src/server/web/templates/setup.html` | Setup template |
+| `src/server/web/templates/loading.html` | Loading template |
+| `src/server/web/templates/unresolved.html` | Unresolved folders template |
+| `src/server/api/setup_endpoints.py` | Unresolved folders API |
+| `src/server/database/service.py` | UnresolvedFolderService |
+
+## Common Issues
+
+### Redirect Loop
+
+**Symptom:** Browser keeps redirecting between pages.
+
+**Causes:**
+1. `loading.html` always redirected to `/setup/unresolved` without checking if any exist
+2. `unresolved.html` redirected to `/` which middleware redirected back to `/login`
+
+**Fix:** See the navigation logic updates in loading.html and unresolved.html.
+
+### Can't Access Unresolved Page After Setup
+
+**Symptom:** Middleware redirects to `/login` instead of allowing access to `/setup/unresolved`.
+
+**Cause:** `/setup/unresolved` is in the exempt paths but the request may not be reaching it due to completion check timing.
+
+**Fix:** The middleware allows access to `/loading` which handles the redirect to `/setup/unresolved` after initialization.

Docs/TESTING.md

@@ -73,40 +73,31 @@ from src.server.models.download import DownloadItem, EpisodeIdentifier
 class MockQueueRepository:
     def __init__(self):
         self._items: Dict[str, DownloadItem] = {}
-
-    async def save_item(self, item: DownloadItem) -> DownloadItem:
-        self._items[item.id] = item
-        return item
-
-    async def get_item(self, item_id: str) -> Optional[DownloadItem]:
-        return self._items.get(item_id)
-
-    async def get_all_items(self) -> List[DownloadItem]:
-        return list(self._items.values())
-
-    async def set_error(self, item_id: str, error: str) -> bool:
-        if item_id in self._items:
-            self._items[item_id].error = error
-            return True
-        return False
-
-    async def delete_item(self, item_id: str) -> bool:
-        if item_id in self._items:
-            del self._items[item_id]
-            return True
-        return False
-
-    async def clear_all(self) -> int:
-        count = len(self._items)
-        self._items.clear()
-        return count
 ```
 
-**Key points:**
-- The mock uses in-memory storage, no database required
-- All async methods are implemented (even if just pass-through)
-- `save_item` uses `item.id` as key (must be set before calling)
-- Suitable for unit tests only (no persistence)
+### Testing SetupService
+
+SetupService handles series key resolution from folder names during library setup. Test file: `tests/unit/test_setup_service.py`.
+
+Key methods tested:
+- `_extract_year_from_folder_name()` — parses `(YYYY)` suffix
+- `_extract_title_from_folder_name()` — strips year suffix
+- `_resolve_key_via_search()` — resolves provider key via fuzzy title matching
+
+```python
+@pytest.mark.asyncio
+async def test_returns_key_when_single_exact_match(self):
+    """Search returns 1 result with same name → returns key."""
+    mock_series_app = AsyncMock()
+    mock_series_app.search.return_value = [
+        {'title': 'Attack on Titan', 'link': '/anime/stream/attack-on-titan'}
+    ]
+
+    with patch('src.server.services.setup_service.get_series_app', return_value=mock_series_app):
+        result = await SetupService._resolve_key_via_search("Attack on Titan")
+
+    assert result == 'attack-on-titan'
+```
 
 ### Mocking aiohttp Sessions
 

Docs/features.md

@@ -107,6 +107,10 @@ The application now features a comprehensive configuration system that allows us
 - **Progress Tracking**: Live progress updates for downloads and scans
 - **System Notifications**: Real-time system messages and alerts
 
+## Folder Management
+
+- **Fuzzy Series Key Resolution**: Automatic series key resolution from folder names using fuzzy title matching — tolerates title variations like `(TV)`, `(OVA)`, `(Movie)` suffixes and uses similarity matching to resolve provider keys during library setup
+
 ## Core Functionality Overview
 
 The web application provides a complete interface for managing anime downloads with user-friendly pages for configuration, library management, search capabilities, and download monitoring. All operations are tracked in real-time with comprehensive progress reporting and error handling.

Docs/key

@@ -0,0 +1,3 @@
+API key : 299ae8f630a31bda814263c551361448
+9bc3e547caff878615cbdba2cc421d37
+

docs/key

@@ -1,51 +0,0 @@
-API key : 299ae8f630a31bda814263c551361448
-
-/mnt/server/serien/Serien/
-
-{
-  "name": "Aniworld",
-  "data_dir": "data",
-  "scheduler": {
-    "enabled": true,
-    "interval_minutes": 60,
-    "schedule_time": "03:00",
-    "schedule_days": [
-      "mon",
-      "tue",
-      "wed",
-      "thu",
-      "fri",
-      "sat",
-      "sun"
-    ],
-    "auto_download_after_rescan": true,
-    "folder_scan_enabled": true
-  },
-  "logging": {
-    "level": "INFO",
-    "file": null,
-    "max_bytes": null,
-    "backup_count": 3
-  },
-  "backup": {
-    "enabled": false,
-    "path": "data/backups",
-    "keep_days": 30
-  },
-  "nfo": {
-    "tmdb_api_key": "9bc3e547caff878615cbdba2cc421d37",
-    "auto_create": true,
-    "update_on_scan": true,
-    "download_poster": true,
-    "download_logo": true,
-    "download_fanart": true,
-    "image_size": "original"
-  },
-  "other": {
-    "master_password_hash": "$pbkdf2-sha256$29000$HQNASKk1xpgTAgAgJGRMaQ$73TOCCM0UEZONyNXQEPa3SmIoXeG6C1l5mMFDNgYfMQ",
-    "anime_directory": "/data"
-  },
-  "version": "1.0.0"
-}
-
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aniworld-web",
-  "version": "1.4.0",
+  "version": "1.4.13",
   "description": "Aniworld Anime Download Manager - Web Frontend",
   "type": "module",
   "scripts": {

src/server/api/auth.py

@@ -1,6 +1,7 @@
 """Authentication API endpoints for Aniworld."""
 from typing import Optional
 
+import structlog
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi import status as http_status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
@@ -16,6 +17,8 @@ from src.server.models.config import AppConfig
 from src.server.services.auth_service import AuthError, LockedOutError, auth_service
 from src.server.services.config_service import get_config_service
 
+logger = structlog.get_logger(__name__)
+
 # NOTE: import dependencies (optional_auth, security) lazily inside handlers
 # to avoid importing heavyweight modules (e.g. sqlalchemy) at import time.
 
@@ -144,10 +147,7 @@ async def setup_auth(req: SetupRequest):
         # Trigger initialization in background task
         import asyncio
 
-        from src.server.services.initialization_service import (
-            perform_initial_setup,
-            perform_nfo_scan_if_needed,
-        )
+        from src.server.services.initialization_service import perform_initial_setup
         from src.server.services.progress_service import get_progress_service
         
         progress_service = get_progress_service()
@@ -158,9 +158,6 @@ async def setup_auth(req: SetupRequest):
                 # Perform the initial series sync and mark as completed
                 await perform_initial_setup(progress_service)
                 
-                # Perform NFO scan if configured
-                await perform_nfo_scan_if_needed(progress_service)
-                
                 # Start scheduler if anime_directory is now set
                 try:
                     from src.server.services.scheduler.scheduler_service import (
@@ -178,7 +175,6 @@ async def setup_auth(req: SetupRequest):
                     # Continue — scheduler failure should not break initialization
                 
                 # Send completion event
-                from src.server.services.progress_service import ProgressType
                 await progress_service.start_progress(
                     progress_id="initialization_complete",
                     progress_type=ProgressType.SYSTEM,
@@ -212,8 +208,9 @@ async def setup_auth(req: SetupRequest):
         # Start initialization in background
         asyncio.create_task(run_initialization())
         
-        # Return redirect to loading page
-        return {"status": "ok", "redirect": "/loading"}
+        # Return redirect to loading page with phase=initial
+        # The loading page will show ONLY series_sync step, then redirect to /setup/unresolved
+        return {"status": "ok", "redirect": "/loading?phase=initial"}
         # Note: Media scan is skipped during setup as it requires
         # background_loader service which is only available during
         # application lifespan. It will run on first application startup.

src/server/api/setup_endpoints.py

@@ -0,0 +1,423 @@
+"""API endpoints for setup and unresolved folder management.
+
+Provides endpoints to:
+- List unresolved folders that couldn't be auto-resolved during setup
+- Get suggestions/search results for an unresolved folder
+- Resolve an unresolved folder by providing a provider key
+"""
+import json
+import logging
+from typing import Any, Optional
+
+from fastapi import APIRouter, Depends, HTTPException, status
+from pydantic import BaseModel, Field
+
+from src.server.database.connection import get_db_session
+from src.server.database.service import AnimeSeriesService, UnresolvedFolderService
+from src.server.utils.dependencies import (
+    get_database_session,
+    get_series_app,
+    require_auth,
+)
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/setup", tags=["setup"])
+
+
+class UnresolvedFolderResponse(BaseModel):
+    """Response model for an unresolved folder."""
+    
+    folder_name: str = Field(..., description="Original filesystem folder name")
+    title: str = Field(..., description="Extracted title from folder name")
+    year: Optional[int] = Field(None, description="Extracted release year")
+    search_attempts: int = Field(..., description="Number of search attempts made")
+    search_suggestions: list[dict[str, Any]] = Field(
+        default_factory=list,
+        description="Cached search results for potential matches"
+    )
+    
+    class Config:
+        from_attributes = True
+
+
+class ResolveFolderRequest(BaseModel):
+    """Request model for resolving an unresolved folder."""
+    
+    provider_key: str = Field(
+        ...,
+        min_length=1,
+        max_length=255,
+        description="Provider key to associate with this folder"
+    )
+
+
+class ResolveFolderResponse(BaseModel):
+    """Response model for resolving an unresolved folder."""
+    
+    status: str = Field(..., description="Operation status")
+    message: str = Field(..., description="Human-readable message")
+    folder_name: str = Field(..., description="Folder name that was resolved")
+    key: str = Field(..., description="Provider key that was used")
+    series_id: int = Field(..., description="Database ID of the created series")
+
+
+@router.get("/unresolved", response_model=list[UnresolvedFolderResponse])
+async def list_unresolved_folders(
+    db=Depends(get_database_session),
+) -> list[UnresolvedFolderResponse]:
+    """List all unresolved folders that need manual key resolution.
+    
+    Returns folders that couldn't be auto-resolved during setup,
+    including cached search suggestions when available.
+    
+    Returns:
+        List of UnresolvedFolderResponse objects
+    """
+    folders = await UnresolvedFolderService.get_all_unresolved(db)
+    
+    result = []
+    for folder in folders:
+        suggestions = []
+        if folder.last_search_result:
+            try:
+                suggestions = json.loads(folder.last_search_result)
+            except json.JSONDecodeError:
+                logger.warning(
+                    "Failed to parse search result for folder: %s",
+                    folder.folder_name
+                )
+        
+        result.append(UnresolvedFolderResponse(
+            folder_name=folder.folder_name,
+            title=folder.title,
+            year=folder.year,
+            search_attempts=folder.search_attempts,
+            search_suggestions=suggestions,
+        ))
+    
+    return result
+
+
+@router.get("/unresolved/{folder_name}", response_model=UnresolvedFolderResponse)
+async def get_unresolved_folder(
+    folder_name: str,
+    db=Depends(get_database_session),
+) -> UnresolvedFolderResponse:
+    """Get details for a specific unresolved folder.
+    
+    Args:
+        folder_name: URL-encoded folder name to look up
+        
+    Returns:
+        UnresolvedFolderResponse for the specified folder
+        
+    Raises:
+        HTTPException: 404 if folder not found or already resolved
+    """
+    folder = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+    
+    if not folder:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Unresolved folder not found: {folder_name}"
+        )
+    
+    if folder.is_resolved:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Folder already resolved: {folder_name}"
+        )
+    
+    suggestions = []
+    if folder.last_search_result:
+        try:
+            suggestions = json.loads(folder.last_search_result)
+        except json.JSONDecodeError:
+            pass
+    
+    return UnresolvedFolderResponse(
+        folder_name=folder.folder_name,
+        title=folder.title,
+        year=folder.year,
+        search_attempts=folder.search_attempts,
+        search_suggestions=suggestions,
+    )
+
+
+@router.post("/unresolved/{folder_name}/resolve", response_model=ResolveFolderResponse)
+async def resolve_unresolved_folder(
+    folder_name: str,
+    request: ResolveFolderRequest,
+    db=Depends(get_database_session),
+) -> ResolveFolderResponse:
+    """Resolve an unresolved folder by providing the correct provider key.
+    
+    This endpoint:
+    1. Validates the provider key format
+    2. Updates the UnresolvedFolder record as resolved
+    3. Creates the AnimeSeries record in the database
+    4. Returns the created series information
+    
+    Args:
+        folder_name: URL-encoded folder name to resolve
+        request: ResolveFolderRequest with the provider_key
+        
+    Returns:
+        ResolveFolderResponse with created series details
+        
+    Raises:
+        HTTPException: 404 if folder not found
+        HTTPException: 400 if key is invalid or series already exists
+    """
+    # Check if folder exists and is unresolved
+    unresolved = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+    
+    if not unresolved:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Unresolved folder not found: {folder_name}"
+        )
+    
+    if unresolved.is_resolved:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Folder already resolved: {folder_name}"
+        )
+    
+    # Check if a series with this key already exists
+    existing_series = await AnimeSeriesService.get_by_key(db, request.provider_key)
+    if existing_series:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Series with key '{request.provider_key}' already exists"
+        )
+    
+    # Mark as resolved
+    await UnresolvedFolderService.resolve(db, folder_name, request.provider_key)
+    
+    # Create the AnimeSeries record
+    series = await AnimeSeriesService.create(
+        db=db,
+        key=request.provider_key,
+        name=unresolved.title,
+        site="https://aniworld.to",
+        folder=folder_name,
+        year=unresolved.year,
+        loading_status="pending",
+        episodes_loaded=False,
+        logo_loaded=False,
+        images_loaded=False,
+    )
+    
+    logger.info(
+        "Resolved unresolved folder via API: %s -> key=%s (series_id=%d)",
+        folder_name, request.provider_key, series.id
+    )
+    
+    return ResolveFolderResponse(
+        status="success",
+        message=f"Successfully resolved and added series: {unresolved.title}",
+        folder_name=folder_name,
+        key=request.provider_key,
+        series_id=series.id,
+    )
+
+
+class SearchFolderRequest(BaseModel):
+    """Request model for searching an unresolved folder with custom query."""
+    query: Optional[str] = Field(None, description="Custom search query override")
+
+
+@router.post("/unresolved/{folder_name}/search", response_model=UnresolvedFolderResponse)
+async def search_unresolved_folder(
+    folder_name: str,
+    request: Optional[SearchFolderRequest] = None,
+    db=Depends(get_database_session),
+) -> UnresolvedFolderResponse:
+    """Re-search for a specific unresolved folder to get fresh suggestions.
+    
+    Performs a new search using the folder's title or a custom query.
+    Caches the results for subsequent display.
+    
+    Args:
+        folder_name: URL-encoded folder name to search for
+        request: Optional SearchFolderRequest with custom query override
+        
+    Returns:
+        UnresolvedFolderResponse with updated search suggestions
+        
+    Raises:
+        HTTPException: 404 if folder not found or already resolved
+    """
+    from pathlib import Path
+    
+    folder = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+    
+    if not folder:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Unresolved folder not found: {folder_name}"
+        )
+    
+    if folder.is_resolved:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Folder already resolved: {folder_name}"
+        )
+    
+    # Use custom query if provided, otherwise fall back to folder title
+    search_query = request.query if request and request.query else folder.title
+    
+    # Perform search
+    series_app = get_series_app()
+    try:
+        results = await series_app.search(search_query)
+        search_result_json = json.dumps(results) if results else "[]"
+    except Exception as e:
+        logger.warning(
+            "Search failed for unresolved folder: %s, error: %s",
+            folder_name, str(e)
+        )
+        search_result_json = "[]"
+        results = []
+    
+    # Update the folder with new search results
+    await UnresolvedFolderService.update_search_result(db, folder_name, search_result_json)
+    
+    return UnresolvedFolderResponse(
+        folder_name=folder.folder_name,
+        title=folder.title,
+        year=folder.year,
+        search_attempts=folder.search_attempts + 1,
+        search_suggestions=results,
+    )
+
+
+@router.delete("/unresolved/{folder_name}")
+async def delete_unresolved_folder(
+    folder_name: str,
+    db=Depends(get_database_session),
+) -> dict[str, str]:
+    """Delete an unresolved folder tracking record.
+    
+    Use this when you've manually added the series outside of this flow
+    (e.g., via POST /api/anime/add) to clean up the unresolved tracker.
+    
+    Args:
+        folder_name: URL-encoded folder name to delete
+        
+    Returns:
+        Dict with status message
+        
+    Raises:
+        HTTPException: 404 if folder not found
+    """
+    deleted = await UnresolvedFolderService.delete(db, folder_name)
+    
+    if not deleted:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Unresolved folder not found: {folder_name}"
+        )
+    
+    return {"status": "success", "message": f"Deleted unresolved folder: {folder_name}"}
+
+
+class DoneResponse(BaseModel):
+    """Response model for completing unresolved folders."""
+    status: str = Field(..., description="Operation status")
+    message: str = Field(..., description="Human-readable message")
+    count: int = Field(..., description="Number of folders marked as done")
+
+
+@router.post("/unresolved/done", response_model=DoneResponse)
+async def complete_unresolved_folders(
+    db=Depends(get_database_session),
+) -> DoneResponse:
+    """Mark all unresolved folders as handled and complete the unresolved phase.
+    
+    This endpoint:
+    1. Marks the unresolved phase as completed in config
+    2. Returns the count of folders that were handled
+    
+    After this, /setup/unresolved will redirect to /loading.
+    
+    Returns:
+        DoneResponse with status and count of handled folders
+    """
+    from src.server.services.config_service import get_config_service
+
+    # Get all unresolved folders
+    folders = await UnresolvedFolderService.get_all_unresolved(db)
+    count = len(folders)
+    
+    # Mark unresolved as completed in config
+    config_service = get_config_service()
+    try:
+        config = config_service.load_config()
+        if config.other is None:
+            config.other = {}
+        config.other['unresolved_completed'] = True
+        config_service.save_config(config, create_backup=False)
+        logger.info("Marked unresolved phase as completed")
+    except Exception as e:
+        logger.warning("Failed to save unresolved_completed flag: %s", e)
+    
+    logger.info(
+        "Completed unresolved phase: %d folders handled",
+        count
+    )
+    
+    return DoneResponse(
+        status="success",
+        message=f"Marked {count} folders as handled. Unresolved phase completed.",
+        count=count,
+    )
+
+
+class NfoScanPhaseResponse(BaseModel):
+    """Response model for NFO scan phase trigger."""
+    status: str = Field(..., description="Status of the operation")
+    message: str = Field(..., description="Human-readable message")
+
+
+@router.post("/nfo-scan-phase", response_model=NfoScanPhaseResponse)
+async def trigger_nfo_scan_phase() -> NfoScanPhaseResponse:
+    """Trigger the NFO scan phase.
+    
+    This endpoint is called by the loading page when accessed with ?phase=nfo.
+    It starts the NFO scan in the background and returns immediately.
+    The loading page then connects via WebSocket to receive progress updates.
+    
+    Returns:
+        NfoScanPhaseResponse with status and message
+    """
+    import asyncio
+
+    from src.server.services.initialization_service import perform_nfo_scan_phase
+    from src.server.services.progress_service import get_progress_service
+    
+    progress_service = get_progress_service()
+    
+    async def run_nfo_scan():
+        """Run NFO scan phase with progress updates."""
+        try:
+            await perform_nfo_scan_phase(progress_service)
+            logger.info("NFO scan phase completed via API trigger")
+        except Exception as e:
+            logger.error("NFO scan phase failed: %s", e, exc_info=True)
+            if progress_service:
+                await progress_service.fail_progress(
+                    progress_id="nfo_scan",
+                    error_message=f"NFO scan failed: {str(e)}",
+                    metadata={"step_id": "nfo_scan", "phase": "nfo"}
+                )
+    
+    # Start NFO scan in background
+    asyncio.create_task(run_nfo_scan())
+    
+    return NfoScanPhaseResponse(
+        status="started",
+        message="NFO scan phase started. Check progress via WebSocket."
+    )

src/server/controllers/page_controller.py

@@ -59,3 +59,13 @@ async def loading_page(request: Request):
         request,
         title="Initializing - Aniworld"
     )
+
+
+@router.get("/setup/unresolved", response_class=HTMLResponse)
+async def unresolved_page(request: Request):
+    """Serve the unresolved folders resolution page."""
+    return render_template(
+        "unresolved.html",
+        request,
+        title="Resolve Series - Aniworld"
+    )

src/server/database/models.py

@@ -626,6 +626,96 @@ class UserSession(Base, TimestampMixin):
         self.is_active = False
 
 
+class UnresolvedFolder(Base, TimestampMixin):
+    """SQLAlchemy model for folders that couldn't be resolved during setup.
+    
+    Tracks anime folders whose provider key couldn't be auto-resolved
+    during the initial setup scan. Users can provide the correct key
+    via the API to complete the series registration.
+    
+    Attributes:
+        id: Primary key
+        folder_name: Original filesystem folder name
+        title: Extracted title from folder name
+        year: Extracted release year (optional)
+        provider_key: User-provided provider key to resolve this folder
+        search_attempts: Number of auto-search attempts made
+        last_search_result: Cached search results (JSON string) for UI suggestions
+        resolved_at: Timestamp when provider_key was provided
+        created_at: Creation timestamp (from TimestampMixin)
+        updated_at: Last update timestamp (from TimestampMixin)
+    """
+    __tablename__ = "unresolved_folders"
+    
+    # Primary key
+    id: Mapped[int] = mapped_column(
+        Integer, primary_key=True, autoincrement=True
+    )
+    
+    # Folder metadata
+    folder_name: Mapped[str] = mapped_column(
+        String(1000), unique=True, nullable=False, index=True,
+        doc="Original filesystem folder name"
+    )
+    title: Mapped[str] = mapped_column(
+        String(500), nullable=False,
+        doc="Extracted title from folder name"
+    )
+    year: Mapped[Optional[int]] = mapped_column(
+        Integer, nullable=True,
+        doc="Extracted release year"
+    )
+    
+    # Resolution data
+    provider_key: Mapped[Optional[str]] = mapped_column(
+        String(255), nullable=True,
+        doc="User-provided provider key to resolve this folder"
+    )
+    search_attempts: Mapped[int] = mapped_column(
+        Integer, nullable=False, default=0, server_default="0",
+        doc="Number of auto-search attempts made"
+    )
+    last_search_result: Mapped[Optional[str]] = mapped_column(
+        Text, nullable=True,
+        doc="Cached search results (JSON) for UI display"
+    )
+    resolved_at: Mapped[Optional[datetime]] = mapped_column(
+        DateTime(timezone=True), nullable=True,
+        doc="Timestamp when this folder was resolved"
+    )
+    
+    @validates('folder_name')
+    def validate_folder_name(self, key: str, value: str) -> str:
+        """Validate folder name is not empty."""
+        if not value or not value.strip():
+            raise ValueError("Folder name cannot be empty")
+        if len(value) > 1000:
+            raise ValueError("Folder name must be 1000 characters or less")
+        return value.strip()
+    
+    @validates('title')
+    def validate_title(self, key: str, value: str) -> str:
+        """Validate title is not empty."""
+        if not value or not value.strip():
+            raise ValueError("Title cannot be empty")
+        if len(value) > 500:
+            raise ValueError("Title must be 500 characters or less")
+        return value.strip()
+    
+    @property
+    def is_resolved(self) -> bool:
+        """Check if this folder has been resolved with a provider key."""
+        return self.provider_key is not None and self.resolved_at is not None
+    
+    def __repr__(self) -> str:
+        return (
+            f"<UnresolvedFolder(id={self.id}, "
+            f"folder_name='{self.folder_name}', "
+            f"title='{self.title}', "
+            f"resolved={self.is_resolved})>"
+        )
+
+
 class SystemSettings(Base, TimestampMixin):
     """SQLAlchemy model for system-wide settings and state.
     

src/server/database/service.py

@@ -34,6 +34,7 @@ from src.server.database.models import (
     AnimeSeries,
     DownloadQueueItem,
     Episode,
+    UnresolvedFolder,
     UserSession,
 )
 
@@ -1364,3 +1365,176 @@ class UserSessionService:
         
         return new_session
 
+
+# ============================================================================
+# Unresolved Folder Service
+# ============================================================================
+
+
+class UnresolvedFolderService:
+    """Service for tracking and resolving folders that couldn't be auto-resolved.
+    
+    During initial setup, some folders may not resolve to a provider key
+    (no search match or multiple ambiguous matches). These are tracked as
+    UnresolvedFolder records and can later be resolved by the user providing
+    the correct provider key.
+    """
+    
+    @staticmethod
+    async def create(
+        db: AsyncSession,
+        folder_name: str,
+        title: str,
+        year: int | None = None,
+        search_attempts: int = 1,
+        last_search_result: str | None = None,
+    ) -> UnresolvedFolder:
+        """Create a new unresolved folder tracking record.
+        
+        Args:
+            db: Database session
+            folder_name: Original filesystem folder name
+            title: Extracted title from folder name
+            year: Extracted release year (optional)
+            search_attempts: Number of search attempts made (default: 1)
+            last_search_result: JSON string of search results for UI (optional)
+        
+        Returns:
+            Created UnresolvedFolder instance
+        """
+        folder = UnresolvedFolder(
+            folder_name=folder_name,
+            title=title,
+            year=year,
+            search_attempts=search_attempts,
+            last_search_result=last_search_result,
+        )
+        db.add(folder)
+        await db.flush()
+        await db.refresh(folder)
+        logger.info(
+            "Created unresolved folder tracking: %s (title=%s, year=%s)",
+            folder_name, title, year
+        )
+        return folder
+    
+    @staticmethod
+    async def get_by_folder_name(
+        db: AsyncSession,
+        folder_name: str,
+    ) -> Optional[UnresolvedFolder]:
+        """Get unresolved folder by folder name.
+        
+        Args:
+            db: Database session
+            folder_name: Filesystem folder name to look up
+        
+        Returns:
+            UnresolvedFolder instance or None if not found
+        """
+        result = await db.execute(
+            select(UnresolvedFolder).where(
+                UnresolvedFolder.folder_name == folder_name
+            )
+        )
+        return result.scalar_one_or_none()
+    
+    @staticmethod
+    async def get_all_unresolved(
+        db: AsyncSession,
+    ) -> list[UnresolvedFolder]:
+        """Get all unresolved folders that haven't been resolved yet.
+        
+        Args:
+            db: Database session
+        
+        Returns:
+            List of unresolved UnresolvedFolder instances
+        """
+        result = await db.execute(
+            select(UnresolvedFolder)
+            .where(UnresolvedFolder.provider_key.is_(None))
+            .order_by(UnresolvedFolder.created_at)
+        )
+        return list(result.scalars().all())
+    
+    @staticmethod
+    async def resolve(
+        db: AsyncSession,
+        folder_name: str,
+        provider_key: str,
+    ) -> Optional[UnresolvedFolder]:
+        """Mark an unresolved folder as resolved with the given provider key.
+        
+        Args:
+            db: Database session
+            folder_name: Filesystem folder name to resolve
+            provider_key: Provider key to associate with this folder
+        
+        Returns:
+            Updated UnresolvedFolder instance or None if not found
+        """
+        from datetime import datetime, timezone
+        
+        folder = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+        if not folder:
+            return None
+        
+        folder.provider_key = provider_key
+        folder.resolved_at = datetime.now(timezone.utc)
+        await db.flush()
+        await db.refresh(folder)
+        logger.info(
+            "Resolved unresolved folder: %s -> key=%s",
+            folder_name, provider_key
+        )
+        return folder
+    
+    @staticmethod
+    async def delete(
+        db: AsyncSession,
+        folder_name: str,
+    ) -> bool:
+        """Delete an unresolved folder record (e.g., after manual add).
+        
+        Args:
+            db: Database session
+            folder_name: Filesystem folder name to delete
+        
+        Returns:
+            True if deleted, False if not found
+        """
+        folder = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+        if not folder:
+            return False
+        
+        await db.delete(folder)
+        await db.flush()
+        return True
+    
+    @staticmethod
+    async def update_search_result(
+        db: AsyncSession,
+        folder_name: str,
+        search_result: str,
+    ) -> Optional[UnresolvedFolder]:
+        """Update the cached search result for an unresolved folder.
+        
+        Args:
+            db: Database session
+            folder_name: Filesystem folder name to update
+            search_result: JSON string of search results
+        
+        Returns:
+            Updated UnresolvedFolder instance or None if not found
+        """
+        folder = await UnresolvedFolderService.get_by_folder_name(db, folder_name)
+        if not folder:
+            return None
+        
+        folder.search_attempts += 1
+        folder.last_search_result = search_result
+        await db.flush()
+        await db.refresh(folder)
+        return folder
+

src/server/fastapi_app.py

@@ -27,6 +27,7 @@ from src.server.api.health import router as health_router
 from src.server.api.logging import router as logging_router
 from src.server.api.nfo import router as nfo_router
 from src.server.api.scheduler import router as scheduler_router
+from src.server.api.setup_endpoints import router as setup_router
 from src.server.api.websocket import router as websocket_router
 from src.server.controllers.error_controller import (
     not_found_handler,
@@ -343,7 +344,6 @@ async def lifespan(_application: FastAPI):
         from src.server.services.initialization_service import (
             perform_initial_setup,
             perform_media_scan_if_needed,
-            perform_nfo_scan_if_needed,
         )
         
         try:
@@ -372,9 +372,6 @@ async def lifespan(_application: FastAPI):
                         "exist yet): %s", e
                     )
 
-                # Run NFO scan only on first run (if configured)
-                await perform_nfo_scan_if_needed()
-
                 # Initialize download service
                 try:
                     from src.server.utils.dependencies import get_download_service
@@ -648,6 +645,7 @@ app.include_router(scheduler_router)
 app.include_router(anime_router)
 app.include_router(download_router)
 app.include_router(nfo_router)
+app.include_router(setup_router)
 app.include_router(logging_router)
 app.include_router(websocket_router)
 

src/server/middleware/setup_redirect.py

@@ -32,10 +32,12 @@ class SetupRedirectMiddleware(BaseHTTPMiddleware):
     # Paths that should always be accessible, even without setup
     EXEMPT_PATHS = {
         "/setup",  # Setup page itself
+        "/setup/unresolved",  # Unresolved folders page (after setup)
         "/loading",  # Loading page (initialization progress)
         "/login",  # Login page (needs to be accessible after setup)
         "/queue",  # Queue page (for initial load)
         "/api/auth/",  # All auth endpoints (setup, login, logout, register)
+        "/api/setup/",  # Setup API (unresolved folders, etc.)
         "/ws/connect",  # WebSocket connection (needed for loading page)
         "/api/queue/",  # Queue API endpoints
         "/api/downloads/",  # Download API endpoints
@@ -103,6 +105,20 @@ class SetupRedirectMiddleware(BaseHTTPMiddleware):
         
         return False
     
+    def _is_unresolved_completed(self) -> bool:
+        """Check if the unresolved phase has been completed.
+        
+        Returns:
+            True if unresolved phase is complete, False otherwise
+        """
+        try:
+            config_service = get_config_service()
+            config = config_service.load_config()
+            other = config.other or {}
+            return bool(other.get('unresolved_completed', False))
+        except Exception:
+            return False
+    
     async def dispatch(
         self, request: Request, call_next: Callable
     ) -> Response:
@@ -116,31 +132,31 @@ class SetupRedirectMiddleware(BaseHTTPMiddleware):
             Either a redirect to /setup or the normal response
         """
         path = request.url.path
+        query_params = request.query_params
         
         # Check if trying to access setup or loading page after completion
-        if path in ("/setup", "/loading"):
+        if path in ("/setup", "/loading", "/setup/unresolved"):
             if not self._needs_setup():
-                # Setup is complete, check loading status
                 if path == "/setup":
-                    # Redirect to loading if initialization is in progress
-                    # Otherwise redirect to login
+                    # Redirect to login if setup is already complete
                     return RedirectResponse(url="/login", status_code=302)
+                elif path == "/setup/unresolved":
+                    # Check if unresolved phase is already completed
+                    if self._is_unresolved_completed():
+                        # Redirect to loading - unresolved phase already done
+                        return RedirectResponse(url="/loading?phase=nfo", status_code=302)
                 elif path == "/loading":
-                    # Check if initialization is complete
-                    try:
-                        from src.server.database.connection import get_db_session
-                        from src.server.database.system_settings_service import (
-                            SystemSettingsService,
-                        )
-                        
-                        async with get_db_session() as db:
-                            is_complete = await SystemSettingsService.is_initial_scan_completed(db)
-                            if is_complete:
-                                # Initialization complete, redirect to login
-                                return RedirectResponse(url="/login", status_code=302)
-                    except Exception:
-                        # If we can't check, allow access to loading page
-                        pass
+                    # Handle phase query parameter
+                    phase = query_params.get("phase")
+                    if phase == "initial":
+                        # phase=initial should not be accessed after setup is complete
+                        # Redirect to login
+                        return RedirectResponse(url="/login", status_code=302)
+                    elif not phase:
+                        # No phase specified and setup is complete
+                        # Redirect to login since user should be further in the flow
+                        return RedirectResponse(url="/login", status_code=302)
+                    # phase=nfo is allowed - it triggers the NFO scan phase
         
         # Skip setup check for exempt paths
         if self._is_path_exempt(path):

src/server/services/initialization_service.py

@@ -165,7 +165,7 @@ async def _cleanup_legacy_key_files() -> int:
             db_folders: set[str] = {series.folder for series in all_series if series.folder}
 
             for folder_name in db_folders:
-                folder_path = settings.anime_directory / folder_name
+                folder_path = Path(settings.anime_directory) / folder_name
                 key_file = folder_path / "key"
 
                 if not key_file.exists():
@@ -386,6 +386,9 @@ async def perform_initial_setup(progress_service=None):
         # Load series into memory from database
         await _load_series_into_memory(progress_service)
 
+        # NOTE: NFO scan is NO longer run here - it runs in a separate phase
+        # after unresolved folders are completed (via /loading?phase=nfo)
+
         return True
 
     except (OSError, RuntimeError, ValueError) as e:
@@ -427,13 +430,46 @@ async def _is_nfo_scan_configured() -> bool:
 async def _execute_nfo_scan(progress_service=None) -> None:
     """Execute the actual NFO scan with TMDB data.
     
-    Note: NFO service removed. This function is now a no-op stub.
-    
     Args:
-        progress_service: Unused. Kept to avoid breaking call-sites.
+        progress_service: Optional ProgressService for emitting updates
     """
-    logger.info("NFO scan skipped — NFO service removed")
-    return
+    from src.server.services.nfo_scan_service import NfoScanService
+    from src.server.utils.dependencies import get_anime_service
+    
+    logger.info("Starting NFO scan...")
+    
+    anime_service = get_anime_service()
+    nfo_service = NfoScanService()
+    
+    # Subscribe to NFO events and forward to progress service
+    async def nfo_event_handler(event_data):
+        if event_data.get('type') == 'nfo_scan_progress':
+            data = event_data.get('data', {})
+            if progress_service:
+                await progress_service.update_progress(
+                    progress_id="nfo_scan",
+                    current=data.get('current', 0),
+                    total=data.get('total', 100),
+                    message=data.get('message', 'Scanning...'),
+                    key=data.get('key'),
+                    folder=data.get('folder'),
+                )
+        elif event_data.get('type') == 'nfo_scan_completed':
+            stats = event_data.get('statistics', {})
+            if progress_service:
+                await progress_service.complete_progress(
+                    progress_id="nfo_scan",
+                    message=f"NFO scan complete: {stats.get('created', 0)} created, {stats.get('updated', 0)} updated",
+                )
+    
+    nfo_service.subscribe_to_scan_events(nfo_event_handler)
+    
+    try:
+        # Run the scan
+        nfo_result = await nfo_service.scan_all(anime_service)
+        logger.info("NFO scan completed: %s", nfo_result)
+    finally:
+        nfo_service.unsubscribe_from_scan_events(nfo_event_handler)
 
 
 async def perform_nfo_scan_if_needed(progress_service=None):
@@ -446,8 +482,8 @@ async def perform_nfo_scan_if_needed(progress_service=None):
         from src.server.services.progress_service import ProgressType
         await progress_service.start_progress(
             progress_id="nfo_scan",
-            progress_type=ProgressType.SYSTEM,
-            title="Processing NFO Metadata",
+            progress_type=ProgressType.SCAN,
+            title="Scanning NFO Files",
             total=100,
             message="Checking NFO scan status...",
             metadata={"step_id": "nfo_scan"}
@@ -498,6 +534,82 @@ async def perform_nfo_scan_if_needed(progress_service=None):
             )
 
 
+async def perform_nfo_scan_phase(progress_service=None):
+    """Perform the NFO scan phase as part of the second loading page phase.
+    
+    This is called when the loading page is accessed with ?phase=nfo query param.
+    It runs the NFO scan and emits progress updates via the progress service.
+    
+    Args:
+        progress_service: Optional ProgressService for emitting updates
+    """
+    logger.info("Starting NFO scan phase...")
+    
+    if progress_service:
+        from src.server.services.progress_service import ProgressType
+        await progress_service.start_progress(
+            progress_id="nfo_scan",
+            progress_type=ProgressType.SCAN,
+            title="Scanning NFO Files",
+            total=100,
+            message="Starting NFO scan...",
+            metadata={"step_id": "nfo_scan", "phase": "nfo"}
+        )
+    
+    # Check if NFO scan was already completed
+    is_nfo_scan_done = await _check_nfo_scan_status()
+    
+    # Check if NFO features are configured
+    if not await _is_nfo_scan_configured():
+        message = (
+            "Skipped - TMDB API key not configured"
+            if not settings.tmdb_api_key
+            else "Skipped - NFO features disabled"
+        )
+        logger.info("NFO scan phase skipped: %s", message)
+        
+        if progress_service:
+            await progress_service.complete_progress(
+                progress_id="nfo_scan",
+                message=message,
+                metadata={"step_id": "nfo_scan", "phase": "nfo", "nfo_scan_complete": True}
+            )
+        return
+    
+    # Skip if already completed
+    if is_nfo_scan_done:
+        logger.info("Skipping NFO scan phase - already completed on previous run")
+        if progress_service:
+            await progress_service.complete_progress(
+                progress_id="nfo_scan",
+                message="Already completed",
+                metadata={"step_id": "nfo_scan", "phase": "nfo", "nfo_scan_complete": True}
+            )
+        return
+    
+    # Execute the NFO scan
+    try:
+        await _execute_nfo_scan(progress_service)
+        await _mark_nfo_scan_completed()
+        
+        # Send completion event
+        if progress_service:
+            await progress_service.complete_progress(
+                progress_id="nfo_scan",
+                message="NFO scan completed successfully",
+                metadata={"step_id": "nfo_scan", "phase": "nfo", "nfo_scan_complete": True}
+            )
+        logger.info("NFO scan phase completed successfully")
+    except Exception as e:
+        logger.error("Failed to complete NFO scan phase: %s", e, exc_info=True)
+        if progress_service:
+            await progress_service.fail_progress(
+                progress_id="nfo_scan",
+                error_message=f"NFO scan failed: {str(e)}",
+                metadata={"step_id": "nfo_scan", "phase": "nfo"}
+            )
+
+
 async def _check_media_scan_status() -> bool:
     """Check if initial media scan has been completed.
     

src/server/services/setup_service.py

@@ -20,7 +20,7 @@ import structlog
 
 from src.config.settings import settings
 from src.server.database.connection import get_db_session
-from src.server.database.service import AnimeSeriesService
+from src.server.database.service import AnimeSeriesService, UnresolvedFolderService
 from src.server.utils.dependencies import get_series_app
 
 logger = structlog.get_logger(__name__)
@@ -74,6 +74,61 @@ class SetupService:
         """
         return re.sub(r'\s*\(\d{4}\)\s*$', '', folder_name).strip()
 
+    @staticmethod
+    def _normalize_title(title: str) -> str:
+        """Normalize title for fuzzy matching.
+        
+        Strips common suffixes and lowercases for comparison.
+        
+        Args:
+            title: The title to normalize
+            
+        Returns:
+            Normalized title string
+        """
+        # Remove common anime suffixes (case-insensitive)
+        suffixes = [
+            r'\s*\(TV\)\s*$',
+            r'\s*\(Anime\)\s*$',
+            r'\s*\(OAD\)\s*$',
+            r'\s*\(OVA\)\s*$',
+            r'\s*\(Special\)\s*$',
+            r'\s*\(Movie\)\s*$',
+            r'\s*\(Spin-Off\)\s*$',
+        ]
+        normalized = title.lower().strip()
+        for suffix_pattern in suffixes:
+            normalized = re.sub(suffix_pattern, '', normalized, flags=re.IGNORECASE).strip()
+        return normalized
+
+    @staticmethod
+    def _titles_match(title1: str, title2: str, threshold: float = 0.85) -> bool:
+        """Check if two titles match using fuzzy comparison.
+        
+        Args:
+            title1: First title
+            title2: Second title
+            threshold: Similarity threshold (0.0 to 1.0)
+            
+        Returns:
+            True if titles match within threshold
+        """
+        norm1 = SetupService._normalize_title(title1)
+        norm2 = SetupService._normalize_title(title2)
+        
+        # Direct match after normalization
+        if norm1 == norm2:
+            return True
+        
+        # Containment check (e.g., "Attack on Titan" in "Attack on Titan (TV)")
+        if norm1 in norm2 or norm2 in norm1:
+            return True
+        
+        # Similarity ratio check using SequenceMatcher
+        from difflib import SequenceMatcher
+        ratio = SequenceMatcher(None, norm1, norm2).ratio()
+        return ratio >= threshold
+
     @staticmethod
     async def _resolve_key_via_search(title: str) -> str:
         """Resolve provider key by searching for the title.
@@ -93,9 +148,35 @@ class SetupService:
             results = await series_app.search(title)
             
             if len(results) == 1:
-                result_name = results[0].get('name', '').lower()
-                if result_name == title.lower():
-                    return results[0].get('key', '')
+                result_name = results[0].get('title', '')
+                result_link = results[0].get('link', '')
+                
+                if SetupService._titles_match(result_name, title):
+                    if result_link and '/anime/stream/' in result_link:
+                        return result_link.split('/anime/stream/')[-1].split('/')[0]
+                    elif result_link:
+                        # Link is already the key (e.g., "shinobi-no-ittoki")
+                        return result_link
+                    else:
+                        logger.debug(
+                            "Series key resolved but link format unexpected",
+                            folder_title=title,
+                            result_title=result_name,
+                            link=result_link
+                        )
+                else:
+                    logger.debug(
+                        "Series search result title mismatch",
+                        folder_title=title,
+                        result_title=result_name,
+                        link=result_link
+                    )
+            elif len(results) > 1:
+                logger.debug(
+                    "Multiple search results for title, skipping fuzzy match",
+                    title=title,
+                    result_count=len(results)
+                )
         except Exception as e:
             logger.warning(
                 "Provider search failed for folder",
@@ -203,6 +284,7 @@ class SetupService:
         
         created_count = 0
         skipped_existing = 0
+        unresolved_count = 0
         
         try:
             series_app = get_series_app()
@@ -222,6 +304,43 @@ class SetupService:
                         skipped_existing += 1
                         continue
                     
+                    # Check if already tracked as unresolved
+                    existing_unresolved = await UnresolvedFolderService.get_by_folder_name(
+                        db, folder_name
+                    )
+                    if existing_unresolved and existing_unresolved.is_resolved:
+                        # Was previously unresolved but now resolved - create the series
+                        resolved_key = existing_unresolved.provider_key
+                        year = cls._extract_year_from_folder_name(folder_name)
+                        title = cls._extract_title_from_folder_name(folder_name)
+                        props = cls._get_series_properties(folder)
+                        
+                        series = await AnimeSeriesService.create(
+                            db=db,
+                            key=resolved_key,
+                            name=title,
+                            site="https://aniworld.to",
+                            folder=folder_name,
+                            year=year,
+                            loading_status="completed",
+                            episodes_loaded=True,
+                            logo_loaded=props.logo_loaded,
+                            images_loaded=props.images_loaded,
+                            has_nfo=props.has_nfo,
+                            nfo_path=props.nfo_path,
+                            nfo_created_at=props.nfo_created_at,
+                            nfo_updated_at=props.nfo_updated_at,
+                        )
+                        created_count += 1
+                        
+                        # Delete the unresolved tracking now that series is created
+                        await UnresolvedFolderService.delete(db, folder_name)
+                        continue
+                    elif existing_unresolved:
+                        # Already tracked as unresolved, skip
+                        unresolved_count += 1
+                        continue
+                    
                     # Extract title and year from folder name
                     year = cls._extract_year_from_folder_name(folder_name)
                     title = cls._extract_title_from_folder_name(folder_name)
@@ -236,6 +355,41 @@ class SetupService:
                     # Resolve key via provider search
                     resolved_key = await cls._resolve_key_via_search(title)
                     
+                    if not resolved_key:
+                        # Track unresolved folder for later manual resolution
+                        import json
+                        try:
+                            series_results = await series_app.search(title)
+                            search_result_json = json.dumps(series_results) if series_results else None
+                        except Exception:
+                            search_result_json = None
+                        
+                        await UnresolvedFolderService.create(
+                            db=db,
+                            folder_name=folder_name,
+                            title=title,
+                            year=year,
+                            search_attempts=1,
+                            last_search_result=search_result_json,
+                        )
+                        logger.warning(
+                            "Could not resolve series key for folder, tracking as unresolved: %s",
+                            folder_name
+                        )
+                        continue
+                    
+                    # Also check if a series with this key already exists (different folder, same anime)
+                    existing_by_key = await AnimeSeriesService.get_by_key(db, resolved_key)
+                    if existing_by_key:
+                        logger.debug(
+                            "Series with key already exists, skipping",
+                            folder=folder_name,
+                            key=resolved_key,
+                            existing_folder=existing_by_key.folder
+                        )
+                        skipped_existing += 1
+                        continue
+                    
                     # Check filesystem properties
                     props = cls._get_series_properties(folder)
                     
@@ -272,7 +426,8 @@ class SetupService:
             logger.info(
                 "Setup complete",
                 created=created_count,
-                skipped_existing=skipped_existing
+                skipped_existing=skipped_existing,
+                unresolved=unresolved_count
             )
             
         except Exception as e:

src/server/web/templates/loading.html

@@ -279,19 +279,83 @@
         let ws = null;
         const steps = new Map();
         let isComplete = false;
+        
+        // Get phase from URL query parameter
+        const urlParams = new URLSearchParams(window.location.search);
+        const currentPhase = urlParams.get('phase') || 'initial';
 
         const stepOrder = [
             'series_sync',
-            'nfo_scan',
-            'media_scan'
+            'nfo_scan'
         ];
 
         const stepTitles = {
             'series_sync': 'Syncing Series Database',
-            'nfo_scan': 'Processing NFO Metadata',
-            'media_scan': 'Scanning Media Files'
+            'nfo_scan': 'Scanning NFO Files'
         };
 
+        // State management for setup flow
+        const SETUP_STATES = {
+            INITIAL: 'initial',
+            UNRESOLVED: 'unresolved',
+            NFO: 'nfo'
+        };
+
+        function setSetupPhase(phase) {
+            sessionStorage.setItem('setup_phase', phase);
+        }
+
+        function getSetupPhase() {
+            return sessionStorage.getItem('setup_phase');
+        }
+
+        function clearSetupPhase() {
+            sessionStorage.removeItem('setup_phase');
+        }
+
+        function validateStateAndRedirect() {
+            const storedPhase = getSetupPhase();
+            if (storedPhase && storedPhase !== currentPhase) {
+                // State mismatch - redirect to correct page based on stored phase
+                if (storedPhase === SETUP_STATES.INITIAL) {
+                    window.location.href = '/loading?phase=initial';
+                    return false;
+                } else if (storedPhase === SETUP_STATES.UNRESOLVED) {
+                    window.location.href = '/setup/unresolved';
+                    return false;
+                } else if (storedPhase === SETUP_STATES.NFO) {
+                    window.location.href = '/loading?phase=nfo';
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        // For initial phase, we only show series_sync step
+        // For nfo phase, we only show nfo_scan step
+        function getStepsForPhase(phase) {
+            if (phase === 'nfo') {
+                return ['nfo_scan'];
+            }
+            return ['series_sync'];
+        }
+
+        function triggerNfoScanPhase() {
+            // Call API to trigger NFO scan phase
+            fetch('/api/setup/nfo-scan-phase', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            }).then(res => {
+                if (!res.ok) {
+                    console.error('Failed to trigger NFO scan phase');
+                }
+            }).catch(err => {
+                console.error('Error triggering NFO scan phase:', err);
+            });
+        }
+
         function connectWebSocket() {
             const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
             const wsUrl = `${protocol}//${window.location.host}/ws/connect`;
@@ -302,13 +366,24 @@
                 console.log('WebSocket connected');
                 updateConnectionStatus(true);
                 
-                // Subscribe to system room for progress updates
-                ws.send(JSON.stringify({
-                    action: 'join',
-                    data: {
-                        room: 'system'
-                    }
-                }));
+                // Subscribe to rooms based on phase
+                if (currentPhase === 'nfo') {
+                    // For nfo phase, only subscribe to scan room
+                    ws.send(JSON.stringify({
+                        action: 'join',
+                        data: {
+                            room: 'scan'
+                        }
+                    }));
+                } else {
+                    // For initial phase (series_sync), subscribe to system room
+                    ws.send(JSON.stringify({
+                        action: 'join',
+                        data: {
+                            room: 'system'
+                        }
+                    }));
+                }
             };
 
             ws.onmessage = (event) => {
@@ -353,6 +428,18 @@
             const data = message.data || message;
             const { type, status, title, message: msg, percent, current, total, metadata } = data;
 
+            // For NFO phase, all events go to handleNfoScanUpdate
+            if (currentPhase === 'nfo') {
+                handleNfoScanUpdate(data);
+                return;
+            }
+
+            // For initial phase (series_sync), skip NFO scan events
+            if (type === 'nfo_scan_started' || type === 'nfo_scan_progress' || type === 'nfo_scan_completed') {
+                // Ignore NFO scan events during initial phase
+                return;
+            }
+
             // Determine step ID based on type and metadata
             let stepId = metadata?.step_id || type;
 
@@ -363,9 +450,10 @@
 
             updateStep(stepId, status, msg, percent, current, total);
 
-            // Check for completion
-            if (metadata?.initialization_complete) {
-                showCompletion();
+            // Check for completion of series_sync
+            if (metadata?.initialization_complete || type === 'series_sync' && status === 'completed') {
+                // For initial phase, series_sync completion leads to /setup/unresolved
+                handleSeriesSyncComplete();
             }
 
             // Handle errors
@@ -373,6 +461,104 @@
                 showError(msg || 'An error occurred during initialization');
             }
         }
+        
+        function handleSeriesSyncComplete() {
+            isComplete = true;
+            document.getElementById('connectionStatus').style.display = 'none';
+            
+            if (ws) {
+                ws.close();
+            }
+            
+            // Clear the initial phase state
+            clearSetupPhase();
+            
+            // For initial phase, series_sync completion always leads to /setup/unresolved
+            // The unresolved page will handle checking if there are folders or redirect to nfo phase
+            window.location.href = '/setup/unresolved';
+        }
+
+        function handleNfoScanUpdate(data) {
+            const stepId = 'nfo_scan';
+            
+            if (!steps.has(stepId)) {
+                createStep(stepId, stepTitles[stepId] || 'Scanning NFO Files');
+            }
+            
+            const stepEl = steps.get(stepId);
+            if (!stepEl) return;
+            
+            const iconEl = stepEl.querySelector('.step-icon');
+            const statusEl = stepEl.querySelector('.step-status');
+            const messageEl = stepEl.querySelector('.step-message');
+            const progressEl = stepEl.querySelector('.step-progress');
+            const progressFillEl = stepEl.querySelector('.progress-bar-fill');
+            const progressTextEl = stepEl.querySelector('.progress-text');
+            
+            const nfoData = data.data || data;
+            const { status, message, current, total, key, folder, metadata } = nfoData;
+            
+            // Update status
+            stepEl.className = 'progress-step';
+            if (status === 'started') {
+                stepEl.classList.add('active');
+                iconEl.className = 'fas fa-circle-notch fa-spin step-icon loading';
+                statusEl.textContent = 'Starting...';
+            } else if (status === 'in_progress') {
+                stepEl.classList.add('active');
+                iconEl.className = 'fas fa-circle-notch fa-spin step-icon loading';
+                statusEl.textContent = 'In Progress...';
+            } else if (status === 'completed') {
+                stepEl.classList.add('completed');
+                iconEl.className = 'fas fa-check-circle step-icon completed';
+                statusEl.textContent = 'Complete';
+            } else if (status === 'failed') {
+                stepEl.classList.add('error');
+                iconEl.className = 'fas fa-exclamation-circle step-icon error';
+                statusEl.textContent = 'Failed';
+            }
+            
+            // Update message - show current folder being processed
+            if (message) {
+                messageEl.textContent = message;
+                messageEl.style.display = 'block';
+            } else if (key && folder) {
+                messageEl.textContent = `Processing: ${folder}`;
+                messageEl.style.display = 'block';
+            }
+            
+            // Update progress bar
+            if (current > 0 && total > 0) {
+                const actualPercent = (current / total) * 100;
+                progressEl.style.display = 'block';
+                progressFillEl.style.width = `${actualPercent}%`;
+                progressTextEl.textContent = `${current}/${total} series`;
+            } else if (percent > 0) {
+                progressEl.style.display = 'block';
+                progressFillEl.style.width = `${percent}%`;
+                progressTextEl.textContent = `${Math.round(percent)}%`;
+            }
+            
+            // Check for completion - handle based on phase
+            if (data.type === 'nfo_scan_completed' || metadata?.nfo_scan_complete) {
+                handleNfoPhaseComplete();
+            }
+        }
+        
+        function handleNfoPhaseComplete() {
+            isComplete = true;
+            document.getElementById('connectionStatus').style.display = 'none';
+            
+            if (ws) {
+                ws.close();
+            }
+            
+            // Clear the NFO phase state
+            clearSetupPhase();
+            
+            // For NFO phase, completion always goes to login
+            window.location.href = '/login';
+        }
 
         function createStep(stepId, title) {
             const container = document.getElementById('progressContainer');
@@ -468,12 +654,37 @@
 
         function showCompletion() {
             isComplete = true;
-            document.getElementById('completionMessage').style.display = 'block';
             document.getElementById('connectionStatus').style.display = 'none';
             
             if (ws) {
                 ws.close();
             }
+            
+            // Check for unresolved folders before showing completion
+            checkUnresolvedAndProceed();
+        }
+
+        async function checkUnresolvedAndProceed() {
+            // Always check for unresolved folders first
+            // After setup -> loading, always go through unresolved if there are any
+            try {
+                const token = localStorage.getItem('auth_token');
+                const res = await fetch('/api/setup/unresolved', {
+                    headers: { 'Authorization': `Bearer ${token}` }
+                });
+                if (res.ok) {
+                    const folders = await res.json();
+                    if (folders && folders.length > 0) {
+                        // Has unresolved folders - go to resolution page
+                        window.location.href = '/setup/unresolved';
+                        return;
+                    }
+                }
+            } catch (err) {
+                console.error('Failed to check unresolved folders:', err);
+            }
+            // No unresolved folders - go to login
+            window.location.href = '/login';
         }
 
         function showError(message) {
@@ -489,6 +700,27 @@
 
         // Start WebSocket connection when page loads
         document.addEventListener('DOMContentLoaded', () => {
+            // Validate state and redirect if there's a mismatch
+            if (!validateStateAndRedirect()) {
+                return; // Redirect in progress
+            }
+            
+            // Set up the correct state for this phase
+            if (currentPhase === 'nfo') {
+                setSetupPhase(SETUP_STATES.NFO);
+            } else {
+                setSetupPhase(SETUP_STATES.INITIAL);
+            }
+            
+            // Initialize the correct steps based on phase
+            const stepsForPhase = getStepsForPhase(currentPhase);
+            if (stepsForPhase.length === 1 && stepsForPhase[0] === 'nfo_scan') {
+                // For nfo phase, create the step and trigger the scan immediately
+                createStep('nfo_scan', stepTitles['nfo_scan']);
+                // Trigger NFO scan phase via API
+                triggerNfoScanPhase();
+            }
+            
             connectWebSocket();
         });
     </script>

src/server/web/templates/setup.html

@@ -790,18 +790,14 @@
                 const data = await response.json();
 
                 if (response.ok && data.status === 'ok') {
-                    // Redirect to loading page if provided, otherwise go to login
-                    if (data.redirect) {
-                        showMessage('Setup saved! Initializing your anime library...', 'success');
-                        setTimeout(() => {
-                            window.location.href = data.redirect;
-                        }, 500);
-                    } else {
-                        showMessage('Setup completed successfully! Redirecting to login...', 'success');
-                        setTimeout(() => {
-                            window.location.href = '/login';
-                        }, 2000);
-                    }
+                    // Always redirect to loading page with initial phase
+                    // The loading page will handle unresolved folder check
+                    showMessage('Setup saved! Initializing your anime library...', 'success');
+                    setTimeout(() => {
+                        // Set session storage state before redirecting
+                        sessionStorage.setItem('setup_phase', 'initial');
+                        window.location.href = '/loading?phase=initial';
+                    }, 500);
                 } else {
                     const errorMessage = data.detail || data.message || 'Setup failed';
                     showMessage(errorMessage, 'error');

src/server/web/templates/unresolved.html

@@ -0,0 +1,957 @@
+<!DOCTYPE html>
+<html lang="en" data-theme="light">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>AniWorld Manager - Resolve Series</title>
+    <link rel="stylesheet" href="/static/css/styles.css?v={{ static_v }}">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
+    <style>
+        .unresolved-container {
+            min-height: 100vh;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            background: linear-gradient(135deg, var(--color-primary-light) 0%, var(--color-primary) 100%);
+            padding: 2rem 1rem;
+        }
+
+        .unresolved-card {
+            background: var(--color-surface);
+            border-radius: 16px;
+            padding: 2rem;
+            box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
+            width: 100%;
+            max-width: 700px;
+            border: 1px solid var(--color-border);
+            max-height: 90vh;
+            overflow-y: auto;
+        }
+
+        .unresolved-header {
+            text-align: center;
+            margin-bottom: 2rem;
+        }
+
+        .unresolved-header .icon {
+            font-size: 3rem;
+            color: var(--color-warning);
+            margin-bottom: 0.5rem;
+        }
+
+        .unresolved-header h1 {
+            margin: 0;
+            color: var(--color-text);
+            font-size: 1.8rem;
+            font-weight: 600;
+        }
+
+        .unresolved-header p {
+            margin: 1rem 0 0 0;
+            color: var(--color-text-secondary);
+            font-size: 1rem;
+            line-height: 1.5;
+        }
+
+        .folder-list {
+            display: flex;
+            flex-direction: column;
+            gap: 1.5rem;
+        }
+
+        .folder-item {
+            background: var(--color-background);
+            border: 1px solid var(--color-border);
+            border-radius: var(--border-radius-lg);
+            padding: 1.25rem;
+            transition: all var(--transition-duration) var(--transition-easing);
+        }
+
+        .folder-item.resolving {
+            opacity: 0.7;
+            pointer-events: none;
+        }
+
+        .folder-item.resolved {
+            animation: fadeSlideOut 0.4s ease forwards;
+        }
+
+        @keyframes fadeSlideOut {
+            0% { opacity: 1; transform: translateY(0); max-height: 500px; }
+            100% { opacity: 0; transform: translateY(-10px); max-height: 0; padding: 0; margin: 0; border: 0; }
+        }
+
+        .folder-item-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-start;
+            margin-bottom: 1rem;
+        }
+
+        .folder-title {
+            font-size: 1.1rem;
+            font-weight: 600;
+            color: var(--color-text-primary);
+        }
+
+        .folder-year {
+            color: var(--color-text-secondary);
+            font-weight: normal;
+        }
+
+        .folder-attempts {
+            font-size: 0.8rem;
+            color: var(--color-text-tertiary);
+            margin-top: 0.25rem;
+        }
+
+        .folder-delete-btn {
+            background: none;
+            border: none;
+            color: var(--color-text-tertiary);
+            cursor: pointer;
+            padding: 0.25rem;
+            border-radius: var(--border-radius-sm);
+            transition: color var(--transition-duration);
+        }
+
+        .folder-delete-btn:hover {
+            color: var(--color-error);
+        }
+
+        .folder-input-row {
+            display: flex;
+            gap: 0.5rem;
+            margin-bottom: 0.75rem;
+        }
+
+        .folder-input {
+            flex: 1;
+            padding: 0.75rem 1rem;
+            border: 2px solid var(--color-border);
+            border-radius: var(--border-radius-md);
+            font-size: 0.95rem;
+            background: var(--color-surface);
+            color: var(--color-text);
+            transition: border-color var(--transition-duration);
+        }
+
+        .folder-input:focus {
+            outline: none;
+            border-color: var(--color-accent);
+        }
+
+        .folder-input::placeholder {
+            color: var(--color-text-tertiary);
+        }
+
+        .resolve-btn {
+            padding: 0.75rem 1.5rem;
+            background: var(--color-accent);
+            color: white;
+            border: none;
+            border-radius: var(--border-radius-md);
+            font-size: 0.95rem;
+            font-weight: 500;
+            cursor: pointer;
+            transition: all var(--transition-duration);
+            white-space: nowrap;
+        }
+
+        .resolve-btn:hover:not(:disabled) {
+            background: var(--color-accent-hover);
+        }
+
+        .resolve-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
+        .folder-suggestions {
+            margin-top: 0.75rem;
+        }
+
+        .suggestions-label {
+            font-size: 0.85rem;
+            color: var(--color-text-secondary);
+            margin-bottom: 0.5rem;
+            font-weight: 500;
+        }
+
+        .suggestion-list {
+            display: flex;
+            flex-direction: column;
+            gap: 0.35rem;
+        }
+
+        .suggestion-item {
+            display: flex;
+            align-items: center;
+            gap: 0.5rem;
+            font-size: 0.9rem;
+            color: var(--color-text-primary);
+        }
+
+        .suggestion-item i {
+            color: var(--color-accent);
+            font-size: 0.8rem;
+        }
+
+        .suggestion-link {
+            color: var(--color-accent);
+            text-decoration: none;
+        }
+
+        .suggestion-link:hover {
+            text-decoration: underline;
+        }
+
+        .no-suggestions {
+            display: flex;
+            align-items: center;
+            gap: 0.5rem;
+            font-size: 0.85rem;
+            color: var(--color-text-tertiary);
+        }
+
+        .search-again-btn {
+            background: none;
+            border: 1px solid var(--color-border);
+            color: var(--color-text-secondary);
+            padding: 0.4rem 0.8rem;
+            border-radius: var(--border-radius-md);
+            font-size: 0.8rem;
+            cursor: pointer;
+            transition: all var(--transition-duration);
+            margin-top: 0.5rem;
+        }
+
+        .search-again-btn:hover {
+            background: var(--color-surface-hover);
+            border-color: var(--color-accent);
+            color: var(--color-accent);
+        }
+
+        .search-again-btn.searching {
+            pointer-events: none;
+            opacity: 0.7;
+        }
+
+        .search-again-row {
+            display: flex;
+            gap: 0.5rem;
+            margin-top: 0.5rem;
+            align-items: center;
+        }
+
+        .search-again-input {
+            flex: 1;
+            padding: 0.5rem 0.75rem;
+            border: 1px solid var(--color-border);
+            border-radius: var(--border-radius-md);
+            font-size: 0.85rem;
+            background: var(--color-surface);
+            color: var(--color-text);
+        }
+
+        .search-again-input:focus {
+            outline: none;
+            border-color: var(--color-accent);
+        }
+
+        .search-again-row .search-again-btn {
+            margin-top: 0;
+        }
+
+        .search-again-btn.searching {
+            pointer-events: none;
+            opacity: 0.7;
+        }
+
+        .search-again-row {
+            display: flex;
+            gap: 0.5rem;
+            margin-top: 0.5rem;
+            align-items: center;
+        }
+
+        .search-again-input {
+            flex: 1;
+            padding: 0.5rem 0.75rem;
+            border: 1px solid var(--color-border);
+            border-radius: var(--border-radius-md);
+            font-size: 0.85rem;
+            background: var(--color-surface);
+            color: var(--color-text);
+        }
+
+        .search-again-input:focus {
+            outline: none;
+            border-color: var(--color-accent);
+        }
+
+        .search-again-row .search-again-btn {
+            margin-top: 0;
+        }
+
+        /* Empty state */
+        .empty-state {
+            text-align: center;
+            padding: 3rem 2rem;
+        }
+
+        .empty-state .icon {
+            font-size: 4rem;
+            color: var(--color-success);
+            margin-bottom: 1rem;
+        }
+
+        .empty-state h2 {
+            color: var(--color-success);
+            margin-bottom: 0.5rem;
+        }
+
+        .empty-state p {
+            color: var(--color-text-secondary);
+        }
+
+        /* Loading state */
+        .loading-state {
+            text-align: center;
+            padding: 2rem;
+        }
+
+        .spinner {
+            width: 2rem;
+            height: 2rem;
+            border: 3px solid var(--color-border);
+            border-top-color: var(--color-accent);
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+            margin: 0 auto 1rem;
+        }
+
+        @keyframes spin {
+            to { transform: rotate(360deg); }
+        }
+
+        /* Error state */
+        .folder-error {
+            color: var(--color-error);
+            font-size: 0.85rem;
+            margin-top: 0.5rem;
+            display: none;
+        }
+
+        .folder-error.visible {
+            display: block;
+        }
+
+        /* Toast container */
+        .toast-container {
+            position: fixed;
+            top: var(--spacing-xl);
+            right: var(--spacing-xl);
+            z-index: 1100;
+            display: flex;
+            flex-direction: column;
+            gap: var(--spacing-sm);
+        }
+
+        .toast {
+            background: var(--color-surface);
+            border: 1px solid var(--color-border);
+            border-radius: var(--border-radius-lg);
+            padding: var(--spacing-md) var(--spacing-lg);
+            box-shadow: var(--shadow-elevated);
+            min-width: 280px;
+            animation: slideIn 0.2s ease;
+        }
+
+        .toast.success { border-left: 4px solid var(--color-success); }
+        .toast.error { border-left: 4px solid var(--color-error); }
+        .toast.warning { border-left: 4px solid var(--color-warning); }
+
+        @keyframes slideIn {
+            from { transform: translateX(100%); opacity: 0; }
+            to { transform: translateX(0); opacity: 1; }
+        }
+
+        .theme-toggle {
+            position: absolute;
+            top: 1rem;
+            right: 1rem;
+            background: rgba(255, 255, 255, 0.1);
+            border: 1px solid rgba(255, 255, 255, 0.2);
+            color: white;
+            padding: 0.5rem;
+            border-radius: 50%;
+            cursor: pointer;
+            width: 2.5rem;
+            height: 2.5rem;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            transition: all 0.2s ease;
+        }
+
+        .theme-toggle:hover {
+            background: rgba(255, 255, 255, 0.2);
+            transform: scale(1.1);
+        }
+
+        .skip-link {
+            display: block;
+            text-align: center;
+            margin-top: 1.5rem;
+            color: var(--color-text-secondary);
+            font-size: 0.9rem;
+            text-decoration: none;
+        }
+
+        .skip-link:hover {
+            color: var(--color-text-primary);
+            text-decoration: underline;
+        }
+
+        .done-btn {
+            background: var(--color-success);
+            color: white;
+            border: none;
+            padding: 0.75rem 1.5rem;
+            border-radius: var(--border-radius-md);
+            font-size: 1rem;
+            font-weight: 600;
+            cursor: pointer;
+            transition: all var(--transition-duration);
+            display: none;
+        }
+
+        .done-btn:hover:not(:disabled) {
+            background: #27ae60;
+            transform: translateY(-2px);
+        }
+
+        .done-btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
+        .header-actions {
+            display: flex;
+            justify-content: center;
+            gap: 1rem;
+            margin-top: 1.5rem;
+        }
+
+        @media (max-width: 600px) {
+            .folder-input-row {
+                flex-direction: column;
+            }
+            .resolve-btn {
+                width: 100%;
+            }
+        }
+    </style>
+</head>
+
+<body>
+    <div class="unresolved-container">
+        <button class="theme-toggle" id="theme-toggle" title="Toggle theme">
+            <i class="fas fa-moon"></i>
+        </button>
+
+        <div class="unresolved-card">
+            <div class="unresolved-header">
+                <div class="icon">
+                    <i class="fas fa-folder-question"></i>
+                </div>
+                <h1>Resolve Unresolved Series</h1>
+                <p>Some series couldn't be found automatically. Enter the provider key for each folder to complete setup.</p>
+                <div class="header-actions">
+                    <button class="done-btn" id="done-btn" onclick="handleDone()">
+                        <i class="fas fa-check"></i> Done
+                    </button>
+                </div>
+            </div>
+
+            <div id="loading-state" class="loading-state">
+                <div class="spinner"></div>
+                <p>Loading unresolved folders...</p>
+            </div>
+
+            <div id="empty-state" class="empty-state" style="display: none;">
+                <div class="icon">
+                    <i class="fas fa-check-circle"></i>
+                </div>
+                <h2>All Series Configured!</h2>
+                <p>Redirecting to your anime library...</p>
+            </div>
+
+            <div id="folder-list" class="folder-list" style="display: none;"></div>
+
+            <a href="/" id="skip-link" class="skip-link" style="display: none;">
+                Skip and go to main app
+            </a>
+        </div>
+    </div>
+
+    <div id="toast-container" class="toast-container"></div>
+
+    <script>
+        // Theme toggle
+        const themeToggle = document.getElementById('theme-toggle');
+        const htmlElement = document.documentElement;
+        const savedTheme = localStorage.getItem('theme') || 'light';
+        htmlElement.setAttribute('data-theme', savedTheme);
+        updateThemeIcon(savedTheme);
+
+        themeToggle.addEventListener('click', () => {
+            const currentTheme = htmlElement.getAttribute('data-theme');
+            const newTheme = currentTheme === 'dark' ? 'light' : 'dark';
+            htmlElement.setAttribute('data-theme', newTheme);
+            localStorage.setItem('theme', newTheme);
+            updateThemeIcon(newTheme);
+        });
+
+        function updateThemeIcon(theme) {
+            const icon = themeToggle.querySelector('i');
+            icon.className = theme === 'dark' ? 'fas fa-sun' : 'fas fa-moon';
+        }
+
+        // Toast notification
+        function showToast(message, type = 'info') {
+            const container = document.getElementById('toast-container');
+            const toast = document.createElement('div');
+            toast.className = `toast ${type}`;
+            toast.textContent = message;
+            container.appendChild(toast);
+            setTimeout(() => {
+                toast.style.animation = 'slideIn 0.2s ease reverse';
+                setTimeout(() => toast.remove(), 200);
+            }, 3000);
+        }
+
+        // API client helpers
+        async function fetchUnresolved() {
+            // Note: /api/setup/unresolved does not require auth
+            // It's accessible during the initial setup flow
+            const token = localStorage.getItem('auth_token');
+            const headers = token ? { 'Authorization': `Bearer ${token}` } : {};
+            const res = await fetch('/api/setup/unresolved', { headers });
+            if (res.status === 401) {
+                // Redirect to login only if we had a token but it expired
+                localStorage.removeItem('auth_token');
+                window.location.href = '/login';
+                return null;
+            }
+            return res.json();
+        }
+
+        async function resolveFolder(folderName, providerKey) {
+            const token = localStorage.getItem('auth_token');
+            const encodedName = encodeURIComponent(folderName);
+            const res = await fetch(`/api/setup/unresolved/${encodedName}/resolve`, {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ provider_key: providerKey })
+            });
+            return res.json();
+        }
+
+        async function reSearchFolder(folderName, customQuery) {
+            const token = localStorage.getItem('auth_token');
+            const encodedName = encodeURIComponent(folderName);
+            const body = customQuery ? JSON.stringify({ query: customQuery }) : '{}';
+            const res = await fetch(`/api/setup/unresolved/${encodedName}/search`, {
+                method: 'POST',
+                headers: { 
+                    'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+                },
+                body: body
+            });
+            return res.json();
+        }
+
+        async function deleteFolder(folderName) {
+            const token = localStorage.getItem('auth_token');
+            const encodedName = encodeURIComponent(folderName);
+            const res = await fetch(`/api/setup/unresolved/${encodedName}`, {
+                method: 'DELETE',
+                headers: { 'Authorization': `Bearer ${token}` }
+            });
+            return res.json();
+        }
+
+        // Render functions
+        function renderFolderItem(folder) {
+            const suggestionsHtml = folder.search_suggestions && folder.search_suggestions.length > 0
+                ? folder.search_suggestions.map(s => `
+                    <div class="suggestion-item">
+                        <i class="fas fa-link"></i>
+                        <a href="#" class="suggestion-link" data-provider-key="${s.provider_key || s.key || ''}" data-folder="${folder.folder_name}">${s.name || s.title}</a>
+                    </div>
+                `).join('')
+                : '<div class="no-suggestions"><i class="fas fa-info-circle"></i> No suggestions found</div>';
+
+            // Always show search row so user can search multiple times
+            const searchAgainBtn = `<div class="search-again-row">
+                    <input type="text" class="search-again-input" 
+                           placeholder="Custom search..." 
+                           value="${folder.title || ''}"
+                           data-folder="${folder.folder_name}">
+                    <button class="search-again-btn" data-folder="${folder.folder_name}">
+                        <i class="fas fa-search"></i> Search Again
+                    </button>
+                   </div>`;
+
+            return `
+                <div class="folder-item" data-folder="${folder.folder_name}">
+                    <div class="folder-item-header">
+                        <div>
+                            <div class="folder-title">${folder.title}${folder.year ? ` <span class="folder-year">(${folder.year})</span>` : ''}</div>
+                            <div class="folder-attempts">${folder.search_attempts} search attempt${folder.search_attempts !== 1 ? 's' : ''}</div>
+                        </div>
+                        <button class="folder-delete-btn" data-folder="${folder.folder_name}" title="Remove without adding">
+                            <i class="fas fa-times"></i>
+                        </button>
+                    </div>
+                    <div class="folder-input-row">
+                        <input type="text" class="folder-input" 
+                               placeholder="Enter provider key (e.g., ooku-the-inner-chambers)"
+                               data-folder="${folder.folder_name}">
+                        <button class="resolve-btn" data-folder="${folder.folder_name}" disabled>
+                            Resolve
+                        </button>
+                    </div>
+                    <div class="folder-error" data-folder="${folder.folder_name}"></div>
+                    <div class="folder-suggestions">
+                        <div class="suggestions-label">Suggestions:</div>
+                        <div class="suggestion-list">
+                            ${suggestionsHtml}
+                        </div>
+                        ${searchAgainBtn}
+                    </div>
+                </div>
+            `;
+        }
+
+        function renderFolders(folders) {
+            const listEl = document.getElementById('folder-list');
+            const loadingEl = document.getElementById('loading-state');
+            const emptyEl = document.getElementById('empty-state');
+
+            loadingEl.style.display = 'none';
+
+            if (folders.length === 0) {
+                listEl.style.display = 'none';
+                emptyEl.style.display = 'block';
+                document.getElementById('skip-link').style.display = 'block';
+                // No unresolved folders - redirect to NFO scan phase
+                setTimeout(() => { 
+                    sessionStorage.setItem('setup_phase', 'nfo');
+                    window.location.href = '/loading?phase=nfo'; 
+                }, 2000);
+            } else {
+                listEl.style.display = 'flex';
+                emptyEl.style.display = 'none';
+                listEl.innerHTML = folders.map(renderFolderItem).join('');
+                attachFolderEvents();
+            }
+        }
+
+        function attachFolderEvents() {
+            // Input enable/disable resolve button
+            document.querySelectorAll('.folder-input').forEach(input => {
+                input.addEventListener('input', (e) => {
+                    const folder = e.target.dataset.folder;
+                    const btn = document.querySelector(`.resolve-btn[data-folder="${folder}"]`);
+                    btn.disabled = !e.target.value.trim();
+                    // Clear error
+                    const errEl = document.querySelector(`.folder-error[data-folder="${folder}"]`);
+                    errEl.classList.remove('visible');
+                    errEl.textContent = '';
+                });
+
+                // Enter key triggers resolve
+                input.addEventListener('keydown', (e) => {
+                    if (e.key === 'Enter') {
+                        const folder = e.target.dataset.folder;
+                        const btn = document.querySelector(`.resolve-btn[data-folder="${folder}"]`);
+                        if (!btn.disabled) btn.click();
+                    }
+                });
+            });
+
+            // Resolve button
+            document.querySelectorAll('.resolve-btn').forEach(btn => {
+                btn.addEventListener('click', async (e) => {
+                    const folder = e.target.dataset.folder;
+                    const input = document.querySelector(`.folder-input[data-folder="${folder}"]`);
+                    const item = document.querySelector(`.folder-item[data-folder="${folder}"]`);
+                    const errEl = document.querySelector(`.folder-error[data-folder="${folder}"]`);
+
+                    const providerKey = input.value.trim();
+                    if (!providerKey) return;
+
+                    item.classList.add('resolving');
+                    btn.disabled = true;
+                    btn.innerHTML = '<i class="fas fa-spinner fa-spin"></i>';
+
+                    try {
+                        const result = await resolveFolder(folder, providerKey);
+
+                        if (result.status === 'success') {
+                            showToast(`Added: ${result.message.replace('Successfully resolved and added series: ', '')}`, 'success');
+                            item.classList.add('resolved');
+                            setTimeout(() => {
+                                item.remove();
+                                checkEmptyList();
+                            }, 400);
+                        } else {
+                            errEl.textContent = result.detail || result.message || 'Failed to resolve';
+                            errEl.classList.add('visible');
+                            btn.disabled = false;
+                            btn.innerHTML = 'Resolve';
+                        }
+                    } catch (err) {
+                        errEl.textContent = 'Server error. Please try again.';
+                        errEl.classList.add('visible');
+                        btn.disabled = false;
+                        btn.innerHTML = 'Resolve';
+                    } finally {
+                        item.classList.remove('resolving');
+                    }
+                });
+            });
+
+            // Delete button
+            document.querySelectorAll('.folder-delete-btn').forEach(btn => {
+                btn.addEventListener('click', async (e) => {
+                    const folder = e.currentTarget.dataset.folder;
+                    const item = document.querySelector(`.folder-item[data-folder="${folder}"]`);
+
+                    if (!confirm('Remove this unresolved folder? You can add the series manually later.')) return;
+
+                    try {
+                        await deleteFolder(folder);
+                        item.classList.add('resolved');
+                        setTimeout(() => {
+                            item.remove();
+                            checkEmptyList();
+                        }, 400);
+                    } catch (err) {
+                        showToast('Failed to remove folder', 'error');
+                    }
+                });
+            });
+
+            // Search again button
+            document.querySelectorAll('.search-again-btn').forEach(btn => {
+                btn.addEventListener('click', async (e) => {
+                    const folder = e.target.dataset.folder || e.target.closest('button').dataset.folder;
+                    const item = document.querySelector(`.folder-item[data-folder="${folder}"]`);
+                    const searchInput = item.querySelector('.search-again-input');
+                    const customQuery = searchInput ? searchInput.value.trim() : null;
+
+                    btn.classList.add('searching');
+                    btn.innerHTML = '<i class="fas fa-spinner fa-spin"></i> Searching...';
+
+                    try {
+                        const result = await reSearchFolder(folder, customQuery);
+                        // Update suggestions in place
+                        const suggestionsEl = item.querySelector('.suggestion-list');
+                        if (result.search_suggestions && result.search_suggestions.length > 0) {
+                            suggestionsEl.innerHTML = result.search_suggestions.map(s => `
+                                <div class="suggestion-item">
+                                    <i class="fas fa-link"></i>
+                                    <a href="#" class="suggestion-link" data-provider-key="${s.provider_key || s.key || ''}" data-folder="${folder}">${s.name || s.title}</a>
+                                </div>
+                            `).join('');
+                        } else {
+                            suggestionsEl.innerHTML = '<div class="no-suggestions"><i class="fas fa-info-circle"></i> No suggestions found</div>';
+                        }
+                        // Keep search row visible for additional searches
+                        btn.classList.remove('searching');
+                        btn.innerHTML = '<i class="fas fa-search"></i> Search Again';
+                    } catch (err) {
+                        showToast('Search failed', 'error');
+                        btn.classList.remove('searching');
+                        btn.innerHTML = '<i class="fas fa-search"></i> Search Again';
+                    } finally {
+                        btn.classList.remove('searching');
+                    }
+                });
+            });
+
+            // Suggestion link click - populate input and resolve
+            document.querySelectorAll('.suggestion-link').forEach(link => {
+                link.addEventListener('click', async (e) => {
+                    e.preventDefault();
+                    const providerKey = e.target.dataset.providerKey;
+                    const folder = e.target.dataset.folder;
+                    
+                    if (!providerKey) {
+                        showToast('No provider key available for this suggestion', 'error');
+                        return;
+                    }
+                    
+                    const input = document.querySelector(`.folder-input[data-folder="${folder}"]`);
+                    const resolveBtn = document.querySelector(`.resolve-btn[data-folder="${folder}"]`);
+                    const item = document.querySelector(`.folder-item[data-folder="${folder}"]`);
+                    const errEl = document.querySelector(`.folder-error[data-folder="${folder}"]`);
+                    
+                    if (!input || !resolveBtn || !item) return;
+                    
+                    // Populate input and enable button
+                    input.value = providerKey;
+                    resolveBtn.disabled = false;
+                    
+                    // Trigger resolve
+                    item.classList.add('resolving');
+                    resolveBtn.disabled = true;
+                    resolveBtn.innerHTML = '<i class="fas fa-spinner fa-spin"></i>';
+                    
+                    try {
+                        const result = await resolveFolder(folder, providerKey);
+                        
+                        if (result.status === 'success') {
+                            showToast(`Added: ${result.message.replace('Successfully resolved and added series: ', '')}`, 'success');
+                            item.classList.add('resolved');
+                            setTimeout(() => {
+                                item.remove();
+                                checkEmptyList();
+                            }, 400);
+                        } else {
+                            errEl.textContent = result.detail || result.message || 'Failed to resolve';
+                            errEl.classList.add('visible');
+                            resolveBtn.disabled = false;
+                            resolveBtn.innerHTML = 'Resolve';
+                        }
+                    } catch (err) {
+                        errEl.textContent = 'Server error. Please try again.';
+                        errEl.classList.add('visible');
+                        resolveBtn.disabled = false;
+                        resolveBtn.innerHTML = 'Resolve';
+                    } finally {
+                        item.classList.remove('resolving');
+                    }
+                });
+            });
+        }
+
+        function checkEmptyList() {
+            const listEl = document.getElementById('folder-list');
+            const emptyEl = document.getElementById('empty-state');
+            const skipLink = document.getElementById('skip-link');
+            const doneBtn = document.getElementById('done-btn');
+
+            if (listEl.children.length === 0) {
+                listEl.style.display = 'none';
+                emptyEl.style.display = 'block';
+                skipLink.style.display = 'block';
+                showToast('All series configured!', 'success');
+                // All folders resolved - redirect to NFO scan phase
+                setTimeout(() => { 
+                    sessionStorage.setItem('setup_phase', 'nfo');
+                    window.location.href = '/loading?phase=nfo'; 
+                }, 2000);
+            }
+        }
+
+        async function completeUnresolved() {
+            const token = localStorage.getItem('auth_token');
+            const res = await fetch('/api/setup/unresolved/done', {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+                }
+            });
+            return res.json();
+        }
+
+        async function handleDone() {
+            const doneBtn = document.getElementById('done-btn');
+            doneBtn.disabled = true;
+            doneBtn.innerHTML = '<i class="fas fa-spinner fa-spin"></i> Processing...';
+
+            try {
+                const result = await completeUnresolved();
+                if (result.status === 'success') {
+                    showToast(result.message, 'success');
+                    // Clear unresolved state and set NFO phase before redirecting
+                    clearSetupPhase();
+                    setTimeout(() => { 
+                        sessionStorage.setItem('setup_phase', 'nfo');
+                        window.location.href = '/loading?phase=nfo'; 
+                    }, 1000);
+                } else {
+                    showToast(result.message || 'Failed to complete', 'error');
+                    doneBtn.disabled = false;
+                    doneBtn.innerHTML = '<i class="fas fa-check"></i> Done';
+                }
+            } catch (err) {
+                showToast('Server error. Please try again.', 'error');
+                doneBtn.disabled = false;
+                doneBtn.innerHTML = '<i class="fas fa-check"></i> Done';
+            }
+        }
+
+        // Show Done button when there are folders
+        function showDoneButton() {
+            const doneBtn = document.getElementById('done-btn');
+            doneBtn.style.display = 'inline-flex';
+        }
+
+        // State management for setup flow
+        function setSetupPhase(phase) {
+            sessionStorage.setItem('setup_phase', phase);
+        }
+
+        function clearSetupPhase() {
+            sessionStorage.removeItem('setup_phase');
+        }
+
+        function validateStateAndRedirect() {
+            const storedPhase = sessionStorage.getItem('setup_phase');
+            // If we have a stored phase that isn't 'unresolved', redirect appropriately
+            if (storedPhase && storedPhase !== 'unresolved') {
+                if (storedPhase === 'initial') {
+                    window.location.href = '/loading?phase=initial';
+                    return false;
+                } else if (storedPhase === 'nfo') {
+                    window.location.href = '/loading?phase=nfo';
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        // Init
+        (async function init() {
+            // Validate state and redirect if there's a mismatch
+            if (!validateStateAndRedirect()) {
+                return; // Redirect in progress
+            }
+            
+            // Set the unresolved phase state
+            setSetupPhase('unresolved');
+            
+            const folders = await fetchUnresolved();
+            if (folders !== null) {
+                renderFolders(folders);
+                if (folders.length > 0) {
+                    showDoneButton();
+                }
+            }
+        })();
+    </script>
+</body>
+
+</html>

tests/unit/test_initialization_service.py

@@ -320,6 +320,8 @@ class TestPerformInitialSetup:
              patch('src.server.services.initialization_service._mark_initial_scan_completed', 
                    new_callable=AsyncMock), \
              patch('src.server.services.initialization_service._load_series_into_memory', 
+                   new_callable=AsyncMock), \
+             patch('src.server.services.initialization_service.perform_nfo_scan_if_needed',
                    new_callable=AsyncMock):
             result = await perform_initial_setup()
         
@@ -339,6 +341,8 @@ class TestPerformInitialSetup:
              patch('src.server.services.initialization_service._mark_initial_scan_completed', 
                    new_callable=AsyncMock), \
              patch('src.server.services.initialization_service._load_series_into_memory', 
+                   new_callable=AsyncMock), \
+             patch('src.server.services.initialization_service.perform_nfo_scan_if_needed',
                    new_callable=AsyncMock):
             result = await perform_initial_setup(progress_service=mock_progress)
         

tests/unit/test_setup_service.py

@@ -67,7 +67,7 @@ class TestResolveKeyViaSearch:
         """Search returns 1 result with same name → returns key."""
         mock_series_app = AsyncMock()
         mock_series_app.search.return_value = [
-            {'key': 'attack-on-titan', 'name': 'Attack on Titan'}
+            {'title': 'Attack on Titan', 'link': '/anime/stream/attack-on-titan'}
         ]
 
         with patch(
@@ -97,8 +97,8 @@ class TestResolveKeyViaSearch:
         """Search returns >1 results → returns empty string."""
         mock_series_app = AsyncMock()
         mock_series_app.search.return_value = [
-            {'key': 'attack-on-titan', 'name': 'Attack on Titan'},
-            {'key': 'attack-on-titan-ova', 'name': 'Attack on Titan OVA'}
+            {'title': 'Attack on Titan', 'link': '/anime/stream/attack-on-titan'},
+            {'title': 'Attack on Titan OVA', 'link': '/anime/stream/attack-on-titan-ova'}
         ]
 
         with patch(
@@ -114,7 +114,7 @@ class TestResolveKeyViaSearch:
         """Search returns 1 result but name differs (case-insensitive) → returns empty string."""
         mock_series_app = AsyncMock()
         mock_series_app.search.return_value = [
-            {'key': 'attack-on-titan', 'name': 'Attack on Titan'}
+            {'title': 'Attack on Titan', 'link': '/anime/stream/attack-on-titan'}
         ]
 
         with patch(
@@ -153,19 +153,22 @@ class TestSetupServiceRun:
 
     @pytest.mark.asyncio
     async def test_creates_series_for_new_folders(self, tmp_path):
-        """Folders without DB entries → creates AnimeSeries records."""
+        """Folders without DB entries and single search match → creates AnimeSeries records.
+        
+        Note: This test verifies the logic flow when search returns a single match.
+        The actual search call goes through SeriesApp which uses run_in_executor,
+        so we test the flow with a resolved key being passed through.
+        """
         anime_dir = tmp_path / "anime"
         anime_dir.mkdir()
         (anime_dir / "Attack on Titan (2013)").mkdir()
-        (anime_dir / "OnePiece").mkdir()
-
-        mock_series_app = AsyncMock()
-        mock_series_app.search.return_value = []
 
         mock_db = AsyncMock()
         mock_get_db = MagicMock()
         mock_get_db.__aenter__.return_value = mock_db
         mock_get_db.__aexit__.return_value = None
+        mock_series_app = AsyncMock()
+        mock_series_app.search.return_value = []
 
         with patch(
             'src.server.services.setup_service.settings'
@@ -182,16 +185,32 @@ class TestSetupServiceRun:
                  'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
                  new_callable=AsyncMock, return_value=None
              ), \
+             patch(
+                 'src.server.services.setup_service.AnimeSeriesService.get_by_key',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
+                 new_callable=AsyncMock, return_value=None
+             ), \
              patch(
                  'src.server.services.setup_service.AnimeSeriesService.create',
                  new_callable=AsyncMock
              ) as mock_create:
             mock_settings.anime_directory = str(anime_dir)
+            
+            # Directly test the flow by patching _resolve_key_via_search
+            # to return a key (simulating successful search)
+            with patch.object(
+                SetupService, '_resolve_key_via_search',
+                new_callable=AsyncMock, return_value='attack-on-titan'
+            ):
+                result = await SetupService.run()
 
-            result = await SetupService.run()
-
-        assert result == 2
-        assert mock_create.call_count == 2
+        assert result == 1
+        mock_create.assert_called_once()
+        call_kwargs = mock_create.call_args.kwargs
+        assert call_kwargs['key'] == 'attack-on-titan'
 
     @pytest.mark.asyncio
     async def test_skips_existing_folders(self, tmp_path):
@@ -236,20 +255,21 @@ class TestSetupServiceRun:
 
     @pytest.mark.asyncio
     async def test_resolves_key_for_single_match(self, tmp_path):
-        """Single search match with same name → uses that key."""
+        """Single search match with same name → uses that key.
+        
+        This tests that when _resolve_key_via_search returns a key,
+        the series is created with that key.
+        """
         anime_dir = tmp_path / "anime"
         anime_dir.mkdir()
         (anime_dir / "Attack on Titan (2013)").mkdir()
 
-        mock_series_app = AsyncMock()
-        mock_series_app.search.return_value = [
-            {'key': 'attack-on-titan', 'name': 'Attack on Titan'}
-        ]
-
         mock_db = AsyncMock()
         mock_get_db = MagicMock()
         mock_get_db.__aenter__.return_value = mock_db
         mock_get_db.__aexit__.return_value = None
+        mock_series_app = AsyncMock()
+        mock_series_app.search.return_value = []
 
         with patch(
             'src.server.services.setup_service.settings'
@@ -266,13 +286,26 @@ class TestSetupServiceRun:
                  'src.server.services.setup_service.AnimeSeriesService.get_by_folder',
                  new_callable=AsyncMock, return_value=None
              ), \
+             patch(
+                 'src.server.services.setup_service.AnimeSeriesService.get_by_key',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
+                 new_callable=AsyncMock, return_value=None
+             ), \
              patch(
                  'src.server.services.setup_service.AnimeSeriesService.create',
                  new_callable=AsyncMock
              ) as mock_create:
             mock_settings.anime_directory = str(anime_dir)
-
-            await SetupService.run()
+            
+            # Simulate successful search returning a key
+            with patch.object(
+                SetupService, '_resolve_key_via_search',
+                new_callable=AsyncMock, return_value='attack-on-titan'
+            ):
+                await SetupService.run()
 
         # Verify create was called with resolved key
         call_kwargs = mock_create.call_args.kwargs
@@ -281,8 +314,8 @@ class TestSetupServiceRun:
         assert call_kwargs['year'] == 2013
 
     @pytest.mark.asyncio
-    async def test_empty_key_for_no_match(self, tmp_path):
-        """No search match → empty key."""
+    async def test_tracks_unresolved_when_no_match(self, tmp_path):
+        """No search match → tracks folder as unresolved, doesn't create series."""
         anime_dir = tmp_path / "anime"
         anime_dir.mkdir()
         (anime_dir / "Unknown Series (2020)").mkdir()
@@ -311,16 +344,28 @@ class TestSetupServiceRun:
                  new_callable=AsyncMock, return_value=None
              ), \
              patch(
-                 'src.server.services.setup_service.AnimeSeriesService.create',
+                 'src.server.services.setup_service.AnimeSeriesService.get_by_key',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.create',
                  new_callable=AsyncMock
-             ) as mock_create:
+             ) as mock_create_unresolved:
             mock_settings.anime_directory = str(anime_dir)
 
-            await SetupService.run()
+            result = await SetupService.run()
 
-        call_kwargs = mock_create.call_args.kwargs
-        assert call_kwargs['key'] == ''
-        assert call_kwargs['name'] == 'Unknown Series'
+        # Should return 0 since no series was created
+        assert result == 0
+        # Should track as unresolved instead of creating series
+        mock_create_unresolved.assert_called_once()
+        call_kwargs = mock_create_unresolved.call_args.kwargs
+        assert call_kwargs['folder_name'] == 'Unknown Series (2020)'
+        assert call_kwargs['title'] == 'Unknown Series'
         assert call_kwargs['year'] == 2020
 
     @pytest.mark.asyncio
@@ -381,15 +426,24 @@ class TestSetupServiceRun:
                  new_callable=AsyncMock, return_value=None
              ), \
              patch(
-                 'src.server.services.setup_service.AnimeSeriesService.create',
+                 'src.server.services.setup_service.AnimeSeriesService.get_by_key',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.get_by_folder_name',
+                 new_callable=AsyncMock, return_value=None
+             ), \
+             patch(
+                 'src.server.services.setup_service.UnresolvedFolderService.create',
                  new_callable=AsyncMock
-             ) as mock_create:
+             ) as mock_create_unresolved:
             mock_settings.anime_directory = str(anime_dir)
 
             result = await SetupService.run()
 
-        assert result == 1
-        mock_create.assert_called_once()
+        # Empty search results → folder tracked as unresolved, not created
+        assert result == 0
+        mock_create_unresolved.assert_called_once()
 
 
 class TestCheckNfoFile:

tests/unit/test_unresolved_folder_service.py

@@ -0,0 +1,244 @@
+"""Tests for UnresolvedFolderService and UnresolvedFolder model."""
+from datetime import datetime, timezone
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from src.server.database.models import UnresolvedFolder
+from src.server.database.service import UnresolvedFolderService
+
+
+class TestUnresolvedFolderModel:
+    """Test UnresolvedFolder model."""
+
+    def test_is_resolved_false_when_no_key(self):
+        """provider_key is None → is_resolved is False."""
+        folder = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            provider_key=None,
+            resolved_at=None,
+        )
+        assert folder.is_resolved is False
+
+    def test_is_resolved_false_when_key_but_no_timestamp(self):
+        """provider_key set but resolved_at is None → is_resolved is False."""
+        folder = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            provider_key="test-key",
+            resolved_at=None,
+        )
+        assert folder.is_resolved is False
+
+    def test_is_resolved_true_when_both_set(self):
+        """Both provider_key and resolved_at set → is_resolved is True."""
+        folder = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            provider_key="test-key",
+            resolved_at=datetime.now(timezone.utc),
+        )
+        assert folder.is_resolved is True
+
+    def test_validate_folder_name_empty_raises(self):
+        """Empty folder_name → raises ValueError during construction."""
+        with pytest.raises(ValueError, match="Folder name cannot be empty"):
+            UnresolvedFolder(
+                folder_name="",
+                title="Test",
+            )
+
+    def test_validate_folder_name_too_long_raises(self):
+        """Folder name > 1000 chars → raises ValueError during construction."""
+        long_name = "x" * 1001
+        with pytest.raises(ValueError, match="Folder name must be 1000 characters"):
+            UnresolvedFolder(
+                folder_name=long_name,
+                title="Test",
+            )
+
+    def test_validate_title_empty_raises(self):
+        """Empty title → raises ValueError during construction."""
+        with pytest.raises(ValueError, match="Title cannot be empty"):
+            UnresolvedFolder(
+                folder_name="Test (2020)",
+                title="",
+            )
+
+
+class TestUnresolvedFolderService:
+    """Test UnresolvedFolderService methods."""
+
+    @pytest.mark.asyncio
+    async def test_create(self):
+        """Creates a new unresolved folder record."""
+        mock_db = AsyncMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        folder = await UnresolvedFolderService.create(
+            db=mock_db,
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            search_attempts=1,
+        )
+
+        assert folder.folder_name == "Test (2020)"
+        assert folder.title == "Test"
+        assert folder.year == 2020
+        assert folder.search_attempts == 1
+        mock_db.add.assert_called_once()
+        mock_db.flush.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_get_by_folder_name_found(self):
+        """Found → returns UnresolvedFolder."""
+        mock_db = AsyncMock()
+        mock_result = MagicMock()
+        mock_result.scalar_one_or_none.return_value = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+        )
+        mock_db.execute.return_value = mock_result
+
+        folder = await UnresolvedFolderService.get_by_folder_name(mock_db, "Test (2020)")
+
+        assert folder is not None
+        assert folder.folder_name == "Test (2020)"
+
+    @pytest.mark.asyncio
+    async def test_get_by_folder_name_not_found(self):
+        """Not found → returns None."""
+        mock_db = AsyncMock()
+        mock_result = MagicMock()
+        mock_result.scalar_one_or_none.return_value = None
+        mock_db.execute.return_value = mock_result
+
+        folder = await UnresolvedFolderService.get_by_folder_name(mock_db, "Unknown")
+
+        assert folder is None
+
+    @pytest.mark.asyncio
+    async def test_get_all_unresolved(self):
+        """Returns only unresolved folders (no provider_key)."""
+        mock_db = AsyncMock()
+        mock_result = MagicMock()
+        mock_result.scalars.return_value.all.return_value = [
+            UnresolvedFolder(folder_name="Folder1", title="Title1", year=2020),
+            UnresolvedFolder(folder_name="Folder2", title="Title2", year=2021),
+        ]
+        mock_db.execute.return_value = mock_result
+
+        folders = await UnresolvedFolderService.get_all_unresolved(mock_db)
+
+        assert len(folders) == 2
+        mock_db.execute.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_resolve(self):
+        """Marks folder as resolved with provider_key."""
+        mock_db = AsyncMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        existing = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            provider_key=None,
+            resolved_at=None,
+        )
+
+        with patch.object(
+            UnresolvedFolderService, 'get_by_folder_name',
+            new_callable=AsyncMock, return_value=existing
+        ):
+            result = await UnresolvedFolderService.resolve(
+                mock_db, "Test (2020)", "test-key"
+            )
+
+        assert result.provider_key == "test-key"
+        assert result.resolved_at is not None
+        mock_db.flush.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_resolve_not_found(self):
+        """Folder not found → returns None."""
+        mock_db = AsyncMock()
+
+        with patch.object(
+            UnresolvedFolderService, 'get_by_folder_name',
+            new_callable=AsyncMock, return_value=None
+        ):
+            result = await UnresolvedFolderService.resolve(
+                mock_db, "Unknown", "test-key"
+            )
+
+        assert result is None
+
+    @pytest.mark.asyncio
+    async def test_delete(self):
+        """Deletes unresolved folder record."""
+        mock_db = AsyncMock()
+        mock_db.flush = AsyncMock()
+
+        existing = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+        )
+
+        with patch.object(
+            UnresolvedFolderService, 'get_by_folder_name',
+            new_callable=AsyncMock, return_value=existing
+        ):
+            result = await UnresolvedFolderService.delete(mock_db, "Test (2020)")
+
+        assert result is True
+        mock_db.delete.assert_called_once_with(existing)
+        mock_db.flush.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_delete_not_found(self):
+        """Folder not found → returns False."""
+        mock_db = AsyncMock()
+
+        with patch.object(
+            UnresolvedFolderService, 'get_by_folder_name',
+            new_callable=AsyncMock, return_value=None
+        ):
+            result = await UnresolvedFolderService.delete(mock_db, "Unknown")
+
+        assert result is False
+
+    @pytest.mark.asyncio
+    async def test_update_search_result(self):
+        """Increments search_attempts and updates last_search_result."""
+        mock_db = AsyncMock()
+        mock_db.flush = AsyncMock()
+        mock_db.refresh = AsyncMock()
+
+        existing = UnresolvedFolder(
+            folder_name="Test (2020)",
+            title="Test",
+            year=2020,
+            search_attempts=1,
+            last_search_result=None,
+        )
+
+        with patch.object(
+            UnresolvedFolderService, 'get_by_folder_name',
+            new_callable=AsyncMock, return_value=existing
+        ):
+            result = await UnresolvedFolderService.update_search_result(
+                mock_db, "Test (2020)", '[{"title": "Test"}]'
+            )
+
+        assert result.search_attempts == 2
+        assert result.last_search_result == '[{"title": "Test"}]'