basicmachines-co
diff --git a/‎src/basic_memory/mcp/tools/edit_note.py‎
Lines changed: 10 additions & 3 deletions b/‎src/basic_memory/mcp/tools/edit_note.py‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎test-int/mcp/test_edit_note_integration.py‎
Lines changed: 28 additions & 0 deletions b/‎test-int/mcp/test_edit_note_integration.py‎
Lines changed: 28 additions & 0 deletions
@@ -14,7 +14,12 @@
     from basic_memory.mcp.clients import KnowledgeClient
 
 from basic_memory.config import ConfigManager
-from basic_memory.file_utils import dump_frontmatter, has_frontmatter
+from basic_memory.file_utils import (
+    dump_frontmatter,
+    has_frontmatter,
+    parse_frontmatter,
+    remove_frontmatter,
+)
 from basic_memory.ignore_utils import IGNORED_PATH_REJECTION_DETAIL
 from basic_memory.mcp.project_context import (
     UnresolvedProjectRouteError,
@@ -733,8 +738,10 @@ async def edit_note(
                         # content frontmatter that create preparation reads back into note_type.
                         # Outcome: the canonical create path sees the validated metadata type.
                         if metadata and "type" in metadata and has_frontmatter(content):
-                            post = frontmatter.loads(content)
-                            post.metadata["type"] = entity.note_type
+                            content_metadata = parse_frontmatter(content)
+                            content_metadata["type"] = entity.note_type
+                            post = frontmatter.Post(remove_frontmatter(content, strip=False))
+                            post.metadata.update(content_metadata)
                             entity.content = dump_frontmatter(post)
 
                         logger.info(
 
@@ -498,6 +498,34 @@ async def test_edit_note_auto_create_metadata_type_overrides_content_frontmatter
         assert "Decision body." in read_result.content[0].text
 
 
+@pytest.mark.asyncio
+async def test_edit_note_auto_create_type_preserves_bom_frontmatter(mcp_server, app, test_project):
+    """Type precedence must not turn BOM-prefixed frontmatter into note body text."""
+    async with Client(mcp_server) as client:
+        edit_result = await client.call_tool(
+            "edit_note",
+            {
+                "project": test_project.name,
+                "identifier": "notes/bom-frontmatter",
+                "operation": "append",
+                "content": "\ufeff---\ntype: incident\nstatus: draft\n---\n# BOM Note\n\nBody.",
+                "metadata": {"type": "decision"},
+            },
+        )
+
+        assert "Created note (append)" in edit_result.content[0].text
+        read_result = await client.call_tool(
+            "read_note",
+            {"project": test_project.name, "identifier": "notes/bom-frontmatter"},
+        )
+        persisted = read_result.content[0].text
+        persisted_metadata = parse_frontmatter(persisted)
+        assert persisted_metadata["type"] == "decision"
+        assert persisted_metadata["status"] == "draft"
+        assert persisted.count("---") == 2
+        assert "# BOM Note\n\nBody." in persisted
+
+
 @pytest.mark.asyncio
 async def test_edit_note_rejects_blank_metadata_type(mcp_server, app, test_project):
     """A writable type field must reject an empty note classification."""