get-shit-pretty 0.6.2 → 0.7.0

package/gsp/skills/gsp-progress/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: progress
+name: gsp-progress
 description: How pretty are we?
 user-invocable: true
 model: sonnet
@@ -57,7 +57,7 @@ Determine the Brand Mark diamond states:
 
 For each phase marked as complete in STATE.md, verify the phase directory contains at least 1 chunk file. If `status === 'complete'` and chunk count is 0, display that phase as `◆!` with note "(empty — may need re-run)".
 
-If `config.json` is missing or unparseable for any instance, show the instance name with "(config error — run /gsp:doctor)" instead of crashing.
+If `config.json` is missing or unparseable for any instance, show the instance name with "(config error — run /gsp-doctor)" instead of crashing.
 
 ## Step 5: Display progress
 
@@ -66,15 +66,15 @@ Output as plain text using the visual elements from the styling section above.
 ### Empty State
 
 ```
-  /gsp: ◇◇
+  /gsp- ◇◇
 
   no brands or projects found.
-  run /gsp:start to begin.
+  run /gsp-start to begin.
 ```
 
 ### Standard State — render these elements:
 
-**Brand Mark:** `/gsp:` (accent+bold) followed by state diamonds
+**Brand Mark:** `/gsp-` (accent+bold) followed by state diamonds
 
 **Labeled Divider:** `  ─── {Label} ──────────────────` (tertiary `───`, secondary+bold label)
 
@@ -93,12 +93,12 @@ Column positions: phase at col 4, status at col 19, chunks at col 29, time at co
 **Collapsed complete items:**
 When 100% complete, single-line: `  acme-corp ◆ complete (4/4, 11 chunks)`
 
-**Next Skill:** `  → next: /gsp:brand-identity` (secondary `→ next:`, accent skill name)
+**Next Skill:** `  → next: /gsp-brand-identity` (secondary `→ next:`, accent skill name)
 
 ### Example: Early State (2/4 branding)
 
 ```
-  /gsp: ◈◇
+  /gsp- ◈◇
 
 
   ─── Brands ───────────────────────────
@@ -113,7 +113,7 @@ When 100% complete, single-line: `  acme-corp ◆ complete (4/4, 11 chunks)`
     identity       ◇         —         —
     patterns       ◇         —         —
 
-  → next: /gsp:brand-identity
+  → next: /gsp-brand-identity
 
 
   ─── Overall ──────────────────────────
@@ -127,7 +127,7 @@ When 100% complete, single-line: `  acme-corp ◆ complete (4/4, 11 chunks)`
 ### Example: Late State (brand complete, 4/6 project)
 
 ```
-  /gsp: ◆◈
+  /gsp- ◆◈
 
 
   ─── Brands ───────────────────────────
@@ -149,7 +149,7 @@ When 100% complete, single-line: `  acme-corp ◆ complete (4/4, 11 chunks)`
     build          ◈         —         —
     review         ◇         —         —
 
-  → next: /gsp:project-build
+  → next: /gsp-project-build
 
 
   ─── Overall ──────────────────────────
@@ -169,18 +169,18 @@ After the summary, if everything is 100% complete, add: `  fully pretty.` in pri
 For each in-progress instance, identify the next pending phase and suggest the skill.
 
 **Brand routing:**
-- Phase 1 (Research) pending -> `/gsp:brand-research`
-- Phase 2 (Strategy) pending -> `/gsp:brand-strategy`
-- Phase 3 (Identity) pending -> `/gsp:brand-identity`
-- Phase 4 (Patterns) pending -> `/gsp:brand-patterns`
+- Phase 1 (Research) pending -> `/gsp-brand-research`
+- Phase 2 (Strategy) pending -> `/gsp-brand-strategy`
+- Phase 3 (Identity) pending -> `/gsp-brand-identity`
+- Phase 4 (Patterns) pending -> `/gsp-brand-guidelines`
 
 **Project routing:**
