feat(paths): enhance file resolution for intermediate assets and ensure idempotency

Implement logic to detect existing shape and painted files in both the main and intermediate directories, allowing for resuming of asset processing. Refactor the `move_to_intermediate` function to ensure it is idempotent, preventing unnecessary file operations if the source is already at the destination. Update related tests to validate these enhancements.

Author: maikramer

GameAssets/src/gameassets/paths.py

@@ -167,6 +167,12 @@ def move_to_intermediate(src: Path, mesh_final: Path) -> Path:
     if not suffix:
         suffix = ""
     dst = dst_dir / f"{base}{suffix}{src.suffix}"
+    # Idempotente: se src já está no destino (resume), não faz nada.
+    try:
+        if dst.exists() and src.resolve() == dst.resolve():
+            return dst
+    except OSError:
+        pass
     if dst.exists():
         try:
             dst.unlink()
@@ -188,6 +194,32 @@ def _valid_file(p: Path) -> bool:
     return p.is_file() and p.stat().st_size > 0
 
 
+def _resolve_intermediate_or_main(canonical: Path, mesh_final: Path) -> Path | None:
+    """Round 2: aceita o ficheiro em ``meshes/`` ou em ``meshes/_intermediate/``.
+
+    O master pipeline move ``shape``/``painted`` para ``_intermediate/`` no fim.
+    Para retomar uma pipeline parcial precisamos detectar o ficheiro em
+    qualquer das duas localizações. Devolve o path existente (preferindo a
+    localização canónica) ou ``None`` se nenhum existe e é válido.
+    """
+    if _valid_file(canonical):
+        return canonical
+    intermediate = _intermediate_dir(mesh_final) / canonical.name
+    if _valid_file(intermediate):
+        return intermediate
+    return None
+
+
+def _shape_existing(mesh_final: Path) -> Path | None:
+    """Devolve o ``id_shape.glb`` existente em ``meshes/`` ou ``_intermediate/``."""
+    return _resolve_intermediate_or_main(_shape_path(mesh_final), mesh_final)
+
+
+def _painted_existing(mesh_final: Path) -> Path | None:
+    """Devolve o ``id_painted.glb`` existente em ``meshes/`` ou ``_intermediate/``."""
+    return _resolve_intermediate_or_main(_painted_path(mesh_final), mesh_final)
+
+
 def _classify_row_state(
     *,
     img_final: Path,
@@ -239,21 +271,21 @@ def _classify_row_state_master(
     paint → bake-master (lod0) → lod gen → rig_hi → transfer → animate →
     validate. Devolve o primeiro estágio que ainda falta.
     """
-    shape = _shape_path(mesh_final)
+    shape_any = _shape_existing(mesh_final)
+    painted_any = _painted_existing(mesh_final)
     clean = _clean_path(mesh_final)
-    painted = _painted_path(mesh_final)
     lod0 = _lod_path(mesh_final, 0)
     lod1 = _lod_path(mesh_final, 1)
     lod2 = _lod_path(mesh_final, 2)
     rigged_hi = _rigged_hi_path(mesh_final)
 
-    if not _valid_file(img_final) and not _valid_file(shape):
+    if not _valid_file(img_final) and shape_any is None:
         return _ROW_NEED_IMAGE
-    if not _valid_file(shape):
+    if shape_any is None:
         return _ROW_NEED_SHAPE
     if not _valid_file(clean):
         return _ROW_NEED_TOPOLOGY_FIX
-    if want_texture and not _valid_file(painted):
+    if want_texture and painted_any is None:
         return _ROW_NEED_PAINT
     if not _valid_file(lod0):
         return _ROW_NEED_BAKE_MASTER

GameAssets/src/gameassets/pipeline_master.py

@@ -35,8 +35,10 @@
     _lod_animated_path,
     _lod_path,
     _lod_rigged_path,
+    _painted_existing,
     _painted_path,
     _rigged_hi_path,
+    _shape_existing,
     _shape_path,
     move_to_intermediate,
 )
@@ -221,8 +223,10 @@ def _run(name: str, argv: list[str], output: Path | None = None) -> StageResult:
         res.stages.append(StageResult("setup", False, 0.0, "text3d não encontrado"))
         return res
 
-    shape_p = _shape_path(mesh_final)
-    painted_p = _painted_path(mesh_final)
+    # Round 2: shape/painted podem estar em meshes/ OU em meshes/_intermediate/
+    # (após uma run anterior). Resolve dinamicamente para permitir resume.
+    shape_p = _shape_existing(mesh_final) or _shape_path(mesh_final)
+    painted_p = _painted_existing(mesh_final) or _painted_path(mesh_final)
     clean_p = _clean_path(mesh_final)
 
     if not shape_p.is_file():

GameAssets/tests/test_resume_master.py

@@ -155,3 +155,68 @@ def test_resume_master_pipeline_importable() -> None:
 
     assert hasattr(pipeline_master, "resume_master_pipeline")
     assert hasattr(pipeline_master, "run_master_pipeline")
+
+
+def test_classify_master_detects_shape_in_intermediate(tmp_path: Path) -> None:
+    """Round 2: shape/painted em _intermediate/ devem ser detectados (resume)."""
+    from gameassets.paths import (
+        _ROW_NEED_TOPOLOGY_FIX,
+        _classify_row_state_master,
+        _intermediate_dir,
+        _shape_path,
+    )
+
+    img = tmp_path / "img.png"
+    _touch(img)
+    mesh = tmp_path / "mesh.glb"
+    # shape vai direto para _intermediate/ (simula run anterior).
+    canonical_shape = _shape_path(mesh)
+    intermediate_shape = _intermediate_dir(mesh) / canonical_shape.name
+    _touch(intermediate_shape)
+    assert not canonical_shape.exists()
+
+    state = _classify_row_state_master(
+        img_final=img, mesh_final=mesh, want_texture=True, wants_rig=False, wants_animate=False
+    )
+    # Shape detectado → próximo é topology-fix (clean ainda não existe).
+    assert state == _ROW_NEED_TOPOLOGY_FIX
+
+
+def test_classify_master_detects_painted_in_intermediate(tmp_path: Path) -> None:
+    """Round 2: painted em _intermediate/ deve ser detectado (resume)."""
+    from gameassets.paths import (
+        _ROW_NEED_BAKE_MASTER,
+        _classify_row_state_master,
+        _clean_path,
+        _intermediate_dir,
+        _painted_path,
+        _shape_path,
+    )
+
+    img = tmp_path / "img.png"
+    _touch(img)
+    mesh = tmp_path / "mesh.glb"
+    _touch(_intermediate_dir(mesh) / _shape_path(mesh).name)
+    _touch(_clean_path(mesh))
+    _touch(_intermediate_dir(mesh) / _painted_path(mesh).name)
+
+    state = _classify_row_state_master(
+        img_final=img, mesh_final=mesh, want_texture=True, wants_rig=False, wants_animate=False
+    )
+    # Tem shape (intermediate), clean, painted (intermediate) — falta lod0.
+    assert state == _ROW_NEED_BAKE_MASTER
+
+
+def test_move_to_intermediate_idempotent(tmp_path: Path) -> None:
+    """move_to_intermediate é safe se o ficheiro já está no destino."""
+    from gameassets.paths import _intermediate_dir, _shape_path, move_to_intermediate
+
+    mesh = tmp_path / "mesh.glb"
+    intermediate = _intermediate_dir(mesh) / _shape_path(mesh).name
+    intermediate.parent.mkdir(parents=True, exist_ok=True)
+    intermediate.write_bytes(b"data")
+    # passar o path do intermediate como src — deve preservar.
+    result = move_to_intermediate(intermediate, mesh)
+    assert intermediate.is_file()
+    assert intermediate.read_bytes() == b"data"
+    assert result.resolve() == intermediate.resolve()