diff --git a/.changeset/ask-matt.md b/.changeset/ask-matt.md
new file mode 100644
index 0000000..1811ab8
--- /dev/null
+++ b/.changeset/ask-matt.md
@@ -0,0 +1,7 @@
+---
+"mattpocock-skills": major
+---
+
+Add the **`ask-matt`** skill — a user-invoked router that points you at the right skill or flow for your situation.
+
+**Breaking:** `ask-matt` routes over the other user-invoked skills in this repo, so it expects them to be installed.
diff --git a/.changeset/codebase-design-and-domain-modeling.md b/.changeset/codebase-design-and-domain-modeling.md
new file mode 100644
index 0000000..e8cd150
--- /dev/null
+++ b/.changeset/codebase-design-and-domain-modeling.md
@@ -0,0 +1,13 @@
+---
+"mattpocock-skills": major
+---
+
+Add the shared design skills and rewire existing skills onto them.
+
+- New **`codebase-design`** skill — the deep-module vocabulary (module, interface, depth, seam, adapter) and the principles for putting a lot of behaviour behind a small interface. The language that previously lived in `improve-codebase-architecture/LANGUAGE.md` now lives here, generalized for reuse across skills.
+- New **`domain-modeling`** skill — actively build and sharpen a project's domain model, stress-testing terms against the glossary and keeping `CONTEXT.md` and ADRs current.
+- `improve-codebase-architecture` now draws its architecture vocabulary from `/codebase-design` and its domain model from `/domain-modeling`.
+- `tdd` now leans on `/codebase-design` for interface-design guidance — its inline `deep-modules.md` / `interface-design.md` notes were removed in favour of the shared skill.
+- `grill-with-docs` now builds the domain model inline via `/domain-modeling`.
+
+**Breaking:** these skills now depend on the new `codebase-design` / `domain-modeling` skills, so you must install them too.
diff --git a/.changeset/initial-skill-updates.md b/.changeset/initial-skill-updates.md
deleted file mode 100644
index 8d5626c..0000000
--- a/.changeset/initial-skill-updates.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-"mattpocock-skills": minor
----
-
-Recent skill updates:
-
-- Add `ask-matt` user-invoked skill for triage and multi-session build guidance.
-- Add `writing-great-skills` skill, with no-op hunting at the sentence level.
-- Add `decision-mapping`, `prefactoring`, and `implement` (PRD-based) skills.
-- Tighten the review skill: fail-fast ref check, single-sourced rules, no-op cuts.
-- Rename terminology from Commands/Skills to User-invoked/Model-invoked across the docs.
-- Remove the `caveman` and `zoom-out` skills and all references.
diff --git a/.changeset/remove-caveman-and-zoom-out.md b/.changeset/remove-caveman-and-zoom-out.md
new file mode 100644
index 0000000..3ffac3f
--- /dev/null
+++ b/.changeset/remove-caveman-and-zoom-out.md
@@ -0,0 +1,10 @@
+---
+"mattpocock-skills": major
+---
+
+Remove the **`caveman`** and **`zoom-out`** skills.
+
+- `caveman` was a duplicate of another skill I was testing and was never meant to be public.
+- `zoom-out` went unused in practice, so it's been removed from the repo.
+
+**Breaking:** both skills have been removed.
diff --git a/.changeset/rename-diagnose-to-diagnosing-bugs.md b/.changeset/rename-diagnose-to-diagnosing-bugs.md
new file mode 100644
index 0000000..1bdae07
--- /dev/null
+++ b/.changeset/rename-diagnose-to-diagnosing-bugs.md
@@ -0,0 +1,7 @@
+---
+"mattpocock-skills": major
+---
+
+Rename the **`diagnose`** skill to **`diagnosing-bugs`**.
+
+**Breaking:** invoke it as `/diagnosing-bugs` — the old `/diagnose` name no longer exists.
diff --git a/.changeset/resolving-merge-conflicts.md b/.changeset/resolving-merge-conflicts.md
new file mode 100644
index 0000000..5a17cfb
--- /dev/null
+++ b/.changeset/resolving-merge-conflicts.md
@@ -0,0 +1,5 @@
+---
+"mattpocock-skills": minor
+---
+
+Add the **`resolving-merge-conflicts`** skill — a loop for resolving an in-progress git merge or rebase conflict. Standalone, with no dependencies on other skills.
diff --git a/.changeset/tighten-review-skill.md b/.changeset/tighten-review-skill.md
new file mode 100644
index 0000000..2a41bdb
--- /dev/null
+++ b/.changeset/tighten-review-skill.md
@@ -0,0 +1,5 @@
+---
+"mattpocock-skills": patch
+---
+
+Tighten the **`review`** skill: fail-fast ref check, single-sourced rules, and no-op cuts.
diff --git a/.changeset/user-invoked-model-invoked-taxonomy.md b/.changeset/user-invoked-model-invoked-taxonomy.md
new file mode 100644
index 0000000..f268c18
--- /dev/null
+++ b/.changeset/user-invoked-model-invoked-taxonomy.md
@@ -0,0 +1,5 @@
+---
+"mattpocock-skills": minor
+---
+
+Rename the skill taxonomy from **Commands / Skills** to **User-invoked / Model-invoked** across the docs, and add `docs/invocation.md` defining the split: user-invoked skills are reachable only when you type them and exist to orchestrate; model-invoked skills can also be reached automatically when the task fits. A user-invoked skill may invoke model-invoked skills, but never another user-invoked one.
diff --git a/.changeset/writing-great-skills.md b/.changeset/writing-great-skills.md
new file mode 100644
index 0000000..f8797ec
--- /dev/null
+++ b/.changeset/writing-great-skills.md
@@ -0,0 +1,11 @@
+---
+"mattpocock-skills": major
+---
+
+Replace **`write-a-skill`** with **`writing-great-skills`**.
+
+- Removed `write-a-skill`.
+- Added `writing-great-skills` (plus its `GLOSSARY.md`) — a reference for writing and editing skills well: the vocabulary and principles that make a skill predictable, hunting no-ops down to the sentence level.
+- Exposed `grilling` as a model-invoked skill — the reusable interview loop behind `grill-me` and `grill-with-docs`.
+
+**Breaking:** `write-a-skill` has been removed; use `writing-great-skills` instead.