-- Brief pending -> `/gsp:project-brief`
-- Research pending -> `/gsp:project-research`
-- Design pending -> `/gsp:project-design`
-- Critique pending -> `/gsp:project-critique`
-- Build pending -> `/gsp:project-build`
-- Review pending -> `/gsp:project-review`
+- Brief pending -> `/gsp-project-brief`
+- Research pending -> `/gsp-project-research`
+- Design pending -> `/gsp-project-design`
+- Critique pending -> `/gsp-project-critique`
+- Build pending -> `/gsp-project-build`
+- Review pending -> `/gsp-project-review`
 
 Output this as a single block. Do NOT add commentary or suggestions beyond the dashboard content.
 </process>

package/gsp/skills/gsp-project-brief/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: project-brief
+name: gsp-project-brief
 description: Scope what you're building
 user-invocable: true
 model: sonnet
@@ -28,7 +28,6 @@ Scope the project and plan adaptations from the brand system.
 </objective>
 
 <execution_context>
-@${CLAUDE_SKILL_DIR}/../../prompts/10-project-scoper.md
 @${CLAUDE_SKILL_DIR}/../../templates/phases/brief.md
 </execution_context>
 
@@ -37,7 +36,7 @@ Scope the project and plan adaptations from the brand system.
 
 Resolve project from `.design/projects/` (one → use it, multiple → ask). Set `PROJECT_PATH`.
 
-Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`. If brand.ref doesn't exist, tell the user to run `/gsp:start`.
+Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`. If brand.ref doesn't exist, tell the user to run `/gsp-start`.
 
 ## Step 1: Load context
 
