Fix project.yaml overwrite when forcing a re-separate.

Author: SpoddyCoder

cleave/project.py

@@ -109,19 +109,44 @@ def write_manifest(
     original_path: Path,
     demucs_model: str,
     separated_at: datetime | None = None,
-    song_markers: Sequence[float] = (),
+    song_markers: Sequence[float] | None = None,
 ) -> Path:
+    """Create or update ``project.yaml`` mix and ingest fields.
+
+    When the file already exists, only ``slug``, ``mix.filename``, and
+    ``ingest`` are updated. ``song-markers``, ``restored-from``, and other
+    fields are preserved unless ``song_markers`` is passed explicitly.
+    """
     when = separated_at or datetime.now(timezone.utc)
-    manifest = ProjectManifest(
-        version=1,
-        slug=slug,
-        mix_filename=mix_filename,
-        original_path=str(original_path.resolve()),
-        separated_at=when.isoformat(),
-        demucs_model=demucs_model,
-        song_markers=tuple(float(t) for t in song_markers),
-    )
     path = manifest_path(project_dir)
+    original = str(original_path.resolve())
+    separated = when.isoformat()
+    if path.is_file():
+        existing = load_manifest(project_dir)
+        markers = (
+            tuple(float(t) for t in song_markers)
+            if song_markers is not None
+            else existing.song_markers
+        )
+        manifest = replace(
+            existing,
+            slug=slug,
+            mix_filename=mix_filename,
+            original_path=original,
+            separated_at=separated,
+            demucs_model=demucs_model,
+            song_markers=markers,
+        )
+    else:
+        manifest = ProjectManifest(
+            version=1,
+            slug=slug,
+            mix_filename=mix_filename,
+            original_path=original,
+            separated_at=separated,
+            demucs_model=demucs_model,
+            song_markers=tuple(float(t) for t in (song_markers or ())),
+        )
     with path.open("w", encoding="utf-8") as handle:
         yaml.safe_dump(manifest.to_dict(), handle, sort_keys=False)
     return path

tests/cleave/test_project.py

@@ -241,6 +241,47 @@ def test_manifest_round_trip_with_song_markers(tmp_path: Path) -> None:
     assert data["ingest"]["demucs_model"] == "htdemucs"
 
 
+def test_write_manifest_update_preserves_song_markers_and_restored_from(
+    tmp_path: Path,
+) -> None:
+    project = tmp_path / "song"
+    project.mkdir()
+    original = tmp_path / "source.flac"
+    original.write_bytes(b"audio")
+    when = datetime(2026, 6, 8, 20, 15, tzinfo=timezone.utc)
+    write_manifest(
+        project,
+        slug="song",
+        mix_filename="song.flac",
+        original_path=original,
+        demucs_model="htdemucs",
+        separated_at=when,
+        song_markers=(10.0, 42.5),
+    )
+    rewrite_manifest_slug(project, "song", restored_from="archived-slug")
+
+    new_original = tmp_path / "new-source.wav"
+    new_original.write_bytes(b"new")
+    later = datetime(2026, 7, 22, 12, 0, tzinfo=timezone.utc)
+    write_manifest(
+        project,
+        slug="song",
+        mix_filename="song.wav",
+        original_path=new_original,
+        demucs_model="htdemucs_ft",
+        separated_at=later,
+    )
+
+    manifest = load_manifest(project)
+    assert manifest.mix_filename == "song.wav"
+    assert manifest.original_path == str(new_original.resolve())
+    assert manifest.separated_at == "2026-07-22T12:00:00+00:00"
+    assert manifest.demucs_model == "htdemucs_ft"
+    assert manifest.song_markers == (10.0, 42.5)
+    assert manifest.restored_from == "archived-slug"
+    assert manifest.version == 1
+
+
 def test_save_song_markers_preserves_ingest(tmp_path: Path) -> None:
     project = tmp_path / "song"
     project.mkdir()

tests/cleave/test_separate.py

@@ -10,7 +10,12 @@
 
 from cleave.config import VIZ_CONFIG_FILENAME
 from cleave.extract import STEM_NAMES, stems_dir
-from cleave.project import PROJECT_FILENAME, load_manifest, write_manifest
+from cleave.project import (
+    PROJECT_FILENAME,
+    load_manifest,
+    rewrite_manifest_slug,
+    write_manifest,
+)
 from cleave.separate import (
     _run_demucs,
     project_stems_complete,
@@ -513,3 +518,43 @@ def fake_run(cmd: list[str], *, check: bool) -> None:
     assert (project / "song.wav").read_bytes() == b"new"
     manifest = load_manifest(project)
     assert manifest.mix_filename == "song.wav"
+
+
+def test_run_separate_force_preserves_song_markers(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("CLEAVE_DATA", str(tmp_path))
+    project = tmp_path / "projects" / "song"
+    project.mkdir(parents=True)
+    (project / "renders").mkdir()
+    _write_stub_stems(project)
+    mix = project / "song.flac"
+    mix.write_bytes(b"mix")
+    write_manifest(
+        project,
+        slug="song",
+        mix_filename="song.flac",
+        original_path=tmp_path / "elsewhere.flac",
+        demucs_model="htdemucs",
+        song_markers=(12.5, 64.0, 120.0),
+    )
+    rewrite_manifest_slug(project, "song", restored_from="archived-slug")
+
+    def fake_run(cmd: list[str], *, check: bool) -> None:
+        out_flag = cmd.index("-o")
+        out_root = Path(cmd[out_flag + 1])
+        target = out_root / "htdemucs" / "song"
+        target.mkdir(parents=True, exist_ok=True)
+        for name in STEM_NAMES:
+            (target / f"{name}.wav").write_bytes(b"wav")
+
+    with patch("cleave.separate.subprocess.run", side_effect=fake_run), patch(
+        "cleave.separate.run_analyse", return_value=project / "signals.json"
+    ):
+        run_separate("song", force=True)
+
+    manifest = load_manifest(project)
+    assert manifest.song_markers == (12.5, 64.0, 120.0)
+    assert manifest.restored_from == "archived-slug"
+    assert manifest.demucs_model == "htdemucs"
+    assert manifest.mix_filename == "song.flac"