From 9d56b6b776c27942b47fd42dd794cdc9e344bc58 Mon Sep 17 00:00:00 2001
From: Samuele Verzi <samu@stacklok.com>
Date: Wed, 8 Jul 2026 18:30:15 +0200
Subject: [PATCH 1/4] fix(skills): update mattpocock/skills to d574778, follow
 upstream restructuring

- Bump ref for 10 skills to main as of 2026-07-08
- Sync metadata.description fields with new upstream SKILL.md frontmatter
- Remove zoom-out and caveman (deleted upstream)
- Replace diagnose with diagnosing-bugs and write-a-skill with
  writing-great-skills, following upstream renames (new names start at 0.1.0)

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 skills/caveman/spec.yaml                      | 23 -------------------
 skills/diagnose/spec.yaml                     | 23 -------------------
 skills/diagnosing-bugs/spec.yaml              | 23 +++++++++++++++++++
 skills/git-guardrails-claude-code/spec.yaml   |  2 +-
 skills/grill-me/spec.yaml                     |  4 ++--
 skills/grill-with-docs/spec.yaml              |  4 ++--
 .../improve-codebase-architecture/spec.yaml   |  4 ++--
 skills/migrate-to-shoehorn/spec.yaml          |  2 +-
 skills/scaffold-exercises/spec.yaml           |  2 +-
 skills/setup-matt-pocock-skills/spec.yaml     |  4 ++--
 skills/setup-pre-commit/spec.yaml             |  2 +-
 skills/tdd/spec.yaml                          |  4 ++--
 skills/triage/spec.yaml                       |  4 ++--
 skills/write-a-skill/spec.yaml                | 23 -------------------
 skills/writing-great-skills/spec.yaml         | 23 +++++++++++++++++++
 skills/zoom-out/spec.yaml                     | 23 -------------------
 16 files changed, 62 insertions(+), 108 deletions(-)
 delete mode 100644 skills/caveman/spec.yaml
 delete mode 100644 skills/diagnose/spec.yaml
 create mode 100644 skills/diagnosing-bugs/spec.yaml
 delete mode 100644 skills/write-a-skill/spec.yaml
 create mode 100644 skills/writing-great-skills/spec.yaml
 delete mode 100644 skills/zoom-out/spec.yaml

diff --git a/skills/caveman/spec.yaml b/skills/caveman/spec.yaml
deleted file mode 100644
index 5b248c90..00000000
--- a/skills/caveman/spec.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Matt Pocock caveman Skill
-# Ultra-compressed communication mode that drops filler while keeping technical accuracy.
-# Source: https://github.com/mattpocock/skills
-# Will publish as: ghcr.io/stacklok/dockyard/skills/caveman:0.1.0
-
-metadata:
-  name: caveman
-  description: "Ultra-compressed communication mode. Cuts token usage ~75% by dropping filler, articles, and pleasantries while keeping full technical accuracy. Use when the user says 'caveman mode', 'talk like caveman', 'use caveman', 'less tokens', 'be brief', or invokes /caveman."
-
-spec:
-  repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
-  path: "skills/productivity/caveman"
-  version: "0.1.1"
-
-provenance:
-  repository_uri: "https://github.com/mattpocock/skills"
-  repository_ref: "refs/heads/main"
-
-security:
-  allowed_issues:
-    - rule_id: MANIFEST_MISSING_LICENSE
-      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/diagnose/spec.yaml b/skills/diagnose/spec.yaml
deleted file mode 100644
index b98f64d3..00000000
--- a/skills/diagnose/spec.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Matt Pocock diagnose Skill
-# Disciplined diagnosis loop for hard bugs and performance regressions.
-# Source: https://github.com/mattpocock/skills
-# Will publish as: ghcr.io/stacklok/dockyard/skills/diagnose:0.1.0
-
-metadata:
-  name: diagnose
-  description: "Disciplined diagnosis loop for hard bugs and performance regressions — reproduce, minimise, hypothesise, instrument, fix, regression-test. Use when the user says 'diagnose this' / 'debug this', reports a bug, says something is broken/throwing/failing, or describes a performance regression."
-
-spec:
-  repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
-  path: "skills/engineering/diagnose"
-  version: "0.1.1"
-
-provenance:
-  repository_uri: "https://github.com/mattpocock/skills"
-  repository_ref: "refs/heads/main"
-
-security:
-  allowed_issues:
-    - rule_id: MANIFEST_MISSING_LICENSE
-      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/diagnosing-bugs/spec.yaml b/skills/diagnosing-bugs/spec.yaml
new file mode 100644
index 00000000..2294d4f4
--- /dev/null
+++ b/skills/diagnosing-bugs/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock diagnosing-bugs Skill
+# Diagnosis loop for hard bugs and performance regressions.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/diagnosing-bugs:0.1.0
+
+metadata:
+  name: diagnosing-bugs
+  description: "Diagnosis loop for hard bugs and performance regressions. Use when the user says 'diagnose'/'debug this', or reports something broken/throwing/failing/slow."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/diagnosing-bugs"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/git-guardrails-claude-code/spec.yaml b/skills/git-guardrails-claude-code/spec.yaml
index 00b07fa6..5315dc52 100644
--- a/skills/git-guardrails-claude-code/spec.yaml
+++ b/skills/git-guardrails-claude-code/spec.yaml
@@ -9,7 +9,7 @@ metadata:
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/git-guardrails-claude-code"
   version: "0.1.1"
 
diff --git a/skills/grill-me/spec.yaml b/skills/grill-me/spec.yaml
index d61794e8..a211d6db 100644
--- a/skills/grill-me/spec.yaml
+++ b/skills/grill-me/spec.yaml
@@ -5,11 +5,11 @@
 
 metadata:
   name: grill-me
-  description: "Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when the user wants to stress-test a plan, get grilled on their design, or mentions 'grill me'."
+  description: "A relentless interview to sharpen a plan or design."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/productivity/grill-me"
   version: "0.1.1"
 
diff --git a/skills/grill-with-docs/spec.yaml b/skills/grill-with-docs/spec.yaml
index bbc3a00a..1ca0ccba 100644
--- a/skills/grill-with-docs/spec.yaml
+++ b/skills/grill-with-docs/spec.yaml
@@ -5,11 +5,11 @@
 
 metadata:
   name: grill-with-docs
-  description: "Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as decisions crystallise. Use when the user wants to stress-test a plan against their project's language and documented decisions."
+  description: "A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/grill-with-docs"
   version: "0.1.1"
 
diff --git a/skills/improve-codebase-architecture/spec.yaml b/skills/improve-codebase-architecture/spec.yaml
index f434fe9e..d251395a 100644
--- a/skills/improve-codebase-architecture/spec.yaml
+++ b/skills/improve-codebase-architecture/spec.yaml
@@ -5,11 +5,11 @@
 
 metadata:
   name: improve-codebase-architecture
-  description: "Find deepening opportunities in a codebase, informed by the domain language in CONTEXT.md and the decisions in docs/adr/. Use when the user wants to improve architecture, find refactoring opportunities, consolidate tightly-coupled modules, or make a codebase more testable and AI-navigable."
+  description: "Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/improve-codebase-architecture"
   version: "0.1.1"
 
diff --git a/skills/migrate-to-shoehorn/spec.yaml b/skills/migrate-to-shoehorn/spec.yaml
index 7a5e5c2b..7cff8533 100644
--- a/skills/migrate-to-shoehorn/spec.yaml
+++ b/skills/migrate-to-shoehorn/spec.yaml
@@ -9,7 +9,7 @@ metadata:
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/migrate-to-shoehorn"
   version: "0.1.1"
 
diff --git a/skills/scaffold-exercises/spec.yaml b/skills/scaffold-exercises/spec.yaml
index 35923c1a..ea8db8fe 100644
--- a/skills/scaffold-exercises/spec.yaml
+++ b/skills/scaffold-exercises/spec.yaml
@@ -9,7 +9,7 @@ metadata:
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/scaffold-exercises"
   version: "0.1.1"
 
diff --git a/skills/setup-matt-pocock-skills/spec.yaml b/skills/setup-matt-pocock-skills/spec.yaml
index dcd6cda3..07ef36d5 100644
--- a/skills/setup-matt-pocock-skills/spec.yaml
+++ b/skills/setup-matt-pocock-skills/spec.yaml
@@ -6,11 +6,11 @@
 
 metadata:
   name: setup-matt-pocock-skills
