fix(runtime): parse skill frontmatter as YAML

Cargo.toml

@@ -70,6 +70,7 @@ syn = { version = "2", features = ["full"] }
 schemars = { version = "1.0", features = ["derive"] }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
+serde_norway = "0.9"
 sha2 = "0.10"
 syntect = "5"
 thiserror = "2.0"

crates/merry-cli/src/coding/tests/skills.rs

@@ -21,7 +21,7 @@ async fn projects_skill_metadata_without_body() {
     std::fs::create_dir_all(skill_root.join("demo")).expect("mkdir skill");
     std::fs::write(
         skill_root.join("demo/SKILL.md"),
-        "---\nname: demo-skill\ndescription: Use for demo tasks.\n---\n# Demo\nbody sentinel\n",
+        "---\nname: demo-skill\ndescription: Use for demo tasks.\nmetadata:\n  cli_version: \">=1.2.3\"\n  requires:\n    bins:\n      - demo-cli\n---\n# Demo\nbody sentinel\n",
     )
     .expect("write skill");
 

crates/merry-runtime/Cargo.toml

@@ -15,6 +15,7 @@ merry-tools-macros = { path = "../merry-tools-macros", version = "0.1.0" }
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+serde_norway.workspace = true
 sha2.workspace = true
 thiserror.workspace = true
 tokio.workspace = true

crates/merry-runtime/src/context/projection.rs

@@ -8,6 +8,7 @@ use crate::{
         ActivatedMemory, MemoryActivationProvenance, MemoryActivationReason, MemoryActivationScore,
         MemoryEvidence, MemoryId, MemoryScope,
     },
+    text,
     token_estimate::estimate_text_tokens,
 };
 use merry_core::EvidenceRef;
@@ -33,11 +34,7 @@ fn format_memory_scopes(scopes: &[MemoryScope]) -> String {
 }
 
 fn canonicalize_memory_reason_text(value: &str) -> String {
-    value
-        .split_whitespace()
-        .collect::<Vec<_>>()
-        .join(" ")
-        .to_lowercase()
+    text::collapse_whitespace(value).to_lowercase()
 }
 
 /// Compiles allowlisted structured runtime state into a deterministic context snapshot.

crates/merry-runtime/src/lib.rs

@@ -59,6 +59,7 @@ mod session_store;
 mod skill;
 mod step;
 mod subagent;
+mod text;
 mod token_estimate;
 mod tool;
 mod tool_admission;
@@ -155,7 +156,10 @@ pub use session_projection::SessionTranscriptItem;
 pub use session_store::{
     FileSessionStore, PlanPersistenceLocation, SessionReservation, SessionStoreError,
 };
-pub use skill::{SkillCatalog, SkillError, SkillLoadWarning, SkillMetadata};
+pub use skill::{
+    FrontmatterError, SkillCatalog, SkillError, SkillLoadWarning, SkillLoadWarningReason,
+    SkillMetadata,
+};
 pub use step::StepContext;
 pub use subagent::{
     CancelSubagentsInput, ChildRuntimeFactory, ChildRuntimeInput, ChildWorkspaceScope,

crates/merry-runtime/src/memory.rs

@@ -7,6 +7,7 @@
 // Staged internal activation types are compiled before every call path is wired.
 #![cfg_attr(not(test), allow(dead_code))]
 
+use crate::text;
 use merry_core::EvidenceRef;
 use std::{cmp::Ordering, fmt};
 use thiserror::Error;
@@ -608,15 +609,11 @@ fn validate_non_blank(field: &'static str, value: &str) -> Result<(), MemoryErro
 }
 
 fn canonicalize_match_text(value: &str) -> String {
-    value
-        .split_whitespace()
-        .collect::<Vec<_>>()
-        .join(" ")
-        .to_lowercase()
+    text::collapse_whitespace(value).to_lowercase()
 }
 
 fn canonicalize_label_text(value: &str) -> String {
-    value.split_whitespace().collect::<Vec<_>>().join(" ")
+    text::collapse_whitespace(value)
 }
 
 fn validate_reason(reason: &MemoryActivationReason) -> Result<(), MemoryError> {