refactor(imports): retire 8 David skills, make 10 David/Matt skills Stack-owned

artifacts/audits/phase1-architecture/capability-reconciliation.json

@@ -32,6 +32,9 @@
       "skills/design/rams/SKILL.md": "skills/design/rams/capability.json",
       "skills/design/review-animations/SKILL.md": "skills/design/review-animations/capability.json",
       "skills/design/ui-design-brain/SKILL.md": "skills/design/ui-design-brain/capability.json",
+      "skills/engineering/david-brain-to-docs/SKILL.md": "skills/engineering/david-brain-to-docs/capability.json",
+      "skills/engineering/david-create-readonly-db-role/SKILL.md": "skills/engineering/david-create-readonly-db-role/capability.json",
+      "skills/engineering/david-prompt-me/SKILL.md": "skills/engineering/david-prompt-me/capability.json",
       "skills/engineering/fix-sentry-issues/SKILL.md": "skills/engineering/fix-sentry-issues/capability.json",
       "skills/engineering/gemini-review/SKILL.md": "skills/engineering/gemini-review/capability.json",
       "skills/engineering/hermes-native-patch-migration/SKILL.md": "skills/engineering/hermes-native-patch-migration/capability.json",
@@ -40,35 +43,18 @@
       "skills/engineering/simplify/SKILL.md": "skills/engineering/simplify/capability.json",
       "skills/engineering/tdd/SKILL.md": "skills/engineering/tdd/capability.json",
       "skills/imported/benjitaylor/stageshow/SKILL.md": "skills/imported/benjitaylor/stageshow/capability.json",
-      "skills/imported/david/david-agent-self-scheduling/SKILL.md": "skills/imported/david/david-agent-self-scheduling/capability.json",
       "skills/imported/david/david-anti-sleep/SKILL.md": "skills/imported/david/david-anti-sleep/capability.json",
-      "skills/imported/david/david-brain-to-docs/SKILL.md": "skills/imported/david/david-brain-to-docs/capability.json",
       "skills/imported/david/david-browser-harness/SKILL.md": "skills/imported/david/david-browser-harness/capability.json",
       "skills/imported/david/david-cmux/SKILL.md": "skills/imported/david/david-cmux/capability.json",
       "skills/imported/david/david-codex-subagent/SKILL.md": "skills/imported/david/david-codex-subagent/capability.json",
-      "skills/imported/david/david-create-readonly-db-role/SKILL.md": "skills/imported/david/david-create-readonly-db-role/capability.json",
-      "skills/imported/david/david-cyber-audit/SKILL.md": "skills/imported/david/david-cyber-audit/capability.json",
       "skills/imported/david/david-deep-research/SKILL.md": "skills/imported/david/david-deep-research/capability.json",
       "skills/imported/david/david-deepapi/SKILL.md": "skills/imported/david/david-deepapi/capability.json",
-      "skills/imported/david/david-distribute-skill-to-all-agents/SKILL.md": "skills/imported/david/david-distribute-skill-to-all-agents/capability.json",
       "skills/imported/david/david-effective-agent-skills/SKILL.md": "skills/imported/david/david-effective-agent-skills/capability.json",
       "skills/imported/david/david-fable-safe-prompt/SKILL.md": "skills/imported/david/david-fable-safe-prompt/capability.json",
-      "skills/imported/david/david-folder-specific-claude-and-agents-md/SKILL.md": "skills/imported/david/david-folder-specific-claude-and-agents-md/capability.json",
       "skills/imported/david/david-goal-loop/SKILL.md": "skills/imported/david/david-goal-loop/capability.json",
-      "skills/imported/david/david-google-safe-browsing/SKILL.md": "skills/imported/david/david-google-safe-browsing/capability.json",
       "skills/imported/david/david-handoff/SKILL.md": "skills/imported/david/david-handoff/capability.json",
