fix(cli): include generated OKF identities and reject stage collisions

Signed-off-by: phernandez <paul@basicmachines.co>

Author: phernandez

src/basic_memory/okf/export.py

@@ -154,7 +154,10 @@ async def export_project(
         for file in rendered:
             target = staging / file.path
             target.parent.mkdir(parents=True, exist_ok=True)
-            target.write_bytes(file.content)
+            # Destination filesystems may collapse distinct source spellings.
+            # Exclusive creation detects collisions before any bundle is published.
+            with target.open("xb") as output:
+                output.write(file.content)
         report = check_bundle(staging)
         if not report.success:
             return report

src/basic_memory/okf/render.py

@@ -20,7 +20,11 @@
 from basic_memory.repository.entity_repository import file_path_alias
 from basic_memory.services.bulk_link_resolver import RelationTargetReference
 from basic_memory.services.link_resolver import normalize_link_text
-from basic_memory.utils import build_permalink_resolution_candidates, generate_permalink
+from basic_memory.utils import (
+    build_canonical_permalink,
+    build_permalink_resolution_candidates,
+    generate_permalink,
+)
 
 from basic_memory.okf.validation import Document, parse_document
 
@@ -279,6 +283,10 @@ def render_bundle(snapshot: ExportSnapshot) -> tuple[ExportFile, ...]:
         else:
             title_targets[title] = file.path
         permalink = normalize_frontmatter_value(source_metadata.get("permalink"))
+        if not isinstance(permalink, str) or not permalink:
+            permalink = build_canonical_permalink(
+                snapshot.project, file.path, include_project=snapshot.permalinks_include_project
+            )
         if isinstance(permalink, str) and permalink:
             # Offline files can violate the indexed uniqueness rule; never choose a winner.
             if permalink in permalinks:

tests/okf/test_export_failures.py

@@ -301,3 +301,28 @@ def failing_lstat(path, *args, **kwargs):
     with pytest.raises(PermissionError, match="stat unavailable"):
         await export_project(source_config, "export", destination, replace=True)
     assert (destination / "keep").read_bytes() == b"previous bundle"
+
+
+@pytest.mark.asyncio
+async def test_staging_path_collision_preserves_destination(source_config, tmp_path, monkeypatch):
+    import basic_memory.okf.export as exporting
+
+    destination = tmp_path / "bundle"
+    destination.mkdir()
+    (destination / "keep").write_bytes(b"previous bundle")
+    original_open = Path.open
+
+    def case_insensitive_staging_open(path, mode="r", *args, **kwargs):
+        if mode == "xb":
+            path = path.with_name(path.name.lower())
+        return original_open(path, mode, *args, **kwargs)
+
+    monkeypatch.setattr(Path, "open", case_insensitive_staging_open)
+    monkeypatch.setattr(
+        exporting,
+        "render_bundle",
+        lambda snapshot: (ExportFile("A.md", b"first"), ExportFile("a.md", b"second")),
+    )
+    with pytest.raises(FileExistsError):
+        await export_project(source_config, "export", destination, replace=True)
+    assert (destination / "keep").read_bytes() == b"previous bundle"

tests/okf/test_okf.py

@@ -693,7 +693,7 @@ def test_unique_title_precedes_filename_and_rooted_links_remain_literal(test_pro
 
     owner = Entity(title="foo.md", file_path="owner.md")
     index = ProjectEntityIdentityIndex.from_entities(
-        test_project, [Entity(title="foo", file_path="foo.md"), owner]
+        test_project, [Entity(title="foo", file_path="foo.md", permalink="custom"), owner]
     )
     assert (
         index.resolve_strict(
@@ -704,7 +704,7 @@ def test_unique_title_precedes_filename_and_rooted_links_remain_literal(test_pro
     snapshot = ExportSnapshot(
         "p",
         (
-            ExportFile("foo.md", b"# File"),
+            ExportFile("foo.md", b"---\npermalink: custom\n---\n# File"),
             ExportFile("owner.md", b"---\ntitle: foo.md\n---\n# Title owner"),
             ExportFile("source.md", b"[[foo.md]] [[/foo]] [[/foo.md]]"),
         ),
@@ -824,3 +824,17 @@ def test_unordered_identity_metadata_fails_explicitly(field, value):
     snapshot = ExportSnapshot("p", (ExportFile("a.md", f"---\n{field}: {value}\n---\n".encode()),))
     with pytest.raises(ValueError, match=f"a.md: {field} cannot contain an unordered YAML set"):
         render_bundle(snapshot)
+
+
+@pytest.mark.parametrize("include_project", [False, True])
+def test_missing_authored_permalink_uses_canonical_generated_address(include_project):
+    snapshot = ExportSnapshot(
+        "p",
+        (
+            ExportFile("folder/foo.md", b"# Foo"),
+            ExportFile("source.md", b"[[p/folder/foo]]"),
+        ),
+        permalinks_include_project=include_project,
+    )
+    source = next(file.content for file in render_bundle(snapshot) if file.path == "source.md")
+    assert b"[p/folder/foo](/folder/foo.md)" in source