refactor(songwriting): split pat-pattison mega-skill into concern skills

README.md

@@ -49,7 +49,7 @@ Browse and manage with `/plugin`. To refresh after updates: `/plugin marketplace
 | [`session-flow`](plugins/session-flow) | Skills | Session-lifecycle toolkit of four skills: `workflow` (navigate a staged dev workflow and suggest the next stage), `handoff` (write a save-point + resume prompt for the `/clear`-and-resume pattern), `retro` (structured retrospective with a bundled transcript-metrics parser and learning codification), and `orchestration-brief` (arm a session or spawned worker with proactive-orchestration imperatives). |
 | [`tdd`](plugins/tdd) | Skill | Ships a TDD knowledge base distilled from Beck's *TDD: By Example* and Khorikov's *Unit Testing: Principles, Practices, and Patterns* — fourteen author-attributed reference files behind a routing table plus a no-load quick decision guide, answering the WHY behind test design decisions. |
 | [`claude-ops`](plugins/claude-ops) | Skills | Claude Code operations toolkit of three skills: `/claude-ops:claude-observability` (read locally captured telemetry — OTEL store, collector, hook-event JSONL, ccusage — with trend reports and store pruning), `/claude-ops:claude-troubleshooting` (search known Claude product bugs, check service health, maintain a persistent tracked-issue registry), and `/claude-ops:claude-code-changelog` (ingest Claude Code changelog entries and integrate them into the current repo). |
-| [`songwriting`](plugins/songwriting) | Skills | Songwriting craft companion. Ships two skills: `/songwriting:pat-pattison` (Pat Pattison lyric-craft coaching — rhyme, meter, prosody, song form, object writing, metaphor, co-writing, daily practice, with a live Datamuse rhyme/vocabulary helper) and `/songwriting:suno` (Suno v5.5 prompt engineering — style prompts, tagged lyrics, genre templates, troubleshooting). |
+| [`songwriting`](plugins/songwriting) | Skills | Songwriting craft companion. Lyric craft is decomposed by concern — `/songwriting:workflow` (start-here situation router + coaching), `/songwriting:rhyme` (rhyme generation, mosaic, worksheets, Datamuse helper), `/songwriting:object-writing` (object writing, metaphor, cliche, POV), `/songwriting:meter-prosody`, `/songwriting:song-form`, `/songwriting:co-write`, `/songwriting:diagnosis`, `/songwriting:daily-practice` (Pat Pattison methods) — plus `/songwriting:suno` (Suno v5.5 prompt engineering). |
 | [`source-control`](plugins/source-control) | Skills | Git/GitHub delivery workflow in three skills: `/source-control:commit` (Conventional Commits + Co-Authored-By trailer via safe heredoc mechanics), `/source-control:pull-request` (prep, create, CI monitoring, review-comment triage, merge, multi-PR babysit loop), and `/source-control:worktree` (create/status/cleanup/audit for parallel-session isolation). |
 | [`planning`](plugins/planning) | Skills | Pre-implementation planning pipeline of seven skills: `/planning:brainstorm` (cheapest→most-ambitious candidate divergence), `/planning:prd` (three-tier product requirements), `/planning:interview` (depth-first Q&A locking a task contract into a PLAN.md Brief), `/planning:design` (collaborative type/contract/topology exploration), `/planning:design-handoff` (binary design→plan gate with the architect-ready summary), `/planning:devils-advocate` (evidence-backed adversarial stress-testing), and `/planning:architect` (structured implementation plans with blast radius, parallelism analysis, and a user approval gate). |
 | [`review-toolkit`](plugins/review-toolkit) | Agents + Skills | Code-review toolkit: six read-only reviewer agents (code quality, security, architecture, doc drift, build/test/lint, CI-log audit) plus two orchestration skills — `/review-toolkit:quality-gate` (single-lens checkpoint with eight modes) and `/review-toolkit:code-review-fanout` (multi-surface fan-out normalized into one severity-ranked findings report, with a findings-driven fix pass). |

plugins/planning/skills/brainstorm/SKILL.md

@@ -10,7 +10,7 @@ disable-model-invocation: false
 
 The divergence step before any scoping: unknown-knowns (criteria the user only recognizes when seen) surface cheapest at candidate-list time — finding one mid-implementation costs a re-plan. A brainstorm round also calibrates scope: reacting to a cheapest→most-ambitious spread prevents locking a scope that is too narrow (missed the high-value approach) or too wide (ambition the problem doesn't need).
 
-Distinct neighbors: `/design` Phase 1 decomposes the problem space WITHIN a design task already chosen; a proactive architecture-friction scan (e.g. `/improve-architecture:improve-architecture`, if installed) hunts on its own lanes; a UI-variation prototyper (e.g. `/prototype:ui`, if installed) builds visual variations of a chosen direction. This skill is the general, problem-shaped entry upstream of all three. Creative-domain ideation owned by a domain skill (e.g. songwriting brainstorms → `/songwriting:pat-pattison`, if installed) stays with that skill.
+Distinct neighbors: `/design` Phase 1 decomposes the problem space WITHIN a design task already chosen; a proactive architecture-friction scan (e.g. `/improve-architecture:improve-architecture`, if installed) hunts on its own lanes; a UI-variation prototyper (e.g. `/prototype:ui`, if installed) builds visual variations of a chosen direction. This skill is the general, problem-shaped entry upstream of all three. Creative-domain ideation owned by a domain skill (e.g. songwriting brainstorms → `/songwriting:workflow`, if installed) stays with that skill.
 
 ## Task
 

plugins/songwriting/.claude-plugin/plugin.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://json.schemastore.org/claude-code-plugin-manifest.json",
   "name": "songwriting",
-  "version": "0.1.0",
-  "description": "Songwriting craft companion — Pat Pattison lyric-craft coaching (rhyme, meter, prosody, song form, object writing, metaphor, co-writing) and Suno AI prompt engineering (style prompts, tagged lyrics, genre templates, troubleshooting).",
+  "version": "0.2.0",
+  "description": "Songwriting craft companion — eight concern-scoped lyric-craft skills (workflow router, rhyme, object-writing, meter-prosody, song-form, co-write, diagnosis, daily-practice) applying Pat Pattison's methods, plus Suno v5.5 prompt engineering (style prompts, tagged lyrics, genre templates, troubleshooting).",
   "author": {
     "name": "Melodic Software",
     "email": "info@melodicsoftware.com"

plugins/songwriting/CHANGELOG.md

@@ -0,0 +1,36 @@
+# Changelog
+
+All notable changes to the `songwriting` plugin are documented here. Format follows
+[Keep a Changelog](https://keepachangelog.com/en/1.1.0/); this plugin uses semantic versioning.
+
+## [0.2.0]
+
+### Changed (breaking)
+
+- **Decomposed the `pat-pattison` mega-skill by concern.** The single lyric-craft skill is replaced
+  by focused concern skills: `workflow`, `rhyme`, `object-writing`, `meter-prosody`, `song-form`,
+  `co-write`, `diagnosis`, and `daily-practice`. Each is a thin router over the shared reference
+  corpus and runs the applicable response-filter section as its pre-flight. The `suno` skill is
+  unchanged.
+  - **Invocation change:** `/songwriting:pat-pattison <action>` is removed. Use the concern skill
+    that owns the action — e.g. `/songwriting:rhyme`, `/songwriting:meter-prosody meter`,
+    `/songwriting:diagnosis audit`. `/songwriting:workflow` is the start-here situation router and
+    carries the full cross-skill routing index and Quick Decision Guide.
+- **Reference content is preserved, not lost.** All 48 research files, 16 templates, the Datamuse
+  script, and the response filter moved verbatim to `context/pat-pattison/`, keeping every
+  intra-corpus link intact.
+
+### Design decision — concern-as-skill, author-as-context
+
+The decomposition separates two independent axes: **concern** (the craft topic → the skill you
+invoke) and **author/method** (whose opinionated technique → a content namespace). Pat Pattison's
+full method now lives once under `context/pat-pattison/`; the concern skills are author-neutral
+interfaces that load it. A future author's method for the same concern plugs in at
+`context/<author>/` without modifying the concern skills (open for extension, closed for
+modification). This is why the corpus is namespaced by author rather than sitting in a plain
+`context/` pool.
+
+## [0.1.0]
+
+- Initial release: `pat-pattison` lyric-craft skill (all four books plus Berklee/Coursera materials,
+  action router, mandatory response filter) and `suno` Suno v5.5 prompt-engineering skill.

plugins/songwriting/README.md

@@ -3,24 +3,48 @@
 A Claude Code plugin for **songwriting craft** — one cohesive capability covering the two halves of
 getting a song written with AI in the loop: writing the lyric well, and prompting Suno to perform it.
 
-It ships **two skills**:
+The lyric-craft side is decomposed **by concern** into focused skills, each a thin router over a
+shared reference corpus. Start with `/songwriting:workflow` if you have a situation ("blank page",
+"co-write tonight", "half a song") and it routes you; invoke a concern skill directly when you know
+the craft term.
 
 | Skill | Invoke | Answers |
 |---|---|---|
-| `pat-pattison` | `/songwriting:pat-pattison <action>` | Lyric craft — writing, rewriting, rhyming, diagnosis, object writing, metaphor, meter/prosody, song form, point of view, co-writing, and daily practice, applying Pat Pattison's methods (all 4 books plus Berklee/Coursera materials) through an action router and a mandatory response filter. |
-| `suno` | `/songwriting:suno <action>` | Suno v5.5 prompt engineering — style prompts (6-layer formula), tagged lyrics with per-section style overrides, 12 genre templates, genre research, troubleshooting, and feature guidance (Voices, Custom Models, Studio). |
+| `workflow` | `/songwriting:workflow <action>` | Start-here situation router (11 scenarios), step-by-step coaching dialog, blank-page/idea/fragment starts, the response-filter diagnostic, and going-deeper resources. |
+| `rhyme` | `/songwriting:rhyme <action>` | Rhyme generation and stress-testing — identity check, stability tiers, rhyme types, mosaic/multi-word rhyme, worksheets, and the Datamuse lookup supplement. |
+| `object-writing` | `/songwriting:object-writing <action>` | Sensory raw material and figurative language — object writing, metaphor (3 types, 8 recipes), cliche repair, and point of view. |
+| `meter-prosody` | `/songwriting:meter-prosody <action>` | Sound and motion — scansion/meter, prosody, phrasing, section stability, and lyric-melody alignment. |
+| `song-form` | `/songwriting:song-form <action>` | Structure — form and song forms, hook placement, repetition/repainting, verse development, the box model, and bridges. |
+| `co-write` | `/songwriting:co-write <action>` | Collaboration and volume — the No-Free-Zone co-write protocol, the Title Game, title generation, and high-volume line/section dumps. |
+| `diagnosis` | `/songwriting:diagnosis <action>` | Review and revise — demo review, full-draft diagnosis, the pre-lock audit checklist, variations, and rewrite. |
+| `daily-practice` | `/songwriting:daily-practice <action>` | Habit — the daily craft routine and numbered exercises across all four Pat Pattison books. |
+| `suno` | `/songwriting:suno <action>` | Suno v5.5 prompt engineering — style prompts (6-layer formula), tagged lyrics with per-section overrides, 12 genre templates, genre research, troubleshooting, and feature guidance (Voices, Custom Models, Studio). |
 
-The pair is deliberate: `/songwriting:pat-pattison` develops the lyric; `/songwriting:suno` formats
-the finished lyric for Suno's syntax. Each works standalone.
+The lyric-craft skills and `suno` are deliberately paired: the lyric-craft skills develop the lyric;
+`/songwriting:suno` formats the finished lyric for Suno's syntax. Each works standalone.
+
+## Method content and the author seam
+
+Every lyric-craft skill is **concern-scoped and author-neutral** — the skill is the stable interface
+(what you invoke); the opinionated method behind it is content. Today that method is **Pat
+Pattison's**, held once under `context/pat-pattison/` (the full reference corpus, its templates, the
+Datamuse script, and the mandatory response filter). A future author's method for the same concern
+plugs in at `context/<author>/` without changing the concern skills — the concern skills are open for
+extension, closed for modification.
+
+Every craft output first runs the applicable section of the response filter
+(`context/pat-pattison/research/response-filter.md`) — the gate that replaces generic LLM defaults
+(perfect rhymes, abstract telling, single-winner picks) with Pat's craft.
 
 ## Artifacts
 
 Per-song work persists under your project root at `songwriting/songs/<slug>/` by default
 (`LYRIC.md`, `BRIEF.md`, `ideation/`, `variations/`, `worksheets/`, `decisions/`), with daily
-practice, cross-song research, and shared worksheets in sibling `songwriting/` folders. If your
-project's own `CLAUDE.md` or rules define a different songwriting layout, that layout wins.
+practice (`songwriting/practice/<YYYY>/<date>.md`), cross-song research, and shared worksheets in
+sibling `songwriting/` folders. If your project's own `CLAUDE.md` or rules define a different
+songwriting layout, that layout wins.
 
-You can override any `pat-pattison` prompt template without forking the plugin: a file at
+You can override any prompt template without forking the plugin: a file at
 `songwriting/templates/pat-pattison/<name>.md` in your project takes precedence over the bundled
 default.
 
@@ -39,7 +63,7 @@ plus the project-level template override and layout override described above.
 ## Requirements
 
 None beyond Claude Code for the core skills. The optional Datamuse rhyme/vocabulary helper
-(`scripts/datamuse.sh`, used by `/songwriting:pat-pattison` rhyme actions as a supplement) needs
+(`context/pat-pattison/scripts/datamuse.sh`, used by `/songwriting:rhyme` as a supplement) needs
 `bash`, `curl`, and `jq`, and calls the free, no-auth [Datamuse API](https://www.datamuse.com/api/)
 — the only network egress in the plugin. Without those tools the skill degrades gracefully to
 internal rhyme generation.