-  description: "Sets up an `## Agent skills` block in AGENTS.md/CLAUDE.md and `docs/agents/` so the engineering skills know this repo's issue tracker (GitHub or local markdown), triage label vocabulary, and domain doc layout. Run before first use of `to-issues`, `to-prd`, `triage`, `diagnose`, `tdd`, `improve-codebase-architecture`, or `zoom-out` — or if those skills appear to be missing context about the issue tracker, triage labels, or domain docs."
+  description: "Configure this repo for the engineering skills — set up its issue tracker, triage label vocabulary, and domain doc layout. Run once before first use of the other engineering skills."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/setup-matt-pocock-skills"
   version: "0.1.1"
 
diff --git a/skills/setup-pre-commit/spec.yaml b/skills/setup-pre-commit/spec.yaml
index 921556df..75cb4fc3 100644
--- a/skills/setup-pre-commit/spec.yaml
+++ b/skills/setup-pre-commit/spec.yaml
@@ -9,7 +9,7 @@ metadata:
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/setup-pre-commit"
   version: "0.1.1"
 
diff --git a/skills/tdd/spec.yaml b/skills/tdd/spec.yaml
index 3699597c..972630ed 100644
--- a/skills/tdd/spec.yaml
+++ b/skills/tdd/spec.yaml
@@ -5,11 +5,11 @@
 
 metadata:
   name: tdd
-  description: "Test-driven development with red-green-refactor loop. Use when the user wants to build features or fix bugs using TDD, mentions 'red-green-refactor', wants integration tests, or asks for test-first development."
+  description: "Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions 'red-green-refactor', or wants integration tests."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/tdd"
   version: "0.1.1"
 
diff --git a/skills/triage/spec.yaml b/skills/triage/spec.yaml
index d9fa9426..2de73f6f 100644
--- a/skills/triage/spec.yaml
+++ b/skills/triage/spec.yaml
@@ -5,11 +5,11 @@
 
 metadata:
   name: triage
-  description: "Triage issues through a state machine driven by triage roles. Use when the user wants to create an issue, triage issues, review incoming bugs or feature requests, prepare issues for an AFK agent, or manage issue workflow."
+  description: "Move issues and external PRs through a state machine of triage roles — categorise, verify, grill if needed, and write agent-ready briefs."
 
 spec:
   repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/triage"
   version: "0.1.1"
 
diff --git a/skills/write-a-skill/spec.yaml b/skills/write-a-skill/spec.yaml
deleted file mode 100644
index 2a987012..00000000
--- a/skills/write-a-skill/spec.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Matt Pocock write-a-skill Skill
-# Create new agent skills with proper structure, progressive disclosure, and bundled resources.
-# Source: https://github.com/mattpocock/skills
-# Will publish as: ghcr.io/stacklok/dockyard/skills/write-a-skill:0.1.0
-
-metadata:
-  name: write-a-skill
-  description: "Create new agent skills with proper structure, progressive disclosure, and bundled resources. Use when the user wants to create, write, or build a new skill."
-
-spec:
-  repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
-  path: "skills/productivity/write-a-skill"
-  version: "0.1.1"
-
-provenance:
-  repository_uri: "https://github.com/mattpocock/skills"
-  repository_ref: "refs/heads/main"
-
-security:
-  allowed_issues:
-    - rule_id: MANIFEST_MISSING_LICENSE
-      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/writing-great-skills/spec.yaml b/skills/writing-great-skills/spec.yaml
new file mode 100644
index 00000000..2c5d874a
--- /dev/null
+++ b/skills/writing-great-skills/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock writing-great-skills Skill
+# Reference for writing and editing skills well.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/writing-great-skills:0.1.0
+
+metadata:
+  name: writing-great-skills
+  description: "Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/productivity/writing-great-skills"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/zoom-out/spec.yaml b/skills/zoom-out/spec.yaml
deleted file mode 100644
index 87ef33db..00000000
--- a/skills/zoom-out/spec.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Matt Pocock zoom-out Skill
-# Tell the agent to zoom out and give broader context on unfamiliar code.
-# Source: https://github.com/mattpocock/skills
-# Will publish as: ghcr.io/stacklok/dockyard/skills/zoom-out:0.1.0
-
-metadata:
-  name: zoom-out
-  description: "Tell the agent to zoom out and give broader context or a higher-level perspective. Use when you're unfamiliar with a section of code or need to understand how it fits into the bigger picture."
-
-spec:
-  repository: "https://github.com/mattpocock/skills"
-  ref: "f304057d61d3df3c9fd992ac2b6e3833cb9325fb"  # main as of 2026-04-30
-  path: "skills/engineering/zoom-out"
-  version: "0.1.1"
-
-provenance:
-  repository_uri: "https://github.com/mattpocock/skills"
-  repository_ref: "refs/heads/main"
-
-security:
-  allowed_issues:
-    - rule_id: MANIFEST_MISSING_LICENSE
-      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."

