[thecolormaroun]

#51 kept 14 David skills and Matt's merge-conflict skill at their last reviewed versions after upstream removed them. This PR decides each one for good: 8 retired, 10 Stack-owned. Draft; not merged, not installed.

Retired

I read each SKILL.md first and kept none of them.

Skill	Why
david-pi-web-search	Pi agent only. Claude and Codex have their own web tools.
david-pi-custom-model	Edits Pi's model registry in ~/.pi/agent. No Pi on this machine.
david-push-skill-to-github	Pushes David's private ~/.agents repo through cmux panes.
david-distribute-skill-to-all-agents	David's four-folder symlink layout. Stack's installer already does distribution.
david-run-deep-swe	Model benchmark that reads David's OpenRouter key from ~/.zshrc.
david-level-up	Writes notes/learning/david-knowledge.md, tuned to David.
david-short	A one-line "make it shorter" prompt.
david-teach	An older fork of matt-teach, which stays.

Stack-owned

These no longer track upstream. Each moved out of skills/imported/ into its family root. Canonical name, family, command, role and trust are unchanged, so stack:<name> still works. references/source.md keeps the origin path, the last inspected commit and the full MIT notice, and the SKILL.md header now says "Stack-owned, adapted from …".

Skill	New path
david-youtube-transcript, david-research-prompt	skills/knowledge/
david-google-safe-browsing, david-cyber-audit	skills/review/
david-create-readonly-db-role, david-prompt-me, david-brain-to-docs	skills/engineering/
david-agent-self-scheduling	skills/orchestration/
david-folder-specific-claude-and-agents-md	skills/platform/
matt-resolving-merge-conflicts	skills/planning/. Matt removed the skill in 1.3.0 (CHANGELOG) and kept only an archived docs page.

The 12 other David skills still exist upstream and stay on the maintenance lane here. The next PR changes that.

What else changed

• registry/maintenance-imports.json: every David retained target is gone, and so is Matt's merge-conflict one. Matt's older writing-great-skills retention and CONTEXT-FORMAT.md are untouched.
• registry/maintenance-sources.json and config/stack-maintenance.json: a new stack-owned-imports row (repository-owned-capability) lists the 10 paths, and its id is in legacy_target_ids. The paths sit outside the maintenance diff allowlist, so the lane can't write to them.
• scripts/classify-capabilities.py: retired and converted names left the hardcoded family sets, because path now decides family. It also now skips manifests from import providers it has no rules for. On main, a rerun rewrote benjitaylor/stageshow's hand-reviewed manifest (family, context, validation evidence) and so was not idempotent. A new test reruns the classifier on a copy and requires zero manifest changes.
• Regenerated: registry/capabilities.json, the layout migration, the reconciliation artifact and config/runtime-targets.json catalog_digest. Retired skills left the layout record; converted ones record their new destination.
• docs/stack-maintenance.md records both lists with reasons. The router's imported-skills.md reference was updated to match, and I dropped a stale david-online-shopping row from it.

Watch out

• Monday's lane still blocks on David after this PR. davidondrej/skills flattened every path on 2026-11-09 (ad5bedd, skills/<category>/<name> became skills/<name>), after the audit Preserve approved imports during upstream maintenance #51 was built from. The 12 David skills this PR keeps point at paths that no longer exist. The next PR makes David pick-only, which clears it.
• Rollback for the retired skills is this PR's parent commit.
• Expect conflicts in generated files with feat(emil): import new emil skills (gestures, learn-taste) #54 and the ibelick pin. Rebase and regenerate; don't hand-edit them.

Validation

• python3 -m unittest discover -s tests: 531 tests, all pass.
• build-capability-registry.py --check, classify-capabilities.py --check, apply-skill-layout.py --dry-run (0 pending moves) and sync-upstreams.py pass. A classifier rerun leaves the tree unchanged.

🤖 Generated with Claude Code