From 579f2016aa3978ce4ab4495536dfde66252d6049 Mon Sep 17 00:00:00 2001
From: TroyHernandez <troy@cornball.ai>
Date: Mon, 7 Sep 2026 18:38:01 -0500
Subject: [PATCH] Flatten the bundled Matrix messaging skill layout

---
 .Rbuildignore                                      |  1 +
 NEWS.md                                            |  7 +++++++
 .../{mx.client => }/matrix-messaging/SKILL.md      |  0
 inst/tinytest/test_skills.R                        | 14 ++++++++++++++
 4 files changed, 22 insertions(+)
 rename inst/skills/{mx.client => }/matrix-messaging/SKILL.md (100%)
 create mode 100644 inst/tinytest/test_skills.R

diff --git a/.Rbuildignore b/.Rbuildignore
index 746f931..2e63668 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,6 +1,7 @@
 ^\.git$
 ^\.github$
 ^\.claude$
+^\.agents$
 ^CLAUDE\.md$
 ^cran-comments\.md$
 ^README\.Rmd$
diff --git a/NEWS.md b/NEWS.md
index 4d6f769..2292016 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,12 @@
 # mx.client 0.2.0.8
 
+## Documentation
+
+* Move the bundled skill to `inst/skills/matrix-messaging/`, installed at
+  `system.file("skills", "matrix-messaging", package = "mx.client")`.
+  The instruction body is unchanged; direct links to the old nested
+  `skills/mx.client/matrix-messaging` path need updating.
+
 ## New
 
 * Missing Megolm sessions now create persistent `m.room_key_request`
diff --git a/inst/skills/mx.client/matrix-messaging/SKILL.md b/inst/skills/matrix-messaging/SKILL.md
similarity index 100%
rename from inst/skills/mx.client/matrix-messaging/SKILL.md
rename to inst/skills/matrix-messaging/SKILL.md
diff --git a/inst/tinytest/test_skills.R b/inst/tinytest/test_skills.R
new file mode 100644
index 0000000..75d1c4b
--- /dev/null
+++ b/inst/tinytest/test_skills.R
@@ -0,0 +1,14 @@
+library(tinytest)
+
+root <- system.file("skills", package = "mx.client")
+expect_true(nzchar(root))
+skill <- file.path(root, "matrix-messaging", "SKILL.md")
+expect_true(file.exists(skill))
+expect_false(file.exists(file.path(root, "mx.client",
+                                  "matrix-messaging", "SKILL.md")))
+entries <- list.files(root, pattern = "^SKILL[.]md$", recursive = TRUE)
+expect_equal(entries, "matrix-messaging/SKILL.md")
+body <- readLines(skill, warn = FALSE)
+expect_equal(body[[1L]], "---")
+expect_true("name: matrix-messaging" %in% body)
+expect_true(any(grepl("^description:", body)))