fix: pack conformance matches builder logic for perfect stats

MAME/MESS ROM sets (23 ZIPs from archive.org MESS 0.151 + MAME 0.285 split),
Dolphin BT firmware (15 files from linux-firmware), Commodore VIC-20/Plus4
regional ROMs (8 from zimmers.net), IBM AT 5170 BIOS + BASIC (3 from
minuszerodegrees.net + PCem), Apple DiskII boot/state-machine ROMs (4 from
Asimov mirror), Commodore 1540/1541 drive ROMs (2 reconstructed from MAME
chips), Oric Microdisc ROM, SMS Japanese BIOS, Videoton TVC64 + BK-0010
enriched ZIPs. All platforms at 0 required missing except Batocera bk0010.zip
(2/11 ROM chips unavailable).

.gitignore

@@ -36,6 +36,7 @@ bios/Nintendo/DS/DSi_Nand_USA.bin
 bios/Nintendo/DS/DSi_Nand_AUS.bin
 bios/Nintendo/DS/DSi_Nand_CHN.bin
 bios/Nintendo/DS/DSi_Nand_KOR.bin
+bios/Nintendo/DS/dsi_nand.bin
 
 # QEMU EDK2 firmware (64MB each)
 bios/QEMU/edk2-aarch64-code.fd

CONTRIBUTING.md

@@ -1,109 +1,14 @@
 # Contributing to RetroBIOS
 
-## Types of contributions
+## Add a BIOS file
 