From b2c7853c4a3c64b5d149c8ae6a516670d4e815bd Mon Sep 17 00:00:00 2001
From: Samuele Verzi <samu@stacklok.com>
Date: Wed, 8 Jul 2026 18:30:48 +0200
Subject: [PATCH 2/4] chore(skills): bump spec.version to 0.2.0 for 10
 refreshed mattpocock skills

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 skills/git-guardrails-claude-code/spec.yaml    | 2 +-
 skills/grill-me/spec.yaml                      | 2 +-
 skills/grill-with-docs/spec.yaml               | 2 +-
 skills/improve-codebase-architecture/spec.yaml | 2 +-
 skills/migrate-to-shoehorn/spec.yaml           | 2 +-
 skills/scaffold-exercises/spec.yaml            | 2 +-
 skills/setup-matt-pocock-skills/spec.yaml      | 2 +-
 skills/setup-pre-commit/spec.yaml              | 2 +-
 skills/tdd/spec.yaml                           | 2 +-
 skills/triage/spec.yaml                        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/skills/git-guardrails-claude-code/spec.yaml b/skills/git-guardrails-claude-code/spec.yaml
index 5315dc52..9de810f9 100644
--- a/skills/git-guardrails-claude-code/spec.yaml
+++ b/skills/git-guardrails-claude-code/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/git-guardrails-claude-code"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/grill-me/spec.yaml b/skills/grill-me/spec.yaml
index a211d6db..d16236bc 100644
--- a/skills/grill-me/spec.yaml
+++ b/skills/grill-me/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/productivity/grill-me"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/grill-with-docs/spec.yaml b/skills/grill-with-docs/spec.yaml
index 1ca0ccba..cfbe90f5 100644
--- a/skills/grill-with-docs/spec.yaml
+++ b/skills/grill-with-docs/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/grill-with-docs"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/improve-codebase-architecture/spec.yaml b/skills/improve-codebase-architecture/spec.yaml
index d251395a..3661e3a7 100644
--- a/skills/improve-codebase-architecture/spec.yaml
+++ b/skills/improve-codebase-architecture/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/improve-codebase-architecture"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/migrate-to-shoehorn/spec.yaml b/skills/migrate-to-shoehorn/spec.yaml
index 7cff8533..43ac8124 100644
--- a/skills/migrate-to-shoehorn/spec.yaml
+++ b/skills/migrate-to-shoehorn/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/migrate-to-shoehorn"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/scaffold-exercises/spec.yaml b/skills/scaffold-exercises/spec.yaml
index ea8db8fe..f4f0299e 100644
--- a/skills/scaffold-exercises/spec.yaml
+++ b/skills/scaffold-exercises/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/scaffold-exercises"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/setup-matt-pocock-skills/spec.yaml b/skills/setup-matt-pocock-skills/spec.yaml
index 07ef36d5..737c4a24 100644
--- a/skills/setup-matt-pocock-skills/spec.yaml
+++ b/skills/setup-matt-pocock-skills/spec.yaml
@@ -12,7 +12,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/setup-matt-pocock-skills"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/setup-pre-commit/spec.yaml b/skills/setup-pre-commit/spec.yaml
index 75cb4fc3..d6e1917b 100644
--- a/skills/setup-pre-commit/spec.yaml
+++ b/skills/setup-pre-commit/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/misc/setup-pre-commit"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/tdd/spec.yaml b/skills/tdd/spec.yaml
index 972630ed..5f162d39 100644
--- a/skills/tdd/spec.yaml
+++ b/skills/tdd/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/tdd"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"
diff --git a/skills/triage/spec.yaml b/skills/triage/spec.yaml
index 2de73f6f..d57b50a6 100644
--- a/skills/triage/spec.yaml
+++ b/skills/triage/spec.yaml
@@ -11,7 +11,7 @@ spec:
   repository: "https://github.com/mattpocock/skills"
   ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
   path: "skills/engineering/triage"