@@ -45,9 +44,9 @@ Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`. If brand.ref doesn't exist
 
 Read `{BRAND_PATH}/patterns/INDEX.md`. If it exists, load all foundation chunks + selective component chunks.
 
-If it doesn't exist, tell the user to run `/gsp:brand-patterns` first to create the brand's design patterns.
+If it doesn't exist, tell the user to run `/gsp-brand-guidelines` first to create the brand's design patterns.
 
-Also read `{BRAND_PATH}/patterns/tokens.json`.
+Also read the brand `.yml` preset from `{BRAND_PATH}/patterns/`.
 
 ### Project context
 
@@ -68,7 +67,7 @@ Glob `.design/projects/*/STATE.md` — detect active sibling projects.
 **If `design_scope` is `tokens`:**
 1. Update `{PROJECT_PATH}/STATE.md` — set Phase 1 (Brief) status to `skipped`
 2. Display: "Brief phase skipped — design scope is `tokens`."
-3. Route: "Run `/gsp:project-build`."
+3. Route: "Run `/gsp-project-build`."
 4. Stop here.
 
 ## Step 1.7: Issue framing
@@ -84,11 +83,11 @@ Spawn the `gsp-scoper` agent. **Inline all content** — the agent should not ne
 
 Pass in the agent prompt:
 - **Content of** brand patterns foundation + component chunks (loaded in Step 1)
-- **Content of** tokens.json (loaded in Step 1)
+- **Content of** brand `.yml` preset (loaded in Step 1)
 - **Content of** BRIEF.md (loaded in Step 1)
 - **Content of** `.design/system/STACK.md`, `COMPONENTS.md` (when loaded in Step 1)
 - **Content of** CHANGELOG.md + relevant MANIFEST.md files (loaded in Step 1)
-- The Project Scoper prompt (10), brief output template (from execution_context)
+- Brief output template (from execution_context)
 - `implementation_target`, `design_scope`, `codebase_type`
 - **Output path:** `{PROJECT_PATH}/brief/`
 
@@ -131,6 +130,6 @@ Update `{PROJECT_PATH}/STATE.md`:
 
 ## Step 5: Phase transition output
 
-Render phase transition (see `references/phase-transitions.md`).
+Invoke `/gsp-phase-transition` with phase `brief` and output directory `{PROJECT_PATH}/brief/`.
 </process>
 </output>

package/gsp/skills/gsp-project-build/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: project-build
+name: gsp-project-build
 description: Translate designs to code
 user-invocable: true
 model: opus
@@ -22,10 +22,10 @@ Works with the dual-diamond architecture: reads brand system from `.design/brand
 **Pipeline architecture:**
 ```
 Phase 1: SCAFFOLD (skill-level, no agent)
-  └─ /gsp:scaffold → verify build passes
+  └─ /gsp-scaffold → verify build passes
 
 Phase 2: FOUNDATIONS (agent: gsp-builder mode:foundations)
-  ├─ Context: tokens.json, target-adaptations.md, STACK.md, CONVENTIONS.md
+  ├─ Context: {brand-name}.yml + token-mapping.md, target-adaptations.md, STACK.md, CONVENTIONS.md
   ├─ Writes: token config, global CSS, layout, shared utils
   └─ CHECKPOINT: build must compile
 
@@ -49,10 +49,14 @@ Implement designs as production-ready code in the codebase via phased pipeline w
 </objective>
 
 <execution_context>
-@${CLAUDE_SKILL_DIR}/../../prompts/09-design-to-code-translator.md
 @${CLAUDE_SKILL_DIR}/../../templates/phases/build.md
 </execution_context>
 
+<rules>
+- Always use `AskUserQuestion` for user interaction — never prompt via plain text
+- One decision per question — never batch multiple questions in a single message
+</rules>
+
 <process>
 ## Step 0: Resolve project and brand
 
@@ -63,7 +67,7 @@ Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`.
 ## Step 0.5: Validate prerequisites
 
 Read `{PROJECT_PATH}/STATE.md`. Check that Design (Phase 3) is `complete` or `needs-revision` (revision means critique ran and is feeding back).
-If design is `pending` or missing: "No designs found. Run `/gsp:project-design` first — building without designs leads to poor results." Then stop.
+If design is `pending` or missing: "No designs found. Run `/gsp-project-design` first — building without designs leads to poor results." Then stop.
 
 Exception: if `design_scope` is `tokens` in config.json, skip this check (tokens-only projects don't need design).
 
@@ -90,7 +94,7 @@ Check `{PROJECT_PATH}/STATE.md` for build status. If status is `needs-revision`:
 
 ### Design check
 
-If design doesn't exist (no `design/` dir or no screen chunks in it), tell the user to run `/gsp:project-design` first and stop.
+If design doesn't exist (no `design/` dir or no screen chunks in it), tell the user to run `/gsp-project-design` first and stop.
 
 ### Enumerate screens
 
@@ -101,7 +105,7 @@ Log screen list for user visibility.
 
 ## Step 2: Phase 1 — SCAFFOLD
 
-Invoke `/gsp:scaffold` via the Skill tool.
+Invoke `/gsp-scaffold` via the Skill tool.
 
 This handles: dependency installation, config file creation, component library init, build verification.
 
@@ -111,13 +115,14 @@ After scaffold completes, verify `{PROJECT_PATH}/build/SCAFFOLD-LOG.md` exists.
 
 ## Step 2.5: Load build references
 
-Read these reference files (relative to skill dir `${CLAUDE_SKILL_DIR}/../../references/`):
-- `visual-effects.md`
-- `block-patterns.md`
-- `anti-patterns.md`
+Read these reference files:
+- `${CLAUDE_SKILL_DIR}/visual-effects.md`
+- `${CLAUDE_SKILL_DIR}/../gsp-project-design/block-patterns.md`
 
 Hold their content for inlining into agent prompts in Steps 3 and 5.
 
+> **Note:** Anti-patterns are distilled into the `gsp-builder` agent prompt. Full ref remains on disk for edge-case agent lookup.
+
 ## Step 3: Phase 2 — FOUNDATIONS
 
 Spawn `gsp-builder` agent with **execution_mode: foundations**.
@@ -126,15 +131,15 @@ Spawn `gsp-builder` agent with **execution_mode: foundations**.
 
 | File | Purpose |
 |------|---------|
-| `{BRAND_PATH}/patterns/tokens.json` | Design tokens |
-| `{BRAND_PATH}/patterns/{brand-name}.md` | Brand visual DNA — effects, component stylings, bold bets (if exists) |
+| `{BRAND_PATH}/patterns/{brand-name}.yml` | Token values only — used with `gsp-brand-guidelines/token-mapping.md` to generate CSS variables. Do NOT re-read patterns/constraints/effects from here — those are in STYLE.md. |
+| `{BRAND_PATH}/patterns/STYLE.md` | Design law — philosophy, patterns, constraints, effects, bold bets, implementation hints (if exists; fall back to `{brand-name}.md`) |
 | `{PROJECT_PATH}/brief/target-adaptations.md` | Component adaptations for target |
 | `.design/system/STACK.md` | Stack state |
 | `.design/system/CONVENTIONS.md` | Codebase conventions (if exists) |
 | `.design/system/COMPONENTS.md` | Existing components (if exists) |
 | `{PROJECT_PATH}/config.json` | Tech stack, target |
-| Design-to-Code Translator prompt (09, from execution_context) | Translation methodology |
-| Visual effects, block patterns, anti-patterns refs (loaded in Step 2.5) | Design patterns + constraints |
+| Build output template (from execution_context) | Build log structure |
+| Visual effects, block patterns refs (loaded in Step 2.5) | Design patterns + CSS recipes |
 
 ### Agent instructions:
 
@@ -146,7 +151,7 @@ Spawn `gsp-builder` agent with **execution_mode: foundations**.
 > 2. Create global CSS (resets, base styles, font imports, dark mode setup)
 > 3. Create root layout with nav shell and footer shell (structure only — no page content)
 > 4. Create shared utilities (cn helper, theme provider if needed)
-> 5. Apply the brand style prompt's visual effects and signature patterns — create CSS utilities or Tailwind extensions for the brand's signature effects (glass, glow, gradients, shadows, motion patterns)
+> 5. Apply the STYLE.md bold bets and effects vocabulary — create CSS utilities or Tailwind extensions for the brand's signature effects. Validate against constraints (never/always rules are non-negotiable).
 > 6. Do NOT build individual screens or page content
 > 7. Write code directly to the codebase, not to `.design/`
 > 8. Leave changes unstaged
@@ -210,10 +215,10 @@ If the user requests adjustments during foundation review:
 
 1. Apply the changes to the project codebase first (directly or via a quick builder re-run)
 2. Ask: "Should this change also update the brand system? (Other projects using this brand would inherit it)"
-3. If yes, spawn a background `gsp-pattern-architect` agent to update brand patterns:
+3. If yes, spawn a background `gsp-brand-engineer` agent to update brand patterns:
    - Pass: the specific changes made (what tokens/values changed, old → new)
-   - Pass: `{BRAND_PATH}/patterns/tokens.json` and relevant identity chunks
-   - Agent updates tokens.json, foundation chunks, and style preset YAML if applicable
+   - Pass: `{BRAND_PATH}/patterns/{brand-name}.yml` and relevant identity chunks
+   - Agent updates the `.yml` preset, foundation chunks, and STYLE.md if applicable
    - Agent writes to `{BRAND_PATH}/` — the brand source of truth
    - Run in background (`run_in_background: true`) so the build pipeline continues
 4. Continue to Step 5 without waiting for brand sync
@@ -231,10 +236,10 @@ Build screens sequentially. For each screen in `SCREENS`:
 | `{PROJECT_PATH}/brief/target-adaptations.md` | Component adaptations |
 | `{PROJECT_PATH}/research/reference-specs.md` (if exists) | Technical specs |
 | `{PROJECT_PATH}/critique/prioritized-fixes.md` (if exists) | Critique fixes relevant to this screen |
-| Design-to-Code Translator prompt (09, from execution_context) | Translation methodology |
-| Visual effects, block patterns, anti-patterns refs (loaded in Step 2.5) | Design patterns + constraints |
+| Build output template (from execution_context) | Build log structure |
+| Visual effects, block patterns refs (loaded in Step 2.5) | Design patterns + CSS recipes |
 
-**Does NOT receive:** other screen chunks, tokens.json (already in codebase), full brand system, research monoliths.
+**Does NOT receive:** other screen chunks, brand `.yml` (already integrated into codebase), full brand system, research monoliths.
 
 ### Agent instructions per screen:
 
@@ -308,7 +313,7 @@ This step is **not auto-applied** — the user decides what to extract.
 If the extraction scan finds hardcoded values that should be tokens (finding type #2), and those tokens are missing from the brand system:
 
 1. After applying fixes in the project, ask: "These token gaps also exist in the brand. Update brand patterns?"
-2. If yes, spawn a background `gsp-pattern-architect` agent with the missing token definitions to add them to `{BRAND_PATH}/patterns/tokens.json` and relevant foundation chunks.
+2. If yes, spawn a background `gsp-brand-engineer` agent with the missing token definitions to add them to `{BRAND_PATH}/patterns/{brand-name}.yml` and relevant foundation chunks.
 
 ## Step 6: Finalize
 
@@ -348,7 +353,7 @@ Update `{PROJECT_PATH}/STATE.md`:
 
 ### Phase transition output
 
-Render phase transition (see `references/phase-transitions.md`). Include screen count and build status in the output.
+Invoke `/gsp-phase-transition` with phase `build` and output directory `{PROJECT_PATH}/build/`.
 
 ---
 
@@ -365,7 +370,7 @@ For `needs-revision` status, spawn a single `gsp-builder` agent with execution_m
 After the revision agent completes, check if any QA fixes changed token-level values (colors, typography, spacing, shadows). If so:
 
 1. Ask: "These revisions changed brand-level values. Update brand patterns so future projects inherit the fix?"
-2. If yes, spawn a background `gsp-pattern-architect` agent with the changed values to update `{BRAND_PATH}/patterns/`.
+2. If yes, spawn a background `gsp-brand-engineer` agent with the changed values to update `{BRAND_PATH}/patterns/`.
 
 Then continue from Step 6 (finalize).
 </process>

package/gsp/skills/gsp-project-critique/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: project-critique
+name: gsp-project-critique
 description: Critique your designs + accessibility audit
 user-invocable: true
 model: opus
@@ -26,8 +26,6 @@ Critique design quality and audit accessibility compliance.
 </objective>
 
 <execution_context>
-@${CLAUDE_SKILL_DIR}/../../prompts/06-design-critique-partner.md
-@${CLAUDE_SKILL_DIR}/../../prompts/08-accessibility-auditor.md
 @${CLAUDE_SKILL_DIR}/../../templates/phases/critique.md
 </execution_context>
 
@@ -59,48 +57,49 @@ Read `{PROJECT_PATH}/config.json` to get `implementation_target`, `design_scope`
 ## Step 1.5: Scope check
 
 **If `design_scope` is `tokens`:**
-1. Check if `{PROJECT_PATH}/critique/accessibility-token-audit.md` exists (from prior `/gsp:accessibility --tokens`). If yes, reference it and skip inline token checks. If no, suggest running `/gsp:accessibility --tokens` for detailed token contrast analysis.
+1. Check if `{PROJECT_PATH}/critique/accessibility-token-audit.md` exists (from prior `/gsp-accessibility --tokens`). If yes, reference it and skip inline token checks. If no, suggest running `/gsp-accessibility --tokens` for detailed token contrast analysis.
 2. Review system chunks only — token foundations, naming, scale consistency
 3. Run accessibility audit on color contrast and token values only (unless prior token audit exists)
 4. Write results to `{PROJECT_PATH}/critique/accessibility-audit.md` and `accessibility-fixes.md`
 5. Write `{PROJECT_PATH}/critique/INDEX.md`
 6. Update STATE.md — set Phase 4 to `complete`
-7. Route: "Run `/gsp:project-build`."
+7. Route: "Run `/gsp-project-build`."
 8. **Stop here**
 
 **Otherwise:** If design chunks don't exist and scope is not `tokens`, tell the user to complete the design phase first.
 
 ## Step 1.8: Load critique references
 
-Read these reference files (relative to skill dir `${CLAUDE_SKILL_DIR}/../../references/`):
-- `nielsen-heuristics.md`
-- `visual-taste.md`
-- `anti-patterns.md`
-- `wcag-checklist.md`
-- `color-composition.md`
+Read these reference files:
+- `${CLAUDE_SKILL_DIR}/../gsp-accessibility-audit/wcag-checklist.md`
+- `${CLAUDE_SKILL_DIR}/../gsp-color/references/color-composition.md`
 
 Hold their content for inlining into agent prompts in Step 2.
 
+> **Note:** Nielsen's heuristics, visual taste, and anti-patterns are distilled into the `gsp-critic` agent prompt. Full refs remain on disk for edge-case agent lookup.
+
 ## Step 2: Spawn critics (parallel)
 
-**Inline all content** — agents should not need to read any input files.
+**Inline all project content** — agents should not need to read project files. Reference files for supplementary evaluation (visual-taste, anti-patterns) are on disk — the critic reads them as needed.
 
 **Agent 1: gsp-critic** — Pass in the agent prompt:
 - **Content of** all design chunks (loaded in Step 1)
 - **Content of** all identity chunks (loaded in Step 1)
 - **Content of** all patterns chunks (loaded in Step 1)
+- **Content of** `STYLE.md` from `{BRAND_PATH}/patterns/` (if exists) — the critic checks designs against STYLE.md constraints, patterns, effects vocabulary, and bold bets
 - **Content of** brief chunks (loaded in Step 1)
 - **Content of** research recommendations.md (loaded in Step 1)
 - **Content of** BRIEF.md
-- **Content of** Nielsen's 10 Heuristics, visual taste, anti-patterns, color composition references (loaded in Step 1.8)
-- The Design Critique Partner prompt (06), critique output template (from execution_context)
+- **Content of** color composition reference (loaded in Step 1.8)
+- Critique output template (from execution_context)
+- `references_path`: `${CLAUDE_SKILL_DIR}/` — for supplementary Read access to visual-taste.md, anti-patterns.md
 - Output path: `{PROJECT_PATH}/critique/`
 
-**Agent 2: gsp-accessibility-auditor** — Check if `{PROJECT_PATH}/critique/accessibility-audit.md` already exists from a prior `/gsp:accessibility` run. If yes, skip spawning the accessibility auditor — reuse the existing output. If no, pass in the agent prompt:
+**Agent 2: gsp-accessibility-auditor** — Check if `{PROJECT_PATH}/critique/accessibility-audit.md` already exists from a prior `/gsp-accessibility` run. If yes, skip spawning the accessibility auditor — reuse the existing output. If no, pass in the agent prompt:
 - **Content of** all design chunks (loaded in Step 1)
 - **Content of** identity color-system.md and typography.md (loaded in Step 1)
 - **Content of** patterns tokens chunks (loaded in Step 1)
-- **Content of** WCAG checklist reference (loaded in Step 1.8), Accessibility Auditor prompt (08, from execution_context)
+- **Content of** WCAG checklist reference (loaded in Step 1.8)
 - `accessibility_level` from config (defaults to "WCAG 2.2 AA")
 - Output path: `{PROJECT_PATH}/critique/`
 
@@ -167,8 +166,8 @@ If verdict is **Fail**:
 
 ## Step 6: Phase transition output
 
-Render phase transition (see `references/phase-transitions.md`). This phase has pass/fail variants — the reference covers both.
+Invoke `/gsp-phase-transition` with phase `critique` and output directory `{PROJECT_PATH}/critique/`.
 
-If critique identified brand-level issues (palette contrast, typography weight, spacing scale), note: "Some issues are brand-level — run `/gsp:brand-refine` to adjust tokens without re-running identity."
+If critique identified brand-level issues (palette contrast, typography weight, spacing scale), note: "Some issues are brand-level — run `/gsp-brand-refine` to adjust tokens without re-running identity."
 </process>
 </output>

package/gsp/{references → skills/gsp-project-critique}/visual-taste.md

@@ -110,7 +110,7 @@ Does it feel like a $150k agency build? Score 1 if it looks AI-generated or temp
 
 ## How to Use
 
-This reference is loaded by the critique agent alongside `references/nielsen-heuristics.md`. During critique:
+This reference is loaded by the critique agent alongside `nielsen-heuristics.md`. During critique:
 
 1. Score each of the 15 taste items 1-5 with specific examples from the design
 2. Calculate total and map to sophistication level

package/gsp/skills/gsp-project-design/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: project-design
+name: gsp-project-design
 description: Design screens and interaction flows
 user-invocable: true
 model: opus
@@ -28,7 +28,6 @@ Design core UI/UX screens and interaction flows.
 </objective>
 
 <execution_context>
-@${CLAUDE_SKILL_DIR}/../../prompts/03-ui-ux-pattern-master.md
 @${CLAUDE_SKILL_DIR}/../../templates/phases/design.md
 </execution_context>
 
@@ -42,7 +41,7 @@ Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`.
 ## Step 0.5: Validate prerequisites
 
 Read `{PROJECT_PATH}/STATE.md`. Check that Brief (Phase 1) is `complete`.
-If not: "Brief hasn't been completed yet. Run `/gsp:project-brief` first." Then stop.
+If not: "Brief hasn't been completed yet. Run `/gsp-project-brief` first." Then stop.
 
 Research (Phase 2) is recommended but not required — if skipped, log: "No research artifacts found — designing from brief only."
 
@@ -67,19 +66,21 @@ If `{PROJECT_PATH}/references/` exists, scan for files (images, PDFs, markdown,
 
 Read `{BRAND_PATH}/patterns/INDEX.md`. If it exists, load all foundation chunks + selective component chunks.
 
-If it doesn't exist, tell the user to run `/gsp:brand-patterns` first.
+If it doesn't exist, tell the user to run `/gsp-brand-guidelines` first.
 
 ### Brand context (selective)
 
 Read `{BRAND_PATH}/identity/INDEX.md`. If it exists, load `color-system.md`, `typography.md`, and `imagery-style.md`.
 
-### Brand style prompt (visual DNA)
+### STYLE.md (visual DNA)
 
-Scan `{BRAND_PATH}/patterns/` for a `.md` file that is NOT `INDEX.md`, `principles.md`, or inside `foundations/` or `components/`. This is the brand's custom style prompt (`{brand-name}.md`).
+Check for `{BRAND_PATH}/patterns/STYLE.md`. This is the single document that governs all visual decisions.
 
-If found, read it. Pass to the designer agent in Step 3 as the **primary visual direction** — it contains design philosophy, bold visual bets, effects vocabulary, and component stylings with CSS/Tailwind hints.
+If found, read it. Pass to the designer agent in Step 3 as the **primary visual direction** — it contains intensity dials, component patterns, constraints (never/always), effects vocabulary, and bold bets.
 
-If not found, proceed without it (older brands may not have this file).
+If not found, fall back to scanning `{BRAND_PATH}/patterns/` for a `.md` file that is NOT `INDEX.md` or inside `components/` (legacy `{brand-name}.md` format).
+
+If neither found, proceed without it (older brands may not have this file).
 
 ### Brief (chunk-first)
 
@@ -98,7 +99,7 @@ If research doesn't exist, proceed without it (research is informative, not bloc
 **If `design_scope` is `tokens`:**
 1. Update `{PROJECT_PATH}/STATE.md` — set Phase 3 (Design) status to `skipped`
 2. Display: "Design phase skipped — design scope is `tokens`."
-3. Route: "Run `/gsp:project-build`."
+3. Route: "Run `/gsp-project-build`."
 4. Stop here.
 
 **If `design_scope` is `partial`:**
@@ -113,29 +114,28 @@ When `implementation_target` is not `figma`:
 ## Step 2.5: Load design references
 
 Read these reference files (relative to skill dir `${CLAUDE_SKILL_DIR}/../../references/`):
-- `apple-hig-patterns.md`
-- `visual-effects.md`
 - `block-patterns.md`
-- `anti-patterns.md`
 
 Hold their content for inlining into the agent prompt in Step 3.
 
+> **Note:** Apple HIG patterns and anti-patterns are distilled into the `gsp-designer` agent prompt. Visual effects are covered by STYLE.md's patterns/constraints/effects blocks (from #69). Full refs remain on disk for edge-case agent lookup.
+
 ## Step 3: Spawn designer
 
 Spawn the `gsp-designer` agent. **Inline all content** — the agent should not need to read any input files.
 
 Pass in the agent prompt:
-- **Content of** all brand patterns foundation chunks + selective component chunks (loaded in Step 1)
-- **Content of** brand identity chunks: color-system.md, typography.md, imagery-style.md (loaded in Step 1)
-- **Content of** brand style prompt ({brand-name}.md) when available
+- **Content of** STYLE.md when available — this is the primary visual direction. When STYLE.md exists, skip foundation chunks (color-system, typography, spacing, elevation, border-radius) — STYLE.md already contains this data. Only load selective component chunks.
+- **Content of** all brand patterns foundation chunks (only when STYLE.md does NOT exist — fallback for older brands)
+- **Content of** brand identity chunks: imagery-style.md (always — not covered by STYLE.md). Skip identity color-system.md and typography.md when STYLE.md exists (redundant).
 - **Content of** brief chunks: scope.md, target-adaptations.md (loaded in Step 1)
 - **Content of** research chunks: ux-patterns.md, recommendations.md, reference-specs.md (loaded in Step 1)
 - **Content of** BRIEF.md
 - **Content of** `.design/system/COMPONENTS.md`, `TOKENS.md` (when loaded in Step 2)
 - **Content of** custom references (when loaded in Step 1)
 - **Content of** critique fixes: prioritized-fixes.md, accessibility-fixes.md (when in revision mode)
-- The UI/UX Pattern Master prompt (03), design output template (from execution_context)
-- **Content of** Apple HIG patterns, visual effects, block patterns, anti-patterns references (loaded in Step 2.5)
+- Design output template (from execution_context)
+- **Content of** block patterns reference (loaded in Step 2.5)
 - `implementation_target`, `design_scope`, `codebase_type`
 - Target screens (when partial)
 - **Output path:** `{PROJECT_PATH}/design/`
@@ -155,6 +155,6 @@ Update `{PROJECT_PATH}/STATE.md`:
 
 ## Step 5: Phase transition output
 
-Render phase transition (see `references/phase-transitions.md`).
+Invoke `/gsp-phase-transition` with phase `design` and output directory `{PROJECT_PATH}/design/`.
 </process>
 </output>

package/gsp/skills/gsp-project-research/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: project-research
+name: gsp-project-research
 description: Research UX patterns and technical approaches
 user-invocable: true
 model: sonnet
@@ -17,7 +17,7 @@ allowed-tools:
 <context>
 Phase 2 of the GSP project diamond. Deep research phase that investigates UX patterns, competitor experiences, technical approaches, accessibility strategies, and content patterns specific to what this project is building.
 
-This is NOT brand-level discovery (that's `/gsp:brand-research`). This is project-level research — focused on the product type, user flows, and implementation challenges.
+This is NOT brand-level discovery (that's `/gsp-brand-research`). This is project-level research — focused on the product type, user flows, and implementation challenges.
 
 Works with the dual-diamond architecture: reads brand context from `.design/branding/{brand}/` via `brand.ref`, reads/writes project assets in `.design/projects/{project}/`.
 </context>
@@ -31,7 +31,6 @@ Deep research into UX patterns, competitor experiences, and technical approaches
 </objective>
 
 <execution_context>
-@${CLAUDE_SKILL_DIR}/../../prompts/12-project-researcher.md
 @${CLAUDE_SKILL_DIR}/../../templates/phases/research.md
 </execution_context>
 
@@ -48,7 +47,7 @@ Read `{PROJECT_PATH}/brand.ref` → set `BRAND_PATH`.
 
 Read `{PROJECT_PATH}/brief/INDEX.md`. If it exists, load `scope.md` and `target-adaptations.md`.
 
-If brief doesn't exist, tell the user to run `/gsp:project-brief` first.
+If brief doesn't exist, tell the user to run `/gsp-project-brief` first.
 
 ### Brand system (selective)
 
@@ -73,7 +72,7 @@ Read:
 **If `design_scope` is `tokens`:**
 1. Update `{PROJECT_PATH}/STATE.md` — set Phase 2 (Research) status to `skipped`
 2. Display: "Research phase skipped — design scope is `tokens`."
-3. Route: "Run `/gsp:project-build`."
+3. Route: "Run `/gsp-project-build`."
 4. Stop here.
 
 ## Step 1.75: Pre-fetch references (background)
@@ -91,7 +90,7 @@ Pass in the agent prompt:
 - **Content of** custom references (loaded in Step 1)
 - **Content of** BRIEF.md (loaded in Step 1)
 - Any pre-fetched reference content (from Step 1.75)
-- The Project Researcher prompt (12), research output template (from execution_context)
+- Research output template (from execution_context)
 - `implementation_target`, `platform`, `tech_stack`
 - **Output path:** `{PROJECT_PATH}/research/`
 
@@ -133,6 +132,6 @@ Update `{PROJECT_PATH}/STATE.md`:
 
 ## Step 4: Phase transition output
 
-Render phase transition (see `references/phase-transitions.md`).
+Invoke `/gsp-phase-transition` with phase `research` and output directory `{PROJECT_PATH}/research/`.
 </process>
 </output>