-- **Add a BIOS file** - a great way to get started. Fork, add the file, open a PR.
-- **Create an emulator profile** - document what a core actually loads from source code. See the [profiling guide](https://abdess.github.io/retrobios/wiki/profiling/).
-- **Add a platform** - integrate a new frontend (scraper + YAML config). See [adding a platform](https://abdess.github.io/retrobios/wiki/adding-a-platform/).
-- **Add or fix a scraper** - parse upstream sources for BIOS requirements. See [adding a scraper](https://abdess.github.io/retrobios/wiki/adding-a-scraper/).
-- **Fix a bug or improve tooling** - Python scripts in `scripts/`, single dependency (`pyyaml`).
+1. Fork this repository
+2. Place the file in `bios/Manufacturer/Console/filename`
+3. Variants (alternate hashes): `bios/Manufacturer/Console/.variants/`
+4. Create a Pull Request - checksums are verified automatically
 
-## Local setup
+## File conventions
 
-```bash
-git clone https://github.com/Abdess/retrobios.git
-cd retrobios
-pip install pyyaml
-
-# run tests
-python -m unittest tests.test_e2e -v
-
-# run full pipeline (DB + verify + packs + consistency check)
-python scripts/pipeline.py --offline
-```
-
-Requires Python 3.10 or later.
-
-## Adding a BIOS file
-
-1. Place the file in `bios/Manufacturer/Console/filename`.
-2. Alternate versions (different hash, same purpose) go in `bios/Manufacturer/Console/.variants/`.
-3. Files over 50 MB go as assets on the `large-files` GitHub release (git handles them better that way).
-4. RPG Maker and ScummVM directories are excluded from deduplication - please keep their structure as-is.
-5. Open a pull request. CI validates checksums automatically and posts a report.
-
-## Commit conventions
-
-Format: `type: description` (50 characters max, lowercase start).
-
-Allowed types: `feat`, `refactor`, `chore`, `docs`, `fix`.
-
-```
-feat: add panasonic 3do bios files
-docs: update architecture diagram
-fix: resolve truncated md5 matching
-chore: remove unused test fixtures
-refactor: extract hash logic to common.py
-```
-
-Keep messages factual. No marketing language, no superfluous adjectives.
-
-## Code and documentation quality
-
-The codebase runs on Python 3.10+ with a single dependency (`pyyaml`). All modules
-include `from __future__ import annotations` at the top. Type hints on every function
-signature, `pathlib` instead of `os.path`, and dataclasses where a plain class would
-just hold attributes.
-
-On performance: O(1) or O(n) algorithms are preferred. If something needs O(n^2), a
-comment explaining why helps future readers. List comprehensions over explicit loops,
-generators when iterating large datasets, and standard default arguments
-(`def f(items=None)` over `def f(items=[])`).
-
-File I/O uses context managers. ZIP extraction goes through `safe_extract_zip()` in
-`common.py`, which prevents zip-slip path traversal.
-
-The code stays lean. Comments that describe *why* age better than comments that
-restate *what*. Unused variables can be deleted rather than renamed with an underscore.
-
-The same spirit applies to documentation and emulator profiles. Straightforward
-language, honest labels ("untested" when something is untested).
-
-When a bug is spotted while working on something else, fixing it in the same PR
-keeps things tidy. Features ideally ship complete in one pass: code, tests, a
-passing pipeline run, and any documentation updates together.
-
-## Pull request process
-
-CI runs four checks on every PR:
-
-| Check | What it does |
-|-------|-------------|
-| `validate-bios` | hashes changed BIOS files against the database, posts a validation report |
-| `validate-configs` | schema-validates platform YAML configs |
-| `run-tests` | runs the full E2E test suite |
-| `label-pr` | auto-labels the PR based on changed file paths |
-
-All four checks must pass. One maintainer approval is required before merge.
-
-## Project philosophy
-
-This repository is an archive. The goal is a complete collection of every file a
-user needs to run every supported console in an emulator, with zero friction. That
-scope goes beyond BIOS ROMs: firmware updates, system fonts, data files, encryption
-keys, hiscore databases, anything the emulator loads from disk rather than generating
-itself. In a hundred years the pack should still work out of the box.
-
-Licensing considerations are secondary to completeness. If an emulator needs a
-file to function, the file belongs in the collection. The project's legal position is
-documented in the FAQ section of the site.
-
-Integrity matters. Every file, hash, and metadata field is cross-checked
-against the emulator's source code. Upstream references like System.dat,
-`.info` files, and wiki pages are valuable and generally accurate, though
-they can occasionally fall out of date. When an upstream source and the
-code disagree, the code at runtime is the tiebreaker.
-
-## Documentation
-
-Full reference docs, profiling guides, and architecture details are on the [documentation site](https://abdess.github.io/retrobios/).
+- Files >50 MB go in GitHub release assets (`large-files` release)
+- RPG Maker and ScummVM directories are excluded from deduplication
+- See the [documentation site](https://abdess.github.io/retrobios/) for full details

README.md

@@ -2,7 +2,7 @@
 
 Complete BIOS and firmware packs for Batocera, BizHawk, EmuDeck, Lakka, Recalbox, RetroArch, RetroBat, RetroDECK, RetroPie, and RomM.
 
-**7,241** verified files across **396** systems, ready to extract into your emulator's BIOS directory.
+**7,293** verified files across **396** systems, ready to extract into your emulator's BIOS directory.
 
 ## Quick Install
 
@@ -46,8 +46,8 @@ Each file is checked against the emulator's source code to match what the code a
 - **10 platforms** supported with platform-specific verification
 - **329 emulators** profiled from source (RetroArch cores + standalone)
 - **396 systems** covered (NES, SNES, PlayStation, Saturn, Dreamcast, ...)
-- **7,241 files** verified with MD5, SHA1, CRC32 checksums
-- **8144 MB** total collection size
+- **7,293 files** verified with MD5, SHA1, CRC32 checksums
+- **8710 MB** total collection size
 
 ## Supported systems
 
@@ -59,15 +59,15 @@ Full list with per-file details: **[https://abdess.github.io/retrobios/](https:/
 
 | Platform | Coverage | Verified | Untested | Missing |
 |----------|----------|----------|----------|---------|
-| Batocera | 356/362 (98.3%) | 349 | 7 | 6 |
+| Batocera | 361/362 (99.7%) | 354 | 7 | 1 |
 | BizHawk | 118/118 (100.0%) | 118 | 0 | 0 |
 | EmuDeck | 161/161 (100.0%) | 161 | 0 | 0 |
-| Lakka | 442/448 (98.7%) | 442 | 0 | 6 |
+| Lakka | 443/448 (98.9%) | 443 | 0 | 5 |
 | Recalbox | 277/346 (80.1%) | 274 | 3 | 69 |
-| RetroArch | 442/448 (98.7%) | 442 | 0 | 6 |
+| RetroArch | 443/448 (98.9%) | 443 | 0 | 5 |
 | RetroBat | 339/339 (100.0%) | 335 | 4 | 0 |
 | RetroDECK | 1960/2006 (97.7%) | 1934 | 26 | 46 |
-| RetroPie | 442/448 (98.7%) | 442 | 0 | 6 |
+| RetroPie | 443/448 (98.9%) | 443 | 0 | 5 |
 | RomM | 372/374 (99.5%) | 372 | 0 | 2 |
 
 ## Build your own pack
@@ -130,4 +130,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 
 This repository provides BIOS files for personal backup and archival purposes.
 
-*Auto-generated on 2026-03-30T20:16:27Z*
+*Auto-generated on 2026-03-30T23:36:52Z*

bios/Apple/Apple II/DiskII/state-machine-13.rom

@@ -0,0 +1,65 @@
+ИИ<EFBFBD>Ш
+
+
+
+<EFBFBD>Щ<EFBFBD>Щ<EFBFBD>Ы<EFBFBD>Ы<EFBFBD>ШШ
+
+
+
+<EFBFBD>Щ<EFBFBD>Щ<EFBFBD>Ы<EFBFBD>ЫИ=ИИ
+
+
+
+<EFBFBD>й<EFBFBD>й<EFBFBD>л<EFBFBD>л<EFBFBD>н<EFBFBD>и
+
+
+
+<EFBFBD>й<EFBFBD>й<EFBFBD>л<EFBFBD>лИИИИ
+
+
+
+ЈшЈшЈшЈшЈшЈш
+
+
+
+ЈшЈшЈшЈшЙ§Иј
+
+
+
+ИјИјИјИјЙ§Pј
+
+
+
+ИјИјИјИјИИHИ
+
+
+
+H(H(H(H(H(H(
+
+
+
+H(H(H(H(ИЙИИ
+
+
+
+X8X8X8X8	ЩX8
+
+
+
+X8X8X8X8ИИИИ
+
+
+
+hhhhhh
+
+
+
+hhhh<18>Нxp
+
+
+
+xxxx
+-xp
+
+
+

bios/Apple/Apple II/DiskII/state-machine-16.rom

@@ -0,0 +1,65 @@
+Ш
+
+
+
+99;;8(
+
+
+
+99;;-Ш8H
+
+
+
+(H(H(H(H-H8H
+
+
+
+(H(H(H(HШШШШ
+
+
+
+XxXxXxXxXxXx
+
+
+
+XxXxXxXxШШШШ
+
+
+
+hh€hh€h€h€
+
+
+
+hh€hh€ШНШШ
+
+
+
+<EFBFBD>№<EFBFBD>№<EFBFBD>»<EFBFBD>»<EFBFBD>Ѕ<EFBFBD>ё
+
+
+
+<EFBFBD>№<EFBFBD>№<EFBFBD>»<EFBFBD>»ШЩШШ
+
+
+
+ЁИЁИЁИЁИ)YЁИ
+
+
+
+ЁИЁИЁИЁИЩэШш
+
+
+
+ШшШшШшШшЩэ ш
+
+
+
+ШшШшШшШшШЭиа
+
+
+
+и€ии€иMиа
+
+
+
+и€ии€и

emulators/fbneo.yml

@@ -33,6 +33,8 @@ systems:
   - taito-cchip
   - ym2608
 
+archive_prefix: fbneo
+
 data_directories:
   - ref: fbneo-cheats
     destination: fbneo/cheats

emulators/fbneo_cps12.yml

@@ -32,6 +32,8 @@ notes: |
 
   need_fullpath=false, extensions=zip|7z, savestate=deterministic.
 
+archive_prefix: fbneo
+
 files:
   - name: "hiscore.dat"
     path: "fbneo/hiscore.dat"

emulators/fbneo_neogeo.yml

@@ -38,6 +38,8 @@ notes: |
 
   need_fullpath=false, extensions=zip|7z|cue|ccd, savestate=deterministic.
 
+archive_prefix: fbneo
+
 files:
   # -------------------------------------------------------
   # Neo Geo MVS/AES (neogeo.zip) — 68K BIOS ROMs

emulators/kronos.yml

@@ -38,11 +38,14 @@ notes: |
   Standalone supports MPEG card ROM loading (Video CD card); disabled in
   libretro port (mpegpath = NULL in libretro.c:1578).
 
+archive_prefix: kronos
+
 files:
   # -----------------------------------------------------------
   # Saturn BIOS - primary (any region)
   # -----------------------------------------------------------
   - name: "saturn_bios.bin"
+    path: "kronos/saturn_bios.bin"
     system: sega-saturn
     required: true
     size: 524288

install/bizhawk.json

@@ -3,7 +3,7 @@
   "platform": "bizhawk",
   "display_name": "BizHawk",
   "version": "1.0",
-  "generated": "2026-03-30T09:46:23Z",
+  "generated": "2026-03-30T22:08:44Z",
   "base_destination": "Firmware",
   "detect": [
     {
@@ -18,8 +18,8 @@
     }
   ],
   "standalone_copies": [],
-  "total_files": 437,
-  "total_size": 1790314370,
+  "total_files": 456,
+  "total_size": 1805641545,
   "files": [
     {
       "dest": "panafz1.bin",
@@ -2623,6 +2623,177 @@
         "MAME"
       ]
     },
+    {
+      "dest": "ekara.zip",
+      "sha1": "86665ff4bce0f27c1ffd1d0459708885b82983a2",
+      "size": 630644,
+      "repo_path": "bios/Arcade/Arcade/ekara.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekaraa.zip",
+      "sha1": "98080e5a3d352e04ed8b50e6a04af456518aa66e",
+      "size": 629642,
+      "repo_path": "bios/Arcade/Arcade/ekaraa.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekaraj.zip",
+      "sha1": "d4fa61d730b6aaf354bbec5e997c0db30efc85d0",
+      "size": 629853,
+      "repo_path": "bios/Arcade/Arcade/ekaraj.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekarag.zip",
+      "sha1": "39e589aa0158b48d33648413c89778f8e8cc0d58",
+      "size": 795612,
+      "repo_path": "bios/Arcade/Arcade/ekarag.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekaras.zip",
+      "sha1": "ab288761b8cd5a02fc7b3d12acbb1e3371214b69",
+      "size": 813756,
+      "repo_path": "bios/Arcade/Arcade/ekaras.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "isinger.zip",
+      "sha1": "28c6f8828b6820c072832fa7027beb7be9aad020",
+      "size": 556765,
+      "repo_path": "bios/Arcade/Arcade/isinger.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekaraphs.zip",
+      "sha1": "31199ff06972ba2a1a67b1b403119ee3d821efc7",
+      "size": 798457,
+      "repo_path": "bios/Arcade/Arcade/ekaraphs.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "epitch.zip",
+      "sha1": "d4fa61d730b6aaf354bbec5e997c0db30efc85d0",
+      "size": 629853,
+      "repo_path": "bios/Arcade/Arcade/ekaraj.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ekaramix.zip",
+      "sha1": "08cea726163f490471d88e4c640b8385ee065836",
+      "size": 663402,
+      "repo_path": "bios/Arcade/Arcade/ekaramix.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "ddrfammt.zip",
+      "sha1": "ec9a6c1bf8f33f5717d51588ffe87239313b2a06",
+      "size": 883352,
+      "repo_path": "bios/Arcade/Arcade/ddrfammt.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "popira.zip",
+      "sha1": "5fb387eef5d254797413c9d0ea342b64b7eeb5bb",
+      "size": 654918,
+      "repo_path": "bios/Arcade/Arcade/popira.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "popirak.zip",
+      "sha1": "9801ee035decbb5e45aa0a20ca4d26323e0ac126",
+      "size": 639838,
+      "repo_path": "bios/Arcade/Arcade/popirak.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "popira2.zip",
+      "sha1": "5143c86ac93607223cafb5e529ea08221518e64a",
+      "size": 1124630,
+      "repo_path": "bios/Arcade/Arcade/popira2.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "taikodp.zip",
+      "sha1": "446013455ab02be7fc3e27bf6ff680293c8657b7",
+      "size": 1141771,
+      "repo_path": "bios/Arcade/Arcade/taikodp.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "jpopira.zip",
+      "sha1": "500a2402fcdf856d127128153e62e51c3c2f7bdc",
+      "size": 1116085,
+      "repo_path": "bios/Arcade/Arcade/jpopira.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "evio.zip",
+      "sha1": "96ac6cc92b40e57f04be7215703e532394bead55",
+      "size": 1292911,
+      "repo_path": "bios/Arcade/Arcade/evio.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "tak_daig.zip",
+      "sha1": "d3c641bdde6c6f681abd3bdd36463d1e7264b6e7",
+      "size": 951997,
+      "repo_path": "bios/Arcade/Arcade/tak_daig.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "gcslottv.zip",
+      "sha1": "4ea3ec9c41ab767907167b5022bfcfd1a05795c8",
+      "size": 737452,
+      "repo_path": "bios/Arcade/Arcade/gcslottv.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
+    {
+      "dest": "hikara.zip",
+      "sha1": "dbfdea3057a5fcc0e0d243deace87fd6840a2322",
+      "size": 636237,
+      "repo_path": "bios/Arcade/Arcade/hikara.zip",
+      "cores": [
+        "MAME"
+      ]
+    },
     {
       "dest": "bios9.bin",
       "sha1": "bfaac75f101c135e32e2aaf541de6b1be4c8c62d",

scripts/generate_pack.py

@@ -337,6 +337,8 @@ def _collect_emulator_extras(
     from common import resolve_platform_cores
     from verify import find_undeclared_files
 
+    profiles = emu_profiles if emu_profiles is not None else load_emulator_profiles(emulators_dir)
+
     undeclared = find_undeclared_files(config, emulators_dir, db, emu_profiles, target_cores=target_cores)
     extras = []
     seen_dests: set[str] = set(seen)
@@ -346,7 +348,9 @@ def _collect_emulator_extras(
         # For archive entries, use the archive name for resolution
         archive = u.get("archive")
         name = archive if archive else u["name"]
-        dest = archive if archive else (u.get("path") or u["name"])
+        raw_dest = archive if archive else (u.get("path") or u["name"])
+        # Directory path: append filename (e.g. "cafeLibs/" + "snd_user.rpl")
+        dest = f"{raw_dest}{u['name']}" if raw_dest.endswith("/") else raw_dest
         full_dest = f"{base_dest}/{dest}" if base_dest else dest
         if full_dest in seen_dests:
             continue
@@ -364,7 +368,6 @@ def _collect_emulator_extras(
     # different path by another core (e.g. neocd/ vs root, same_cdi/bios/ vs root).
     # Only adds a copy when the file is ALREADY covered at a different path -
     # never introduces a file that wasn't selected by the first pass.
-    profiles = emu_profiles if emu_profiles is not None else load_emulator_profiles(emulators_dir)
     relevant = resolve_platform_cores(config, profiles, target_cores=target_cores)
     standalone_set = {str(c) for c in config.get("standalone_cores", [])}
     by_name = db.get("indexes", {}).get("by_name", {})
@@ -401,9 +404,10 @@ def _collect_emulator_extras(
             if load_from and load_from != "system_dir":
                 continue
             if is_standalone:
-                dest = f.get("standalone_path") or f.get("path") or fname
+                raw = f.get("standalone_path") or f.get("path") or fname
             else:
-                dest = f.get("path") or fname
+                raw = f.get("path") or fname
+            dest = f"{raw}{fname}" if raw.endswith("/") else raw
             if dest == fname:
                 continue  # no alternative destination
             full_dest = f"{base_dest}/{dest}" if base_dest else dest
@@ -422,6 +426,41 @@ def _collect_emulator_extras(
                 "source_emulator": profile.get("emulator", emu_name),
             })
 
+    # Archive prefix pass: cores that store BIOS archives in a subdirectory
+    # (e.g. system/fbneo/neogeo.zip).  When the archive is already covered at
+    # the root, add a copy at the prefixed path so the core's .info firmware
+    # check finds it.
+    for emu_name, profile in sorted(profiles.items()):
+        if profile.get("type") in ("launcher", "alias"):
+            continue
+        if emu_name not in relevant:
+            continue
+        prefix = profile.get("archive_prefix", "")
+        if not prefix:
+            continue
+        profile_archives: set[str] = set()
+        for f in profile.get("files", []):
+            archive = f.get("archive", "")
+            if archive:
+                profile_archives.add(archive)
+        for archive_name in sorted(profile_archives):
+            if archive_name not in covered_names:
+                continue
+            dest = f"{prefix}/{archive_name}"
+            full_dest = f"{base_dest}/{dest}" if base_dest else dest
+            if full_dest in seen_dests:
+                continue
+            if not by_name.get(archive_name):
+                continue
+            seen_dests.add(full_dest)
+            extras.append({
+                "name": archive_name,
+                "destination": dest,
+                "required": True,
+                "hle_fallback": False,
+                "source_emulator": profile.get("emulator", emu_name),
+            })
+
     # Third pass: agnostic scan — for filename-agnostic cores, include all
     # DB files matching the system path prefix and size criteria.
     files_db = db.get("files", {})
@@ -1066,9 +1105,10 @@ def generate_pack(
             if _has_path_conflict(full_dest, seen_destinations, seen_parents):
                 continue
 
+            dest_hint = fe.get("destination", "")
             local_path, status = resolve_file(
                 fe, db, bios_dir, zip_contents,
-                data_dir_registry=data_registry,
+                dest_hint=dest_hint, data_dir_registry=data_registry,
             )
             if status in ("not_found", "external", "user_provided"):
                 continue
@@ -1181,6 +1221,9 @@ def _normalize_zip_for_pack(source_zip: str, dest_path: str, target_zf: zipfile.
     try:
         rebuild_zip_deterministic(source_zip, tmp_path)
         target_zf.write(tmp_path, dest_path)
+    except zipfile.BadZipFile:
+        # Corrupt source ZIP: copy as-is (will be flagged by verify)
+        target_zf.write(source_zip, dest_path)
     finally:
         os.unlink(tmp_path)
 
@@ -1318,8 +1361,11 @@ def generate_emulator_pack(
                     archives.add(archive)
 
             # Pack archives as units
+            archive_prefix = profile.get("archive_prefix", "")
             for archive_name in sorted(archives):
                 archive_dest = _sanitize_path(archive_name)
+                if archive_prefix:
+                    archive_dest = f"{archive_prefix}/{archive_dest}"
                 if pack_structure:
                     mode_key = "standalone" if standalone else "libretro"
                     prefix = pack_structure.get(mode_key, "")
@@ -2262,7 +2308,9 @@ def generate_manifest(
         if _has_path_conflict(full_dest, seen_destinations, seen_parents):
             continue
 
-        local_path, status = resolve_file(fe, db, bios_dir, zip_contents)
+        dest_hint = fe.get("destination", "")
+        local_path, status = resolve_file(fe, db, bios_dir, zip_contents,
+                                          dest_hint=dest_hint)
         if status in ("not_found", "external", "user_provided"):
             continue
 
@@ -2598,25 +2646,43 @@ def verify_pack_against_platform(
                     errors.append(f"baseline missing: {expected}")
 
         # 2. Core extras presence (files from emulator profiles, in repo)
+        #    Mirror the pack builder's skip logic: only count files that
+        #    can actually be resolved and don't have path conflicts.
         core_checked = 0
         core_present = 0
         if db is not None:
             undeclared = find_undeclared_files(config, emulators_dir, db, emu_profiles)
+            seen_conformance: set[str] = set(zip_set)
+            seen_parents: set[str] = set()
+            for n in zip_set:
+                parts = n.split("/")
+                for i in range(1, len(parts)):
+                    seen_parents.add("/".join(parts[:i]))
             for u in undeclared:
                 if not u["in_repo"]:
                     continue
-                dest = u.get("path") or u["name"]
+                raw_dest = u.get("path") or u["name"]
+                dest = f"{raw_dest}{u['name']}" if raw_dest.endswith("/") else raw_dest
                 if base_dest:
                     full = f"{base_dest}/{dest}"
                 elif "/" not in dest:
                     full = f"bios/{dest}"
                 else:
                     full = dest
+                # Skip path conflicts (same logic as pack builder)
+                if _has_path_conflict(full, seen_conformance, seen_parents):
+                    continue
+                # Skip unresolvable files (game_data dirs, etc.)
+                fe = {"name": u["name"], "destination": dest}
+                local_path, status = resolve_file(fe, db, "bios", {},
+                                                  dest_hint=raw_dest)
+                if status in ("not_found", "external", "user_provided"):
+                    continue
                 core_checked += 1
-
                 if full in zip_set or full.lower() in zip_lower:
                     core_present += 1
-                # Not an error if missing -some get deduped or filtered
+                    seen_conformance.add(full)
+                    _register_path(full, seen_conformance, seen_parents)
 
         checked = baseline_checked + core_checked
         present = baseline_present + core_present