Skip to content

refactor: single Matt-Pocock-style skills repo (ADR-0002, supersedes #42)#44

Merged
devstefancho merged 3 commits into
mainfrom
restructure-single-skills-repo
Jun 10, 2026
Merged

refactor: single Matt-Pocock-style skills repo (ADR-0002, supersedes #42)#44
devstefancho merged 3 commits into
mainfrom
restructure-single-skills-repo

Conversation

@devstefancho

Copy link
Copy Markdown
Owner

Summary

Re-applies the restructure from #42 on top of current main. #42 diverged before the skill restyle work (#43) merged and could not be taken as-is; this PR merges the #42 branch into main with conflicts resolved, keeping #42's structure and main's restyled skill content.

The repo is now a single Matt-Pocock-style skills repo (mattpocock/skills): every skill lives at skills/<category>/<name>/SKILL.md, there is one .claude-plugin/plugin.json, and the primary install path is the tool-agnostic npx skills add devstefancho/claude-plugins.

Implements docs/adr/0002-single-skills-repo-npx-primary.md and records docs/adr/0001-topic-based-spec-task-authoring.md.

What changed (vs main)

  • Layout — 14 skills under 5 categories: spec-driven, agents, browser, productivity, misc (git history preserved via merge). Single .claude-plugin/plugin.json lists all 14.
  • Commands folded into skills (argument dispatch): create-team absorbs cleanup-team/expand-team; hermes-runtime becomes the user-facing entry with its 5 commands + runtime scripts; test-commit-push-pr-clean / ui-prototype-preview commands move into their skill dirs.
  • Hook → setup-skillstop-notification becomes skills/misc/setup-notification, which installs the Stop/Notification hooks into the user's settings.json.
  • Dropped dual-publish machinery — all *-plugin/ wrappers, .codex-plugin/ manifests, both marketplace catalogs, scripts/sync-marketplace.sh, scripts/validate-plugins.sh.
  • DocsAGENTS.md / README.md rewritten to the single-repo shape, and they absorb the Skill Authoring Conventions and npx skills usage examples added on main in Refactor skill documentation: consolidate SKILL.md, add reference docs #43.

Conflict resolution vs #42

Verification

  • .claude-plugin/plugin.json valid; all 14 skill paths exist and every on-disk skill is registered.
  • All SKILL.md frontmatter parses; name matches its directory; description ≤1024 chars.
  • All ${CLAUDE_PLUGIN_ROOT}/… references and markdown links resolve to existing files.
  • No leftover *-plugin/ dirs, marketplace catalogs, or .codex-plugin references.

Follow-ups (carried over from #42)

  • Verify the npx skills add → Codex install path (ADR-0002 consequence).
  • Stale, out of scope: website/, scripts/generate-plugin-data.js, IMPLEMENTATION_SUMMARY*, QUICKSTART* still describe the old marketplace.
  • ADR-0001 (topic-based authoring) not yet applied to writing-specs / writing-tasks bodies.
  • test-commit-push-pr-clean sits under spec-driven; move to misc if preferred.

Closes #42.

🤖 Generated with Claude Code

devstefancho and others added 3 commits June 4, 2026 16:25
…isions

Captures the decisions from the 2026-05-23 /grill-with-docs session that
were left untracked in this worktree (at risk of loss on worktree removal):

- ADR-0002: restructure into a single skills repo, Matt-Pocock style
  (skills/<category>/<name>/SKILL.md as the unit, one repo-level plugin.json,
  `npx skills add` as the tier-1 install path, dropping the dual-publish
  marketplace machinery). Decision only — not yet implemented.
- ADR-0001: organize spec/task output by Topic, retiring the phase axis.
- CONTEXT.md: authoring glossary (Spec / Task / Topic / phase-retired /
  cross-cutting constraint).

Implementation of ADR-0002 (skills/ flattening, *-plugin wrapper removal,
single plugin.json, marketplace teardown, stop-notification -> setup-skill,
commands -> skill argument-dispatch, AGENTS.md rewrite) is still pending.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…R-0002)

Implements ADR-0002. The repo is now one plugin: every skill lives at
skills/<category>/<name>/SKILL.md, with a single .claude-plugin/plugin.json
and `npx skills add devstefancho/claude-plugins` as the primary install path.

Structure
- Move 13 skills out of *-plugin/ wrappers into 5 categories (spec-driven,
  agents, browser, productivity, misc) via git mv (history preserved).
- Add the single .claude-plugin/plugin.json listing all 14 skills.

Fold slash commands into their skills (argument dispatch)
- create-team absorbs cleanup-team / expand-team (kept under commands/ + a
  dispatch section; description updated to trigger on cleanup/expand).
- hermes-runtime becomes the user-facing entry; its 5 commands + runtime
  scripts (scripts/, lib/) move into the skill; script paths updated.
- test-commit-push-pr-clean / ui-prototype-preview commands move into their
  skill dirs (the SKILLs already own the logic; template paths fixed).

Hooks -> setup-skill
- stop-notification becomes skills/misc/setup-notification: a setup-skill that
  installs the Stop/Notification hooks into the user's settings.json. The TTS
  scripts travel with it.

Drop the dual-publish machinery
- Remove all *-plugin/ wrappers, .codex-plugin/ manifests, both marketplace
  catalogs (.claude-plugin/marketplace.json, .agents/), and
  scripts/sync-marketplace.sh + scripts/validate-plugins.sh.
- Rewrite AGENTS.md and README.md to the single-repo shape.

Preserve dev artifacts
- Eval suites move to evals/<skill>/; llm-wiki config example moves into its
  skill dir. Stale internal path references updated repo-wide.

Not done (follow-ups)
- Verify the npx -> Codex install path (ADR-0002 consequence).
- website/, scripts/generate-plugin-data.js, and IMPLEMENTATION_SUMMARY*/
  QUICKSTART* still describe the old marketplace and need updating.
- ADR-0001 (topic-based authoring) is recorded but not applied to SKILL bodies.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Restructure into a single Matt-Pocock-style skills repo (ADR-0002),
re-applied on top of the skill restyle work merged in PR #43:

- 14 skills under skills/<category>/ (spec-driven, agents, browser,
  productivity, misc); single .claude-plugin/plugin.json manifest.
- Dual-publish machinery dropped: *-plugin wrappers, .codex-plugin
  manifests, both marketplace catalogs, sync/validate scripts.
- Conflict resolution keeps main's restyled SKILL.md bodies
  (writing-specs, writing-tasks, llm-wiki path fix) and PR #42's
  structural edits (create-team dispatch, hermes-runtime user-facing
  entry, new file locations).
- AGENTS.md keeps the new single-repo shape and absorbs the Skill
  Authoring Conventions added on main.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@vercel

vercel Bot commented Jun 10, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
claude-plugins Ready Ready Preview, Comment Jun 10, 2026 12:46pm

@devstefancho devstefancho merged commit 52213ba into main Jun 10, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant