Skip to content

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

Open
devstefancho wants to merge 2 commits into
mainfrom
worktree-grill-topic-restructure
Open

refactor: single Matt-Pocock-style skills repo (ADR-0002)#42
devstefancho wants to merge 2 commits into
mainfrom
worktree-grill-topic-restructure

Conversation

@devstefancho
Copy link
Copy Markdown
Owner

Summary

Restructures the repo from a multi-agent plugins marketplace (13 *-plugin/ wrappers, dual .claude-plugin/.codex-plugin manifests, two marketplace catalogs, sync/validate scripts) into a single Matt-Pocock-style skills repo (mattpocock/skills).

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

Implements the decisions in docs/adr/0002-single-skills-repo-npx-primary.md (recorded in the first commit) and docs/adr/0001-topic-based-spec-task-authoring.md.

What changed

  • Layout — 13 skills git mv'd (history preserved) into 5 categories: spec-driven, agents, browser, productivity, misc. Single .claude-plugin/plugin.json lists all 14 skills.
  • Commands folded into skills (argument dispatch):
    • create-team absorbs cleanup-team / expand-team (under commands/ + a dispatch section).
    • hermes-runtime becomes the user-facing entry; its 5 commands + runtime scripts (scripts/, lib/) move into the skill.
    • test-commit-push-pr-clean / ui-prototype-preview commands move into their skill dirs.
  • Hook → setup-skillstop-notification becomes skills/misc/setup-notification, a setup-skill that installs the Stop/Notification hooks into the user's settings.json (TTS scripts travel with it).
  • Dropped dual-publish machinery — all *-plugin/ wrappers, .codex-plugin/ manifests, both marketplace catalogs (.claude-plugin/marketplace.json, .agents/), and scripts/sync-marketplace.sh + scripts/validate-plugins.sh.
  • DocsAGENTS.md and README.md rewritten to the single-repo shape.
  • Preserved — eval suites moved to evals/<skill>/; llm-wiki config example kept with its skill. Stale internal path references updated repo-wide.

143 files changed, 230 insertions(+), 1816 deletions(-)

Verification

  • .claude-plugin/plugin.json is valid JSON; all 14 listed skill paths exist and contain SKILL.md; every on-disk skill is registered.
  • All SKILL.md have name + description frontmatter; skill names are unique.
  • All ${CLAUDE_PLUGIN_ROOT}/… references and markdown links resolve to existing files.
  • No leftover marketplace.json / .codex-plugin / *-plugin wrapper references in shipped skills.

Follow-ups (not in this PR)

  • Verify the npx skills add → Codex install path (ADR-0002 consequence); document a clone + skills/ fallback if it falls short.
  • hermes-runtime still names its operations as /hermes:setup, /hermes:status, … in hints/docs — stale post-fold; pick a post-fold invocation convention and update.
  • Stale, out of scope here: website/, scripts/generate-plugin-data.js, IMPLEMENTATION_SUMMARY*, QUICKSTART* still describe the old marketplace.
  • ADR-0001 (topic-based authoring) is recorded but not yet applied to writing-specs / writing-tasks SKILL bodies.
  • test-commit-push-pr-clean was placed under spec-driven; move to misc if preferred (one git mv).

🤖 Generated with Claude Code

devstefancho and others added 2 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>
@vercel
Copy link
Copy Markdown

vercel Bot commented Jun 4, 2026

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

Project Deployment Actions Updated (UTC)
claude-plugins Ready Ready Preview, Comment Jun 4, 2026 8:18am

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