-      "skills/imported/david/david-level-up/SKILL.md": "skills/imported/david/david-level-up/capability.json",
-      "skills/imported/david/david-pi-custom-model/SKILL.md": "skills/imported/david/david-pi-custom-model/capability.json",
-      "skills/imported/david/david-pi-web-search/SKILL.md": "skills/imported/david/david-pi-web-search/capability.json",
-      "skills/imported/david/david-prompt-me/SKILL.md": "skills/imported/david/david-prompt-me/capability.json",
-      "skills/imported/david/david-push-skill-to-github/SKILL.md": "skills/imported/david/david-push-skill-to-github/capability.json",
       "skills/imported/david/david-read-all-adrs/SKILL.md": "skills/imported/david/david-read-all-adrs/capability.json",
-      "skills/imported/david/david-research-prompt/SKILL.md": "skills/imported/david/david-research-prompt/capability.json",
-      "skills/imported/david/david-run-deep-swe/SKILL.md": "skills/imported/david/david-run-deep-swe/capability.json",
       "skills/imported/david/david-setup-help/SKILL.md": "skills/imported/david/david-setup-help/capability.json",
-      "skills/imported/david/david-short/SKILL.md": "skills/imported/david/david-short/capability.json",
-      "skills/imported/david/david-teach/SKILL.md": "skills/imported/david/david-teach/capability.json",
-      "skills/imported/david/david-youtube-transcript/SKILL.md": "skills/imported/david/david-youtube-transcript/capability.json",
       "skills/imported/emil/emil-animate-expo/SKILL.md": "skills/imported/emil/emil-animate-expo/capability.json",
       "skills/imported/emil/emil-animate/SKILL.md": "skills/imported/emil/emil-animate/capability.json",
       "skills/imported/emil/emil-animation-performance/SKILL.md": "skills/imported/emil/emil-animation-performance/capability.json",
@@ -119,7 +105,6 @@
       "skills/imported/matt/matt-improve-codebase-architecture/SKILL.md": "skills/imported/matt/matt-improve-codebase-architecture/capability.json",
       "skills/imported/matt/matt-prototype/SKILL.md": "skills/imported/matt/matt-prototype/capability.json",
       "skills/imported/matt/matt-research/SKILL.md": "skills/imported/matt/matt-research/capability.json",
-      "skills/imported/matt/matt-resolving-merge-conflicts/SKILL.md": "skills/imported/matt/matt-resolving-merge-conflicts/capability.json",
       "skills/imported/matt/matt-setup-matt-pocock-skills/SKILL.md": "skills/imported/matt/matt-setup-matt-pocock-skills/capability.json",
       "skills/imported/matt/matt-tdd/SKILL.md": "skills/imported/matt/matt-tdd/capability.json",
       "skills/imported/matt/matt-teach/SKILL.md": "skills/imported/matt/matt-teach/capability.json",
@@ -152,20 +137,27 @@
       "skills/imported/ui/fixing-metadata/SKILL.md": "skills/imported/ui/fixing-metadata/capability.json",
       "skills/imported/ui/fixing-motion-performance/SKILL.md": "skills/imported/ui/fixing-motion-performance/capability.json",
       "skills/imported/ui/transitions-dev-motion/SKILL.md": "skills/imported/ui/transitions-dev-motion/capability.json",
+      "skills/knowledge/david-research-prompt/SKILL.md": "skills/knowledge/david-research-prompt/capability.json",
+      "skills/knowledge/david-youtube-transcript/SKILL.md": "skills/knowledge/david-youtube-transcript/capability.json",
       "skills/knowledge/field-theory-bookmark-synthesis/SKILL.md": "skills/knowledge/field-theory-bookmark-synthesis/capability.json",
       "skills/knowledge/fieldbook-source-split/SKILL.md": "skills/knowledge/fieldbook-source-split/capability.json",
       "skills/knowledge/muller-brockmann-grid-systems/SKILL.md": "skills/knowledge/muller-brockmann-grid-systems/capability.json",
       "skills/knowledge/userinterface-wiki/SKILL.md": "skills/knowledge/userinterface-wiki/capability.json",
+      "skills/orchestration/david-agent-self-scheduling/SKILL.md": "skills/orchestration/david-agent-self-scheduling/capability.json",
       "skills/orchestration/goal-validation-threads/SKILL.md": "skills/orchestration/goal-validation-threads/capability.json",
       "skills/orchestration/goal/SKILL.md": "skills/orchestration/goal/capability.json",
       "skills/orchestration/handoff/SKILL.md": "skills/orchestration/handoff/capability.json",
       "skills/orchestration/parallel-goals/SKILL.md": "skills/orchestration/parallel-goals/capability.json",
+      "skills/planning/matt-resolving-merge-conflicts/SKILL.md": "skills/planning/matt-resolving-merge-conflicts/capability.json",
+      "skills/platform/david-folder-specific-claude-and-agents-md/SKILL.md": "skills/platform/david-folder-specific-claude-and-agents-md/capability.json",
       "skills/platform/local-tracker-dashboard/SKILL.md": "skills/platform/local-tracker-dashboard/capability.json",
       "skills/platform/reclaude/SKILL.md": "skills/platform/reclaude/capability.json",
       "skills/product/compatibility/ideate/SKILL.md": "skills/product/compatibility/ideate/capability.json",
       "skills/product/cpo/SKILL.md": "skills/product/cpo/capability.json",
       "skills/qa/live-site-health-check/SKILL.md": "skills/qa/live-site-health-check/capability.json",
       "skills/review/agent-verification-ladder/SKILL.md": "skills/review/agent-verification-ladder/capability.json",