-  version: "0.1.1"
+  version: "0.2.0"
 
 provenance:
   repository_uri: "https://github.com/mattpocock/skills"

From fd92ff8b1ebaa1a284a4666b930f8cd2f7ac0b44 Mon Sep 17 00:00:00 2001
From: Samuele Verzi <samu@stacklok.com>
Date: Wed, 8 Jul 2026 18:46:12 +0200
Subject: [PATCH 3/4] fix(skills): allowlist PG_EXFIL_HTML_TAG FP in
 improve-codebase-architecture

The scanner flags the <script src="https://cdn.tailwindcss.com"> tag in
HTML-REPORT.md's report scaffold. The file documents rendering the
architecture review as a static, self-contained local HTML file; the only
external references are the official Tailwind and Mermaid CDNs and no user
data is transmitted anywhere.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 skills/improve-codebase-architecture/spec.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/skills/improve-codebase-architecture/spec.yaml b/skills/improve-codebase-architecture/spec.yaml
index 3661e3a7..6cfed6fa 100644
--- a/skills/improve-codebase-architecture/spec.yaml
+++ b/skills/improve-codebase-architecture/spec.yaml
@@ -21,3 +21,9 @@ security:
   allowed_issues:
     - rule_id: MANIFEST_MISSING_LICENSE
       reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
+    # FP: PG_EXFIL_HTML_TAG pattern-matches the <script src="https://cdn.tailwindcss.com">
+    # tag in HTML-REPORT.md's scaffold example. The file documents how to render the
+    # architecture review as a static local HTML file; the only external references are
+    # the official Tailwind and Mermaid CDNs and no user data is transmitted anywhere.
+    - rule_id: PG_EXFIL_HTML_TAG
+      reason: "FP: scanner matched the Tailwind CDN <script> tag in HTML-REPORT.md's static report scaffold; a script include from the official CDN in a local, self-contained report template, no data exfiltration."

From 8eba96a25fb1884591433cbbb357578507bbdbd6 Mon Sep 17 00:00:00 2001
From: Samuele V <4377202+samuv@users.noreply.github.com>
Date: Thu, 9 Jul 2026 12:53:05 +0200
Subject: [PATCH 4/4] feat(skills): add 14 new mattpocock skills from upstream
 restructuring (#756)

Onboards all new engineering and productivity skills from
mattpocock/skills at d574778: ask-matt, codebase-design, domain-modeling,
implement, prototype, research, resolving-merge-conflicts, to-spec,
to-tickets, wayfinder, grilling, handoff, teach, and code-review
(vendored as matt-pocock-code-review to avoid colliding with the
getsentry-sourced code-review skill).

Skips upstream in-progress/, personal/, and deprecated/ categories.
Each spec pre-allowlists MANIFEST_MISSING_LICENSE (repo is MIT at root,
no SPDX identifier in per-skill frontmatter).

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 skills/ask-matt/spec.yaml                  | 23 ++++++++++++++++++++
 skills/codebase-design/spec.yaml           | 23 ++++++++++++++++++++
 skills/domain-modeling/spec.yaml           | 23 ++++++++++++++++++++
 skills/grilling/spec.yaml                  | 23 ++++++++++++++++++++
 skills/handoff/spec.yaml                   | 23 ++++++++++++++++++++
 skills/implement/spec.yaml                 | 23 ++++++++++++++++++++
 skills/matt-pocock-code-review/spec.yaml   | 25 ++++++++++++++++++++++
 skills/prototype/spec.yaml                 | 23 ++++++++++++++++++++
 skills/research/spec.yaml                  | 23 ++++++++++++++++++++
 skills/resolving-merge-conflicts/spec.yaml | 23 ++++++++++++++++++++
 skills/teach/spec.yaml                     | 23 ++++++++++++++++++++
 skills/to-spec/spec.yaml                   | 23 ++++++++++++++++++++
 skills/to-tickets/spec.yaml                | 23 ++++++++++++++++++++
 skills/wayfinder/spec.yaml                 | 23 ++++++++++++++++++++
 14 files changed, 324 insertions(+)
 create mode 100644 skills/ask-matt/spec.yaml
 create mode 100644 skills/codebase-design/spec.yaml
 create mode 100644 skills/domain-modeling/spec.yaml
 create mode 100644 skills/grilling/spec.yaml
 create mode 100644 skills/handoff/spec.yaml
 create mode 100644 skills/implement/spec.yaml
 create mode 100644 skills/matt-pocock-code-review/spec.yaml
 create mode 100644 skills/prototype/spec.yaml
 create mode 100644 skills/research/spec.yaml
 create mode 100644 skills/resolving-merge-conflicts/spec.yaml
 create mode 100644 skills/teach/spec.yaml
 create mode 100644 skills/to-spec/spec.yaml
 create mode 100644 skills/to-tickets/spec.yaml
 create mode 100644 skills/wayfinder/spec.yaml

diff --git a/skills/ask-matt/spec.yaml b/skills/ask-matt/spec.yaml
new file mode 100644
index 00000000..a5019761
--- /dev/null
+++ b/skills/ask-matt/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock ask-matt Skill
+# Router that recommends which skill or flow fits your situation.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/ask-matt:0.1.0
+
+metadata:
+  name: ask-matt
+  description: "Ask which skill or flow fits your situation. A router over the skills in this repo."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/ask-matt"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/codebase-design/spec.yaml b/skills/codebase-design/spec.yaml
new file mode 100644
index 00000000..0f7f170c
--- /dev/null
+++ b/skills/codebase-design/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock codebase-design Skill
+# Shared vocabulary for designing deep modules.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/codebase-design:0.1.0
+
+metadata:
+  name: codebase-design
+  description: "Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/codebase-design"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/domain-modeling/spec.yaml b/skills/domain-modeling/spec.yaml
new file mode 100644
index 00000000..84ccdefe
--- /dev/null
+++ b/skills/domain-modeling/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock domain-modeling Skill
+# Build and sharpen a project's domain model.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/domain-modeling:0.1.0
+
+metadata:
+  name: domain-modeling
+  description: "Build and sharpen a project's domain model. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision, or when another skill needs to maintain the domain model."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/domain-modeling"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/grilling/spec.yaml b/skills/grilling/spec.yaml
new file mode 100644
index 00000000..419a480a
--- /dev/null
+++ b/skills/grilling/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock grilling Skill
+# Grill the user relentlessly about a plan or design.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/grilling:0.1.0
+
+metadata:
+  name: grilling
+  description: "Grill the user relentlessly about a plan or design. Use when the user wants to stress-test a plan before building, or uses any 'grill' trigger phrases."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/productivity/grilling"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/handoff/spec.yaml b/skills/handoff/spec.yaml
new file mode 100644
index 00000000..00b470db
--- /dev/null
+++ b/skills/handoff/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock handoff Skill
+# Compact the current conversation into a handoff document for another agent.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/handoff:0.1.0
+
+metadata:
+  name: handoff
+  description: "Compact the current conversation into a handoff document for another agent to pick up."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/productivity/handoff"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/implement/spec.yaml b/skills/implement/spec.yaml
new file mode 100644
index 00000000..68e51205
--- /dev/null
+++ b/skills/implement/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock implement Skill
+# Implement a piece of work based on a spec or set of tickets.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/implement:0.1.0
+
+metadata:
+  name: implement
+  description: "Implement a piece of work based on a spec or set of tickets."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/implement"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/matt-pocock-code-review/spec.yaml b/skills/matt-pocock-code-review/spec.yaml
new file mode 100644
index 00000000..b85e44c7
--- /dev/null
+++ b/skills/matt-pocock-code-review/spec.yaml
@@ -0,0 +1,25 @@
+# Matt Pocock code-review Skill
+# Two-axis review (Standards + Spec) of changes since a fixed point.
+# Source: https://github.com/mattpocock/skills
+# Vendored as matt-pocock-code-review to avoid colliding with the
+# getsentry-sourced code-review skill; upstream name is code-review.
+# Will publish as: ghcr.io/stacklok/dockyard/skills/matt-pocock-code-review:0.1.0
+
+metadata:
+  name: matt-pocock-code-review
+  description: "Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/PRD asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to 'review since X'."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/code-review"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/prototype/spec.yaml b/skills/prototype/spec.yaml
new file mode 100644
index 00000000..261b688b
--- /dev/null
+++ b/skills/prototype/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock prototype Skill
+# Build a throwaway prototype to answer a design question.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/prototype:0.1.0
+
+metadata:
+  name: prototype
+  description: "Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model or logic feels right, or explore what a UI should look like."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/prototype"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/research/spec.yaml b/skills/research/spec.yaml
new file mode 100644
index 00000000..f6934c3f
--- /dev/null
+++ b/skills/research/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock research Skill
+# Investigate a question against high-trust primary sources and capture findings.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/research:0.1.0
+
+metadata:
+  name: research
+  description: "Investigate a question against high-trust primary sources and capture the findings as a Markdown file in the repo. Use when the user wants a topic researched, docs or API facts gathered, or reading legwork delegated to a background agent."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/research"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/resolving-merge-conflicts/spec.yaml b/skills/resolving-merge-conflicts/spec.yaml
new file mode 100644
index 00000000..64b40b17
--- /dev/null
+++ b/skills/resolving-merge-conflicts/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock resolving-merge-conflicts Skill
+# Resolve in-progress git merge/rebase conflicts.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/resolving-merge-conflicts:0.1.0
+
+metadata:
+  name: resolving-merge-conflicts
+  description: "Use when you need to resolve an in-progress git merge/rebase conflict."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/resolving-merge-conflicts"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/teach/spec.yaml b/skills/teach/spec.yaml
new file mode 100644
index 00000000..04e9d3b7
--- /dev/null
+++ b/skills/teach/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock teach Skill
+# Teach the user a new skill or concept within this workspace.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/teach:0.1.0
+
+metadata:
+  name: teach
+  description: "Teach the user a new skill or concept, within this workspace."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/productivity/teach"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/to-spec/spec.yaml b/skills/to-spec/spec.yaml
new file mode 100644
index 00000000..4a3cb554
--- /dev/null
+++ b/skills/to-spec/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock to-spec Skill
+# Turn the current conversation into a spec published to the issue tracker.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/to-spec:0.1.0
+
+metadata:
+  name: to-spec
+  description: "Turn the current conversation into a spec and publish it to the project issue tracker — no interview, just synthesis of what you've already discussed."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/to-spec"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/to-tickets/spec.yaml b/skills/to-tickets/spec.yaml
new file mode 100644
index 00000000..b8f0ff4a
--- /dev/null
+++ b/skills/to-tickets/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock to-tickets Skill
+# Break a plan or spec into tracer-bullet tickets with blocking edges.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/to-tickets:0.1.0
+
+metadata:
+  name: to-tickets
+  description: "Break a plan, spec, or the current conversation into a set of tracer-bullet tickets, each declaring its blocking edges, published to the configured tracker — edges as text in a local file, or native blocking links on a real tracker."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/to-tickets"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."
diff --git a/skills/wayfinder/spec.yaml b/skills/wayfinder/spec.yaml
new file mode 100644
index 00000000..fa5a7b3e
--- /dev/null
+++ b/skills/wayfinder/spec.yaml
@@ -0,0 +1,23 @@
+# Matt Pocock wayfinder Skill
+# Plan a huge chunk of work as a shared map of investigation tickets.
+# Source: https://github.com/mattpocock/skills
+# Will publish as: ghcr.io/stacklok/dockyard/skills/wayfinder:0.1.0
+
+metadata:
+  name: wayfinder
+  description: "Plan a huge chunk of work — more than one agent session can hold — as a shared map of investigation tickets on your issue tracker, and resolve them one at a time until the way to the destination is clear."
+
+spec:
+  repository: "https://github.com/mattpocock/skills"
+  ref: "d574778f94cf620fcc8ce741584093bc650a61d3"  # main as of 2026-07-08
+  path: "skills/engineering/wayfinder"
+  version: "0.1.0"
+
+provenance:
+  repository_uri: "https://github.com/mattpocock/skills"
+  repository_ref: "refs/heads/main"
+
+security:
+  allowed_issues:
+    - rule_id: MANIFEST_MISSING_LICENSE
+      reason: "mattpocock/skills is licensed MIT at the repository root; upstream does not embed an SPDX license identifier in per-skill SKILL.md frontmatter."