+      "skills/review/david-cyber-audit/SKILL.md": "skills/review/david-cyber-audit/capability.json",
+      "skills/review/david-google-safe-browsing/SKILL.md": "skills/review/david-google-safe-browsing/capability.json",
       "skills/review/scratch-eval-promotion-gate/SKILL.md": "skills/review/scratch-eval-promotion-gate/capability.json"
     },
     "discovered": [
@@ -193,6 +185,9 @@
       "skills/design/rams/SKILL.md",
       "skills/design/review-animations/SKILL.md",
       "skills/design/ui-design-brain/SKILL.md",
+      "skills/engineering/david-brain-to-docs/SKILL.md",
+      "skills/engineering/david-create-readonly-db-role/SKILL.md",
+      "skills/engineering/david-prompt-me/SKILL.md",
       "skills/engineering/fix-sentry-issues/SKILL.md",
       "skills/engineering/gemini-review/SKILL.md",
       "skills/engineering/hermes-native-patch-migration/SKILL.md",
@@ -201,35 +196,18 @@
       "skills/engineering/simplify/SKILL.md",
       "skills/engineering/tdd/SKILL.md",
       "skills/imported/benjitaylor/stageshow/SKILL.md",
-      "skills/imported/david/david-agent-self-scheduling/SKILL.md",
       "skills/imported/david/david-anti-sleep/SKILL.md",
-      "skills/imported/david/david-brain-to-docs/SKILL.md",
       "skills/imported/david/david-browser-harness/SKILL.md",
       "skills/imported/david/david-cmux/SKILL.md",
       "skills/imported/david/david-codex-subagent/SKILL.md",
-      "skills/imported/david/david-create-readonly-db-role/SKILL.md",
-      "skills/imported/david/david-cyber-audit/SKILL.md",
       "skills/imported/david/david-deep-research/SKILL.md",
       "skills/imported/david/david-deepapi/SKILL.md",
-      "skills/imported/david/david-distribute-skill-to-all-agents/SKILL.md",
       "skills/imported/david/david-effective-agent-skills/SKILL.md",
       "skills/imported/david/david-fable-safe-prompt/SKILL.md",
-      "skills/imported/david/david-folder-specific-claude-and-agents-md/SKILL.md",
       "skills/imported/david/david-goal-loop/SKILL.md",
-      "skills/imported/david/david-google-safe-browsing/SKILL.md",
       "skills/imported/david/david-handoff/SKILL.md",
-      "skills/imported/david/david-level-up/SKILL.md",
-      "skills/imported/david/david-pi-custom-model/SKILL.md",
-      "skills/imported/david/david-pi-web-search/SKILL.md",
-      "skills/imported/david/david-prompt-me/SKILL.md",
-      "skills/imported/david/david-push-skill-to-github/SKILL.md",
       "skills/imported/david/david-read-all-adrs/SKILL.md",
-      "skills/imported/david/david-research-prompt/SKILL.md",
-      "skills/imported/david/david-run-deep-swe/SKILL.md",
       "skills/imported/david/david-setup-help/SKILL.md",
-      "skills/imported/david/david-short/SKILL.md",
-      "skills/imported/david/david-teach/SKILL.md",
-      "skills/imported/david/david-youtube-transcript/SKILL.md",
       "skills/imported/emil/emil-animate-expo/SKILL.md",
       "skills/imported/emil/emil-animate/SKILL.md",
       "skills/imported/emil/emil-animation-performance/SKILL.md",
@@ -280,7 +258,6 @@
       "skills/imported/matt/matt-improve-codebase-architecture/SKILL.md",
       "skills/imported/matt/matt-prototype/SKILL.md",
       "skills/imported/matt/matt-research/SKILL.md",
-      "skills/imported/matt/matt-resolving-merge-conflicts/SKILL.md",
       "skills/imported/matt/matt-setup-matt-pocock-skills/SKILL.md",
       "skills/imported/matt/matt-tdd/SKILL.md",
       "skills/imported/matt/matt-teach/SKILL.md",
@@ -313,27 +290,34 @@
       "skills/imported/ui/fixing-metadata/SKILL.md",
       "skills/imported/ui/fixing-motion-performance/SKILL.md",
       "skills/imported/ui/transitions-dev-motion/SKILL.md",
+      "skills/knowledge/david-research-prompt/SKILL.md",
+      "skills/knowledge/david-youtube-transcript/SKILL.md",
       "skills/knowledge/field-theory-bookmark-synthesis/SKILL.md",
       "skills/knowledge/fieldbook-source-split/SKILL.md",
       "skills/knowledge/muller-brockmann-grid-systems/SKILL.md",
       "skills/knowledge/userinterface-wiki/SKILL.md",
+      "skills/orchestration/david-agent-self-scheduling/SKILL.md",
       "skills/orchestration/goal-validation-threads/SKILL.md",
       "skills/orchestration/goal/SKILL.md",
       "skills/orchestration/handoff/SKILL.md",
       "skills/orchestration/parallel-goals/SKILL.md",
+      "skills/planning/matt-resolving-merge-conflicts/SKILL.md",
+      "skills/platform/david-folder-specific-claude-and-agents-md/SKILL.md",
       "skills/platform/local-tracker-dashboard/SKILL.md",
       "skills/platform/reclaude/SKILL.md",
       "skills/product/compatibility/ideate/SKILL.md",
       "skills/product/cpo/SKILL.md",
       "skills/qa/live-site-health-check/SKILL.md",
       "skills/review/agent-verification-ladder/SKILL.md",
+      "skills/review/david-cyber-audit/SKILL.md",
+      "skills/review/david-google-safe-browsing/SKILL.md",
       "skills/review/scratch-eval-promotion-gate/SKILL.md"
     ],
     "missing": []
   },
   "counts": {
-    "callable_skills": 159,
-    "manifests": 159,
+    "callable_skills": 151,
+    "manifests": 151,
     "package_exports": 20,
     "private_declarations": 1,
     "unclassified": 0

config/runtime-targets.json

@@ -1,6 +1,6 @@
 {
   "schema_version": 1,
-  "catalog_digest": "f5aea9cb9218e379ee2b5c03a9b0967dd7701c840e5a5cdd48bddfe7c6ec9a8a",
+  "catalog_digest": "3bb864f353cac156603490a1ff0d930971861c5e81b1727b2411f24c830ae09a",
   "targets": [
     {
       "name": "claude",

config/stack-maintenance.json

@@ -10,6 +10,7 @@
     "stack-codex-bundle",
     "matt-skills",
     "david-skills",
+    "stack-owned-imports",
     "impeccable",
     "emil-design-eng",
     "review-animations",

docs/stack-maintenance.md

@@ -219,6 +219,49 @@ support files keep their individual inspected commits across later provider
 updates. The materializer reads both legacy grouped Markdown provenance and
 per-file Markdown/JSON provenance, and rejects malformed retained-file records.
 
+### Retired and Stack-owned former imports (2026-11-13)
+
+Retention keeps a removed upstream skill at its last reviewed bytes until the
+owner decides. On 2026-11-13 every retained David and Matt skill was decided.
+None is a retained target any more.
+
+Retired, because each only works in its author's own setup or adds nothing
+Stack lacks. Git history at the parent of the retiring commit is the rollback
+reference.
+
+| Skill | Reason |
+| --- | --- |
+| `david-pi-web-search` | Pi agent only; other runtimes have their own web tools. |
+| `david-pi-custom-model` | Pi agent model registry (`~/.pi/agent`). |
+| `david-push-skill-to-github` | Pushes the author's private `~/.agents` repo through cmux. |
+| `david-distribute-skill-to-all-agents` | The author's four-folder symlink layout; Stack's installer owns distribution. |
+| `david-run-deep-swe` | Model benchmark using the author's OpenRouter key from `~/.zshrc`. |
+| `david-level-up` | Writes `notes/learning/david-knowledge.md` and is tuned to the author. |
+| `david-short` | A one-line "make it shorter" prompt. |
+| `david-teach` | An older fork of `matt-teach`, which Stack keeps. |
+
+Stack-owned, so the lane no longer tracks upstream. Each skill keeps its
+canonical name, family and command, and moved out of `skills/imported/`
+into its family root. `references/source.md` keeps the origin path, the last
+inspected commit and the MIT notice. The `stack-owned-imports` source row
+records them as `repository-owned-capability`, which puts them outside the
+maintenance diff allowlist.
+
+| Skill | Stack path | Origin |
+| --- | --- | --- |
+| `david-youtube-transcript` | `skills/knowledge/` | `davidondrej/skills` research-and-web |
+| `david-research-prompt` | `skills/knowledge/` | `davidondrej/skills` research-and-web |
+| `david-google-safe-browsing` | `skills/review/` | `davidondrej/skills` ops-and-setup |
+| `david-cyber-audit` | `skills/review/` | `davidondrej/skills` ops-and-setup |
+| `david-create-readonly-db-role` | `skills/engineering/` | `davidondrej/skills` ops-and-setup |
+| `david-prompt-me` | `skills/engineering/` | `davidondrej/skills` thinking-and-docs |
+| `david-brain-to-docs` | `skills/engineering/` | `davidondrej/skills` thinking-and-docs |
+| `david-agent-self-scheduling` | `skills/orchestration/` | `davidondrej/skills` agent-orchestration |
+| `david-folder-specific-claude-and-agents-md` | `skills/platform/` | `davidondrej/skills` skill-authoring |
+| `matt-resolving-merge-conflicts` | `skills/planning/` | `mattpocock/skills` engineering; upstream removed the skill (CHANGELOG, PR 1120) and keeps only an archived docs page |
+
+The David skills that still exist upstream stay on the maintenance lane.
+
 `prepare` creates a disposable candidate clone outside the caller checkout
 from that recorded `origin/main` SHA. Only explicit policy-allowlisted files
 with receipt-bound manifest hashes can be proposed, and candidate content is