diff --git a/.agents/skills/impeccable/SKILL.md b/.agents/skills/impeccable/SKILL.md
new file mode 100644
index 00000000..25044b37
--- /dev/null
+++ b/.agents/skills/impeccable/SKILL.md
@@ -0,0 +1,176 @@
+---
+name: impeccable
+description: Use when the user wants to design, redesign, shape, critique, audit, polish, clarify, distill, harden, optimize, adapt, animate, colorize, extract, or otherwise improve a frontend interface. Covers websites, landing pages, dashboards, product UI, app shells, components, forms, settings, onboarding, and empty states. Handles UX review, visual hierarchy, information architecture, cognitive load, accessibility, performance, responsive behavior, theming, anti-patterns, typography, fonts, spacing, layout, alignment, color, motion, micro-interactions, UX copy, error states, edge cases, i18n, and reusable design systems or tokens. Also use for bland designs that need to become bolder or more delightful, loud designs that should become quieter, live browser iteration on UI elements, or ambitious visual effects that should feel technically extraordinary. Not for backend-only or non-UI tasks.
+---
+
+Designs and iterates production-grade frontend interfaces. Real working code, committed design choices, exceptional craft.
+
+## Setup (non-optional)
+
+Before any design work or file edits, pass these gates. Skipping them produces generic output that ignores the project.
+
+| Gate | Required check | If fail |
+|---|---|---|
+| Context | The PRODUCT.md / DESIGN.md loader result is known from `node .agents/skills/impeccable/scripts/load-context.mjs`. | Run the loader before continuing. |
+| Product | PRODUCT.md exists and is not empty or placeholder (`[TODO]` markers, <200 chars). | Run `$impeccable teach`, refresh context, then resume. Never synthesize PRODUCT.md from the user's original prompt alone. |
+| Command | The matching command reference is loaded when a sub-command is used. | Load the reference before continuing. |
+| Craft | `$impeccable craft` has a user-confirmed shape brief for this task. `teach` / PRODUCT.md never counts as shape. | Run `$impeccable shape` and wait for explicit brief confirmation. |
+| Image | Required visual probes / mocks are generated or skipped with a reason. | Resolve the image-generation gate in `shape.md` or `craft.md` before code. |
+| Mutation | All active gates above pass. | Do not edit project files yet. |
+
+Codex-style agents must state this before editing files:
+
+```text
+IMPECCABLE_PREFLIGHT: context=pass product=pass command_reference=pass shape=pass|not_required image_gate=pass|skipped:<reason> mutation=open
+```
+
+For `$impeccable craft`, `shape=pass` is only valid after a separate user response approving the shape design brief, or when the user provided an already-confirmed brief in the request. Do not mark `shape=pass` after writing PRODUCT.md, summarizing assumptions, or drafting an unconfirmed brief yourself.
+
+Other harnesses should follow the same checklist when they can expose this state.
+
+### 1. Context gathering
+
+Two files, case-insensitive. The loader looks at the project root by default and falls back to `.agents/context/` and `docs/` if the root is clean. Override with `IMPECCABLE_CONTEXT_DIR=path/to/dir` (absolute or relative to cwd).
+
+- **PRODUCT.md**: required. Users, brand, tone, anti-references, strategic principles.
+- **DESIGN.md**: optional, strongly recommended. Colors, typography, elevation, components.
+
+Load both in one call:
+
+```bash
+node .agents/skills/impeccable/scripts/load-context.mjs
+```
+
+Consume the full JSON output. Never pipe through `head`, `tail`, `grep`, or `jq`. The output's `contextDir` field tells you where the files were resolved from.
+
+If the output is already in this session's conversation history, don't re-run. Exceptions requiring a fresh load: you just ran `$impeccable teach` or `$impeccable document` (they rewrite the files), or the user manually edited one.
+
+`$impeccable live` already warms context via `live.mjs`. If you've run `live.mjs`, don't also run `load-context.mjs` this session.
+
+If PRODUCT.md is missing, empty, or placeholder (`[TODO]` markers, <200 chars): run `$impeccable teach`, then resume the user's original task with the fresh context. If the original task was `$impeccable craft`, resume into `$impeccable shape` before any implementation work.
+
+If DESIGN.md is missing: nudge once per session (*"Run `$impeccable document` for more on-brand output"*), then proceed.
+
+### 2. Register
+
+Every design task is **brand** (marketing, landing, campaign, long-form content, portfolio: design IS the product) or **product** (app UI, admin, dashboard, tool: design SERVES the product).
+
+Identify before designing. Priority: (1) cue in the task itself ("landing page" vs "dashboard"); (2) the surface in focus (the page, file, or route being worked on); (3) `register` field in PRODUCT.md. First match wins.
+
+If PRODUCT.md lacks the `register` field (legacy), infer it once from its "Users" and "Product Purpose" sections, then cache the inferred value for the session. Suggest the user run `$impeccable teach` to add the field explicitly.
+
+Load the matching reference: [reference/brand.md](reference/brand.md) or [reference/product.md](reference/product.md). The shared design laws below apply to both.
+
+## Shared design laws
+
+Apply to every design, both registers. Match implementation complexity to the aesthetic vision: maximalism needs elaborate code, minimalism needs precision. Interpret creatively. Vary across projects; never converge on the same choices. GPT is capable of extraordinary work. Don't hold back.
+
+### Color
+
+- Use OKLCH. Reduce chroma as lightness approaches 0 or 100; high chroma at extremes looks garish.
+- Never use `#000` or `#fff`. Tint every neutral toward the brand hue (chroma 0.005–0.01 is enough).
+- Pick a **color strategy** before picking colors. Four steps on the commitment axis:
+  - **Restrained**: tinted neutrals + one accent ≤10%. Product default; brand minimalism.
+  - **Committed**: one saturated color carries 30–60% of the surface. Brand default for identity-driven pages.
+  - **Full palette**: 3–4 named roles, each used deliberately. Brand campaigns; product data viz.
+  - **Drenched**: the surface IS the color. Brand heroes, campaign pages.
+- The "one accent ≤10%" rule is Restrained only. Committed / Full palette / Drenched exceed it on purpose. Don't collapse every design to Restrained by reflex.
+
+### Theme
+
+Dark vs. light is never a default. Not dark "because tools look cool dark." Not light "to be safe."
+
+Before choosing, write one sentence of physical scene: who uses this, where, under what ambient light, in what mood. If the sentence doesn't force the answer, it's not concrete enough. Add detail until it does.
+
+"Observability dashboard" does not force an answer. "SRE glancing at incident severity on a 27-inch monitor at 2am in a dim room" does. Run the sentence, not the category.
+
+### Typography
+
+- Cap body line length at 65–75ch.
+- Hierarchy through scale + weight contrast (≥1.25 ratio between steps). Avoid flat scales.
+
+### Layout
+
+- Vary spacing for rhythm. Same padding everywhere is monotony.
+- Cards are the lazy answer. Use them only when they're truly the best affordance. Nested cards are always wrong.
+- Don't wrap everything in a container. Most things don't need one.
+
+### Motion
+
+- Don't animate CSS layout properties.
+- Ease out with exponential curves (ease-out-quart / quint / expo). No bounce, no elastic.
+
+### Absolute bans
+
+Match-and-refuse. If you're about to write any of these, rewrite the element with different structure.
+
+- **Side-stripe borders.** `border-left` or `border-right` greater than 1px as a colored accent on cards, list items, callouts, or alerts. Never intentional. Rewrite with full borders, background tints, leading numbers/icons, or nothing.
+- **Gradient text.** `background-clip: text` combined with a gradient background. Decorative, never meaningful. Use a single solid color. Emphasis via weight or size.
+- **Glassmorphism as default.** Blurs and glass cards used decoratively. Rare and purposeful, or nothing.
+- **The hero-metric template.** Big number, small label, supporting stats, gradient accent. SaaS cliché.
+- **Identical card grids.** Same-sized cards with icon + heading + text, repeated endlessly.
+- **Modal as first thought.** Modals are usually laziness. Exhaust inline / progressive alternatives first.
+
+### Copy
+
+- Every word earns its place. No restated headings, no intros that repeat the title.
+- **No em dashes.** Use commas, colons, semicolons, periods, or parentheses. Also not `--`.
+
+### The AI slop test
+
+If someone could look at this interface and say "AI made that" without doubt, it's failed. Cross-register failures are the absolute bans above. Register-specific failures live in each reference.
+
+**Category-reflex check.** Run at two altitudes; the second one catches what the first one misses.
+
+- **First-order:** if someone could guess the theme + palette from the category alone ("observability → dark blue", "healthcare → white + teal", "finance → navy + gold", "crypto → neon on black"), it's the first training-data reflex. Rework the scene sentence and color strategy until the answer isn't obvious from the domain.
+- **Second-order:** if someone could guess the aesthetic family from category-plus-anti-references ("AI workflow tool that's not SaaS-cream → editorial-typographic", "fintech that's not navy-and-gold → terminal-native dark mode"), it's the trap one tier deeper. The first reflex was avoided; the second wasn't. Rework until both answers are not obvious. The brand register's [reflex-reject aesthetic lanes](reference/brand.md) list catches the currently-saturated families.
+
+## Commands
+
+| Command | Category | Description | Reference |
+|---|---|---|---|
+| `craft [feature]` | Build | Shape, then build a feature end-to-end | [reference/craft.md](reference/craft.md) |
+| `shape [feature]` | Build | Plan UX/UI before writing code | [reference/shape.md](reference/shape.md) |
+| `teach` | Build | Set up PRODUCT.md and DESIGN.md context | [reference/teach.md](reference/teach.md) |
+| `document` | Build | Generate DESIGN.md from existing project code | [reference/document.md](reference/document.md) |
+| `extract [target]` | Build | Pull reusable tokens and components into design system | [reference/extract.md](reference/extract.md) |
+| `critique [target]` | Evaluate | UX design review with heuristic scoring | [reference/critique.md](reference/critique.md) |
+| `audit [target]` | Evaluate | Technical quality checks (a11y, perf, responsive) | [reference/audit.md](reference/audit.md) |
+| `polish [target]` | Refine | Final quality pass before shipping | [reference/polish.md](reference/polish.md) |
+| `bolder [target]` | Refine | Amplify safe or bland designs | [reference/bolder.md](reference/bolder.md) |
+| `quieter [target]` | Refine | Tone down aggressive or overstimulating designs | [reference/quieter.md](reference/quieter.md) |
+| `distill [target]` | Refine | Strip to essence, remove complexity | [reference/distill.md](reference/distill.md) |
+| `harden [target]` | Refine | Production-ready: errors, i18n, edge cases | [reference/harden.md](reference/harden.md) |
+| `onboard [target]` | Refine | Design first-run flows, empty states, activation | [reference/onboard.md](reference/onboard.md) |
+| `animate [target]` | Enhance | Add purposeful animations and motion | [reference/animate.md](reference/animate.md) |
+| `colorize [target]` | Enhance | Add strategic color to monochromatic UIs | [reference/colorize.md](reference/colorize.md) |
+| `typeset [target]` | Enhance | Improve typography hierarchy and fonts | [reference/typeset.md](reference/typeset.md) |
+| `layout [target]` | Enhance | Fix spacing, rhythm, and visual hierarchy | [reference/layout.md](reference/layout.md) |
+| `delight [target]` | Enhance | Add personality and memorable touches | [reference/delight.md](reference/delight.md) |
+| `overdrive [target]` | Enhance | Push past conventional limits | [reference/overdrive.md](reference/overdrive.md) |
+| `clarify [target]` | Fix | Improve UX copy, labels, and error messages | [reference/clarify.md](reference/clarify.md) |
+| `adapt [target]` | Fix | Adapt for different devices and screen sizes | [reference/adapt.md](reference/adapt.md) |
+| `optimize [target]` | Fix | Diagnose and fix UI performance | [reference/optimize.md](reference/optimize.md) |
+| `live` | Iterate | Visual variant mode: pick elements in the browser, generate alternatives | [reference/live.md](reference/live.md) |
+
+Plus two management commands: `pin <command>` and `unpin <command>`, detailed below.
+
+### Routing rules
+
+1. **No argument**: render the table above as the user-facing command menu, grouped by category. Ask what they'd like to do.
+2. **First word matches a command**: load its reference file and follow its instructions. Everything after the command name is the target.
+3. **First word doesn't match**: general design invocation. Apply the setup steps, shared design laws, and the loaded register reference, using the full argument as context.
+
+Setup (context gathering, register) is already loaded by then; sub-commands don't re-invoke `$impeccable`.
+
+If the first word is `craft`, setup still runs first, but [reference/craft.md](reference/craft.md) owns the rest of the flow. If setup invokes `teach` as a blocker, finish teach, refresh context, then resume the original command and target.
+
+## Pin / Unpin
+
+**Pin** creates a standalone shortcut so `$<command>` invokes `$impeccable <command>` directly. **Unpin** removes it. The script writes to every harness directory present in the project.
+
+```bash
+node .agents/skills/impeccable/scripts/pin.mjs <pin|unpin> <command>
+```
+
+Valid `<command>` is any command from the table above. Report the script's result concisely. Confirm the new shortcut on success, relay stderr verbatim on error.
\ No newline at end of file
diff --git a/.agents/skills/impeccable/agents/openai.yaml b/.agents/skills/impeccable/agents/openai.yaml
new file mode 100644
index 00000000..ee6cae77
--- /dev/null
+++ b/.agents/skills/impeccable/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: Impeccable
+  short_description: Use when the user wants to design, redesign, shape, critique, audit, polish, clarify,...
+  default_prompt: Use Impeccable to redesign, critique, audit, or polish this frontend.
\ No newline at end of file
diff --git a/.agents/skills/impeccable/reference/adapt.md b/.agents/skills/impeccable/reference/adapt.md
new file mode 100644
index 00000000..21bb0255
--- /dev/null
+++ b/.agents/skills/impeccable/reference/adapt.md
@@ -0,0 +1,190 @@
+> **Additional context needed**: target platforms/devices and usage contexts.
+
+Adapt an existing design to a different context: another screen size, device, platform, or use case. The trap is treating adaptation as scaling. The job is rethinking the experience for the new context.
+
+
+---
+
+## Assess Adaptation Challenge
+
+Understand what needs adaptation and why:
+
+1. **Identify the source context**:
+   - What was it designed for originally? (Desktop web? Mobile app?)
+   - What assumptions were made? (Large screen? Mouse input? Fast connection?)
+   - What works well in current context?
+
+2. **Understand target context**:
+   - **Device**: Mobile, tablet, desktop, TV, watch, print?
+   - **Input method**: Touch, mouse, keyboard, voice, gamepad?
+   - **Screen constraints**: Size, resolution, orientation?
+   - **Connection**: Fast wifi, slow 3G, offline?
+   - **Usage context**: On-the-go vs desk, quick glance vs focused reading?
+   - **User expectations**: What do users expect on this platform?
+
+3. **Identify adaptation challenges**:
+   - What won't fit? (Content, navigation, features)
+   - What won't work? (Hover states on touch, tiny touch targets)
+   - What's inappropriate? (Desktop patterns on mobile, mobile patterns on desktop)
+
+**CRITICAL**: Adaptation is rethinking the experience for the new context, not scaling pixels.
+
+## Plan Adaptation Strategy
+
+Create context-appropriate strategy:
+
+### Mobile Adaptation (Desktop → Mobile)
+
+**Layout Strategy**:
+- Single column instead of multi-column
+- Vertical stacking instead of side-by-side
+- Full-width components instead of fixed widths
+- Bottom navigation instead of top/side navigation
+
+**Interaction Strategy**:
+- Touch targets 44x44px minimum (not hover-dependent)
+- Swipe gestures where appropriate (lists, carousels)
+- Bottom sheets instead of dropdowns
+- Thumbs-first design (controls within thumb reach)
+- Larger tap areas with more spacing
+
+**Content Strategy**:
+- Progressive disclosure (don't show everything at once)
+- Prioritize primary content (secondary content in tabs/accordions)
+- Shorter text (more concise)
+- Larger text (16px minimum)
+
+**Navigation Strategy**:
+- Hamburger menu or bottom navigation
+- Reduce navigation complexity
+- Sticky headers for context
+- Back button in navigation flow
+
+### Tablet Adaptation (Hybrid Approach)
+
+**Layout Strategy**:
+- Two-column layouts (not single or three-column)
+- Side panels for secondary content
+- Master-detail views (list + detail)
+- Adaptive based on orientation (portrait vs landscape)
+
+**Interaction Strategy**:
+- Support both touch and pointer
+- Touch targets 44x44px but allow denser layouts than phone
+- Side navigation drawers
+- Multi-column forms where appropriate
+
+### Desktop Adaptation (Mobile → Desktop)
+
+**Layout Strategy**:
+- Multi-column layouts (use horizontal space)
+- Side navigation always visible
+- Multiple information panels simultaneously
+- Fixed widths with max-width constraints (don't stretch to 4K)
+
+**Interaction Strategy**:
+- Hover states for additional information
+- Keyboard shortcuts
+- Right-click context menus
+- Drag and drop where helpful
+- Multi-select with Shift/Cmd
+
+**Content Strategy**:
+- Show more information upfront (less progressive disclosure)
+- Data tables with many columns
+- Richer visualizations
+- More detailed descriptions
+
+### Print Adaptation (Screen → Print)
+
+**Layout Strategy**:
+- Page breaks at logical points
+- Remove navigation, footer, interactive elements
+- Black and white (or limited color)
+- Proper margins for binding
+
+**Content Strategy**:
+- Expand shortened content (show full URLs, hidden sections)
+- Add page numbers, headers, footers
+- Include metadata (print date, page title)
+- Convert charts to print-friendly versions
+
+### Email Adaptation (Web → Email)
+
+**Layout Strategy**:
+- Narrow width (600px max)
+- Single column only
+- Inline CSS (no external stylesheets)
+- Table-based layouts (for email client compatibility)
+
+**Interaction Strategy**:
+- Large, obvious CTAs (buttons not text links)
+- No hover states (not reliable)
+- Deep links to web app for complex interactions
+
+## Implement Adaptations
+
+Apply changes systematically:
+
+### Responsive Breakpoints
+
+Choose appropriate breakpoints:
+- Mobile: 320px-767px
+- Tablet: 768px-1023px
+- Desktop: 1024px+
+- Or content-driven breakpoints (where design breaks)
+
+### Layout Adaptation Techniques
+
+- **CSS Grid/Flexbox**: Reflow layouts automatically
+- **Container Queries**: Adapt based on container, not viewport
+- **`clamp()`**: Fluid sizing between min and max
+- **Media queries**: Different styles for different contexts
+- **Display properties**: Show/hide elements per context
+
+### Touch Adaptation
+
+- Increase touch target sizes (44x44px minimum)
+- Add more spacing between interactive elements
+- Remove hover-dependent interactions
+- Add touch feedback (ripples, highlights)
+- Consider thumb zones (easier to reach bottom than top)
+
+### Content Adaptation
+
+- Use `display: none` sparingly (still downloads)
+- Progressive enhancement (core content first, enhancements on larger screens)
+- Lazy loading for off-screen content
+- Responsive images (`srcset`, `picture` element)
+
+### Navigation Adaptation
+
+- Transform complex nav to hamburger/drawer on mobile
+- Bottom nav bar for mobile apps
+- Persistent side navigation on desktop
+- Breadcrumbs on smaller screens for context
+
+**IMPORTANT**: Test on real devices. Device emulation in DevTools is helpful but not perfect.
+
+**NEVER**:
+- Hide core functionality on mobile (if it matters, make it work)
+- Assume desktop = powerful device (consider accessibility, older machines)
+- Use different information architecture across contexts (confusing)
+- Break user expectations for platform (mobile users expect mobile patterns)
+- Forget landscape orientation on mobile/tablet
+- Use generic breakpoints blindly (use content-driven breakpoints)
+- Ignore touch on desktop (many desktop devices have touch)
+
+## Verify Adaptations
+
+Test thoroughly across contexts:
+
+- **Real devices**: Test on actual phones, tablets, desktops
+- **Different orientations**: Portrait and landscape
+- **Different browsers**: Safari, Chrome, Firefox, Edge
+- **Different OS**: iOS, Android, Windows, macOS
+- **Different input methods**: Touch, mouse, keyboard
+- **Edge cases**: Very small screens (320px), very large screens (4K)
+- **Slow connections**: Test on throttled network
+
+When the adaptation feels native to each context, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/animate.md b/.agents/skills/impeccable/reference/animate.md
new file mode 100644
index 00000000..48b5e268
--- /dev/null
+++ b/.agents/skills/impeccable/reference/animate.md
@@ -0,0 +1,175 @@
+> **Additional context needed**: performance constraints.
+
+Add motion that conveys state, gives feedback, and clarifies hierarchy. Cut motion that exists only for decoration. Animation fatigue is a real cost; spend the budget on the moments that need it.
+
+---
+
+## Register
+
+Brand: orchestrated page-load sequences, staggered reveals, scroll-driven animation. Motion is part of the voice; one well-rehearsed entrance beats scattered micro-interactions.
+
+Product: 150–250 ms on most transitions. Motion conveys state: feedback, reveal, loading, transitions between views. No page-load choreography; users are in a task and won't wait for it.
+
+---
+
+## Assess Animation Opportunities
+
+Analyze where motion would improve the experience:
+
+1. **Identify static areas**:
+   - **Missing feedback**: Actions without visual acknowledgment (button clicks, form submission, etc.)
+   - **Jarring transitions**: Instant state changes that feel abrupt (show/hide, page loads, route changes)
+   - **Unclear relationships**: Spatial or hierarchical relationships that aren't obvious
+   - **Lack of delight**: Functional but joyless interactions
+   - **Missed guidance**: Opportunities to direct attention or explain behavior
+
+2. **Understand the context**:
+   - What's the personality? (Playful vs serious, energetic vs calm)
+   - What's the performance budget? (Mobile-first? Complex page?)
+   - Who's the audience? (Motion-sensitive users? Power users who want speed?)
+   - What matters most? (One hero animation vs many micro-interactions?)
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: Respect `prefers-reduced-motion`. Always provide non-animated alternatives for users who need them.
+
+## Plan Animation Strategy
+
+Create a purposeful animation plan:
+
+- **Hero moment**: What's the ONE signature animation? (Page load? Hero section? Key interaction?)
+- **Feedback layer**: Which interactions need acknowledgment?
+- **Transition layer**: Which state changes need smoothing?
+- **Delight layer**: Where can we surprise and delight?
+
+**IMPORTANT**: One well-orchestrated experience beats scattered animations everywhere. Focus on high-impact moments.
+
+## Implement Animations
+
+Add motion systematically across these categories:
+
+### Entrance Animations
+- **Page load choreography**: Stagger element reveals (100-150ms delays), fade + slide combinations
+- **Hero section**: Dramatic entrance for primary content (scale, parallax, or creative effects)
+- **Content reveals**: Scroll-triggered animations using intersection observer
+- **Modal/drawer entry**: Smooth slide + fade, backdrop fade, focus management
+
+### Micro-interactions
+- **Button feedback**:
+  - Hover: Subtle scale (1.02-1.05), color shift, shadow increase
+  - Click: Quick scale down then up (0.95 → 1), ripple effect
+  - Loading: Spinner or pulse state
+- **Form interactions**:
+  - Input focus: Border color transition, slight scale or glow
+  - Validation: Shake on error, check mark on success, smooth color transitions
+- **Toggle switches**: Smooth slide + color transition (200-300ms)
+- **Checkboxes/radio**: Check mark animation, ripple effect
+- **Like/favorite**: Scale + rotation, particle effects, color transition
+
+### State Transitions
+- **Show/hide**: Fade + slide (not instant), appropriate timing (200-300ms)
+- **Expand/collapse**: Height transition with overflow handling, icon rotation
+- **Loading states**: Skeleton screen fades, spinner animations, progress bars
+- **Success/error**: Color transitions, icon animations, gentle scale pulse
+- **Enable/disable**: Opacity transitions, cursor changes
+
+### Navigation & Flow
+- **Page transitions**: Crossfade between routes, shared element transitions
+- **Tab switching**: Slide indicator, content fade/slide
+- **Carousel/slider**: Smooth transforms, snap points, momentum
+- **Scroll effects**: Parallax layers, sticky headers with state changes, scroll progress indicators
+
+### Feedback & Guidance
+- **Hover hints**: Tooltip fade-ins, cursor changes, element highlights
+- **Drag & drop**: Lift effect (shadow + scale), drop zone highlights, smooth repositioning
+- **Copy/paste**: Brief highlight flash on paste, "copied" confirmation
+- **Focus flow**: Highlight path through form or workflow
+
+### Delight Moments
+- **Empty states**: Subtle floating animations on illustrations
+- **Completed actions**: Confetti, check mark flourish, success celebrations
+- **Easter eggs**: Hidden interactions for discovery
+- **Contextual animation**: Weather effects, time-of-day themes, seasonal touches
+
+## Technical Implementation
+
+Use appropriate techniques for each animation:
+
+### Timing & Easing
+
+**Durations by purpose:**
+- **100-150ms**: Instant feedback (button press, toggle)
+- **200-300ms**: State changes (hover, menu open)
+- **300-500ms**: Layout changes (accordion, modal)
+- **500-800ms**: Entrance animations (page load)
+
+**Easing curves (use these, not CSS defaults):**
+```css
+/* Recommended: natural deceleration */
+--ease-out-quart: cubic-bezier(0.25, 1, 0.5, 1);    /* Smooth */
+--ease-out-quint: cubic-bezier(0.22, 1, 0.36, 1);   /* Slightly snappier */
+--ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);     /* Confident, decisive */
+
+/* AVOID: feel dated and tacky */
+/* bounce: cubic-bezier(0.34, 1.56, 0.64, 1); */
+/* elastic: cubic-bezier(0.68, -0.6, 0.32, 1.6); */
+```
+
+**Exit animations are faster than entrances.** Use ~75% of enter duration.
+
+### CSS Animations
+```css
+/* Prefer for simple, declarative animations */
+- transitions for state changes
+- @keyframes for complex sequences
+- transform and opacity for reliable movement
+- blur, filters, masks, clip paths, shadows, and color shifts for premium atmospheric effects when verified smooth
+```
+
+### JavaScript Animation
+```javascript
+/* Use for complex, interactive animations */
+- Web Animations API for programmatic control
+- Framer Motion for React
+- GSAP for complex sequences
+```
+
+### Performance
+- **Motion materials**: Use transform/opacity for reliable movement, but use blur, filters, masks, shadows, and color shifts when they materially improve the effect
+- **Layout safety**: Avoid casual animation of layout-driving properties (`width`, `height`, `top`, `left`, margins)
+- **will-change**: Add sparingly for known expensive animations
+- **Bound expensive effects**: Keep blur/filter/shadow areas small or isolated, use `contain` where appropriate
+- **Monitor FPS**: Ensure 60fps on target devices
+
+### Accessibility
+```css
+@media (prefers-reduced-motion: reduce) {
+  * {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}
+```
+
+**NEVER**:
+- Use bounce or elastic easing curves; they feel dated and draw attention to the animation itself
+- Animate layout properties casually (`width`, `height`, `top`, `left`, margins) when transform, FLIP, or grid-based techniques would work
+- Use durations over 500ms for feedback (it feels laggy)
+- Animate without purpose (every animation needs a reason)
+- Ignore `prefers-reduced-motion` (this is an accessibility violation)
+- Animate everything (animation fatigue makes interfaces feel exhausting)
+- Block interaction during animations unless intentional
+
+## Verify Quality
+
+Test animations thoroughly:
+
+- **Smooth at 60fps**: No jank on target devices
+- **Feels natural**: Easing curves feel organic, not robotic
+- **Appropriate timing**: Not too fast (jarring) or too slow (laggy)
+- **Reduced motion works**: Animations disabled or simplified appropriately
+- **Doesn't block**: Users can interact during/after animations
+- **Adds value**: Makes interface clearer or more delightful
+
+When the motion clarifies state instead of decorating it, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/audit.md b/.agents/skills/impeccable/reference/audit.md
new file mode 100644
index 00000000..10f5572f
--- /dev/null
+++ b/.agents/skills/impeccable/reference/audit.md
@@ -0,0 +1,133 @@
+Run systematic **technical** quality checks and generate a comprehensive report. Don't fix issues; document them for other commands to address.
+
+This is a code-level audit, not a design critique. Check what's measurable and verifiable in the implementation.
+
+## Diagnostic Scan
+
+Run comprehensive checks across 5 dimensions. Score each dimension 0-4 using the criteria below.
+
+### 1. Accessibility (A11y)
+
+**Check for**:
+- **Contrast issues**: Text contrast ratios < 4.5:1 (or 7:1 for AAA)
+- **Missing ARIA**: Interactive elements without proper roles, labels, or states
+- **Keyboard navigation**: Missing focus indicators, illogical tab order, keyboard traps
+- **Semantic HTML**: Improper heading hierarchy, missing landmarks, divs instead of buttons
+- **Alt text**: Missing or poor image descriptions
+- **Form issues**: Inputs without labels, poor error messaging, missing required indicators
+
+**Score 0-4**: 0=Inaccessible (fails WCAG A), 1=Major gaps (few ARIA labels, no keyboard nav), 2=Partial (some a11y effort, significant gaps), 3=Good (WCAG AA mostly met, minor gaps), 4=Excellent (WCAG AA fully met, approaches AAA)
+
+### 2. Performance
+
+**Check for**:
+- **Layout thrashing**: Reading/writing layout properties in loops
+- **Expensive animations**: Casual layout-property animation, unbounded blur/filter/shadow effects, or effects that visibly drop frames
+- **Missing optimization**: Images without lazy loading, unoptimized assets, missing will-change
+- **Bundle size**: Unnecessary imports, unused dependencies
+- **Render performance**: Unnecessary re-renders, missing memoization
+
+**Score 0-4**: 0=Severe issues (layout thrash, unoptimized everything), 1=Major problems (no lazy loading, expensive animations), 2=Partial (some optimization, gaps remain), 3=Good (mostly optimized, minor improvements possible), 4=Excellent (fast, lean, well-optimized)
+
+### 3. Theming
+
+**Check for**:
+- **Hard-coded colors**: Colors not using design tokens
+- **Broken dark mode**: Missing dark mode variants, poor contrast in dark theme
+- **Inconsistent tokens**: Using wrong tokens, mixing token types
+- **Theme switching issues**: Values that don't update on theme change
+
+**Score 0-4**: 0=No theming (hard-coded everything), 1=Minimal tokens (mostly hard-coded), 2=Partial (tokens exist but inconsistently used), 3=Good (tokens used, minor hard-coded values), 4=Excellent (full token system, dark mode works perfectly)
+
+### 4. Responsive Design
+
+**Check for**:
+- **Fixed widths**: Hard-coded widths that break on mobile
+- **Touch targets**: Interactive elements < 44x44px
+- **Horizontal scroll**: Content overflow on narrow viewports
+- **Text scaling**: Layouts that break when text size increases
+- **Missing breakpoints**: No mobile/tablet variants
+
+**Score 0-4**: 0=Desktop-only (breaks on mobile), 1=Major issues (some breakpoints, many failures), 2=Partial (works on mobile, rough edges), 3=Good (responsive, minor touch target or overflow issues), 4=Excellent (fluid, all viewports, proper touch targets)
+
+### 5. Anti-Patterns (CRITICAL)
+
+Check against ALL the **DON'T** guidelines from the parent impeccable skill (already loaded in this context). Look for AI slop tells (AI color palette, gradient text, glassmorphism, hero metrics, card grids, generic fonts) and general design anti-patterns (gray on color, nested cards, bounce easing, redundant copy).
+
+**Score 0-4**: 0=AI slop gallery (5+ tells), 1=Heavy AI aesthetic (3-4 tells), 2=Some tells (1-2 noticeable), 3=Mostly clean (subtle issues only), 4=No AI tells (distinctive, intentional design)
+
+## Generate Report
+
+### Audit Health Score
+
+| # | Dimension | Score | Key Finding |
+|---|-----------|-------|-------------|
+| 1 | Accessibility | ? | [most critical a11y issue or "--"] |
+| 2 | Performance | ? | |
+| 3 | Responsive Design | ? | |
+| 4 | Theming | ? | |
+| 5 | Anti-Patterns | ? | |
+| **Total** | | **??/20** | **[Rating band]** |
+
+**Rating bands**: 18-20 Excellent (minor polish), 14-17 Good (address weak dimensions), 10-13 Acceptable (significant work needed), 6-9 Poor (major overhaul), 0-5 Critical (fundamental issues)
+
+### Anti-Patterns Verdict
+**Start here.** Pass/fail: Does this look AI-generated? List specific tells. Be brutally honest.
+
+### Executive Summary
+- Audit Health Score: **??/20** ([rating band])
+- Total issues found (count by severity: P0/P1/P2/P3)
+- Top 3-5 critical issues
+- Recommended next steps
+
+### Detailed Findings by Severity
+
+Tag every issue with **P0-P3 severity**:
+- **P0 Blocking**: Prevents task completion. Fix immediately
+- **P1 Major**: Significant difficulty or WCAG AA violation. Fix before release
+- **P2 Minor**: Annoyance, workaround exists. Fix in next pass
+- **P3 Polish**: Nice-to-fix, no real user impact. Fix if time permits
+
+For each issue, document:
+- **[P?] Issue name**
+- **Location**: Component, file, line
+- **Category**: Accessibility / Performance / Theming / Responsive / Anti-Pattern
+- **Impact**: How it affects users
+- **WCAG/Standard**: Which standard it violates (if applicable)
+- **Recommendation**: How to fix it
+- **Suggested command**: Which command to use (prefer: $impeccable adapt, $impeccable animate, $impeccable audit, $impeccable bolder, $impeccable clarify, $impeccable colorize, $impeccable critique, $impeccable delight, $impeccable distill, $impeccable document, $impeccable harden, $impeccable layout, $impeccable onboard, $impeccable optimize, $impeccable overdrive, $impeccable polish, $impeccable quieter, $impeccable shape, $impeccable typeset)
+
+### Patterns & Systemic Issues
+
+Identify recurring problems that indicate systemic gaps rather than one-off mistakes:
+- "Hard-coded colors appear in 15+ components, should use design tokens"
+- "Touch targets consistently too small (<44px) throughout mobile experience"
+
+### Positive Findings
+
+Note what's working well: good practices to maintain and replicate.
+
+## Recommended Actions
+
+List recommended commands in priority order (P0 first, then P1, then P2):
+
+1. **[P?] `$command-name`**: Brief description (specific context from audit findings)
+2. **[P?] `$command-name`**: Brief description (specific context)
+
+**Rules**: Only recommend commands from: $impeccable adapt, $impeccable animate, $impeccable audit, $impeccable bolder, $impeccable clarify, $impeccable colorize, $impeccable critique, $impeccable delight, $impeccable distill, $impeccable document, $impeccable harden, $impeccable layout, $impeccable onboard, $impeccable optimize, $impeccable overdrive, $impeccable polish, $impeccable quieter, $impeccable shape, $impeccable typeset. Map findings to the most appropriate command. End with `$impeccable polish` as the final step if any fixes were recommended.
+
+After presenting the summary, tell the user:
+
+> You can ask me to run these one at a time, all at once, or in any order you prefer.
+>
+> Re-run `$impeccable audit` after fixes to see your score improve.
+
+**IMPORTANT**: Be thorough but actionable. Too many P3 issues creates noise. Focus on what actually matters.
+
+**NEVER**:
+- Report issues without explaining impact (why does this matter?)
+- Provide generic recommendations (be specific and actionable)
+- Skip positive findings (celebrate what works)
+- Forget to prioritize (everything can't be P0)
+- Report false positives without verification
+
diff --git a/.agents/skills/impeccable/reference/bolder.md b/.agents/skills/impeccable/reference/bolder.md
new file mode 100644
index 00000000..25e94d59
--- /dev/null
+++ b/.agents/skills/impeccable/reference/bolder.md
@@ -0,0 +1,113 @@
+When asked for "bolder," AI defaults to the same tired tricks: cyan/purple gradients, glassmorphism, neon accents on dark backgrounds, gradient text on metrics. These are the opposite of bold. Reject them first, then increase visual impact and personality through stronger hierarchy, committed scale, and decisive type.
+
+---
+
+## Register
+
+Brand: "bolder" means distinctive. Extreme scale, unexpected color, typographic risk, committed POV.
+
+Product: "bolder" rarely means theatrics; those undermine trust. It means stronger hierarchy, clearer weight contrast, one sharper accent, more committed density. The amplification is in clarity, not drama.
+
+---
+
+## Assess Current State
+
+Analyze what makes the design feel too safe or boring:
+
+1. **Identify weakness sources**:
+   - **Generic choices**: System fonts, basic colors, standard layouts
+   - **Timid scale**: Everything is medium-sized with no drama
+   - **Low contrast**: Everything has similar visual weight
+   - **Static**: No motion, no energy, no life
+   - **Predictable**: Standard patterns with no surprises
+   - **Flat hierarchy**: Nothing stands out or commands attention
+
+2. **Understand the context**:
+   - What's the brand personality? (How far can we push?)
+   - What's the purpose? (Marketing can be bolder than financial dashboards)
+   - Who's the audience? (What will resonate?)
+   - What are the constraints? (Brand guidelines, accessibility, performance)
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: "Bolder" doesn't mean chaotic or garish. It means distinctive, memorable, and confident. Think intentional drama, not random chaos.
+
+**WARNING - AI SLOP TRAP**: Review ALL the DON'T guidelines from the parent impeccable skill (already loaded in this context) before proceeding. Bold means distinctive, not "more effects."
+
+## Plan Amplification
+
+Create a strategy to increase impact while maintaining coherence:
+
+- **Focal point**: What should be the hero moment? (Pick ONE, make it amazing)
+- **Personality direction**: Maximalist chaos? Elegant drama? Playful energy? Dark moody? Choose a lane.
+- **Risk budget**: How experimental can we be? Push boundaries within constraints.
+- **Hierarchy amplification**: Make big things BIGGER, small things smaller (increase contrast)
+
+**IMPORTANT**: Bold design must still be usable. Impact without function is just decoration.
+
+## Amplify the Design
+
+Systematically increase impact across these dimensions:
+
+### Typography Amplification
+- **Replace generic fonts**: Swap system fonts for distinctive choices (see the parent skill's typography guidelines and [typography.md](typography.md) for inspiration)
+- **Extreme scale**: Create dramatic size jumps (3x-5x differences, not 1.5x)
+- **Weight contrast**: Pair 900 weights with 200 weights, not 600 with 400
+- **Unexpected choices**: Variable fonts, display fonts for headlines, condensed/extended widths, monospace as intentional accent (not as lazy "dev tool" default)
+
+### Color Intensification
+- **Increase saturation**: Shift to more vibrant, energetic colors (but not neon)
+- **Bold palette**: Introduce unexpected color combinations. Avoid the purple-blue gradient AI slop
+- **Dominant color strategy**: Let one bold color own 60% of the design
+- **Sharp accents**: High-contrast accent colors that pop
+- **Tinted neutrals**: Replace pure grays with tinted grays that harmonize with your palette
+- **Rich gradients**: Intentional multi-stop gradients (not generic purple-to-blue)
+
+### Spatial Drama
+- **Extreme scale jumps**: Make important elements 3-5x larger than surroundings
+- **Break the grid**: Let hero elements escape containers and cross boundaries
+- **Asymmetric layouts**: Replace centered, balanced layouts with tension-filled asymmetry
+- **Generous space**: Use white space dramatically (100-200px gaps, not 20-40px)
+- **Overlap**: Layer elements intentionally for depth
+
+### Visual Effects
+- **Dramatic shadows**: Large, soft shadows for elevation (but not generic drop shadows on rounded rectangles)
+- **Background treatments**: Mesh patterns, noise textures, geometric patterns, intentional gradients (not purple-to-blue)
+- **Texture & depth**: Grain, halftone, duotone, layered elements. NOT glassmorphism (it's overused AI slop)
+- **Borders & frames**: Thick borders, decorative frames, custom shapes (not rounded rectangles with colored border on one side)
+- **Custom elements**: Illustrative elements, custom icons, decorative details that reinforce brand
+
+### Motion & Animation
+- **Entrance choreography**: Staggered, dramatic page load animations with 50-100ms delays
+- **Scroll effects**: Parallax, reveal animations, scroll-triggered sequences
+- **Micro-interactions**: Satisfying hover effects, click feedback, state changes
+- **Transitions**: Smooth, noticeable transitions using ease-out-quart/quint/expo (not bounce or elastic, which cheapen the effect)
+
+### Composition Boldness
+- **Hero moments**: Create clear focal points with dramatic treatment
+- **Diagonal flows**: Escape horizontal/vertical rigidity with diagonal arrangements
+- **Full-bleed elements**: Use full viewport width/height for impact
+- **Unexpected proportions**: Golden ratio? Throw it out. Try 70/30, 80/20 splits
+
+**NEVER**:
+- Add effects randomly without purpose (chaos ≠ bold)
+- Sacrifice readability for aesthetics (body text must be readable)
+- Make everything bold (then nothing is bold; you need contrast)
+- Ignore accessibility (bold design must still meet WCAG standards)
+- Overwhelm with motion (animation fatigue is real)
+- Copy trendy aesthetics blindly (bold means distinctive, not derivative)
+
+## Verify Quality
+
+Ensure amplification maintains usability and coherence:
+
+- **NOT AI slop**: Does this look like every other AI-generated "bold" design? If yes, start over.
+- **Still functional**: Can users accomplish tasks without distraction?
+- **Coherent**: Does everything feel intentional and unified?
+- **Memorable**: Will users remember this experience?
+- **Performant**: Do all these effects run smoothly?
+- **Accessible**: Does it still meet accessibility standards?
+
+**The test**: If you showed this to someone and said "AI made this bolder," would they believe you immediately? If yes, you've failed. Bold means distinctive, not "more AI effects."
+
+When the result feels right, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/brand.md b/.agents/skills/impeccable/reference/brand.md
new file mode 100644
index 00000000..b069f255
--- /dev/null
+++ b/.agents/skills/impeccable/reference/brand.md
@@ -0,0 +1,114 @@
+# Brand register
+
+When design IS the product: brand sites, landing pages, marketing surfaces, campaign pages, portfolios, long-form content, about pages. The deliverable is the design itself; a visitor's impression is the thing being made.
+
+The register spans every genre. A tech brand (Stripe, Linear, Vercel). A luxury brand (a hotel, a fashion house). A consumer product (a restaurant, a travel site, a CPG packaging page). A creative studio, an agency portfolio, a band's album page. They all share the stance (*communicate, not transact*) and diverge wildly in aesthetic. Don't collapse them into a single look.
+
+## The brand slop test
+
+If someone could look at this and say "AI made that" without hesitation, it's failed. The bar is distinctiveness; a visitor should ask "how was this made?", not "which AI made this?"
+
+Brand isn't a neutral register. AI-generated landing pages have flooded the internet, and average is no longer findable. Restraint without intent now reads as mediocre, not refined. Brand surfaces need a POV, a specific audience, a willingness to risk strangeness. Go big or go home.
+
+**The second slop test: aesthetic lane.** Before committing to moves, name the reference. A Klim-style specimen page is one lane; Stripe-minimal is another; Liquid-Death-acid-maximalism is another. Don't drift into editorial-magazine aesthetics on a brief that isn't editorial. A hiking brand with Cormorant italic drop caps has the wrong register within the register.
+
+## Typography
+
+### Font selection procedure
+
+Every project. Never skip.
+
+1. Read the brief. Write three concrete brand-voice words. Not "modern" or "elegant," but "warm and mechanical and opinionated" or "calm and clinical and careful." Physical-object words.
+2. List the three fonts you'd reach for by reflex. If any appear in the reflex-reject list below, reject them; they are training-data defaults and they create monoculture.
+3. Browse a real catalog (Google Fonts, Pangram Pangram, Future Fonts, Adobe Fonts, ABC Dinamo, Klim, Velvetyne) with the three words in mind. Find the font for the brand as a *physical object*: a museum caption, a 1970s terminal manual, a fabric label, a cheap-newsprint children's book, a concert poster, a receipt from a mid-century diner. Reject the first thing that "looks designy."
+4. Cross-check. "Elegant" is not necessarily serif. "Technical" is not necessarily sans. "Warm" is not Fraunces. If the final pick lines up with the original reflex, start over.
+
+### Reflex-reject list
+
+Training-data defaults. Ban list. Look further:
+
+Fraunces · Newsreader · Lora · Crimson · Crimson Pro · Crimson Text · Playfair Display · Cormorant · Cormorant Garamond · Syne · IBM Plex Mono · IBM Plex Sans · IBM Plex Serif · Space Mono · Space Grotesk · Inter · DM Sans · DM Serif Display · DM Serif Text · Outfit · Plus Jakarta Sans · Instrument Sans · Instrument Serif
+
+### Reflex-reject aesthetic lanes
+
+Parallel to the font list. Currently saturated aesthetic families that have flooded brand surfaces. If a brief lands in one of these lanes without a register reason that *requires* it (a literal magazine, a literal terminal, a literal industrial signage system), it's the second-order training reflex: the trap one tier deeper than picking a Fraunces font. Look further.
+
+- **Editorial-typographic.** Display serif (often italic) + small mono labels + ruled separators + monochromatic restraint. Klim-influenced, magazine-cover affectation. By 2026, every Stripe-adjacent and Notion-adjacent brand has landed here. The fingerprint: three rule-separated columns, an italic Fraunces / Recoleta / Newsreader headline, lowercase track-spaced metadata, no imagery.
+
+(More entries land here on the same cadence the font list updates. Brutalist-utility and acid-maximalism may join when they saturate. Removing entries when they fall back below saturation is also fine.)
+
+The reflex-reject lists apply to **new design choices**. When the existing brand has already committed to a font or a lane as part of its identity, identity-preservation wins; variants on an existing surface don't second-guess what's already shipping. The reflex-reject lists are for greenfield decisions and for departure-mode variants in [live.md](live.md).
+
+### Pairing and voice
+
+Distinctive + refined is the goal. The specific shape depends on the brand:
+
+- **Editorial / long-form / luxury**: display serif + sans body (a magazine shape).
+- **Tech / dev tools / fintech**: one committed sans, usually; custom-tight tracking, strong weight contrast inside a single family.
+- **Consumer / food / travel**: warmer pairings, often a humanist sans plus a script or display serif.
+- **Creative studios / agencies**: rule-breaking welcome. Mono-only, or display-only, or custom-drawn type as voice.
+
+Two families minimum is the rule *only* when the voice needs it. A single well-chosen family with committed weight/size contrast is stronger than a timid display+body pair.
+
+Vary across projects. If the last brief was a serif-display landing page, this one isn't.
+
+### Scale
+
+Modular scale, fluid `clamp()` for headings, ≥1.25 ratio between steps. Flat scales (1.1× apart) read as uncommitted.
+
+Light text on dark backgrounds: add 0.05–0.1 to line-height. Light type reads as lighter weight and needs more breathing room.
+
+## Color
+
+Brand surfaces have permission for Committed, Full palette, and Drenched strategies. Use them. A single saturated color spread across a hero is not excess; it's voice. A beige-and-muted-slate landing page ignores the register.
+
+- Name a real reference before picking a strategy. "Klim Type Foundry #ff4500 orange drench", "Stripe purple-on-white restraint", "Liquid Death acid-green full palette", "Mailchimp yellow full palette", "Condé Nast Traveler muted navy restraint", "Vercel pure black monochrome". Unnamed ambition becomes beige.
+- Palette IS voice. A calm brand and a restless brand should not share palette mechanics.
+- When the strategy is Committed or Drenched, color carries the brand. Don't hedge with neutrals around the edges. Commit.
+- Don't converge across projects. If the last brand surface was restrained-on-cream, this one is not.
+
+## Layout
+
+- Asymmetric compositions are one option. Break the grid intentionally for emphasis.
+- Fluid spacing with `clamp()` that breathes on larger viewports. Vary for rhythm: generous separations, tight groupings.
+- Alternative: a strict, visible grid as the voice (brutalist / Swiss / tech-spec aesthetics). Either asymmetric or rigorously-gridded can be "designed"; the failure mode is splitting the difference into a generic centered stack.
+- Don't default to centering everything. Left-aligned with asymmetric layouts feels more designed; a strict grid reads as confident structure. A centered-stack hero with icon-title-subtitle cards reads as template.
+- When cards ARE the right affordance, use `grid-template-columns: repeat(auto-fit, minmax(280px, 1fr))` for breakpoint-free responsiveness.
+
+## Imagery
+
+Brand surfaces lean on imagery. A restaurant, hotel, magazine, or product landing page without any imagery reads as incomplete, not as restrained. A solid-color rectangle where a hero image should go is worse than a representative stock photo.
+
+**When the brief implies imagery (restaurants, hotels, magazines, photography, hobbyist communities, food, travel, fashion, product), you must ship imagery.** Zero images is a bug, not a design choice. "Restraint" is not an excuse.
+
+- **For greenfield work without local assets, use stock imagery.** Unsplash is the default. The URL shape is `https://images.unsplash.com/photo-{id}?auto=format&fit=crop&w=1600&q=80`. Pick real Unsplash photo IDs you're confident exist (`photo-1559339352-11d035aa65de`, `photo-1590490360182-c33d57733427`, etc.); if unsure, pick fewer photos but don't substitute colored `<div>` placeholders.
+- **Search for the brand's physical object**, not the generic category: "handmade pasta on a scratched wooden table" beats "Italian food"; "cypress trees above a limestone hotel facade at dusk" beats "luxury hotel".
+- **One decisive photo beats five mediocre ones.** Hero imagery should commit to a mood; padding with more stock doesn't rescue an indecisive one.
+- **Alt text is part of the voice.** "Coastal fettuccine, hand-cut, served on the terrace" beats "pasta dish".
+
+Tech / dev-tool brands are the exception where zero imagery can be correct; a developer landing page often carries its voice through typography, code samples, diagrams. Know which kind of brand you're working on.
+
+## Motion
+
+- One well-orchestrated page-load with staggered reveals beats scattered micro-interactions, when the brand invites it. Tech-minimal brands often skip entrance motion entirely; the restraint is the voice.
+- For collapsing/expanding sections, transition `grid-template-rows` rather than `height`.
+
+## Brand bans (on top of the shared absolute bans)
+
+- Monospace as lazy shorthand for "technical / developer." If the brand isn't technical, mono reads as costume.
+- Large rounded-corner icons above every heading. Screams template.
+- Single-family pages that picked the family by reflex, not voice. (A single family chosen deliberately is fine.)
+- All-caps body copy. Reserve caps for short labels and headings.
+- Timid palettes and average layouts. Safe = invisible.
+- Zero imagery on a brief that implies imagery (restaurant, hotel, food, travel, fashion, photography, hobbyist). Colored blocks where a hero photo belongs.
+- Defaulting to editorial-magazine aesthetics (display serif + italic + drop caps + broadsheet grid) on briefs that aren't magazine-shaped. Editorial is ONE aesthetic lane, not the default brand aesthetic.
+
+## Brand permissions
+
+Brand can afford things product can't. Take them.
+
+- Ambitious first-load motion. Reveals, scroll-triggered transitions, typographic choreography.
+- Single-purpose viewports. One dominant idea per fold, long scroll, deliberate pacing.
+- Typographic risk. Enormous display type, unexpected italic cuts, mixed cases, hand-drawn headlines, a single oversize word as a hero.
+- Unexpected color strategies. Palette IS voice; a calm brand and a restless brand should not share palette mechanics.
+- Art direction per section. Different sections can have different visual worlds if the narrative demands it. Consistency of voice beats consistency of treatment.
diff --git a/.agents/skills/impeccable/reference/clarify.md b/.agents/skills/impeccable/reference/clarify.md
new file mode 100644
index 00000000..07b9d8d2
--- /dev/null
+++ b/.agents/skills/impeccable/reference/clarify.md
@@ -0,0 +1,174 @@
+> **Additional context needed**: audience technical level and users' mental state in context.
+
+Find the unclear, confusing, or poorly written interface text and rewrite it. Vague copy creates support tickets and abandonment; specific copy gets users through the task.
+
+
+---
+
+## Assess Current Copy
+
+Identify what makes the text unclear or ineffective:
+
+1. **Find clarity problems**:
+   - **Jargon**: Technical terms users won't understand
+   - **Ambiguity**: Multiple interpretations possible
+   - **Passive voice**: "Your file has been uploaded" vs "We uploaded your file"
+   - **Length**: Too wordy or too terse
+   - **Assumptions**: Assuming user knowledge they don't have
+   - **Missing context**: Users don't know what to do or why
+   - **Tone mismatch**: Too formal, too casual, or inappropriate for situation
+
+2. **Understand the context**:
+   - Who's the audience? (Technical? General? First-time users?)
+   - What's the user's mental state? (Stressed during error? Confident during success?)
+   - What's the action? (What do we want users to do?)
+   - What's the constraint? (Character limits? Space limitations?)
+
+**CRITICAL**: Clear copy helps users succeed. Unclear copy creates frustration, errors, and support tickets.
+
+## Plan Copy Improvements
+
+Create a strategy for clearer communication:
+
+- **Primary message**: What's the ONE thing users need to know?
+- **Action needed**: What should users do next (if anything)?
+- **Tone**: How should this feel? (Helpful? Apologetic? Encouraging?)
+- **Constraints**: Length limits, brand voice, localization considerations
+
+**IMPORTANT**: Good UX writing is invisible. Users should understand immediately without noticing the words.
+
+## Improve Copy Systematically
+
+Refine text across these common areas:
+
+### Error Messages
+**Bad**: "Error 403: Forbidden"
+**Good**: "You don't have permission to view this page. Contact your admin for access."
+
+**Bad**: "Invalid input"
+**Good**: "Email addresses need an @ symbol. Try: name@example.com"
+
+**Principles**:
+- Explain what went wrong in plain language
+- Suggest how to fix it
+- Don't blame the user
+- Include examples when helpful
+- Link to help/support if applicable
+
+### Form Labels & Instructions
+**Bad**: "DOB (MM/DD/YYYY)"
+**Good**: "Date of birth" (with placeholder showing format)
+
+**Bad**: "Enter value here"
+**Good**: "Your email address" or "Company name"
+
+**Principles**:
+- Use clear, specific labels (not generic placeholders)
+- Show format expectations with examples
+- Explain why you're asking (when not obvious)
+- Put instructions before the field, not after
+- Keep required field indicators clear
+
+### Button & CTA Text
+**Bad**: "Click here" | "Submit" | "OK"
+**Good**: "Create account" | "Save changes" | "Got it, thanks"
+
+**Principles**:
+- Describe the action specifically
+- Use active voice (verb + noun)
+- Match user's mental model
+- Be specific ("Save" is better than "OK")
+
+### Help Text & Tooltips
+**Bad**: "This is the username field"
+**Good**: "Choose a username. You can change this later in Settings."
+
+**Principles**:
+- Add value (don't just repeat the label)
+- Answer the implicit question ("What is this?" or "Why do you need this?")
+- Keep it brief but complete
+- Link to detailed docs if needed
+
+### Empty States
+**Bad**: "No items"
+**Good**: "No projects yet. Create your first project to get started."
+
+**Principles**:
+- Explain why it's empty (if not obvious)
+- Show next action clearly
+- Make it welcoming, not dead-end
+
+### Success Messages
+**Bad**: "Success"
+**Good**: "Settings saved! Your changes will take effect immediately."
+
+**Principles**:
+- Confirm what happened
+- Explain what happens next (if relevant)
+- Be brief but complete
+- Match the user's emotional moment (celebrate big wins)
+
+### Loading States
+**Bad**: "Loading..." (for 30+ seconds)
+**Good**: "Analyzing your data... this usually takes 30-60 seconds"
+
+**Principles**:
+- Set expectations (how long?)
+- Explain what's happening (when it's not obvious)
+- Show progress when possible
+- Offer escape hatch if appropriate ("Cancel")
+
+### Confirmation Dialogs
+**Bad**: "Are you sure?"
+**Good**: "Delete 'Project Alpha'? This can't be undone."
+
+**Principles**:
+- State the specific action
+- Explain consequences (especially for destructive actions)
+- Use clear button labels ("Delete project" not "Yes")
+- Don't overuse confirmations (only for risky actions)
+
+### Navigation & Wayfinding
+**Bad**: Generic labels like "Items" | "Things" | "Stuff"
+**Good**: Specific labels like "Your projects" | "Team members" | "Settings"
+
+**Principles**:
+- Be specific and descriptive
+- Use language users understand (not internal jargon)
+- Make hierarchy clear
+- Consider information scent (breadcrumbs, current location)
+
+## Apply Clarity Principles
+
+Every piece of copy should follow these rules:
+
+1. **Be specific**: "Enter email" not "Enter value"
+2. **Be concise**: Cut unnecessary words (but don't sacrifice clarity)
+3. **Be active**: "Save changes" not "Changes will be saved"
+4. **Be human**: "Oops, something went wrong" not "System error encountered"
+5. **Tell users what to do**, not just what happened
+6. **Be consistent**: Use same terms throughout (don't vary for variety)
+
+**NEVER**:
+- Use jargon without explanation
+- Blame users ("You made an error" → "This field is required")
+- Be vague ("Something went wrong" without explanation)
+- Use passive voice unnecessarily
+- Write overly long explanations (be concise)
+- Use humor for errors (be empathetic instead)
+- Assume technical knowledge
+- Vary terminology (pick one term and stick with it)
+- Repeat information (headers restating intros, redundant explanations)
+- Use placeholders as the only labels (they disappear when users type)
+
+## Verify Improvements
+
+Test that copy improvements work:
+
+- **Comprehension**: Can users understand without context?
+- **Actionability**: Do users know what to do next?
+- **Brevity**: Is it as short as possible while remaining clear?
+- **Consistency**: Does it match terminology elsewhere?
+- **Tone**: Is it appropriate for the situation?
+
+When the copy reads cleanly, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/cognitive-load.md b/.agents/skills/impeccable/reference/cognitive-load.md
new file mode 100644
index 00000000..48f8ad58
--- /dev/null
+++ b/.agents/skills/impeccable/reference/cognitive-load.md
@@ -0,0 +1,106 @@
+# Cognitive Load Assessment
+
+Cognitive load is the total mental effort required to use an interface. Overloaded users make mistakes, get frustrated, and leave. This reference helps identify and fix cognitive overload.
+
+---
+
+## Three Types of Cognitive Load
+
+### Intrinsic Load: The Task Itself
+Complexity inherent to what the user is trying to do. You can't eliminate this, but you can structure it.
+
+**Manage it by**:
+- Breaking complex tasks into discrete steps
+- Providing scaffolding (templates, defaults, examples)
+- Progressive disclosure: show what's needed now, hide the rest
+- Grouping related decisions together
+
+### Extraneous Load: Bad Design
+Mental effort caused by poor design choices. **Eliminate this ruthlessly.** It's pure waste.
+
+**Common sources**:
+- Confusing navigation that requires mental mapping
+- Unclear labels that force users to guess meaning
+- Visual clutter competing for attention
+- Inconsistent patterns that prevent learning
+- Unnecessary steps between user intent and result
+
+### Germane Load: Learning Effort
+Mental effort spent building understanding. This is *good* cognitive load; it leads to mastery.
+
+**Support it by**:
+- Progressive disclosure that reveals complexity gradually
+- Consistent patterns that reward learning
+- Feedback that confirms correct understanding
+- Onboarding that teaches through action, not walls of text
+
+---
+
+## Cognitive Load Checklist
+
+Evaluate the interface against these 8 items:
+
+- [ ] **Single focus**: Can the user complete their primary task without distraction from competing elements?
+- [ ] **Chunking**: Is information presented in digestible groups (≤4 items per group)?
+- [ ] **Grouping**: Are related items visually grouped together (proximity, borders, shared background)?
+- [ ] **Visual hierarchy**: Is it immediately clear what's most important on the screen?
+- [ ] **One thing at a time**: Can the user focus on a single decision before moving to the next?
+- [ ] **Minimal choices**: Are decisions simplified (≤4 visible options at any decision point)?
+- [ ] **Working memory**: Does the user need to remember information from a previous screen to act on the current one?
+- [ ] **Progressive disclosure**: Is complexity revealed only when the user needs it?
+
+**Scoring**: Count the failed items. 0–1 failures = low cognitive load (good). 2–3 = moderate (address soon). 4+ = high cognitive load (critical fix needed).
+
+---
+
+## The Working Memory Rule
+
+**Humans can hold ≤4 items in working memory at once** (Miller's Law revised by Cowan, 2001).
+
+At any decision point, count the number of distinct options, actions, or pieces of information a user must simultaneously consider:
+- **≤4 items**: Within working memory limits, manageable
+- **5–7 items**: Pushing the boundary; consider grouping or progressive disclosure
+- **8+ items**: Overloaded; users will skip, misclick, or abandon
+
+**Practical applications**:
+- Navigation menus: ≤5 top-level items (group the rest under clear categories)
+- Form sections: ≤4 fields visible per group before a visual break
+- Action buttons: 1 primary, 1–2 secondary, group the rest in a menu
+- Dashboard widgets: ≤4 key metrics visible without scrolling
+- Pricing tiers: ≤3 options (more causes analysis paralysis)
+
+---
+
+## Common Cognitive Load Violations
+
+### 1. The Wall of Options
+**Problem**: Presenting 10+ choices at once with no hierarchy.
+**Fix**: Group into categories, highlight recommended, use progressive disclosure.
+
+### 2. The Memory Bridge
+**Problem**: User must remember info from step 1 to complete step 3.
+**Fix**: Keep relevant context visible, or repeat it where it's needed.
+
+### 3. The Hidden Navigation
+**Problem**: User must build a mental map of where things are.
+**Fix**: Always show current location (breadcrumbs, active states, progress indicators).
+
+### 4. The Jargon Barrier
+**Problem**: Technical or domain language forces translation effort.
+**Fix**: Use plain language. If domain terms are unavoidable, define them inline.
+
+### 5. The Visual Noise Floor
+**Problem**: Every element has the same visual weight; nothing stands out.
+**Fix**: Establish clear hierarchy: one primary element, 2–3 secondary, everything else muted.
+
+### 6. The Inconsistent Pattern
+**Problem**: Similar actions work differently in different places.
+**Fix**: Standardize interaction patterns. Same type of action = same type of UI.
+
+### 7. The Multi-Task Demand
+**Problem**: Interface requires processing multiple simultaneous inputs (reading + deciding + navigating).
+**Fix**: Sequence the steps. Let the user do one thing at a time.
+
+### 8. The Context Switch
+**Problem**: User must jump between screens/tabs/modals to gather info for a single decision.
+**Fix**: Co-locate the information needed for each decision. Reduce back-and-forth.
diff --git a/.agents/skills/impeccable/reference/color-and-contrast.md b/.agents/skills/impeccable/reference/color-and-contrast.md
new file mode 100644
index 00000000..110c2ee4
--- /dev/null
+++ b/.agents/skills/impeccable/reference/color-and-contrast.md
@@ -0,0 +1,105 @@
+# Color & Contrast
+
+## Color Spaces: Use OKLCH
+
+**Stop using HSL.** Use OKLCH (or LCH) instead. It's perceptually uniform, meaning equal steps in lightness *look* equal, unlike HSL where 50% lightness in yellow looks bright while 50% in blue looks dark.
+
+The OKLCH function takes three components: `oklch(lightness chroma hue)` where lightness is 0-100%, chroma is roughly 0-0.4, and hue is 0-360. To build a primary color and its lighter / darker variants, hold the chroma+hue roughly constant and vary the lightness, but **reduce chroma as you approach white or black**, because high chroma at extreme lightness looks garish.
+
+The hue you pick is a brand decision and should not come from a default. Do not reach for blue (hue 250) or warm orange (hue 60) by reflex; those are the dominant AI-design defaults, not the right answer for any specific brand.
+
+## Building Functional Palettes
+
+### Tinted Neutrals
+
+**Pure gray is dead.** A neutral with zero chroma feels lifeless next to a colored brand. Add a tiny chroma value (0.005-0.015) to all your neutrals, hued toward whatever your brand color is. The chroma is small enough not to read as "tinted" consciously, but it creates subconscious cohesion between brand color and UI surfaces.
+
+The hue you tint toward should come from THIS project's brand, not from a "warm = friendly, cool = tech" formula. If your brand color is teal, your neutrals lean toward teal. If your brand color is amber, they lean toward amber. The point is cohesion with the SPECIFIC brand, not a stock palette.
+
+**Avoid** the trap of always tinting toward warm orange or always tinting toward cool blue. Those are the two laziest defaults and they create their own monoculture across projects.
+
+### Palette Structure
+
+A complete system needs:
+
+| Role | Purpose | Example |
+|------|---------|---------|
+| **Primary** | Brand, CTAs, key actions | 1 color, 3-5 shades |
+| **Neutral** | Text, backgrounds, borders | 9-11 shade scale |
+| **Semantic** | Success, error, warning, info | 4 colors, 2-3 shades each |
+| **Surface** | Cards, modals, overlays | 2-3 elevation levels |
+
+**Skip secondary/tertiary unless you need them.** Most apps work fine with one accent color. Adding more creates decision fatigue and visual noise.
+
+### The 60-30-10 Rule (Applied Correctly)
+
+This rule is about **visual weight**, not pixel count:
+
+- **60%**: Neutral backgrounds, white space, base surfaces
+- **30%**: Secondary colors: text, borders, inactive states
+- **10%**: Accent: CTAs, highlights, focus states
+
+The common mistake: using the accent color everywhere because it's "the brand color." Accent colors work *because* they're rare. Overuse kills their power.
+
+## Contrast & Accessibility
+
+### WCAG Requirements
+
+| Content Type | AA Minimum | AAA Target |
+|--------------|------------|------------|
+| Body text | 4.5:1 | 7:1 |
+| Large text (18px+ or 14px bold) | 3:1 | 4.5:1 |
+| UI components, icons | 3:1 | 4.5:1 |
+| Non-essential decorations | None | None |
+
+**The gotcha**: Placeholder text still needs 4.5:1. That light gray placeholder you see everywhere? Usually fails WCAG.
+
+### Dangerous Color Combinations
+
+These commonly fail contrast or cause readability issues:
+
+- Light gray text on white (the #1 accessibility fail)
+- **Gray text on any colored background**: gray looks washed out and dead on color. Use a darker shade of the background color, or transparency
+- Red text on green background (or vice versa): 8% of men can't distinguish these
+- Blue text on red background (vibrates visually)
+- Yellow text on white (almost always fails)
+- Thin light text on images (unpredictable contrast)
+
+### Never Use Pure Gray or Pure Black
+
+Pure gray (`oklch(50% 0 0)`) and pure black (`#000`) don't exist in nature; real shadows and surfaces always have a color cast. Even a chroma of 0.005-0.01 is enough to feel natural without being obviously tinted. (See tinted neutrals example above.)
+
+### Testing
+
+Don't trust your eyes. Use tools:
+
+- [WebAIM Contrast Checker](https://webaim.org/resources/contrastchecker/)
+- Browser DevTools → Rendering → Emulate vision deficiencies
+- [Polypane](https://polypane.app/) for real-time testing
+
+## Theming: Light & Dark Mode
+
+### Dark Mode Is Not Inverted Light Mode
+
+You can't just swap colors. Dark mode requires different design decisions:
+
+| Light Mode | Dark Mode |
+|------------|-----------|
+| Shadows for depth | Lighter surfaces for depth (no shadows) |
+| Dark text on light | Light text on dark (reduce font weight) |
+| Vibrant accents | Desaturate accents slightly |
+| White backgrounds | Never pure black; use dark gray (oklch 12-18%) |
+
+In dark mode, depth comes from surface lightness, not shadow. Build a 3-step surface scale where higher elevations are lighter (e.g. 15% / 20% / 25% lightness). Use the SAME hue and chroma as your brand color (whatever it is for THIS project; do not reach for blue) and only vary the lightness. Reduce body text weight slightly (e.g. 350 instead of 400) because light text on dark reads as heavier than dark text on light.
+
+### Token Hierarchy
+
+Use two layers: primitive tokens (`--blue-500`) and semantic tokens (`--color-primary: var(--blue-500)`). For dark mode, only redefine the semantic layer; primitives stay the same.
+
+## Alpha Is A Design Smell
+
+Heavy use of transparency (rgba, hsla) usually means an incomplete palette. Alpha creates unpredictable contrast, performance overhead, and inconsistency. Define explicit overlay colors for each context instead. Exception: focus rings and interactive states where see-through is needed.
+
+---
+
+**Avoid**: Relying on color alone to convey information. Creating palettes without clear roles for each color. Using pure black (#000) for large areas. Skipping color blindness testing (8% of men affected).
diff --git a/.agents/skills/impeccable/reference/colorize.md b/.agents/skills/impeccable/reference/colorize.md
new file mode 100644
index 00000000..a6ddfb29
--- /dev/null
+++ b/.agents/skills/impeccable/reference/colorize.md
@@ -0,0 +1,154 @@
+> **Additional context needed**: existing brand colors.
+
+Replace timid grayscale or single-accent designs with a strategic palette: pick a color strategy, choose a hue family that fits the brand, then apply color with intent. More color ≠ better. Strategic color beats rainbow vomit.
+
+---
+
+## Register
+
+Brand: palette IS voice. Pick a color strategy first per SKILL.md (Restrained / Committed / Full palette / Drenched) and follow its dosage. Committed, Full palette, and Drenched deliberately exceed the ≤10% rule; that rule is Restrained only. Unexpected combinations are allowed; a dominant color can own the page when the chosen strategy calls for it.
+
+Product: semantic-first and almost always Restrained. Accent color is reserved for primary action, current selection, and state indicators. Not decoration. Every color has a consistent meaning across every screen.
+
+---
+
+## Assess Color Opportunity
+
+Analyze the current state and identify opportunities:
+
+1. **Understand current state**:
+   - **Color absence**: Pure grayscale? Limited neutrals? One timid accent?
+   - **Missed opportunities**: Where could color add meaning, hierarchy, or delight?
+   - **Context**: What's appropriate for this domain and audience?
+   - **Brand**: Are there existing brand colors we should use?
+
+2. **Identify where color adds value**:
+   - **Semantic meaning**: Success (green), error (red), warning (yellow/orange), info (blue)
+   - **Hierarchy**: Drawing attention to important elements
+   - **Categorization**: Different sections, types, or states
+   - **Emotional tone**: Warmth, energy, trust, creativity
+   - **Wayfinding**: Helping users navigate and understand structure
+   - **Delight**: Moments of visual interest and personality
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: More color ≠ better. Strategic color beats rainbow vomit every time. Every color should have a purpose.
+
+## Plan Color Strategy
+
+Create a purposeful color introduction plan:
+
+- **Color palette**: What colors match the brand/context? (Choose 2-4 colors max beyond neutrals)
+- **Dominant color**: Which color owns 60% of colored elements?
+- **Accent colors**: Which colors provide contrast and highlights? (30% and 10%)
+- **Application strategy**: Where does each color appear and why?
+
+**IMPORTANT**: Color should enhance hierarchy and meaning, not create chaos. Less is more when it matters more.
+
+## Introduce Color Strategically
+
+Add color systematically across these dimensions:
+
+### Semantic Color
+- **State indicators**:
+  - Success: Green tones (emerald, forest, mint)
+  - Error: Red/pink tones (rose, crimson, coral)
+  - Warning: Orange/amber tones
+  - Info: Blue tones (sky, ocean, indigo)
+  - Neutral: Gray/slate for inactive states
+
+- **Status badges**: Colored backgrounds or borders for states (active, pending, completed, etc.)
+- **Progress indicators**: Colored bars, rings, or charts showing completion or health
+
+### Accent Color Application
+- **Primary actions**: Color the most important buttons/CTAs
+- **Links**: Add color to clickable text (maintain accessibility)
+- **Icons**: Colorize key icons for recognition and personality
+- **Headers/titles**: Add color to section headers or key labels
+- **Hover states**: Introduce color on interaction
+
+### Background & Surfaces
+- **Tinted backgrounds**: Replace pure gray (`#f5f5f5`) with warm neutrals (`oklch(97% 0.01 60)`) or cool tints (`oklch(97% 0.01 250)`)
+- **Colored sections**: Use subtle background colors to separate areas
+- **Gradient backgrounds**: Add depth with subtle, intentional gradients (not generic purple-blue)
+- **Cards & surfaces**: Tint cards or surfaces slightly for warmth
+
+**Use OKLCH for color**: It's perceptually uniform, meaning equal steps in lightness *look* equal. Great for generating harmonious scales.
+
+### Data Visualization
+- **Charts & graphs**: Use color to encode categories or values
+- **Heatmaps**: Color intensity shows density or importance
+- **Comparison**: Color coding for different datasets or timeframes
+
+### Borders & Accents
+- **Hairline borders**: 1px colored borders on full perimeter (not side-stripes; see the absolute ban on `border-left/right > 1px`)
+- **Underlines**: Color underlines for emphasis or active states
+- **Dividers**: Subtle colored dividers instead of gray lines
+- **Focus rings**: Colored focus indicators matching brand
+- **Surface tints**: A 4-8% background wash of the accent color instead of a stripe
+
+**NEVER**: `border-left` or `border-right` greater than 1px as a colored accent stripe. This is one of the three absolute bans in the parent skill. If you want to mark a card as "active" or "warning", use a full hairline border, a background tint, a leading glyph, or a numbered prefix. Not a side stripe.
+
+### Typography Color
+- **Colored headings**: Use brand colors for section headings (maintain contrast)
+- **Highlight text**: Color for emphasis or categories
+- **Labels & tags**: Small colored labels for metadata or categories
+
+### Decorative Elements
+- **Illustrations**: Add colored illustrations or icons
+- **Shapes**: Geometric shapes in brand colors as background elements
+- **Gradients**: Colorful gradient overlays or mesh backgrounds
+- **Blobs/organic shapes**: Soft colored shapes for visual interest
+
+## Balance & Refinement
+
+Ensure color addition improves rather than overwhelms:
+
+### Maintain Hierarchy
+- **Dominant color** (60%): Primary brand color or most used accent
+- **Secondary color** (30%): Supporting color for variety
+- **Accent color** (10%): High contrast for key moments
+- **Neutrals** (remaining): Gray/black/white for structure
+
+### Accessibility
+- **Contrast ratios**: Ensure WCAG compliance (4.5:1 for text, 3:1 for UI components)
+- **Don't rely on color alone**: Use icons, labels, or patterns alongside color
+- **Test for color blindness**: Verify red/green combinations work for all users
+
+### Cohesion
+- **Consistent palette**: Use colors from defined palette, not arbitrary choices
+- **Systematic application**: Same color meanings throughout (green always = success)
+- **Temperature consistency**: Warm palette stays warm, cool stays cool
+
+**NEVER**:
+- Use every color in the rainbow (choose 2-4 colors beyond neutrals)
+- Apply color randomly without semantic meaning
+- Put gray text on colored backgrounds. It looks washed out; use a darker shade of the background color or transparency instead
+- Use pure gray for neutrals. Add subtle color tint (warm or cool) for depth
+- Use pure black (`#000`) or pure white (`#fff`) for large areas
+- Violate WCAG contrast requirements
+- Use color as the only indicator (accessibility issue)
+- Make everything colorful (defeats the purpose)
+- Default to purple-blue gradients (AI slop aesthetic)
+
+## Verify Color Addition
+
+Test that colorization improves the experience:
+
+- **Better hierarchy**: Does color guide attention appropriately?
+- **Clearer meaning**: Does color help users understand states/categories?
+- **More engaging**: Does the interface feel warmer and more inviting?
+- **Still accessible**: Do all color combinations meet WCAG standards?
+- **Not overwhelming**: Is color balanced and purposeful?
+
+When the palette earns its place, hand off to `$impeccable polish` for the final pass.
+
+## Live-mode signature params
+
+When invoked from live mode, each variant MUST declare a `color-amount` param so the user can dial between a restrained accent and a drenched surface without regeneration. Author the variant's CSS against `var(--p-color-amount, 0.5)`, typically as the alpha multiplier on backgrounds, or as a scaling factor on the chroma axis in an OKLCH expression. 0 = neutral/monochrome, 1 = full saturation / dominant coverage.
+
+```json
+{"id":"color-amount","kind":"range","min":0,"max":1,"step":0.05,"default":0.5,"label":"Color amount"}
+```
+
+Layer 1-2 variant-specific params on top: palette selection (`steps` with named options), temperature warmth, or tint vs. true color. See `reference/live.md` for the full params contract.
diff --git a/.agents/skills/impeccable/reference/craft.md b/.agents/skills/impeccable/reference/craft.md
new file mode 100644
index 00000000..337b5c9b
--- /dev/null
+++ b/.agents/skills/impeccable/reference/craft.md
@@ -0,0 +1,193 @@
+# Craft Flow
+
+Build a feature with impeccable UX and UI quality through a structured process: shape the design, land the visual direction, build real production code, then inspect and improve in-browser until the result meets a high-end studio bar.
+
+## Build Gate
+
+Craft cannot build until all of these are true:
+
+1. PRODUCT context is valid and current.
+2. The shape design brief is explicitly confirmed by the user for this task, unless the user already provided a confirmed brief.
+3. Implementation references from the brief are loaded.
+4. The shape visual probe decision is recorded: generated, skipped with reason, or already resolved.
+5. The north-star mock decision is recorded: generated, skipped with reason, or not applicable.
+
+PRODUCT.md and `teach` answers do **not** satisfy the shape gate. They are project context only. A compact self-authored brief does not satisfy the shape gate either. `shape=pass` requires a separate user response approving the shape brief or an already-confirmed brief supplied by the user.
+
+Invalid image-skip reasons include: "the final implementation will be semantic HTML/CSS/SVG", "the diagram should stay editable", "a raster mock would not be used directly", or "the product is fictional." Generated probes and mocks are direction artifacts; they are not implementation assets.
+
+## Craft Contract
+
+Craft is not a first pass. It is a loop with these required artifacts:
+
+1. Confirmed design brief from `shape`.
+2. Approved visual direction, from generated probes / mocks when image generation is available.
+3. Mock fidelity inventory: the visible ingredients from the approved direction that must survive into code.
+4. Semantic, functional implementation using the project's real stack and conventions.
+5. Browser evidence across relevant viewports.
+6. At least one critique-and-fix pass after the first browser inspection, unless the first pass has no material defects.
+
+Do not let generated mockups replace interface structure, copy, accessibility, responsive behavior, or state design. But do treat the approved mock as a concrete visual contract for composition, hierarchy, density, atmosphere, signature motifs, image needs, and distinctive visual moves. "North star" means "preserve the important visible ingredients in semantic code," not "use it as loose mood."
+
+## Step 1: Shape the Design
+
+Run $impeccable shape, passing along whatever feature description the user provided.
+
+Wait for the design brief to be fully confirmed by the user before proceeding. The brief is your blueprint, and every implementation decision should trace back to it.
+
+If this craft run resumed after `teach` created PRODUCT.md, run shape now. Do not treat the teach interview, PRODUCT.md, or a summary of project context as a substitute for shape. Shape is task-specific and must cover scope, content/states, visual direction, constraints, anti-goals, probes when applicable, and explicit brief confirmation.
+
+If the user has already run $impeccable shape and has a confirmed design brief, skip this step and use the existing brief.
+
+## Step 2: Load References
+
+Based on the design brief's "Recommended References" section, consult the relevant impeccable reference files. At minimum, always consult:
+
+- [spatial-design.md](spatial-design.md) for layout and spacing
+- [typography.md](typography.md) for type hierarchy
+
+Then add references based on the brief's needs:
+- Complex interactions or forms? Consult [interaction-design.md](interaction-design.md)
+- Animation or transitions? Consult [motion-design.md](motion-design.md)
+- Color-heavy or themed? Consult [color-and-contrast.md](color-and-contrast.md)
+- Responsive requirements? Consult [responsive-design.md](responsive-design.md)
+- Heavy on copy, labels, or errors? Consult [ux-writing.md](ux-writing.md)
+
+## Step 3: Land the Visual Direction (Capability-Gated)
+
+Before implementation, generate high-fidelity visual comps when all of these are true:
+
+- The work is **net-new** or visually open-ended enough that composition exploration will improve the build.
+- The brief's scope is **mid-fi, high-fi, or production-ready**.
+- The current harness has **built-in image generation capability** (for example, Codex with a native image tool). Do **not** ask the user to set up external APIs, shell scripts, or one-off tooling just to do this.
+
+When those conditions are met, this step is mandatory for **both brand and product work** in Codex and any harness with built-in image generation. Use native image generation; in Codex, use the built-in `image_gen` tool via the imagegen skill. If image generation is unavailable, do not ask the user to install APIs or tooling. State in one line that the image step is skipped because the harness lacks native image generation, then proceed.
+
+Do not skip this step because the eventual UI should be semantic, editable, code-native, responsive, or accessible. Those are implementation requirements, not reasons to avoid visual exploration.
+
+### Purpose
+
+Use the mock step to find a stronger visual lane than code-first generation would reliably discover on its own. The brief remains authoritative on user, purpose, content, constraints, states, and anti-goals. The mock clarifies composition, hierarchy, density, typography, and visual tone.
+
+### What to generate
+
+Generate **1 to 3** high-fidelity north-star comps based on the confirmed brief. If shape already produced direction probes, use those results as input and generate a more resolved mock from the winning lane, not another unrelated exploration.
+
+- For brand work, push visual identity, composition, and mood aggressively.
+- For product work, still push hierarchy, topology, density, and tone, but keep the comps grounded in realistic product structure and states.
+- For landing pages and long-form brand surfaces, show enough of the next section or second fold to establish the system beyond the hero.
+
+The comps must be genuinely different in primary visual direction, not just color variants.
+
+### Approval loop
+
+Show the comps and ask what should carry forward. If the user asks for changes or the best direction is still weak, generate a focused revision before implementation. Continue until one direction is approved, or until the user explicitly delegates the choice.
+
+If the user delegates, pick the strongest direction and explain the decision using the brief, not personal taste.
+
+Before moving to implementation, summarize:
+
+- What to carry into code
+- What **not** to literalize from the mock
+
+This summary is required before Step 4. It is the handoff between visual exploration and semantic implementation.
+
+### Mock fidelity inventory
+
+Before building, inventory the approved mock's major visible ingredients:
+
+- Hero silhouette and dominant composition.
+- Signature motifs: planets, devices, portraits, charts, route lines, insets, badges, or other memorable objects.
+- Nav and primary CTA treatment.
+- Section sequence visible in the mock, especially the second fold.
+- Image-native content the concept depends on.
+- Typography, density, color/material treatment, and motion cues.
+
+For each ingredient, decide how it will be implemented: semantic HTML/CSS/SVG, generated asset, sourced project asset, icon library, canvas/WebGL, or an explicitly accepted omission. Do not substitute a different hero composition or new visual driver after approval unless the user approves the change.
+
+Treat the mock as a **north star**, not a screenshot to trace. Do **not** rasterize core UI text or let the mock override the confirmed brief. But if the live result lacks the mock's major visible ingredients, the implementation is wrong.
+
+## Step 4: Asset Extraction (Need-Gated)
+
+If the chosen direction includes image-native visual ingredients that would materially improve the implementation, generate them as separate assets before building.
+
+Good candidates:
+
+- stickers
+- badges
+- seals
+- tickets
+- graphic labels
+- textures
+- abstract objects
+- decorative marks
+- non-semantic scene elements
+
+For travel, editorial, portfolio, venue, product showcase, entertainment, education, or any other image-led brand surface, visual assets are usually core content, not decoration. Do not ship abstract CSS panels where the approved mock or subject matter calls for real imagery, generated plates, illustrations, maps, product/object renders, or destination scenes.
+
+Do **not** export assets for core UI text, navigation, body copy, or any structure that should stay semantic and editable in code.
+
+Usually **1 to 5** extracted assets is enough. If the design can be built cleanly in HTML/CSS/SVG, prefer that over raster assets. If the mock contains major visual content that cannot be built credibly in code, asset extraction is not optional.
+
+## Step 5: Build to Production Quality
+
+Implement the feature following the design brief. Build in passes so structure, visual system, states, motion/media, and responsive behavior each get deliberate attention. The list below is the definition of done, not inspiration.
+
+### Production bar
+
+- Use real or realistic content. Remove placeholder copy, placeholder images, dead links, fake controls, and unused scaffold before presenting.
+- Preserve the approved mock's major ingredients. Missing hero objects, missing world/product imagery, different section structure, downgraded CTA/nav treatment, or generic replacements for distinctive motifs are blocking defects unless the user accepted the change.
+- Build semantically first: real headings, landmarks, labels, form associations, button/link semantics, accessible names, and state announcements where needed.
+- Calibrate spacing, alignment, grid placement, and vertical rhythm deliberately. Do not accept default gaps, arbitrary margins, unbalanced whitespace, or accidental optical misalignment.
+- Make typography intentional: chosen font loading strategy, clear hierarchy, readable measure, stable line breaks, tuned wrapping, and no overflow at mobile or large desktop sizes.
+- Design realistic state coverage: default, hover where supported, focus-visible, active, disabled, loading, error, success, empty, overflow, long text, short text, and first-run states where relevant.
+- Make interaction quality feel finished: keyboard paths, touch targets, feedback timing, scroll behavior, transitions between states, and no hover-only functionality.
+- Use icons from the project's established icon set when available. If no set exists, choose a coherent library or use accessible text controls; do not mix unrelated icon styles.
+- Optimize imagery and media: correct dimensions, useful alt text, lazy loading below the fold, modern formats when practical, responsive `srcset` / `picture` for raster assets, and no project-referenced asset left outside the workspace.
+- Make motion feel premium: use atmospheric blur, filter, mask, shadow, or reveal effects when they improve the experience; avoid casual layout-property animation, bound expensive effects, verify smoothness in-browser, respect reduced motion, and avoid choreography that blocks task completion.
+- Preserve maintainability: reusable local patterns, clear component boundaries, project conventions, no rasterized UI text, and no hard-coded one-off hacks when a better local pattern exists.
+- Fit the technical context: production build passes, no obvious console errors, no avoidable layout shift, no needless dependency, and no broken asset path.
+- If you discover a design question that materially changes the brief or approved direction, stop and ask rather than guessing.
+
+## Step 6: Browser-Based Iteration
+
+**This step is critical.** Do not stop after the first implementation pass.
+
+Open the result in a browser. In Codex, use browser-use or equivalent browser automation when available; otherwise use Playwright or ask the user for screenshots. Inspect screenshots, not just DOM or terminal output.
+
+### Required viewport pass
+
+Check the experience at the viewports that matter for the brief. Default minimum:
+
+- Mobile narrow
+- Tablet or small laptop
+- Desktop wide
+
+For each viewport, capture or inspect the rendered state and look for visual defects: overlap, clipping, weak hierarchy, off-grid alignment, awkward whitespace, cramped controls, unreadable type, broken imagery, hover-only functionality, layout shift, and text overflow.
+
+### Critique and fix loop
+
+After the first browser pass, write a short critique for yourself and patch the implementation. Repeat browser inspection after fixes. Continue until no material issues remain against this checklist:
+
+1. **Does it match the brief?** Compare the live result against every section of the design brief. Fix discrepancies.
+2. **Does it match the approved mock?** Compare screenshots against the mock fidelity inventory: hero silhouette, major motifs, imagery, nav/CTA, section sequence, density, color/materials, and second-fold substance. Missing major ingredients are P0 defects.
+3. **Does it pass the AI slop test?** If someone saw this and said "AI made this," would they believe it immediately? If yes, it needs more design intention.
+4. **Check against impeccable's DON'T guidelines.** Fix any anti-pattern violations.
+5. **Check every state.** Navigate through empty, error, loading, and edge case states. Each one should feel intentional, not like an afterthought.
+6. **Check responsive behavior.** The design should adapt compositionally, not merely shrink.
+7. **Check craft details.** Spacing consistency, optical alignment, type hierarchy, color contrast, image quality, icon coherence, interactive feedback, motion timing, and focus treatment.
+8. **Check performance basics.** No obviously oversized images, avoidable layout thrash, blocking animations, or heavy assets without a reason.
+
+The exit bar is not "it works." It is: the rendered result looks intentional at all checked viewports, all expected states are handled, no placeholders remain unless explicitly accepted, and the implementation quality would be defensible in a high-end studio review.
+
+## Step 7: Present
+
+Present the result to the user:
+- Show the feature in its primary state
+- Summarize the browser/viewports checked and the most important fixes made after inspection
+- Walk through the key states (empty, error, responsive)
+- Explain design decisions that connect back to the design brief and, when used, the chosen north-star mock. Include any accepted deviations from the mock; do not hide unimplemented mock ingredients.
+- Note any remaining limitations or follow-up risks honestly
+- Ask: "What's working? What isn't?"
+
+Iterate based on feedback. Good design is rarely right on the first pass.
diff --git a/.agents/skills/impeccable/reference/critique.md b/.agents/skills/impeccable/reference/critique.md
new file mode 100644
index 00000000..4e9b73db
--- /dev/null
+++ b/.agents/skills/impeccable/reference/critique.md
@@ -0,0 +1,213 @@
+> **Additional context needed**: what the interface is trying to accomplish.
+
+### Gather Assessments
+
+Launch two independent assessments. **Neither may see the other's output.** This isolation is what makes the combined score honest. Running both in one head silently anchors them to each other; do not shortcut it for cost, speed, or context-size reasons.
+
+Delegate each assessment to a separate sub-agent (Claude Code's `Agent` tool, Codex's subagent spawning, etc.). Each returns structured findings as text. Do NOT output findings to the user yet.
+
+Fall back to sequential in-head work only if the environment genuinely cannot spawn sub-agents.
+
+**Tab isolation**: When browser automation is available, each assessment MUST create its own new tab. Never reuse an existing tab, even if one is already open at the correct URL. This prevents the two assessments from interfering with each other's page state.
+
+#### Assessment A: LLM Design Review
+
+Read the relevant source files (HTML, CSS, JS/TS) and, if browser automation is available, visually inspect the live page. **Create a new tab** for this; do not reuse existing tabs. After navigation, label the tab by setting the document title:
+```javascript
+document.title = '[LLM] ' + document.title;
+```
+Think like a design director. Evaluate:
+
+**AI Slop Detection (CRITICAL)**: Does this look like every other AI-generated interface? Review against ALL **DON'T** guidelines from the parent impeccable skill (already loaded in this context). Check for AI color palette, gradient text, dark glows, glassmorphism, hero metric layouts, identical card grids, generic fonts, and all other tells. **The test**: If someone said "AI made this," would you believe them immediately?
+
+**Holistic Design Review**: visual hierarchy (eye flow, primary action clarity), information architecture (structure, grouping, cognitive load), emotional resonance (does it match brand and audience?), discoverability (are interactive elements obvious?), composition (balance, whitespace, rhythm), typography (hierarchy, readability, font choices), color (purposeful use, cohesion, accessibility), states & edge cases (empty, loading, error, success), microcopy (clarity, tone, helpfulness).
+
+**Cognitive Load** (consult [cognitive-load](cognitive-load.md)):
+- Run the 8-item cognitive load checklist. Report failure count: 0-1 = low (good), 2-3 = moderate, 4+ = critical.
+- Count visible options at each decision point. If >4, flag it.
+- Check for progressive disclosure: is complexity revealed only when needed?
+
+**Emotional Journey**:
+- What emotion does this interface evoke? Is that intentional?
+- **Peak-end rule**: Is the most intense moment positive? Does the experience end well?
+- **Emotional valleys**: Check for anxiety spikes at high-stakes moments (payment, delete, commit). Are there design interventions (progress indicators, reassurance copy, undo options)?
+
+**Nielsen's Heuristics** (consult [heuristics-scoring](heuristics-scoring.md)):
+Score each of the 10 heuristics 0-4. This scoring will be presented in the report.
+
+Return structured findings covering: AI slop verdict, heuristic scores, cognitive load assessment, what's working (2-3 items), priority issues (3-5 with what/why/fix), minor observations, and provocative questions.
+
+#### Assessment B: Automated Detection
+
+Run the bundled deterministic detector, which flags 27 specific patterns (AI slop tells + general design quality).
+
+**CLI scan**:
+```bash
+npx impeccable --json [--fast] [target]
+```
+
+- Pass HTML/JSX/TSX/Vue/Svelte files or directories as `[target]` (anything with markup). Do not pass CSS-only files.
+- For URLs, skip the CLI scan (it requires Puppeteer). Use browser visualization instead.
+- For large directories (200+ scannable files), use `--fast` (regex-only, skips jsdom)
+- For 500+ files, narrow scope or ask the user
+- Exit code 0 = clean, 2 = findings
+
+**Browser visualization**: **required** when browser automation tools are available AND the target is a viewable page. The `[Human]` overlay tab is the user-facing deliverable; the critique is incomplete without it. Skip only if the target is not a viewable page (CSS-only file, non-browser target).
+
+The overlay is a **visual aid for the user**. It highlights issues directly in their browser. Do NOT scroll through the page to screenshot overlays. Instead, read the console output to get the results programmatically.
+
+1. **Start the live detection server**:
+   ```bash
+   npx impeccable live &
+   ```
+   Note the port printed to stdout (auto-assigned). Use `--port=PORT` to fix it.
+2. **Create a new tab** and navigate to the page (use dev server URL for local files, or direct URL). Do not reuse existing tabs.
+3. **Label the tab** via `javascript_tool` so the user can distinguish it:
+   ```javascript
+   document.title = '[Human] ' + document.title;
+   ```
+4. **Scroll to top** to ensure the page is scrolled to the very top before injection
+5. **Inject** via `javascript_tool` (replace PORT with the port from step 1):
+   ```javascript
+   const s = document.createElement('script'); s.src = 'http://localhost:PORT/detect.js'; document.head.appendChild(s);
+   ```
+6. Wait 2-3 seconds for the detector to render overlays
+7. **Read results from console** using `read_console_messages` with pattern `impeccable`. The detector logs all findings with the `[impeccable]` prefix. Do NOT scroll through the page to take screenshots of the overlays.
+8. **Cleanup**: Stop the live server when done:
+   ```bash
+   npx impeccable live stop
+   ```
+
+For multi-view targets, inject on 3-5 representative pages. If injection fails, continue with CLI results only.
+
+Return: CLI findings (JSON), browser console findings (if applicable), and any false positives noted.
+
+### Generate Combined Critique Report
+
+Synthesize both assessments into a single report. Do NOT simply concatenate. Weave the findings together, noting where the LLM review and detector agree, where the detector caught issues the LLM missed, and where detector findings are false positives.
+
+Structure your feedback as a design director would:
+
+#### Design Health Score
+> *Consult [heuristics-scoring](heuristics-scoring.md)*
+
+Present the Nielsen's 10 heuristics scores as a table:
+
+| # | Heuristic | Score | Key Issue |
+|---|-----------|-------|-----------|
+| 1 | Visibility of System Status | ? | [specific finding or "n/a" if solid] |
+| 2 | Match System / Real World | ? | |
+| 3 | User Control and Freedom | ? | |
+| 4 | Consistency and Standards | ? | |
+| 5 | Error Prevention | ? | |
+| 6 | Recognition Rather Than Recall | ? | |
+| 7 | Flexibility and Efficiency | ? | |
+| 8 | Aesthetic and Minimalist Design | ? | |
+| 9 | Error Recovery | ? | |
+| 10 | Help and Documentation | ? | |
+| **Total** | | **??/40** | **[Rating band]** |
+
+Be honest with scores. A 4 means genuinely excellent. Most real interfaces score 20-32.
+
+#### Anti-Patterns Verdict
+
+**Start here.** Does this look AI-generated?
+
+**LLM assessment**: Your own evaluation of AI slop tells. Cover overall aesthetic feel, layout sameness, generic composition, missed opportunities for personality.
+
+**Deterministic scan**: Summarize what the automated detector found, with counts and file locations. Note any additional issues the detector caught that you missed, and flag any false positives.
+
+**Visual overlays** (if browser was used): Tell the user that overlays are now visible in the **[Human]** tab in their browser, highlighting the detected issues. Summarize what the console output reported.
+
+#### Overall Impression
+A brief gut reaction: what works, what doesn't, and the single biggest opportunity.
+
+#### What's Working
+Highlight 2-3 things done well. Be specific about why they work.
+
+#### Priority Issues
+The 3-5 most impactful design problems, ordered by importance.
+
+For each issue, tag with **P0-P3 severity** (consult [heuristics-scoring](heuristics-scoring.md) for severity definitions):
+- **[P?] What**: Name the problem clearly
+- **Why it matters**: How this hurts users or undermines goals
+- **Fix**: What to do about it (be concrete)
+- **Suggested command**: Which command could address this (from: $impeccable adapt, $impeccable animate, $impeccable audit, $impeccable bolder, $impeccable clarify, $impeccable colorize, $impeccable critique, $impeccable delight, $impeccable distill, $impeccable document, $impeccable harden, $impeccable layout, $impeccable onboard, $impeccable optimize, $impeccable overdrive, $impeccable polish, $impeccable quieter, $impeccable shape, $impeccable typeset)
+
+#### Persona Red Flags
+> *Consult [personas](personas.md)*
+
+Auto-select 2-3 personas most relevant to this interface type (use the selection table in the reference). If `AGENTS.md` contains a `## Design Context` section from `impeccable teach`, also generate 1-2 project-specific personas from the audience/brand info.
+
+For each selected persona, walk through the primary user action and list specific red flags found:
+
+**Alex (Power User)**: No keyboard shortcuts detected. Form requires 8 clicks for primary action. Forced modal onboarding. High abandonment risk.
+
+**Jordan (First-Timer)**: Icon-only nav in sidebar. Technical jargon in error messages ("404 Not Found"). No visible help. Will abandon at step 2.
+
+Be specific. Name the exact elements and interactions that fail each persona. Don't write generic persona descriptions; write what broke for them.
+
+#### Minor Observations
+Quick notes on smaller issues worth addressing.
+
+#### Questions to Consider
+Provocative questions that might unlock better solutions:
+- "What if the primary action were more prominent?"
+- "Does this need to feel this complex?"
+- "What would a confident version of this look like?"
+
+**Remember**:
+- Be direct. Vague feedback wastes everyone's time.
+- Be specific. "The submit button," not "some elements."
+- Say what's wrong AND why it matters to users.
+- Give concrete suggestions. Cut "consider exploring..." entirely.
+- Prioritize ruthlessly. If everything is important, nothing is.
+- Don't soften criticism. Developers need honest feedback to ship great design.
+
+### Ask the User
+
+**After presenting findings**, use targeted questions based on what was actually found. STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. These answers will shape the action plan.
+
+Ask questions along these lines (adapt to the specific findings; do NOT ask generic questions):
+
+1. **Priority direction**: Based on the issues found, ask which category matters most to the user right now. For example: "I found problems with visual hierarchy, color usage, and information overload. Which area should we tackle first?" Offer the top 2-3 issue categories as options.
+
+2. **Design intent**: If the critique found a tonal mismatch, ask whether it was intentional. For example: "The interface feels clinical and corporate. Is that the intended tone, or should it feel warmer/bolder/more playful?" Offer 2-3 tonal directions as options based on what would fix the issues found.
+
+3. **Scope**: Ask how much the user wants to take on. For example: "I found N issues. Want to address everything, or focus on the top 3?" Offer scope options like "Top 3 only", "All issues", "Critical issues only".
+
+4. **Constraints** (optional; only ask if relevant): If the findings touch many areas, ask if anything is off-limits. For example: "Should any sections stay as-is?" This prevents the plan from touching things the user considers done.
+
+**Rules for questions**:
+- Every question must reference specific findings from the report. Never ask generic "who is your audience?" questions.
+- Keep it to 2-4 questions maximum. Respect the user's time.
+- Offer concrete options, not open-ended prompts.
+- If findings are straightforward (e.g., only 1-2 clear issues), skip questions and go directly to Recommended Actions.
+
+### Recommended Actions
+
+**After receiving the user's answers**, present a prioritized action summary reflecting the user's priorities and scope from Ask the User.
+
+#### Action Summary
+
+List recommended commands in priority order, based on the user's answers:
+
+1. **`$command-name`**: Brief description of what to fix (specific context from critique findings)
+2. **`$command-name`**: Brief description (specific context)
+...
+
+**Rules for recommendations**:
+- Only recommend commands from: $impeccable adapt, $impeccable animate, $impeccable audit, $impeccable bolder, $impeccable clarify, $impeccable colorize, $impeccable critique, $impeccable delight, $impeccable distill, $impeccable document, $impeccable harden, $impeccable layout, $impeccable onboard, $impeccable optimize, $impeccable overdrive, $impeccable polish, $impeccable quieter, $impeccable shape, $impeccable typeset
+- Order by the user's stated priorities first, then by impact
+- Each item's description should carry enough context that the command knows what to focus on
+- Map each Priority Issue to the appropriate command
+- Skip commands that would address zero issues
+- If the user chose a limited scope, only include items within that scope
+- If the user marked areas as off-limits, exclude commands that would touch those areas
+- End with `$impeccable polish` as the final step if any fixes were recommended
+
+After presenting the summary, tell the user:
+
+> You can ask me to run these one at a time, all at once, or in any order you prefer.
+>
+> Re-run `$impeccable critique` after fixes to see your score improve.
diff --git a/.agents/skills/impeccable/reference/delight.md b/.agents/skills/impeccable/reference/delight.md
new file mode 100644
index 00000000..b3196705
--- /dev/null
+++ b/.agents/skills/impeccable/reference/delight.md
@@ -0,0 +1,302 @@
+> **Additional context needed**: what's appropriate for the domain (playful vs professional vs quirky vs elegant).
+
+Find the moments where personality and unexpected polish would turn a functional interface into one users remember and tell other people about. Add only where the moment earns it; delight everywhere reads as noise.
+
+---
+
+## Register
+
+Brand: delight can be distributed across copy voice, section transitions, discovery rewards, seasonal touches, personality across the whole surface.
+
+Product: delight at specific moments, not pages. Completion, first-time actions, error recovery, milestone crossings. Reliability and consistency carry the rest of the experience; delight pushed everywhere reads as noise.
+
+---
+
+## Assess Delight Opportunities
+
+Identify where delight would enhance (not distract from) the experience:
+
+1. **Find natural delight moments**:
+   - **Success states**: Completed actions (save, send, publish)
+   - **Empty states**: First-time experiences, onboarding
+   - **Loading states**: Waiting periods that could be entertaining
+   - **Achievements**: Milestones, streaks, completions
+   - **Interactions**: Hover states, clicks, drags
+   - **Errors**: Softening frustrating moments
+   - **Easter eggs**: Hidden discoveries for curious users
+
+2. **Understand the context**:
+   - What's the brand personality? (Playful? Professional? Quirky? Elegant?)
+   - Who's the audience? (Tech-savvy? Creative? Corporate?)
+   - What's the emotional context? (Accomplishment? Exploration? Frustration?)
+   - What's appropriate? (Banking app ≠ gaming app)
+
+3. **Define delight strategy**:
+   - **Subtle sophistication**: Refined micro-interactions (luxury brands)
+   - **Playful personality**: Whimsical illustrations and copy (consumer apps)
+   - **Helpful surprises**: Anticipating needs before users ask (productivity tools)
+   - **Sensory richness**: Satisfying sounds, smooth animations (creative tools)
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: Delight should enhance usability, never obscure it. If users notice the delight more than accomplishing their goal, you've gone too far.
+
+## Delight Principles
+
+Follow these guidelines:
+
+### Delight Amplifies, Never Blocks
+- Delight moments should be quick (< 1 second)
+- Never delay core functionality for delight
+- Make delight skippable or subtle
+- Respect user's time and task focus
+
+### Surprise and Discovery
+- Hide delightful details for users to discover
+- Reward exploration and curiosity
+- Don't announce every delight moment
+- Let users share discoveries with others
+
+### Appropriate to Context
+- Match delight to emotional moment (celebrate success, empathize with errors)
+- Respect the user's state (don't be playful during critical errors)
+- Match brand personality and audience expectations
+- Cultural sensitivity (what's delightful varies by culture)
+
+### Compound Over Time
+- Delight should remain fresh with repeated use
+- Vary responses (not same animation every time)
+- Reveal deeper layers with continued use
+- Build anticipation through patterns
+
+## Delight Techniques
+
+Add personality and joy through these methods:
+
+### Micro-interactions & Animation
+
+**Button delight**:
+```css
+/* Satisfying button press */
+.button {
+  transition: transform 0.1s, box-shadow 0.1s;
+}
+.button:active {
+  transform: translateY(2px);
+  box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+}
+
+/* Ripple effect on click */
+/* Smooth lift on hover */
+.button:hover {
+  transform: translateY(-2px);
+  transition: transform 0.2s cubic-bezier(0.25, 1, 0.5, 1); /* ease-out-quart */
+}
+```
+
+**Loading delight**:
+- Playful loading animations (not just spinners)
+- Personality in loading messages (write product-specific ones, not generic AI filler)
+- Progress indication with encouraging messages
+- Skeleton screens with subtle animations
+
+**Success animations**:
+- Checkmark draw animation
+- Confetti burst for major achievements
+- Gentle scale + fade for confirmation
+- Satisfying sound effects (subtle)
+
+**Hover surprises**:
+- Icons that animate on hover
+- Color shifts or glow effects
+- Tooltip reveals with personality
+- Cursor changes (custom cursors for branded experiences)
+
+### Personality in Copy
+
+**Playful error messages**:
+```
+"Error 404"
+"This page is playing hide and seek. (And winning)"
+
+"Connection failed"
+"Looks like the internet took a coffee break. Want to retry?"
+```
+
+**Encouraging empty states**:
+```
+"No projects"
+"Your canvas awaits. Create something amazing."
+
+"No messages"
+"Inbox zero! You're crushing it today."
+```
+
+**Playful labels & tooltips**:
+```
+"Delete"
+"Send to void" (for playful brand)
+
+"Help"
+"Rescue me" (tooltip)
+```
+
+**IMPORTANT**: Match copy personality to brand. Banks shouldn't be wacky, but they can be warm.
+
+### Illustrations & Visual Personality
+
+**Custom illustrations**:
+- Empty state illustrations (not stock icons)
+- Error state illustrations (friendly monsters, quirky characters)
+- Loading state illustrations (animated characters)
+- Success state illustrations (celebrations)
+
+**Icon personality**:
+- Custom icon set matching brand personality
+- Animated icons (subtle motion on hover/click)
+- Illustrative icons (more detailed than generic)
+- Consistent style across all icons
+
+**Background effects**:
+- Subtle particle effects
+- Gradient mesh backgrounds
+- Geometric patterns
+- Parallax depth
+- Time-of-day themes (morning vs night)
+
+### Satisfying Interactions
+
+**Drag and drop delight**:
+- Lift effect on drag (shadow, scale)
+- Snap animation when dropped
+- Satisfying placement sound
+- Undo toast ("Dropped in wrong place? [Undo]")
+
+**Toggle switches**:
+- Smooth slide with spring physics
+- Color transition
+- Haptic feedback on mobile
+- Optional sound effect
+
+**Progress & achievements**:
+- Streak counters with celebratory milestones
+- Progress bars that "celebrate" at 100%
+- Badge unlocks with animation
+- Playful stats ("You're on fire! 5 days in a row")
+
+**Form interactions**:
+- Input fields that animate on focus
+- Checkboxes with a satisfying scale pulse when checked
+- Success state that celebrates valid input
+- Auto-grow textareas
+
+### Sound Design
+
+**Subtle audio cues** (when appropriate):
+- Notification sounds (distinctive but not annoying)
+- Success sounds (satisfying "ding")
+- Error sounds (empathetic, not harsh)
+- Typing sounds for chat/messaging
+- Ambient background audio (very subtle)
+
+**IMPORTANT**:
+- Respect system sound settings
+- Provide mute option
+- Keep volumes quiet (subtle cues, not alarms)
+- Don't play on every interaction (sound fatigue is real)
+
+### Easter Eggs & Hidden Delights
+
+**Discovery rewards**:
+- Konami code unlocks special theme
+- Hidden keyboard shortcuts (Cmd+K for special features)
+- Hover reveals on logos or illustrations
+- Alt text jokes on images (for screen reader users too!)
+- Console messages for developers ("Like what you see? We're hiring!")
+
+**Seasonal touches**:
+- Holiday themes (subtle, tasteful)
+- Seasonal color shifts
+- Weather-based variations
+- Time-based changes (dark at night, light during day)
+
+**Contextual personality**:
+- Different messages based on time of day
+- Responses to specific user actions
+- Randomized variations (not same every time)
+- Progressive reveals with continued use
+
+### Loading & Waiting States
+
+**Make waiting engaging**:
+- Interesting loading messages that rotate
+- Progress bars with personality
+- Mini-games during long loads
+- Fun facts or tips while waiting
+- Countdown with encouraging messages
+
+```
+Loading messages: write ones specific to your product, not generic AI filler:
+- "Crunching your latest numbers..."
+- "Syncing with your team's changes..."
+- "Preparing your dashboard..."
+- "Checking for updates since yesterday..."
+```
+
+**WARNING**: Avoid cliched loading messages like "Herding pixels", "Teaching robots to dance", "Consulting the magic 8-ball", "Counting backwards from infinity". These are AI-slop copy, instantly recognizable as machine-generated. Write messages that are specific to what your product actually does.
+
+### Celebration Moments
+
+**Success celebrations**:
+- Confetti for major milestones
+- Animated checkmarks for completions
+- Progress bar celebrations at 100%
+- "Achievement unlocked" style notifications
+- Personalized messages ("You published your 10th article!")
+
+**Milestone recognition**:
+- First-time actions get special treatment
+- Streak tracking and celebration
+- Progress toward goals
+- Anniversary celebrations
+
+## Implementation Patterns
+
+**Animation libraries**:
+- Framer Motion (React)
+- GSAP (universal)
+- Lottie (After Effects animations)
+- Canvas confetti (party effects)
+
+**Sound libraries**:
+- Howler.js (audio management)
+- Use-sound (React hook)
+
+**Physics libraries**:
+- React Spring (spring physics)
+- Popmotion (animation primitives)
+
+**IMPORTANT**: File size matters. Compress images, optimize animations, lazy load delight features.
+
+**NEVER**:
+- Delay core functionality for delight
+- Force users through delightful moments (make skippable)
+- Use delight to hide poor UX
+- Overdo it (less is more)
+- Ignore accessibility (animate responsibly, provide alternatives)
+- Make every interaction delightful (special moments should be special)
+- Sacrifice performance for delight
+- Be inappropriate for context (read the room)
+
+## Verify Delight Quality
+
+Test that delight actually delights:
+
+- **User reactions**: Do users smile? Share screenshots?
+- **Doesn't annoy**: Still pleasant after 100th time?
+- **Doesn't block**: Can users opt out or skip?
+- **Performant**: No jank, no slowdown
+- **Appropriate**: Matches brand and context
+- **Accessible**: Works with reduced motion, screen readers
+
+When the moments feel earned, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/distill.md b/.agents/skills/impeccable/reference/distill.md
new file mode 100644
index 00000000..2ac85043
--- /dev/null
+++ b/.agents/skills/impeccable/reference/distill.md
@@ -0,0 +1,111 @@
+Strip a design to its essence. Remove anything that doesn't earn its place: redundant elements, repeated information, decorative noise, cosmetic complexity.
+
+
+---
+
+## Assess Current State
+
+Analyze what makes the design feel complex or cluttered:
+
+1. **Identify complexity sources**:
+   - **Too many elements**: Competing buttons, redundant information, visual clutter
+   - **Excessive variation**: Too many colors, fonts, sizes, styles without purpose
+   - **Information overload**: Everything visible at once, no progressive disclosure
+   - **Visual noise**: Unnecessary borders, shadows, backgrounds, decorations
+   - **Confusing hierarchy**: Unclear what matters most
+   - **Feature creep**: Too many options, actions, or paths forward
+
+2. **Find the essence**:
+   - What's the primary user goal? (There should be ONE)
+   - What's actually necessary vs nice-to-have?
+   - What can be removed, hidden, or combined?
+   - What's the 20% that delivers 80% of value?
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: Simplicity is not about removing features. It's about removing obstacles between users and their goals. Every element should justify its existence.
+
+## Plan Simplification
+
+Create a ruthless editing strategy:
+
+- **Core purpose**: What's the ONE thing this should accomplish?
+- **Essential elements**: What's truly necessary to achieve that purpose?
+- **Progressive disclosure**: What can be hidden until needed?
+- **Consolidation opportunities**: What can be combined or integrated?
+
+**IMPORTANT**: Simplification is hard. It requires saying no to good ideas to make room for great execution. Be ruthless.
+
+## Simplify the Design
+
+Systematically remove complexity across these dimensions:
+
+### Information Architecture
+- **Reduce scope**: Remove secondary actions, optional features, redundant information
+- **Progressive disclosure**: Hide complexity behind clear entry points (accordions, modals, step-through flows)
+- **Combine related actions**: Merge similar buttons, consolidate forms, group related content
+- **Clear hierarchy**: ONE primary action, few secondary actions, everything else tertiary or hidden
+- **Remove redundancy**: If it's said elsewhere, don't repeat it here
+
+### Visual Simplification
+- **Reduce color palette**: Use 1-2 colors plus neutrals, not 5-7 colors
+- **Limit typography**: One font family, 3-4 sizes maximum, 2-3 weights
+- **Remove decorations**: Eliminate borders, shadows, backgrounds that don't serve hierarchy or function
+- **Flatten structure**: Reduce nesting, remove unnecessary containers; never nest cards inside cards
+- **Remove unnecessary cards**: Cards aren't needed for basic layout; use spacing and alignment instead
+- **Consistent spacing**: Use one spacing scale, remove arbitrary gaps
+
+### Layout Simplification
+- **Linear flow**: Replace complex grids with simple vertical flow where possible
+- **Remove sidebars**: Move secondary content inline or hide it
+- **Full-width**: Use available space generously instead of complex multi-column layouts
+- **Consistent alignment**: Pick left or center, stick with it
+- **Generous white space**: Let content breathe, don't pack everything tight
+
+### Interaction Simplification
+- **Reduce choices**: Fewer buttons, fewer options, clearer path forward (paradox of choice is real)
+- **Smart defaults**: Make common choices automatic, only ask when necessary
+- **Inline actions**: Replace modal flows with inline editing where possible
+- **Remove steps**: Can signup be one step instead of three? Can checkout be simplified?
+- **Clear CTAs**: ONE obvious next step, not five competing actions
+
+### Content Simplification
+- **Shorter copy**: Cut every sentence in half, then do it again
+- **Active voice**: "Save changes" not "Changes will be saved"
+- **Remove jargon**: Plain language always wins
+- **Scannable structure**: Short paragraphs, bullet points, clear headings
+- **Essential information only**: Remove marketing fluff, legalese, hedging
+- **Remove redundant copy**: No headers restating intros, no repeated explanations, say it once
+
+### Code Simplification
+- **Remove unused code**: Dead CSS, unused components, orphaned files
+- **Flatten component trees**: Reduce nesting depth
+- **Consolidate styles**: Merge similar styles, use utilities consistently
+- **Reduce variants**: Does that component need 12 variations, or can 3 cover 90% of cases?
+
+**NEVER**:
+- Remove necessary functionality (simplicity ≠ feature-less)
+- Sacrifice accessibility for simplicity (clear labels and ARIA still required)
+- Make things so simple they're unclear (mystery ≠ minimalism)
+- Remove information users need to make decisions
+- Eliminate hierarchy completely (some things should stand out)
+- Oversimplify complex domains (match complexity to actual task complexity)
+
+## Verify Simplification
+
+Ensure simplification improves usability:
+
+- **Faster task completion**: Can users accomplish goals more quickly?
+- **Reduced cognitive load**: Is it easier to understand what to do?
+- **Still complete**: Are all necessary features still accessible?
+- **Clearer hierarchy**: Is it obvious what matters most?
+- **Better performance**: Does simpler design load faster?
+
+## Document Removed Complexity
+
+If you removed features or options:
+- Document why they were removed
+- Consider if they need alternative access points
+- Note any user feedback to monitor
+
+When the cuts feel right, hand off to `$impeccable polish` for the final pass. As Antoine de Saint-Exupéry put it: "Perfection is achieved not when there is nothing more to add, but when there is nothing left to take away."
diff --git a/.agents/skills/impeccable/reference/document.md b/.agents/skills/impeccable/reference/document.md
new file mode 100644
index 00000000..ebafe4f4
--- /dev/null
+++ b/.agents/skills/impeccable/reference/document.md
@@ -0,0 +1,427 @@
+Generate a `DESIGN.md` file at the project root that captures the current visual design system, so AI agents generating new screens stay on-brand.
+
+DESIGN.md follows the [official Google Stitch DESIGN.md format](https://stitch.withgoogle.com/docs/design-md/format/): YAML frontmatter carrying machine-readable design tokens, followed by a markdown body with exactly six sections in a fixed order. **Tokens are normative; prose provides context for how to apply them.** Sections may be omitted when not relevant, but **do not reorder them and do not rename them**. Section headers must match the spec character-for-character so the file stays parseable by other DESIGN.md-aware tools (Stitch itself, awesome-design-md, skill-rest, etc.).
+
+## The frontmatter: token schema
+
+The YAML frontmatter is the machine-readable layer. It's what Stitch's linter validates and what the live panel renders tiles from. Keep it tight; every entry should correspond to a token the project actually uses.
+
+```yaml
+---
+name: <project title>
+description: <one-line tagline>
+colors:
+  primary: "#b8422e"
+  neutral-bg: "#faf7f2"
+  # ...one entry per extracted color; key = descriptive slug
+typography:
+  display:
+    fontFamily: "Cormorant Garamond, Georgia, serif"
+    fontSize: "clamp(2.5rem, 7vw, 4.5rem)"
+    fontWeight: 300
+    lineHeight: 1
+    letterSpacing: "normal"
+  body:
+    # ...
+rounded:
+  sm: "4px"
+  md: "8px"
+spacing:
+  sm: "8px"
+  md: "16px"
+components:
+  button-primary:
+    backgroundColor: "{colors.primary}"
+    textColor: "{colors.neutral-bg}"
+    rounded: "{rounded.sm}"
+    padding: "16px 48px"
+  button-primary-hover:
+    backgroundColor: "{colors.primary-deep}"
+---
+```
+
+Rules that matter:
+
+- **Token refs** use `{path.to.token}` (e.g. `{colors.primary}`, `{rounded.md}`). Components may reference primitives; primitives may not reference each other.
+- **Stitch validates colors as hex sRGB only** (`#RGB` / `#RGBA` / `#RRGGBB` / `#RRGGBBAA`); OKLCH/HSL/P3 trigger a linter warning, not a hard error. YAML accepts the string either way and our own parser is format-agnostic. Choose based on project posture: (a) if the project has an "OKLCH-only" doctrine or uses Display-P3 values that don't round-trip through sRGB, put OKLCH directly in the frontmatter and accept the Stitch linter warning; (b) if the project wants strict Stitch compliance or plans to use their Tailwind/DTCG export pipeline, put hex in the frontmatter and keep OKLCH in prose as the canonical reference. Never split the source of truth without explicit reason.
+- **Component sub-tokens** are limited to 8 props: `backgroundColor`, `textColor`, `typography`, `rounded`, `padding`, `size`, `height`, `width`. Shadows, motion, focus rings, backdrop-filter: none of those fit. Carry them in the sidecar (Step 4b).
+- **Scale keys are open-ended.** Use whatever names the project already uses (`warm-ash-cream`, `surface-container-low`). Don't rename to Material defaults.
+- **Variants are naming convention, not schema.** `button-primary` / `button-primary-hover` / `button-primary-active` as sibling keys.
+
+## The markdown body: six sections (exact order)
+
+1. `## Overview`
+2. `## Colors`
+3. `## Typography`
+4. `## Elevation`
+5. `## Components`
+6. `## Do's and Don'ts`
+
+Optional evocative subtitles are allowed in the form `## 2. Colors: The [Name] Palette` (Stitch's own outputs do this), but the literal word in each header (Overview, Colors, Typography, Elevation, Components, Do's and Don'ts) must be present. Do NOT add extra top-level sections (Layout Principles, Responsive Behavior, Motion, Agent Prompt Guide). Fold that content into the six spec sections where it naturally belongs.
+
+## When to run
+
+- The user just ran `$impeccable teach` and needs the visual side documented.
+- The skill noticed no `DESIGN.md` exists and nudged the user to create one.
+- An existing `DESIGN.md` is stale (the design has drifted).
+- Before a large redesign, to capture the current state as a reference.
+
+If a `DESIGN.md` already exists, **do not silently overwrite it**. Show the user the existing file and STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. whether to refresh, overwrite, or merge.
+
+## Two paths
+
+- **Scan mode** (default): the project has design tokens, components, or rendered output. Extract, then confirm descriptive language. Use when there's code to analyze.
+- **Seed mode**: the project is pre-implementation (fresh teach, nothing built yet). Interview for five high-level answers, write a minimal DESIGN.md marked `<!-- SEED -->`. Re-run in scan mode once there's code.
+
+Decide by scanning first (Scan mode Step 1). If the scan finds no tokens, no component files, and no rendered site, offer seed mode; don't silently switch. `$impeccable document --seed` forces seed mode regardless of code presence.
+
+## Scan mode (approach C: auto-extract, then confirm descriptive language)
+
+### Step 1: Find the design assets
+
+Search the codebase in priority order:
+
+1. **CSS custom properties**: grep for `--color-`, `--font-`, `--spacing-`, `--radius-`, `--shadow-`, `--ease-`, `--duration-` declarations in CSS files (usually `src/styles/`, `public/css/`, `app/globals.css`, etc.). Record name, value, and the file it's defined in.
+2. **Tailwind config**: if `tailwind.config.{js,ts,mjs}` exists, read the `theme.extend` block for colors, fontFamily, spacing, borderRadius, boxShadow.
+3. **CSS-in-JS theme files**: styled-components, emotion, vanilla-extract, stitches; look for `theme.ts`, `tokens.ts`, or equivalent.
+4. **Design token files**: `tokens.json`, `design-tokens.json`, Style Dictionary output, W3C token community group format.
+5. **Component library**: scan the main button, card, input, navigation, dialog components. Note their variant APIs and default styles.
+6. **Global stylesheet**: the root CSS file usually has the base typography and color assignments.
+7. **Visible rendered output**: if browser automation tools are available, load the live site and sample computed styles from key elements (body, h1, a, button, .card). This catches values that tokens miss.
+
+### Step 2: Auto-extract what can be auto-extracted
+
+Build a structured draft from the discovered tokens. For each token class:
+
+- **Colors**: Group into Primary / Secondary / Tertiary / Neutral (the Material-derived roles Stitch uses). If the project only has one accent, express it as Primary + Neutral; omit Secondary and Tertiary rather than inventing them.
+- **Typography**: Map observed sizes and weights to the Material hierarchy (display / headline / title / body / label). Note font-family stacks and the scale ratio.
+- **Elevation**: Catalogue the shadow vocabulary. If the project is flat and uses tonal layering instead, that's a valid answer; state it explicitly.
+- **Components**: For each common component (button, card, input, chip, list item, tooltip, nav), extract shape (radius), color assignment, hover/focus treatment, internal padding.
+- **Spacing + layout**: Fold into Overview or relevant Components. The spec does NOT have a Layout section.
+
+### Step 2b: Stage the frontmatter
+
+From the auto-extracted tokens, draft the YAML frontmatter now (you'll write it at the top of DESIGN.md in Step 4). This is the machine-readable layer: what the live panel and Stitch's linter consume.
+
+- **Colors**: one entry per extracted color. Key = descriptive slug (`warm-ash-cream`, `editorial-magenta`, not `blue-800`). Value = whichever format the project treats as canonical (OKLCH or hex; see the frontmatter rules above). Don't split the source of truth: one format in the frontmatter, don't redefine the same token in prose with a different value.
+- **Typography**: one entry per role (`display`, `headline`, `title`, `body`, `label`). Typography is an object; include only the props that are real for the project (`fontFamily`, `fontSize`, `fontWeight`, `lineHeight`, `letterSpacing`, `fontFeature`, `fontVariation`).
+- **Rounded / Spacing**: whatever scale steps the project actually uses, keyed by whatever scale name the project uses (`sm` / `md` / `lg`, or `surface-sm`, or numeric steps).
+- **Components**: one entry per variant (`button-primary`, `button-primary-hover`, `button-ghost`). Reference primitives via `{colors.X}`, `{rounded.Y}`. If a variant needs a property Stitch's 8-prop set doesn't cover (shadow, focus ring, backdrop-filter), carry the full snippet in the sidecar instead.
+
+Skip anything the project doesn't have. Empty scale keys or fabricated tokens pollute the spec.
+
+### Step 3: Ask the user for qualitative language
+
+The following require creative input that cannot be auto-extracted. Group them into one `AskUserQuestion` interaction:
+
+- **Creative North Star**: a single named metaphor for the whole system ("The Editorial Sanctuary", "The Golden State Curator", "The Lab Notebook"). Offer 2-3 options that honor PRODUCT.md's brand personality.
+- **Overview voice**: mood adjectives, aesthetic philosophy in 2-3 sentences, anti-references (what the system should not feel like).
+- **Color character** (for auto-extracted colors): descriptive names ("Deep Muted Teal-Navy", not "blue-800"). Suggest 2-3 options per key color based on hue/saturation.
+- **Elevation philosophy**: flat/layered/lifted. If shadows exist, is their role ambient or structural?
+- **Component philosophy**: the feel of buttons, cards, inputs in one phrase ("tactile and confident" vs. "refined and restrained").
+
+Quote a line from PRODUCT.md when possible so the user sees their own strategic language carry forward.
+
+### Step 4: Write DESIGN.md
+
+The file opens with the YAML frontmatter staged in Step 2b (schema documented at the top of this reference), then the markdown body using the structure below. Headers must match character-for-character. Optional evocative subtitles (e.g. `## 2. Colors: The Coastal Palette`) are allowed.
+
+```markdown
+---
+name: [Project Title]
+description: [one-line tagline]
+colors:
+  # ... staged frontmatter from Step 2b
+---
+
+# Design System: [Project Title]
+
+## 1. Overview
+
+**Creative North Star: "[Named metaphor in quotes]"**
+
+[2-3 paragraph holistic description: personality, density, aesthetic philosophy. Start from the North Star and work outward. State what this system explicitly rejects (pulled from PRODUCT.md's anti-references). End with a short **Key Characteristics:** bullet list.]
+
+## 2. Colors
+
+[Describe the palette character in one sentence.]
+
+### Primary
+- **[Descriptive Name]** (#HEX / oklch(...)): [Where and why this color is used. Be specific about context, not just role.]
+
+### Secondary (optional; omit if the project has only one accent)
+- **[Descriptive Name]** (#HEX): [Role.]
+
+### Tertiary (optional)
+- **[Descriptive Name]** (#HEX): [Role.]
+
+### Neutral
+- **[Descriptive Name]** (#HEX): [Text / background / border / divider role.]
+- [...]
+
+### Named Rules (optional, powerful)
+**The [Rule Name] Rule.** [Short, forceful prohibition or doctrine, e.g. "The One Voice Rule. The primary accent is used on ≤10% of any given screen. Its rarity is the point."]
+
+## 3. Typography
+
+**Display Font:** [Family] (with [fallback])
+**Body Font:** [Family] (with [fallback])
+**Label/Mono Font:** [Family, if distinct]
+
+**Character:** [1-2 sentence personality description of the pairing.]
+
+### Hierarchy
+- **Display** ([weight], [size/clamp], [line-height]): [Purpose; where it appears.]
+- **Headline** ([weight], [size], [line-height]): [Purpose.]
+- **Title** ([weight], [size], [line-height]): [Purpose.]
+- **Body** ([weight], [size], [line-height]): [Purpose. Include max line length like 65–75ch if relevant.]
+- **Label** ([weight], [size], [letter-spacing], [case if uppercase]): [Purpose.]
+
+### Named Rules (optional)
+**The [Rule Name] Rule.** [Short doctrine about type use.]
+
+## 4. Elevation
+
+[One paragraph: does this system use shadows, tonal layering, or a hybrid? If "no shadows", say so explicitly and describe how depth is conveyed instead.]
+
+### Shadow Vocabulary (if applicable)
+- **[Role name]** (`box-shadow: [exact value]`): [When to use it.]
+- [...]
+
+### Named Rules (optional)
+**The [Rule Name] Rule.** [e.g. "The Flat-By-Default Rule. Surfaces are flat at rest. Shadows appear only as a response to state (hover, elevation, focus)."]
+
+## 5. Components
+
+For each component, lead with a short character line, then specify shape, color assignment, states, and any distinctive behavior.
+
+### Buttons
+- **Shape:** [radius described, exact value in parens]
+- **Primary:** [color assignment + padding, in semantic + exact terms]
+- **Hover / Focus:** [transitions, treatments]
+- **Secondary / Ghost / Tertiary (if applicable):** [brief description]
+
+### Chips (if used)
+- **Style:** [background, text color, border treatment]
+- **State:** [selected / unselected, filter / action variants]
+
+### Cards / Containers
+- **Corner Style:** [radius]
+- **Background:** [colors used]
+- **Shadow Strategy:** [reference Elevation section]
+- **Border:** [if any]
+- **Internal Padding:** [scale]
+
+### Inputs / Fields
+- **Style:** [stroke, background, radius]
+- **Focus:** [treatment, e.g. glow, border shift, etc.]
+- **Error / Disabled:** [if applicable]
+
+### Navigation
+- **Style, typography, default/hover/active states, mobile treatment.**
+
+### [Signature Component] (optional; if the project has a distinctive custom component worth documenting)
+[Description.]
+
+## 6. Do's and Don'ts
+
+Concrete, forceful guardrails. Lead each with "Do" or "Don't". Be specific: include exact colors, pixel values, and named anti-patterns the user mentioned in PRODUCT.md. **Every anti-reference in PRODUCT.md should show up here as a "Don't" with the same language**, so the visual spec carries the strategic line through. Quote PRODUCT.md directly where possible: if PRODUCT.md says *"avoid dark mode with purple gradients, neon accents, glassmorphism"*, the Don'ts here should repeat that by name.
+
+### Do:
+- **Do** [specific prescription with exact values / named rule].
+- **Do** [...]
+
+### Don't:
+- **Don't** [specific prohibition, e.g. "use border-left greater than 1px as a colored stripe"].
+- **Don't** [...]
+- **Don't** [...]
+```
+
+### Step 4b: Write .impeccable/design.json sidecar (extensions only)
+
+The frontmatter owns token primitives (colors, typography, rounded, spacing, components). The sidecar at `.impeccable/design.json` carries **what Stitch's schema can't hold**: tonal ramps per color, shadow/elevation tokens, motion tokens, breakpoints, full component HTML/CSS snippets (the panel renders these into a shadow DOM), and narrative (north star, rules, do's/don'ts). It extends the frontmatter, it doesn't duplicate it.
+
+Regenerate the sidecar whenever you regenerate root `DESIGN.md`. If the user only asks to refresh the sidecar (e.g., from the live panel's stale-hint), preserve `DESIGN.md` and write only `.impeccable/design.json`.
+
+#### Schema
+
+```json
+{
+  "schemaVersion": 2,
+  "generatedAt": "ISO-8601 string",
+  "title": "Design System: [Project Title]",
+  "extensions": {
+    "colorMeta": {
+      "primary":        { "role": "primary",  "displayName": "Editorial Magenta", "canonical": "oklch(60% 0.25 350)", "tonalRamp": ["...", "...", "..."] },
+      "warm-ash-cream": { "role": "neutral",  "displayName": "Warm Ash Cream",    "canonical": "oklch(96% 0.005 350)", "tonalRamp": ["...", "...", "..."] }
+    },
+    "typographyMeta": {
+      "display": { "displayName": "Display", "purpose": "Hero headlines only." }
+    },
+    "shadows": [
+      { "name": "ambient-low", "value": "0 4px 24px rgba(0,0,0,0.12)", "purpose": "Diffuse hover glow under accent elements." }
+    ],
+    "motion": [
+      { "name": "ease-standard", "value": "cubic-bezier(0.4, 0, 0.2, 1)", "purpose": "Default easing for state transitions." }
+    ],
+    "breakpoints": [
+      { "name": "sm", "value": "640px" }
+    ]
+  },
+  "components": [
+    {
+      "name": "Primary Button",
+      "kind": "button | input | nav | chip | card | custom",
+      "refersTo": "button-primary",
+      "description": "One-line what and when.",
+      "html": "<button class=\"ds-btn-primary\">GET STARTED</button>",
+      "css": ".ds-btn-primary { background: #191c1d; color: #fff; padding: 16px 48px; letter-spacing: 0.05em; text-transform: uppercase; font-weight: 500; border: none; border-radius: 0; transition: background 0.2s, transform 0.2s; } .ds-btn-primary:hover { background: oklch(60% 0.25 350); transform: translateY(-2px); }"
+    }
+  ],
+  "narrative": {
+    "northStar": "The Editorial Sanctuary",
+    "overview": "2-3 paragraphs of the philosophy, pulled from DESIGN.md Overview section.",
+    "keyCharacteristics": ["...", "..."],
+    "rules": [{ "name": "The One Voice Rule", "body": "...", "section": "colors|typography|elevation" }],
+    "dos":   ["Do use ..."],
+    "donts": ["Don't use ..."]
+  }
+}
+```
+
+**What changed from schemaVersion 1.** The old sidecar carried token primitive arrays (`tokens.colors[]`, `tokens.typography[]`, etc.). Those values now live in the frontmatter. The sidecar only carries metadata that can't live in the frontmatter (tonal ramps, canonical OKLCH when the hex is an approximation, display names, role hints), keyed by the frontmatter token name (`colorMeta.<token-name>`, `typographyMeta.<token-name>`). Components still carry full HTML/CSS because Stitch's 8-prop set can't hold them.
+
+#### Component translation rules
+
+The `html` and `css` fields must be **self-contained, drop-in snippets** that render correctly when injected into a shadow DOM. The panel applies them directly: no post-processing, no framework runtime.
+
+1. **Tailwind expansion.** If the source uses Tailwind (className="bg-primary text-white rounded-lg px-6 py-3"), expand every utility to literal CSS properties in the `css` string. Do **not** reference Tailwind classes; do **not** assume a Tailwind CSS bundle is loaded. Each component is self-contained.
+2. **Token resolution.** If the project exposes tokens as CSS custom properties on `:root` (e.g. `--color-primary`, `--radius-md`), reference them via `var(--color-primary)`; they inherit through the shadow DOM and stay live-bound. If tokens live only in JS theme objects (styled-components, CSS-in-JS), resolve to literal values at generation time.
+3. **Icons.** Inline as SVG. Do not reference Lucide/Heroicons packages, icon fonts, or `<img src="...">`. A typical icon is 16-24px; copy the SVG path data directly.
+4. **States.** Include `:hover`, `:focus-visible`, and (if meaningful) `:active` rules inline. A static default-only snapshot makes the panel feel dead. Hover + focus rules in the CSS make it feel alive.
+5. **Reset bloat.** Extract only the component's *distinctive* CSS (background, color, padding, border-radius, typography, transition). Skip universal resets (`box-sizing: border-box`, `line-height: inherit`, `-webkit-font-smoothing`). The panel already has a neutral canvas; don't re-ship resets.
+6. **Scoped class names.** Prefix every class with `ds-` (e.g. `ds-btn-primary`, `ds-input-search`) so component CSS doesn't collide with other components' CSS in the same shadow DOM.
+
+#### What to include
+
+Aim for a tight set of **5-10 components** that best represent the visual system:
+
+- **Canonical primitives (always include if the project has them):** button (each variant as a separate component entry), input/text field, navigation, chip/tag, card.
+- **Signature components (include if distinctive):** hero CTA, featured card, filter pill, any custom pattern the user mentioned as important in PRODUCT.md.
+- **Skip the rest.** Utility components, form building blocks, wrapper layouts: not worth documenting unless visually distinctive.
+
+If the project has **no component library yet** (bare landing page, new project), synthesize canonical primitives from the tokens using best-practice defaults consistent with the DESIGN.md's rules. Every `.impeccable/design.json` has *something* to render, even on day zero.
+
+#### Tonal ramps
+
+For each color token, generate an 8-step `tonalRamp` array: dark to light, same hue and chroma, stepped lightness from ~15% to ~95%. The panel renders this as a strip under the swatch. If the project already defines a tonal scale (Material `surface-container-low` family, Tailwind-style `blue-50..blue-900`), use those values. Otherwise synthesize in OKLCH.
+
+#### Narrative mapping
+
+Pull directly from the DESIGN.md you just wrote:
+
+- `narrative.northStar` → the `**Creative North Star: "..."**` line from Overview
+- `narrative.overview` → the philosophy paragraphs from Overview
+- `narrative.keyCharacteristics` → the bulleted `**Key Characteristics:**` list
+- `narrative.rules` → every `**The [Name] Rule.** [body]` across all sections, tagged with `section`
+- `narrative.dos` / `narrative.donts` → the bullet lists from Do's and Don'ts verbatim
+
+Do not reword. The panel shows these as secondary collapsible context; the same voice that's in the Markdown carries through.
+
+### Step 5: Confirm, refine, and refresh session cache
+
+1. Show the user the full DESIGN.md you wrote. Briefly highlight the non-obvious creative choices (descriptive color names, atmosphere language, named rules).
+2. Mention that `.impeccable/design.json` was also written alongside; the live panel will now render this project's actual button/input/nav primitives instead of generic approximations.
+3. Offer to refine any section: "Want me to revise a section, add component patterns I missed, or adjust the atmosphere language?"
+4. **Refresh the session cache.** Run `node .agents/skills/impeccable/scripts/load-context.mjs` one final time so the newly-written DESIGN.md lands in conversation. Subsequent commands in this session will use the fresh version automatically without re-reading.
+
+## Seed mode
+
+For projects with no visual system to extract yet. Produces a minimal scaffold, not a full spec.
+
+### Step 1: Confirm seed mode
+
+Before interviewing: "There's no existing visual system to scan. I'll ask five quick questions to seed a starter DESIGN.md. You can re-run `$impeccable document` once there's code, to capture the real tokens and components. OK?"
+
+If the user prefers to skip, stop. No file.
+
+### Step 2: Five questions
+
+Group into one `AskUserQuestion` interaction. Options must be concrete.
+
+1. **Color strategy.** Pick one:
+   - Restrained: tinted neutrals + one accent ≤10%
+   - Committed: one saturated color carries 30–60% of the surface
+   - Full palette: 3–4 named color roles, each deliberate
+   - Drenched: the surface IS the color
+   
+   Then: one hue family or anchor reference ("deep teal", "mustard", "Klim #ff4500 orange").
+
+2. **Typography direction.** Pick one (specific fonts come later):
+   - Serif display + sans body
+   - Single sans (warm / technical / geometric / humanist; pick a feel)
+   - Display + mono
+   - Mono-forward
+   - Editorial script + sans
+
+3. **Motion energy.** Pick one:
+   - Restrained: state changes only
+   - Responsive: feedback + transitions, no choreography
+   - Choreographed: orchestrated entrances, scroll-driven sequences
+
+4. **Three named references.** Brands, products, printed objects. Not adjectives.
+
+5. **One anti-reference.** What it should NOT feel like. Also named.
+
+### Step 3: Write seed DESIGN.md
+
+Use the six-section spec from Scan mode. Populate what the interview answers; leave the rest as honest placeholders. The seed is a scaffold, not a fabricated spec.
+
+Lead the file with:
+
+```markdown
+<!-- SEED: re-run $impeccable document once there's code to capture the actual tokens and components. -->
+```
+
+Per-section guidance in seed mode:
+
+- **Overview**: Creative North Star and philosophy phrased from the answers (color strategy + motion energy + references). Reference the user's anti-reference directly.
+- **Colors**: Color strategy as a Named Rule (e.g. *"The Drenched Rule. The surface IS the color."*). Hue family or anchor reference. No hex values; mark as `[to be resolved during implementation]`.
+- **Typography**: the direction the user picked (e.g. "Serif display + sans body"). No font names yet: `[font pairing to be chosen at implementation]`.
+- **Elevation**: inferred from motion energy. Restrained/Responsive → flat by default; Choreographed → layered. One sentence.
+- **Components**: omit entirely; no components exist yet.
+- **Do's and Don'ts**: carry PRODUCT.md's anti-references directly plus the anti-reference named in Q5.
+
+Seed mode writes a minimal frontmatter with `name` and `description` only; no colors, typography, rounded, spacing, or components yet. Real tokens land on the next Scan-mode run. Skip the `.impeccable/design.json` sidecar in seed mode for the same reason: nothing to render.
+
+### Step 4: Confirm and refresh session cache
+
+1. Show the seed DESIGN.md. Call out that it is a seed (the marker is the literal commitment).
+2. Tell the user: "Re-run `$impeccable document` once you have some code. That pass will extract real tokens and generate the sidecar."
+3. Run `node .agents/skills/impeccable/scripts/load-context.mjs` once so the seed lands in conversation for the rest of the session.
+
+## Style guidelines
+
+- **Frontmatter first, prose second.** Tokens go in the YAML frontmatter; prose contextualizes them. Don't redefine a token value in two places; the frontmatter is normative.
+- **Cite PRODUCT.md anti-references by name** in the Do's and Don'ts section. If PRODUCT.md lists "SaaS landing-page clichés" or "generic AI tool marketing" as anti-references, the DESIGN.md Don'ts should repeat those phrases verbatim so the visual spec enforces the strategic line.
+- **Match the spec, don't invent new sections.** The six section names are fixed. If you have Layout/Motion/Responsive content to document, fold it into Overview (philosophy-level rules) or Components (per-component behavior).
+- **Descriptive > technical**: "Gently curved edges (8px radius)" > "rounded-lg". Include the technical value in parens, lead with the description.
+- **Functional > decorative**: for each token, explain WHERE and WHY it's used, not just WHAT it is.
+- **Exact values in parens**: hex codes, px/rem values, font weights; always the number in parens alongside the description.
+- **Use Named Rules**: `**The [Name] Rule.** [short doctrine]`. These are memorable, citable, and much stickier for AI consumers than bullet lists. Stitch's own outputs use them heavily ("The No-Line Rule", "The Ghost Border Fallback"). Aim for 1-3 per section.
+- **Be forceful**. The voice of a design director. "Prohibited", "forbidden", "never", "always", not "consider", "might", "prefer". Match PRODUCT.md's tone.
+- **Concrete anti-pattern tests**. Stitch writes things like *"If it looks like a 2014 app, the shadow is too dark and the blur is too small."* A one-sentence audit test beats a paragraph of principle.
+- **Reference PRODUCT.md**. The anti-references section of PRODUCT.md should directly inform the Do's and Don'ts section here. Quote or paraphrase.
+- **Group colors by role**, not by hex-order or hue-order. Primary / Secondary / Tertiary / Neutral is the spec ordering.
+
+## Pitfalls
+
+- Don't paste raw CSS class names. Translate to descriptive language.
+- Don't extract every token. Stop at what's actually reused; one-offs pollute the system.
+- Don't invent components that don't exist. If the project only has buttons and cards, only document those.
+- Don't overwrite an existing DESIGN.md without asking.
+- Don't duplicate content from PRODUCT.md. DESIGN.md is strictly visual.
+- Don't add a "Layout Principles" or "Motion" or "Responsive Behavior" top-level section. The spec has six, not nine. Fold that content where it belongs.
+- Don't rename sections even slightly. "Colors" not "Color Palette & Roles". "Typography" not "Typography Rules". Tooling parsing depends on exact headers.
+- Don't duplicate token values between frontmatter and prose. If a color is in `colors.primary` as hex, the prose can name it and describe its role but should not reassert a different hex. The frontmatter is normative.
+- Don't invent frontmatter token groups outside Stitch's schema (no `motion:`, `breakpoints:`, `shadows:` at the top level). Stitch's Zod schema only accepts `colors`, `typography`, `rounded`, `spacing`, `components`. Anything else belongs in the sidecar's `extensions`.
diff --git a/.agents/skills/impeccable/reference/extract.md b/.agents/skills/impeccable/reference/extract.md
new file mode 100644
index 00000000..f8d863ce
--- /dev/null
+++ b/.agents/skills/impeccable/reference/extract.md
@@ -0,0 +1,69 @@
+# Extract Flow
+
+Identify reusable patterns, components, and design tokens, then extract and consolidate them into the design system for systematic reuse.
+
+## Step 1: Discover the Design System
+
+Find the design system, component library, or shared UI directory. Understand its structure: component organization, naming conventions, design token structure, import/export conventions.
+
+**CRITICAL**: If no design system exists, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. before creating one. Understand the preferred location and structure first.
+
+## Step 2: Identify Patterns
+
+Look for extraction opportunities in the target area:
+
+- **Repeated components**: Similar UI patterns used 3+ times (buttons, cards, inputs)
+- **Hard-coded values**: Colors, spacing, typography, shadows that should be tokens
+- **Inconsistent variations**: Multiple implementations of the same concept
+- **Composition patterns**: Layout or interaction patterns that repeat (form rows, toolbar groups, empty states)
+- **Type styles**: Repeated font-size + weight + line-height combinations
+- **Animation patterns**: Repeated easing, duration, or keyframe combinations
+
+Assess value: only extract things used 3+ times with the same intent. Premature abstraction is worse than duplication.
+
+## Step 3: Plan Extraction
+
+Create a systematic plan:
+
+- **Components to extract**: Which UI elements become reusable components?
+- **Tokens to create**: Which hard-coded values become design tokens?
+- **Variants to support**: What variations does each component need?
+- **Naming conventions**: Component names, token names, prop names that match existing patterns
+- **Migration path**: How to refactor existing uses to consume the new shared versions
+
+**IMPORTANT**: Design systems grow incrementally. Extract what is clearly reusable now, not everything that might someday be reusable.
+
+## Step 4: Extract & Enrich
+
+Build improved, reusable versions:
+
+- **Components**: Clear props API with sensible defaults, proper variants for different use cases, accessibility built in (ARIA, keyboard navigation, focus management), documentation and usage examples
+- **Design tokens**: Clear naming (primitive vs semantic), proper hierarchy and organization, documentation of when to use each token
+- **Patterns**: When to use this pattern, code examples, variations and combinations
+
+## Step 5: Migrate
+
+Replace existing uses with the new shared versions:
+
+- **Find all instances**: Search for the patterns you extracted
+- **Replace systematically**: Update each use to consume the shared version
+- **Test thoroughly**: Ensure visual and functional parity
+- **Delete dead code**: Remove the old implementations
+
+## Step 6: Document
+
+Update design system documentation:
+
+- Add new components to the component library
+- Document token usage and values
+- Add examples and guidelines
+- Update any Storybook or component catalog
+
+**NEVER**:
+- Extract one-off, context-specific implementations without generalization
+- Create components so generic they are useless
+- Extract without considering existing design system conventions
+- Skip proper TypeScript types or prop documentation
+- Create tokens for every single value (tokens should have semantic meaning)
+- Extract things that differ in intent (two buttons that look similar but serve different purposes should stay separate)
+
diff --git a/.agents/skills/impeccable/reference/harden.md b/.agents/skills/impeccable/reference/harden.md
new file mode 100644
index 00000000..917be521
--- /dev/null
+++ b/.agents/skills/impeccable/reference/harden.md
@@ -0,0 +1,347 @@
+Designs that only work with perfect data aren't production-ready. Harden the interface against the inputs, errors, languages, and network conditions that real users will throw at it.
+
+## Assess Hardening Needs
+
+Identify weaknesses and edge cases:
+
+1. **Test with extreme inputs**:
+   - Very long text (names, descriptions, titles)
+   - Very short text (empty, single character)
+   - Special characters (emoji, RTL text, accents)
+   - Large numbers (millions, billions)
+   - Many items (1000+ list items, 50+ options)
+   - No data (empty states)
+
+2. **Test error scenarios**:
+   - Network failures (offline, slow, timeout)
+   - API errors (400, 401, 403, 404, 500)
+   - Validation errors
+   - Permission errors
+   - Rate limiting
+   - Concurrent operations
+
+3. **Test internationalization**:
+   - Long translations (German is often 30% longer than English)
+   - RTL languages (Arabic, Hebrew)
+   - Character sets (Chinese, Japanese, Korean, emoji)
+   - Date/time formats
+   - Number formats (1,000 vs 1.000)
+   - Currency symbols
+
+**CRITICAL**: Designs that only work with perfect data aren't production-ready. Harden against reality.
+
+## Hardening Dimensions
+
+Systematically improve resilience:
+
+### Text Overflow & Wrapping
+
+**Long text handling**:
+```css
+/* Single line with ellipsis */
+.truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* Multi-line with clamp */
+.line-clamp {
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+/* Allow wrapping */
+.wrap {
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  hyphens: auto;
+}
+```
+
+**Flex/Grid overflow**:
+```css
+/* Prevent flex items from overflowing */
+.flex-item {
+  min-width: 0; /* Allow shrinking below content size */
+  overflow: hidden;
+}
+
+/* Prevent grid items from overflowing */
+.grid-item {
+  min-width: 0;
+  min-height: 0;
+}
+```
+
+**Responsive text sizing**:
+- Use `clamp()` for fluid typography
+- Set minimum readable sizes (14px on mobile)
+- Test text scaling (zoom to 200%)
+- Ensure containers expand with text
+
+### Internationalization (i18n)
+
+**Text expansion**:
+- Add 30-40% space budget for translations
+- Use flexbox/grid that adapts to content
+- Test with longest language (usually German)
+- Avoid fixed widths on text containers
+
+```jsx
+// ❌ Bad: Assumes short English text
+<button className="w-24">Submit</button>
+
+// ✅ Good: Adapts to content
+<button className="px-4 py-2">Submit</button>
+```
+
+**RTL (Right-to-Left) support**:
+```css
+/* Use logical properties */
+margin-inline-start: 1rem; /* Not margin-left */
+padding-inline: 1rem; /* Not padding-left/right */
+border-inline-end: 1px solid; /* Not border-right */
+
+/* Or use dir attribute */
+[dir="rtl"] .arrow { transform: scaleX(-1); }
+```
+
+**Character set support**:
+- Use UTF-8 encoding everywhere
+- Test with Chinese/Japanese/Korean (CJK) characters
+- Test with emoji (they can be 2-4 bytes)
+- Handle different scripts (Latin, Cyrillic, Arabic, etc.)
+
+**Date/Time formatting**:
+```javascript
+// ✅ Use Intl API for proper formatting
+new Intl.DateTimeFormat('en-US').format(date); // 1/15/2024
+new Intl.DateTimeFormat('de-DE').format(date); // 15.1.2024
+
+new Intl.NumberFormat('en-US', { 
+  style: 'currency', 
+  currency: 'USD' 
+}).format(1234.56); // $1,234.56
+```
+
+**Pluralization**:
+```javascript
+// ❌ Bad: Assumes English pluralization
+`${count} item${count !== 1 ? 's' : ''}`
+
+// ✅ Good: Use proper i18n library
+t('items', { count }) // Handles complex plural rules
+```
+
+### Error Handling
+
+**Network errors**:
+- Show clear error messages
+- Provide retry button
+- Explain what happened
+- Offer offline mode (if applicable)
+- Handle timeout scenarios
+
+```jsx
+// Error states with recovery
+{error && (
+  <ErrorMessage>
+    <p>Failed to load data. {error.message}</p>
+    <button onClick={retry}>Try again</button>
+  </ErrorMessage>
+)}
+```
+
+**Form validation errors**:
+- Inline errors near fields
+- Clear, specific messages
+- Suggest corrections
+- Don't block submission unnecessarily
+- Preserve user input on error
+
+**API errors**:
+- Handle each status code appropriately
+  - 400: Show validation errors
+  - 401: Redirect to login
+  - 403: Show permission error
+  - 404: Show not found state
+  - 429: Show rate limit message
+  - 500: Show generic error, offer support
+
+**Graceful degradation**:
+- Core functionality works without JavaScript
+- Images have alt text
+- Progressive enhancement
+- Fallbacks for unsupported features
+
+### Edge Cases & Boundary Conditions
+
+**Empty states**:
+- No items in list
+- No search results
+- No notifications
+- No data to display
+- Provide clear next action
+
+**Loading states**:
+- Initial load
+- Pagination load
+- Refresh
+- Show what's loading ("Loading your projects...")
+- Time estimates for long operations
+
+**Large datasets**:
+- Pagination or virtual scrolling
+- Search/filter capabilities
+- Performance optimization
+- Don't load all 10,000 items at once
+
+**Concurrent operations**:
+- Prevent double-submission (disable button while loading)
+- Handle race conditions
+- Optimistic updates with rollback
+- Conflict resolution
+
+**Permission states**:
+- No permission to view
+- No permission to edit
+- Read-only mode
+- Clear explanation of why
+
+**Browser compatibility**:
+- Polyfills for modern features
+- Fallbacks for unsupported CSS
+- Feature detection (not browser detection)
+- Test in target browsers
+
+### Input Validation & Sanitization
+
+**Client-side validation**:
+- Required fields
+- Format validation (email, phone, URL)
+- Length limits
+- Pattern matching
+- Custom validation rules
+
+**Server-side validation** (always):
+- Never trust client-side only
+- Validate and sanitize all inputs
+- Protect against injection attacks
+- Rate limiting
+
+**Constraint handling**:
+```html
+<!-- Set clear constraints -->
+<input 
+  type="text"
+  maxlength="100"
+  pattern="[A-Za-z0-9]+"
+  required
+  aria-describedby="username-hint"
+/>
+<small id="username-hint">
+  Letters and numbers only, up to 100 characters
+</small>
+```
+
+### Accessibility Resilience
+
+**Keyboard navigation**:
+- All functionality accessible via keyboard
+- Logical tab order
+- Focus management in modals
+- Skip links for long content
+
+**Screen reader support**:
+- Proper ARIA labels
+- Announce dynamic changes (live regions)
+- Descriptive alt text
+- Semantic HTML
+
+**Motion sensitivity**:
+```css
+@media (prefers-reduced-motion: reduce) {
+  * {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}
+```
+
+**High contrast mode**:
+- Test in Windows high contrast mode
+- Don't rely only on color
+- Provide alternative visual cues
+
+### Performance Resilience
+
+**Slow connections**:
+- Progressive image loading
+- Skeleton screens
+- Optimistic UI updates
+- Offline support (service workers)
+
+**Memory leaks**:
+- Clean up event listeners
+- Cancel subscriptions
+- Clear timers/intervals
+- Abort pending requests on unmount
+
+**Throttling & Debouncing**:
+```javascript
+// Debounce search input
+const debouncedSearch = debounce(handleSearch, 300);
+
+// Throttle scroll handler
+const throttledScroll = throttle(handleScroll, 100);
+```
+
+## Testing Strategies
+
+**Manual testing**:
+- Test with extreme data (very long, very short, empty)
+- Test in different languages
+- Test offline
+- Test slow connection (throttle to 3G)
+- Test with screen reader
+- Test keyboard-only navigation
+- Test on old browsers
+
+**Automated testing**:
+- Unit tests for edge cases
+- Integration tests for error scenarios
+- E2E tests for critical paths
+- Visual regression tests
+- Accessibility tests (axe, WAVE)
+
+**IMPORTANT**: Hardening is about expecting the unexpected. Real users will do things you never imagined.
+
+**NEVER**:
+- Assume perfect input (validate everything)
+- Ignore internationalization (design for global)
+- Leave error messages generic ("Error occurred")
+- Forget offline scenarios
+- Trust client-side validation alone
+- Use fixed widths for text
+- Assume English-length text
+- Block entire interface when one component errors
+
+## Verify Hardening
+
+Test thoroughly with edge cases:
+
+- **Long text**: Try names with 100+ characters
+- **Emoji**: Use emoji in all text fields
+- **RTL**: Test with Arabic or Hebrew
+- **CJK**: Test with Chinese/Japanese/Korean
+- **Network issues**: Disable internet, throttle connection
+- **Large datasets**: Test with 1000+ items
+- **Concurrent actions**: Click submit 10 times rapidly
+- **Errors**: Force API errors, test all error states
+- **Empty**: Remove all data, test empty states
+
+When edge cases are covered, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/heuristics-scoring.md b/.agents/skills/impeccable/reference/heuristics-scoring.md
new file mode 100644
index 00000000..edbe5028
--- /dev/null
+++ b/.agents/skills/impeccable/reference/heuristics-scoring.md
@@ -0,0 +1,234 @@
+# Heuristics Scoring Guide
+
+Score each of Nielsen's 10 Usability Heuristics on a 0–4 scale. Be honest: a 4 means genuinely excellent, not "good enough."
+
+## Nielsen's 10 Heuristics
+
+### 1. Visibility of System Status
+
+Keep users informed about what's happening through timely, appropriate feedback.
+
+**Check for**:
+- Loading indicators during async operations
+- Confirmation of user actions (save, submit, delete)
+- Progress indicators for multi-step processes
+- Current location in navigation (breadcrumbs, active states)
+- Form validation feedback (inline, not just on submit)
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | No feedback; user is guessing what happened |
+| 1 | Rare feedback; most actions produce no visible response |
+| 2 | Partial; some states communicated, major gaps remain |
+| 3 | Good; most operations give clear feedback, minor gaps |
+| 4 | Excellent; every action confirms, progress is always visible |
+
+### 2. Match Between System and Real World
+
+Speak the user's language. Follow real-world conventions. Information appears in natural, logical order.
+
+**Check for**:
+- Familiar terminology (no unexplained jargon)
+- Logical information order matching user expectations
+- Recognizable icons and metaphors
+- Domain-appropriate language for the target audience
+- Natural reading flow (left-to-right, top-to-bottom priority)
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Pure tech jargon, alien to users |
+| 1 | Mostly confusing; requires domain expertise to navigate |
+| 2 | Mixed; some plain language, some jargon leaks through |
+| 3 | Mostly natural; occasional term needs context |
+| 4 | Speaks the user's language fluently throughout |
+
+### 3. User Control and Freedom
+
+Users need a clear "emergency exit" from unwanted states without extended dialogue.
+
+**Check for**:
+- Undo/redo functionality
+- Cancel buttons on forms and modals
+- Clear navigation back to safety (home, previous)
+- Easy way to clear filters, search, selections
+- Escape from long or multi-step processes
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Users get trapped; no way out without refreshing |
+| 1 | Difficult exits; must find obscure paths to escape |
+| 2 | Some exits; main flows have escape, edge cases don't |
+| 3 | Good control; users can exit and undo most actions |
+| 4 | Full control; undo, cancel, back, and escape everywhere |
+
+### 4. Consistency and Standards
+
+Users shouldn't wonder whether different words, situations, or actions mean the same thing.
+
+**Check for**:
+- Consistent terminology throughout the interface
+- Same actions produce same results everywhere
+- Platform conventions followed (standard UI patterns)
+- Visual consistency (colors, typography, spacing, components)
+- Consistent interaction patterns (same gesture = same behavior)
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Inconsistent everywhere; feels like different products stitched together |
+| 1 | Many inconsistencies; similar things look/behave differently |
+| 2 | Partially consistent; main flows match, details diverge |
+| 3 | Mostly consistent; occasional deviation, nothing confusing |
+| 4 | Fully consistent; cohesive system, predictable behavior |
+
+### 5. Error Prevention
+
+Better than good error messages is a design that prevents problems in the first place.
+
+**Check for**:
+- Confirmation before destructive actions (delete, overwrite)
+- Constraints preventing invalid input (date pickers, dropdowns)
+- Smart defaults that reduce errors
+- Clear labels that prevent misunderstanding
+- Autosave and draft recovery
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Errors easy to make; no guardrails anywhere |
+| 1 | Few safeguards; some inputs validated, most aren't |
+| 2 | Partial prevention; common errors caught, edge cases slip |
+| 3 | Good prevention; most error paths blocked proactively |
+| 4 | Excellent; errors nearly impossible through smart constraints |
+
+### 6. Recognition Rather Than Recall
+
+Minimize memory load. Make objects, actions, and options visible or easily retrievable.
+
+**Check for**:
+- Visible options (not buried in hidden menus)
+- Contextual help when needed (tooltips, inline hints)
+- Recent items and history
+- Autocomplete and suggestions
+- Labels on icons (not icon-only navigation)
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Heavy memorization; users must remember paths and commands |
+| 1 | Mostly recall; many hidden features, few visible cues |
+| 2 | Some aids; main actions visible, secondary features hidden |
+| 3 | Good recognition; most things discoverable, few memory demands |
+| 4 | Everything discoverable; users never need to memorize |
+
+### 7. Flexibility and Efficiency of Use
+
+Accelerators, invisible to novices, speed up expert interaction.
+
+**Check for**:
+- Keyboard shortcuts for common actions
+- Customizable interface elements
+- Recent items and favorites
+- Bulk/batch actions
+- Power user features that don't complicate the basics
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | One rigid path; no shortcuts or alternatives |
+| 1 | Limited flexibility; few alternatives to the main path |
+| 2 | Some shortcuts; basic keyboard support, limited bulk actions |
+| 3 | Good accelerators; keyboard nav, some customization |
+| 4 | Highly flexible; multiple paths, power features, customizable |
+
+### 8. Aesthetic and Minimalist Design
+
+Interfaces should not contain irrelevant or rarely needed information. Every element should serve a purpose.
+
+**Check for**:
+- Only necessary information visible at each step
+- Clear visual hierarchy directing attention
+- Purposeful use of color and emphasis
+- No decorative clutter competing for attention
+- Focused, uncluttered layouts
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Overwhelming; everything competes for attention equally |
+| 1 | Cluttered; too much noise, hard to find what matters |
+| 2 | Some clutter; main content clear, periphery noisy |
+| 3 | Mostly clean; focused design, minor visual noise |
+| 4 | Perfectly minimal; every element earns its pixel |
+
+### 9. Help Users Recognize, Diagnose, and Recover from Errors
+
+Error messages should use plain language, precisely indicate the problem, and constructively suggest a solution.
+
+**Check for**:
+- Plain language error messages (no error codes for users)
+- Specific problem identification ("Email is missing @" not "Invalid input")
+- Actionable recovery suggestions
+- Errors displayed near the source of the problem
+- Non-blocking error handling (don't wipe the form)
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | Cryptic errors; codes, jargon, or no message at all |
+| 1 | Vague errors; "Something went wrong" with no guidance |
+| 2 | Clear but unhelpful; names the problem but not the fix |
+| 3 | Clear with suggestions; identifies problem and offers next steps |
+| 4 | Perfect recovery; pinpoints issue, suggests fix, preserves user work |
+
+### 10. Help and Documentation
+
+Even if the system is usable without docs, help should be easy to find, task-focused, and concise.
+
+**Check for**:
+- Searchable help or documentation
+- Contextual help (tooltips, inline hints, guided tours)
+- Task-focused organization (not feature-organized)
+- Concise, scannable content
+- Easy access without leaving current context
+
+**Scoring**:
+| Score | Criteria |
+|-------|----------|
+| 0 | No help available anywhere |
+| 1 | Help exists but hard to find or irrelevant |
+| 2 | Basic help; FAQ or docs exist, not contextual |
+| 3 | Good documentation; searchable, mostly task-focused |
+| 4 | Excellent contextual help; right info at the right moment |
+
+---
+
+## Score Summary
+
+**Total possible**: 40 points (10 heuristics × 4 max)
+
+| Score Range | Rating | What It Means |
+|-------------|--------|---------------|
+| 36–40 | Excellent | Minor polish only; ship it |
+| 28–35 | Good | Address weak areas, solid foundation |
+| 20–27 | Acceptable | Significant improvements needed before users are happy |
+| 12–19 | Poor | Major UX overhaul required; core experience broken |
+| 0–11 | Critical | Redesign needed; unusable in current state |
+
+---
+
+## Issue Severity (P0–P3)
+
+Tag each individual issue found during scoring with a priority level:
+
+| Priority | Name | Description | Action |
+|----------|------|-------------|--------|
+| **P0** | Blocking | Prevents task completion entirely | Fix immediately; this is a showstopper |
+| **P1** | Major | Causes significant difficulty or confusion | Fix before release |
+| **P2** | Minor | Annoyance, but workaround exists | Fix in next pass |
+| **P3** | Polish | Nice-to-fix, no real user impact | Fix if time permits |
+
+**Tip**: If you're unsure between two levels, ask: "Would a user contact support about this?" If yes, it's at least P1.
diff --git a/.agents/skills/impeccable/reference/interaction-design.md b/.agents/skills/impeccable/reference/interaction-design.md
new file mode 100644
index 00000000..15aed5b2
--- /dev/null
+++ b/.agents/skills/impeccable/reference/interaction-design.md
@@ -0,0 +1,195 @@
+# Interaction Design
+
+## The Eight Interactive States
+
+Every interactive element needs these states designed:
+
+| State | When | Visual Treatment |
+|-------|------|------------------|
+| **Default** | At rest | Base styling |
+| **Hover** | Pointer over (not touch) | Subtle lift, color shift |
+| **Focus** | Keyboard/programmatic focus | Visible ring (see below) |
+| **Active** | Being pressed | Pressed in, darker |
+| **Disabled** | Not interactive | Reduced opacity, no pointer |
+| **Loading** | Processing | Spinner, skeleton |
+| **Error** | Invalid state | Red border, icon, message |
+| **Success** | Completed | Green check, confirmation |
+
+**The common miss**: Designing hover without focus, or vice versa. They're different. Keyboard users never see hover states.
+
+## Focus Rings: Do Them Right
+
+**Never `outline: none` without replacement.** It's an accessibility violation. Instead, use `:focus-visible` to show focus only for keyboard users:
+
+```css
+/* Hide focus ring for mouse/touch */
+button:focus {
+  outline: none;
+}
+
+/* Show focus ring for keyboard */
+button:focus-visible {
+  outline: 2px solid var(--color-accent);
+  outline-offset: 2px;
+}
+```
+
+**Focus ring design**:
+- High contrast (3:1 minimum against adjacent colors)
+- 2-3px thick
+- Offset from element (not inside it)
+- Consistent across all interactive elements
+
+## Form Design: The Non-Obvious
+
+**Placeholders aren't labels.** They disappear on input. Always use visible `<label>` elements. **Validate on blur**, not on every keystroke (exception: password strength). Place errors **below** fields with `aria-describedby` connecting them.
+
+## Loading States
+
+**Optimistic updates**: Show success immediately, rollback on failure. Use for low-stakes actions (likes, follows), not payments or destructive actions. **Skeleton screens > spinners**: they preview content shape and feel faster than generic spinners.
+
+## Modals: The Inert Approach
+
+Focus trapping in modals used to require complex JavaScript. Now use the `inert` attribute:
+
+```html
+<!-- When modal is open -->
+<main inert>
+  <!-- Content behind modal can't be focused or clicked -->
+</main>
+<dialog open>
+  <h2>Modal Title</h2>
+  <!-- Focus stays inside modal -->
+</dialog>
+```
+
+Or use the native `<dialog>` element:
+
+```javascript
+const dialog = document.querySelector('dialog');
+dialog.showModal();  // Opens with focus trap, closes on Escape
+```
+
+## The Popover API
+
+For tooltips, dropdowns, and non-modal overlays, use native popovers:
+
+```html
+<button popovertarget="menu">Open menu</button>
+<div id="menu" popover>
+  <button>Option 1</button>
+  <button>Option 2</button>
+</div>
+```
+
+**Benefits**: Light-dismiss (click outside closes), proper stacking, no z-index wars, accessible by default.
+
+## Dropdown & Overlay Positioning
+
+Dropdowns rendered with `position: absolute` inside a container that has `overflow: hidden` or `overflow: auto` will be clipped. This is the single most common dropdown bug in generated code.
+
+### CSS Anchor Positioning
+
+The modern solution uses the CSS Anchor Positioning API to tether an overlay to its trigger without JavaScript:
+
+```css
+.trigger {
+  anchor-name: --menu-trigger;
+}
+
+.dropdown {
+  position: fixed;
+  position-anchor: --menu-trigger;
+  position-area: block-end span-inline-end;
+  margin-top: 4px;
+}
+
+/* Flip above if no room below */
+@position-try --flip-above {
+  position-area: block-start span-inline-end;
+  margin-bottom: 4px;
+}
+```
+
+Because the dropdown uses `position: fixed`, it escapes any `overflow` clipping on ancestor elements. The `@position-try` block handles viewport edges automatically. **Browser support**: Chrome 125+, Edge 125+. Not yet in Firefox or Safari - use a fallback for those browsers.
+
+### Popover + Anchor Combo
+
+Combining the Popover API with anchor positioning gives you stacking, light-dismiss, accessibility, and correct positioning in one pattern:
+
+```html
+<button popovertarget="menu" class="trigger">Open</button>
+<div id="menu" popover class="dropdown">
+  <button>Option 1</button>
+  <button>Option 2</button>
+</div>
+```
+
+The `popover` attribute places the element in the **top layer**, which sits above all other content regardless of z-index or overflow. No portal needed.
+
+### Portal / Teleport Pattern
+
+In component frameworks, render the dropdown at the document root and position it with JavaScript:
+
+- **React**: `createPortal(dropdown, document.body)`
+- **Vue**: `<Teleport to="body">`
+- **Svelte**: Use a portal library or mount to `document.body`
+
+Calculate position from the trigger's `getBoundingClientRect()`, then apply `position: fixed` with `top` and `left` values. Recalculate on scroll and resize.
+
+### Fixed Positioning Fallback
+
+For browsers without anchor positioning support, `position: fixed` with manual coordinates avoids overflow clipping:
+
+```css
+.dropdown {
+  position: fixed;
+  /* top/left set via JS from trigger's getBoundingClientRect() */
+}
+```
+
+Check viewport boundaries before rendering. If the dropdown would overflow the bottom edge, flip it above the trigger. If it would overflow the right edge, align it to the trigger's right side instead.
+
+### Anti-Patterns
+
+- **`position: absolute` inside `overflow: hidden`** - The dropdown will be clipped. Use `position: fixed` or the top layer instead.
+- **Arbitrary z-index values** like `z-index: 9999` - Use a semantic z-index scale: `dropdown (100) -> sticky (200) -> modal-backdrop (300) -> modal (400) -> toast (500) -> tooltip (600)`.
+- **Rendering dropdown markup inline** without an escape hatch from the parent's stacking context. Either use `popover` (top layer), a portal, or `position: fixed`.
+
+## Destructive Actions: Undo > Confirm
+
+**Undo is better than confirmation dialogs.** Users click through confirmations mindlessly. Remove from UI immediately, show undo toast, actually delete after toast expires. Use confirmation only for truly irreversible actions (account deletion), high-cost actions, or batch operations.
+
+## Keyboard Navigation Patterns
+
+### Roving Tabindex
+
+For component groups (tabs, menu items, radio groups), one item is tabbable; arrow keys move within:
+
+```html
+<div role="tablist">
+  <button role="tab" tabindex="0">Tab 1</button>
+  <button role="tab" tabindex="-1">Tab 2</button>
+  <button role="tab" tabindex="-1">Tab 3</button>
+</div>
+```
+
+Arrow keys move `tabindex="0"` between items. Tab moves to the next component entirely.
+
+### Skip Links
+
+Provide skip links (`<a href="#main-content">Skip to main content</a>`) for keyboard users to jump past navigation. Hide off-screen, show on focus.
+
+## Gesture Discoverability
+
+Swipe-to-delete and similar gestures are invisible. Hint at their existence:
+
+- **Partially reveal**: Show delete button peeking from edge
+- **Onboarding**: Coach marks on first use
+- **Alternative**: Always provide a visible fallback (menu with "Delete")
+
+Don't rely on gestures as the only way to perform actions.
+
+---
+
+**Avoid**: Removing focus indicators without alternatives. Using placeholder text as labels. Touch targets <44x44px. Generic error messages. Custom controls without ARIA/keyboard support.
diff --git a/.agents/skills/impeccable/reference/layout.md b/.agents/skills/impeccable/reference/layout.md
new file mode 100644
index 00000000..cd2bcdda
--- /dev/null
+++ b/.agents/skills/impeccable/reference/layout.md
@@ -0,0 +1,141 @@
+Space is the most underused design tool. Find the layout's actual problem (monotone spacing, weak hierarchy, identical card grids, the centered-stack default) and fix the structure, not the surface.
+
+---
+
+## Register
+
+Brand: asymmetric compositions, fluid spacing with `clamp()`, intentional grid-breaking for emphasis. Rhythm through contrast: tight groupings paired with generous separations.
+
+Product: predictable grids, consistent densities, familiar navigation patterns. Responsive behavior is structural (collapse sidebar, responsive table), not fluid typography. Consistency IS an affordance.
+
+---
+
+## Assess Current Layout
+
+Analyze what's weak about the current spatial design:
+
+1. **Spacing**:
+   - Is spacing consistent or arbitrary? (Random padding/margin values)
+   - Is all spacing the same? (Equal padding everywhere = no rhythm)
+   - Are related elements grouped tightly, with generous space between groups?
+
+2. **Visual hierarchy**:
+   - Apply the squint test: blur your (metaphorical) eyes. Can you still identify the most important element, second most important, and clear groupings?
+   - Is hierarchy achieved effectively? (Space and weight alone can be enough; is the current approach working?)
+   - Does whitespace guide the eye to what matters?
+
+3. **Grid & structure**:
+   - Is there a clear underlying structure, or does the layout feel random?
+   - Are identical card grids used everywhere? (Icon + heading + text, repeated endlessly)
+   - Is everything centered? (Left-aligned with asymmetric layouts feels more designed, but not a hard and fast rule)
+
+4. **Rhythm & variety**:
+   - Does the layout have visual rhythm? (Alternating tight/generous spacing)
+   - Is every section structured the same way? (Monotonous repetition)
+   - Are there intentional moments of surprise or emphasis?
+
+5. **Density**:
+   - Is the layout too cramped? (Not enough breathing room)
+   - Is the layout too sparse? (Excessive whitespace without purpose)
+   - Does density match the content type? (Data-dense UIs need tighter spacing; marketing pages need more air)
+
+**CRITICAL**: Layout problems are often the root cause of interfaces feeling "off" even when colors and fonts are fine. Space is a design material; use it with intention.
+
+## Plan Layout Improvements
+
+Consult the [spatial design reference](spatial-design.md) for detailed guidance on grids, rhythm, and container queries.
+
+Create a systematic plan:
+
+- **Spacing system**: Use a consistent scale (a framework's built-in scale like Tailwind's, rem-based tokens, or a custom system). The specific values matter less than consistency.
+- **Hierarchy strategy**: How will space communicate importance?
+- **Layout approach**: What structure fits the content? Flex for 1D, Grid for 2D, named areas for complex page layouts.
+- **Rhythm**: Where should spacing be tight vs generous?
+
+## Improve Layout Systematically
+
+### Establish a Spacing System
+
+- Use a consistent spacing scale (framework scales like Tailwind, rem-based tokens, or a custom scale all work). What matters is that values come from a defined set, not arbitrary numbers.
+- Name tokens semantically if using custom properties: `--space-xs` through `--space-xl`, not `--spacing-8`
+- Use `gap` for sibling spacing instead of margins; eliminates margin collapse hacks
+- Apply `clamp()` for fluid spacing that breathes on larger screens
+
+### Create Visual Rhythm
+
+- **Tight grouping** for related elements (8-12px between siblings)
+- **Generous separation** between distinct sections (48-96px)
+- **Varied spacing** within sections (not every row needs the same gap)
+- **Asymmetric compositions**: break the predictable centered-content pattern when it makes sense
+
+### Choose the Right Layout Tool
+
+- **Use Flexbox for 1D layouts**: Rows of items, nav bars, button groups, card contents, most component internals. Flex is simpler and more appropriate for the majority of layout tasks.
+- **Use Grid for 2D layouts**: Page-level structure, dashboards, data-dense interfaces, anything where rows AND columns need coordinated control.
+- **Don't default to Grid** when Flexbox with `flex-wrap` would be simpler and more flexible.
+- Use `repeat(auto-fit, minmax(280px, 1fr))` for responsive grids without breakpoints.
+- Use named grid areas (`grid-template-areas`) for complex page layouts; redefine at breakpoints.
+
+### Break Card Grid Monotony
+
+- Don't default to card grids for everything; spacing and alignment create visual grouping naturally
+- Use cards only when content is truly distinct and actionable. Never nest cards inside cards
+- Vary card sizes, span columns, or mix cards with non-card content to break repetition
+
+### Strengthen Visual Hierarchy
+
+- Use the fewest dimensions needed for clear hierarchy. Space alone can be enough; generous whitespace around an element draws the eye. Some of the most polished designs achieve rhythm with just space and weight. Add color or size contrast only when simpler means aren't sufficient.
+- Be aware of reading flow: in LTR languages, the eye naturally scans top-left to bottom-right, but primary action placement depends on context (e.g., bottom-right in dialogs, top in navigation).
+- Create clear content groupings through proximity and separation.
+
+### Manage Depth & Elevation
+
+- Create a semantic z-index scale (dropdown → sticky → modal-backdrop → modal → toast → tooltip)
+- Build a consistent shadow scale (sm → md → lg → xl); shadows should be subtle
+- Use elevation to reinforce hierarchy, not as decoration
+
+### Optical Adjustments
+
+- If an icon looks visually off-center despite being geometrically centered, nudge it. But only if you're confident it actually looks wrong. Don't adjust speculatively.
+
+**NEVER**:
+- Use arbitrary spacing values outside your scale
+- Make all spacing equal (variety creates hierarchy)
+- Wrap everything in cards (not everything needs a container)
+- Nest cards inside cards (use spacing and dividers for hierarchy within)
+- Use identical card grids everywhere (icon + heading + text, repeated)
+- Center everything (left-aligned with asymmetry feels more designed)
+- Default to the hero metric layout (big number, small label, stats, gradient) as a template. If showing real user data, a prominent metric can work, but it should display actual data, not decorative numbers.
+- Default to CSS Grid when Flexbox would be simpler; use the simplest tool for the job
+- Use arbitrary z-index values (999, 9999); build a semantic scale
+
+## Verify Layout Improvements
+
+- **Squint test**: Can you identify primary, secondary, and groupings with blurred vision?
+- **Rhythm**: Does the page have a satisfying beat of tight and generous spacing?
+- **Hierarchy**: Is the most important content obvious within 2 seconds?
+- **Breathing room**: Does the layout feel comfortable, not cramped or wasteful?
+- **Consistency**: Is the spacing system applied uniformly?
+- **Responsiveness**: Does the layout adapt gracefully across screen sizes?
+
+When the rhythm and hierarchy land, hand off to `$impeccable polish` for the final pass.
+
+## Live-mode signature params
+
+Each variant MUST declare a `density` param. Drive all spacing tokens in the variant's scoped CSS through `calc(var(--p-density, 1) * <base>)`: paddings, gaps, column widths. Users slide from airy to packed and see layout re-breathe with no regeneration.
+
+```json
+{"id":"density","kind":"range","min":0.6,"max":1.4,"step":0.05,"default":1,"label":"Density"}
+```
+
+For variants whose topology genuinely changes (stacked vs. side-by-side, grid vs. bento), use a `steps` param whose scoped CSS branches via `:scope[data-p-structure="X"]`. One structure param + one density param is a powerful combo; resist adding a third.
+
+```json
+{"id":"structure","kind":"steps","default":"grid","label":"Structure","options":[
+  {"value":"stacked","label":"Stacked"},
+  {"value":"grid","label":"Grid"},
+  {"value":"bento","label":"Bento"}
+]}
+```
+
+See `reference/live.md` for the full params contract.
diff --git a/.agents/skills/impeccable/reference/live.md b/.agents/skills/impeccable/reference/live.md
new file mode 100644
index 00000000..71cd3f5a
--- /dev/null
+++ b/.agents/skills/impeccable/reference/live.md
@@ -0,0 +1,622 @@
+Interactive live variant mode: select elements in the browser, pick a design action, and get AI-generated HTML+CSS variants hot-swapped via the dev server's HMR.
+
+## Prerequisites
+
+A running dev server with hot module replacement (Vite, Next.js, Bun, etc.), OR a static HTML file open in the browser.
+
+## The contract (read once)
+
+Execute in order. No step skipped, no step reordered.
+
+1. `live.mjs`: boot.
+2. Navigate to the URL that serves `pageFile` (infer from `package.json`, docs, terminal output, or an open tab). If you can't infer it confidently, tell the user once to open their dev/preview URL. Never use `serverPort` as that URL; it's the helper, not the app.
+3. Poll loop with the default long timeout (600000 ms). After every event or `--reply`, run `live-poll.mjs` again immediately. Never pass a short `--timeout=`.
+4. On `generate`: read screenshot if present; load the action's reference; plan three distinct directions; write all variants in one edit; `--reply done`; poll again.
+5. On `accept` / `discard`: the poll script runs `live-accept.mjs`, acknowledges the delivered event, and prints `_completionAck`. Plain accepts/discards are terminal immediately; carbonize accepts remain recoverable until you finish cleanup, run `live-complete.mjs --id EVENT_ID`, and only then poll again.
+6. If interrupted, run `live-status.mjs` or `live-resume.mjs` before guessing. The durable journal replays unacknowledged work after helper restart.
+7. On `exit`: run the cleanup at the bottom.
+
+Harness policy:
+- **Claude Code**: run the poll as a **background task** (no short timeout). The harness notifies you when it completes, so the main conversation stays free. Do not block the shell.
+- **Cursor**: run the poll in the **foreground** (blocking shell; not a background terminal, not a subagent). Cursor background terminals and subagents do not reliably resume the chat with poll stdout.
+- **Codex**: run the poll in the **foreground** (blocking shell; not a background task, not a subagent). Codex background exec sessions do not reliably surface poll stdout back into the conversation at the moment events arrive, so a "fire-and-forget" background poll will stall live mode.
+- **Other harnesses**: foreground unless you know stdout reliably returns to this session.
+
+Chat is overhead. No recap, no tutorial output, no pasting PRODUCT / DESIGN bodies. Spend tokens on tools and edits; on failure, one or two short sentences.
+
+## Start
+
+```bash
+node .agents/skills/impeccable/scripts/live.mjs
+```
+
+Output JSON: `{ ok, serverPort, serverToken, pageFiles, hasProduct, product, productPath, hasDesign, design, designPath, migrated }`. `pageFiles` is the list of HTML entries the live script was injected into. Keep PRODUCT.md and DESIGN.md in mind for variant generation; **DESIGN.md wins on visual decisions; PRODUCT.md wins on strategic/voice decisions.** When DESIGN.md is missing, identity is **not** absent; extract it from CSS variables, computed styles, and sibling components on the page (see Step 4 Phase A). Identity preservation is the default; departure from existing identity requires an explicit trigger from PRODUCT.md anti-references or the user's freeform prompt. If `migrated: true`, the loader auto-renamed legacy `.impeccable.md` to `PRODUCT.md`; mention this once and suggest `$impeccable document` for the matching DESIGN.md.
+
+`serverPort` and `serverToken` belong to the small **Impeccable live helper** HTTP server (serves `/live.js`, SSE, and `/poll`). That port is **not** your dev server and is usually not the URL you open to view the app. The browser page is whatever origin serves one of the `pageFiles` entries (Vite / Next / Bun / tunnel / LAN hostname).
+
+If output is `{ ok: false, error: "config_missing" | "config_invalid", path }`, this project hasn't been configured for live mode (or its config is stale). See **First-time setup** at the bottom.
+
+## Poll loop
+
+```
+LOOP:
+  node .agents/skills/impeccable/scripts/live-poll.mjs   # default long timeout; no --timeout=
+  Read JSON; dispatch on "type"
+
+  "generate"  → Handle Generate; reply done; LOOP
+  "accept"    → Handle Accept; complete carbonize cleanup if required; LOOP
+  "discard"   → Handle Discard; LOOP
+  "prefetch"  → Handle Prefetch; LOOP
+  "timeout"   → LOOP
+  "exit"      → break → Cleanup
+```
+
+## Recovery commands
+
+The live helper persists an append-only journal under `.impeccable/live/sessions/`. Browser checkpoints are advisory but durable; the journal is canonical. This is local durable recovery state, not project source.
+
+Use these commands when the chat was interrupted, polling was missed, the helper restarted, or the browser reloaded:
+
+```bash
+node .agents/skills/impeccable/scripts/live-status.mjs
+node .agents/skills/impeccable/scripts/live-resume.mjs --id SESSION_ID
+node .agents/skills/impeccable/scripts/live-complete.mjs --id SESSION_ID
+```
+
+- `live-status.mjs` prints connected helper state, active durable sessions, and queued pending events. It works even when the helper is down by reading the journal directly.
+- `live-resume.mjs` prints the active snapshot, pending event, checkpoint phase, visible variant, parameter values, and the next safe agent action.
+- `live-complete.mjs` is the canonical manual final acknowledgement. Use it after carbonize/manual cleanup is verified and no further poll acknowledgement will happen automatically.
+
+Server restart rule: start `live-server.mjs` again, then poll. Startup requeues unacknowledged pending events from the journal, so do not ask the user to click Go again unless `live-resume.mjs` says no active session exists.
+
+## Handle `generate`
+
+Event: `{id, action, freeformPrompt?, count, pageUrl, element, screenshotPath?, comments?, strokes?}`.
+
+Speed matters; the user is watching a spinner. Minimize tool calls by using the `wrap` helper and writing all variants in a single edit.
+
+### 1. Read the screenshot (if present)
+
+`event.screenshotPath` is **only sent when the user placed at least one comment or stroke before Go.** When present, it's an absolute path to a PNG of the element as rendered with the annotations baked in. **Read it before planning**: annotations encode user intent not recoverable from `element.outerHTML` alone.
+
+When `screenshotPath` is absent, don't ask for one and don't go looking for the current rendering. The omission is deliberate: without annotations, a screenshot would anchor the model on the existing design and fight the three-distinct-directions brief. Work from `element.outerHTML`, the computed styles in `event.element`, and the freeform prompt if present.
+
+`event.comments` and `event.strokes` carry structured metadata alongside the visual. Treat the screenshot as primary; use the structured data for specifics worth quoting (e.g. the exact text of a comment).
+
+Reading annotations precisely:
+
+- **Comment position carries meaning.** Its `{x, y}` is element-local CSS px (same coord space as `element.boundingRect`). Find the child under that point and apply the comment text LOCALLY to that sub-element. A comment near the title is about the title, not a global description.
+- **Comments and strokes are independent annotations** unless clearly paired by overlap or tight proximity. Don't let the visual weight of a prominent stroke override the precise location of a textually-specific comment elsewhere.
+- **Strokes are gestures; read them by shape.** Closed loop = "this thing" (emphasis / focus); arrow = direction (move / point to); cross or slash = delete; free scribble = emphasis or delete depending on context. A loop around region X means "pay attention to X," not "only change pixels inside X."
+- **When a stroke's intent is ambiguous** (circle or arrow? emphasis or move?), state your reading in one sentence of rationale rather than silently guessing. If the uncertainty materially changes the brief, ask one short clarifying question before generating.
+
+### 2. Wrap the element
+
+```bash
+node .agents/skills/impeccable/scripts/live-wrap.mjs --id EVENT_ID --count EVENT_COUNT --element-id "ELEMENT_ID" --classes "class1,class2" --tag "div" --text "TEXT_SNIPPET"
+```
+
+Flag mapping. Keep them separate, don't collapse into `--query`:
+
+- `--element-id` ← `event.element.id`
+- `--classes` ← `event.element.classes` joined with commas
+- `--tag` ← `event.element.tagName`
+- `--text` ← first ~80 chars of `event.element.textContent` (trim, single-line). **Pass this every call.** When the picked element shares classes + tag with sibling components (a list of `<Card>`s, repeating sections), this is what disambiguates which branch in source to wrap. Without it, wrap silently lands on the first match and may rewrite the wrong element.
+
+The helper searches ID first, then classes, then tag + class combo. If `event.pageUrl` implies the file (e.g. `/` is usually `index.html`), pass `--file PATH` to skip the search. `--query` is a fallback for raw text search only; do not use it for normal element lookups.
+
+If `--text` matches multiple candidates equally well, wrap exits with `{ error: "element_ambiguous", candidates: [...] }` and `fallback: "agent-driven"`: read the candidate line ranges, decide which one matches the picked element from page context, and write the wrapper manually per the fallback flow.
+
+Output on success: `{ file, insertLine, commentSyntax, styleMode, styleTag, cssSelectorPrefixExamples, cssAuthoring }`.
+
+`styleMode` controls how preview CSS must be authored. Treat it as a detected capability mode, not a framework guess:
+
+- `scoped`: use `@scope ([data-impeccable-variant="N"])` rules.
+- `astro-global-prefixed`: use explicit `[data-impeccable-variant="N"]` selector prefixes and the exact `styleTag` returned by the tool.
+
+Use `cssAuthoring` as the source of truth for the current file. It includes the exact `styleTag`, selector strategy, selector examples, requirements, and forbidden patterns. Do not apply a framework-specific exception unless the returned `styleMode` / `cssAuthoring.mode` says to.
+
+**Fallback errors.** Wrap only writes into files it judges to be source (tracked by git, not marked GENERATED, not listed in config's `generatedFiles`). If it can't land on a source file, it errors without writing; accepting a variant into a generated file is silent data loss. Three shapes:
+
+- `{ error: "file_is_generated", file, hint }`: user-supplied `--file` points at a generated file.
+- `{ error: "element_not_in_source", generatedMatch, hint }`: element exists only in a generated file (the next build would wipe any edits).
+- `{ error: "element_not_found", hint }`: element isn't in any project file; likely runtime-injected (JS component, dynamic render from data).
+
+All three carry `fallback: "agent-driven"`. Follow **Handle fallback** below.
+
+### 3. Load the action's reference
+
+If `event.action` is `impeccable` (the default freeform action), use SKILL.md's shared laws plus the loaded register reference (`brand.md` or `product.md`). Do not load a sub-command reference. **Freeform is not a pass to skip parameters:** you still follow the composition budget and the freeform bias in **§7 Parameters** below. Sub-command files list MUST-have signature knobs; freeform has no such file, so sizing knobs from surface weight and primary axes is entirely on you.
+
+Any other `event.action` (`bolder`, `quieter`, `distill`, `polish`, `typeset`, `colorize`, `layout`, `adapt`, `animate`, `delight`, `overdrive`): Read `reference/<action>.md` before planning. Each sub-command encodes a specific discipline; skipping its reference produces generic output. Those files may require specific params; layer them on top of the §7 budget, not instead of it.
+
+### 4. Plan three variants: identity first, then mode, then axes
+
+The wrong frame for live mode is "show three different design directions." Live runs on an existing surface; the brand has already been chosen. The job is variation **within identity**, not selection between identities. Failure mode: three editorial-typographic variants on a brief that wasn't editorial. Bigger failure mode: three off-brand variants the user can't accept because they don't look like their product.
+
+Four phases. Do them in order.
+
+#### Phase A: Extract the identity (non-skippable)
+
+The existing surface has an identity already. Read it before planning anything. Sources, in priority order:
+
+1. **DESIGN.md** if loaded: read the visual system fields (palette, type pairing, motion, components). This is the authoritative answer.
+2. **CSS custom properties** in the page's stylesheets (`:root { --color-...; --font-...; ... }`): these are de-facto tokens.
+3. **Computed styles** on the picked element and its parent: colors, fonts, spacing scales, corner radii.
+4. **Sibling components on the page**: what visual rhetoric do existing components use? (Asymmetric or centered? Dense or airy? Bold or quiet?)
+
+Write down what you see in **one sentence**. The sentence describes the surface that's actually on screen; it is not aspirational, not opinionated, not edited toward what the brand "should" be. Capture, in roughly this order:
+
+- The dominant surface color and accent color, by hex or token name (use the actual values, not categories like "warm" or "neutral").
+- The type pairing: the actual font names loaded, primary first.
+- The layout topology: how the dominant elements are arranged (stacked / side-by-side / grid / asymmetric / overlay).
+- The surface treatment: corners, borders, shadows, density of decoration.
+- The voice tone you read off the copy itself, not off the aesthetic feel.
+
+Be specific. "Modern" is not a color, "elegant" is not a type pairing, "clean" is not a layout. If you can't extract a real value for an axis, skip it rather than fabricate. The point is to record what is, not to describe what you wish it were.
+
+Do not include adjectives that name an aesthetic family ("editorial-leaning", "terminal-flavored", "brutalist"); those are conclusions, not data. They belong to Phase C lane selection in departure mode, not to identity description. Letting them sneak into Phase A is how the identity-lock collapses into a self-fulfilling prophecy.
+
+This sentence is the **identity lock**. Every variant must be readable as the same brand if rendered side by side. Skipping this phase is the primary cause of off-brand variants. Absence of DESIGN.md is never an excuse; extract from CSS and computed styles instead.
+
+#### Phase B: Pick mode (default vs departure)
+
+**Default mode**: the existing identity is preserved. Variants vary expression axes within it. *This is the right mode for ~90% of live sessions.* The user picked an element on a real product they're shipping; they expect variants of *their* hero, not three different brands' heroes.
+
+**Departure mode**: the existing identity is rejected. Variants propose alternatives consistent with PRODUCT.md voice. Trigger only when at least one is true:
+
+- PRODUCT.md anti-references explicitly call out the current surface ("the current `index.html` is itself an example"; "diffuse away from this"; "the page on screen is the failure"). Generic anti-references that describe what to avoid in general do **not** trigger departure mode; only ones that point at *this* surface specifically.
+- The user's freeform prompt explicitly asks for departure ("rebuild this from scratch", "what if it weren't editorial at all", "show me something completely different").
+
+If you're unsure, you're in default mode. The cost of being wrong about default is "three on-brand variants with similar feel": recoverable, the user picks none. The cost of being wrong about departure is "three off-brand variants": unrecoverable, the user is annoyed.
+
+#### Phase C: Plan three variants
+
+**Default mode.** Each variant commits to a different **primary axis** of difference, while preserving the identity sentence. The six axes:
+
+1. **Hierarchy**: which element commands the eye?
+2. **Layout topology**: stacked / side-by-side / grid / asymmetric / overlay
+3. **Typographic system**: pairing logic, scale ratio, case/weight strategy *within the available faces*
+4. **Color strategy**: which existing palette role carries the surface (Restrained / Committed / Full palette / Drenched). Use the brand's existing palette tokens, not new colors.
+5. **Density**: minimal / comfortable / dense
+6. **Structural decomposition**: merge, split, progressive disclosure
+
+Three variants → three DIFFERENT axes. The trio reads as *the same brand at three angles*. Do not introduce new fonts, new palette hues, or new aesthetic-family signals; those belong to departure mode.
+
+**While planning each variant, also name its 2–3 parameter knobs** (per the §7 budget table). Parameters are part of the design, not a decoration added afterward. If the variant explores density, expose a density knob. If it explores color commitment, expose a color-amount range. Deciding "what's tunable" during planning produces better knobs than retrofitting them onto finished HTML.
+
+**Departure mode.** Each variant anchors to a different **aesthetic direction**, derived from the brand's stated voice and register in PRODUCT.md. Do NOT pick from a fixed catalog of lane categories. The right three directions for this brand are not the same as the right three for another brand, and picking from a list is itself the training-data reflex (the model selects "Swiss-grid, Terminal, Industrial-signage" every time because those are the furthest-from-editorial items in any enumerated list).
+
+Instead, work from the brand:
+
+1. Read PRODUCT.md's Brand Personality words. What physical, spatial, or material experiences would embody those words if design were not involved? (A personality described as "specific, earned, unmistakable" evokes a hand-stamped letter, a numbered print, a watchmaker's loupe. A personality described as "restless, loud, unfiltered" evokes a concert poster, a spray-painted wall, a megaphone.)
+2. From those physical experiences, derive three visual directions that are genuinely different from each other AND from the current surface you're departing.
+3. Avoid the **reflex-reject lanes** in [brand.md](brand.md). Don't trade one monoculture for another. If you find yourself reaching for "Swiss-grid" or "Terminal" or "Industrial-signage" by reflex, you are pattern-matching a catalog in your training data, not reading the brand. Start over from the personality words.
+4. Each direction must be expressible in one concrete sentence that names a real-world referent ("a museum exhibition label system for a contemporary art gallery" not "clean and minimal"). If your sentence contains only adjectives, it's not concrete enough.
+5. **While planning each direction, also name its 2–3 parameter knobs** (per the §7 budget table). The same principle as default mode: decide "what's tunable" during planning, not after writing the HTML. A departure-mode hero with 0 parameters is not "bold creative vision," it's a missed opportunity for the user to fine-tune the direction they pick.
+
+#### Phase D: Squint test
+
+**Default mode squint.** Read each variant's identity sentence and compare to the locked identity from Phase A. If any variant has drifted to a different palette, type voice, or visual rhetoric, it has crossed into departure mode by accident; rework. Then check that each variant commits to a different primary axis. Three "tighter density" variants is failure.
+
+**Departure mode squint.** Two passes, family before sentence:
+
+1. **Family pass.** Label each variant with one design-family word of your own choosing (any concrete noun: *exhibition, storefront, cockpit, recipe-card, playbill, field-manual*). If any two variants share a label, or if the label could apply to the other variants equally well, rework. Do not use a fixed vocabulary list for the labels. *This pass is non-negotiable in departure mode and catches the monoculture failure that the sentence pass misses.*
+2. **Sentence pass.** Write three one-sentence descriptions side by side. If two of them rhyme ("both feature big type" / "both are stacks of sections" / "both center the CTA"), rework the offender.
+
+**When the primary axis is color or theme, forbid the trio from sharing theme + dominant hue.** Two dark-plus-one-dark is not distinct. Aim for three color worlds, not three shades of the same.
+
+**For action-specific invocations**, each variant must vary along the dimension the action names:
+
+- `bolder`: amplify a different dimension per variant (scale / saturation / structural change). Not three "slightly bigger" variants.
+- `quieter`: pull back a different dimension (color / ornament / spacing).
+- `distill`: remove a different class of excess (visual noise / redundant content / nested structure).
+- `polish`: target a different refinement axis (rhythm / hierarchy / micro-details like corner radii, focus states, optical kerning).
+- `typeset`: different type pairing AND different scale ratio each. Not three riffs on one pairing.
+- `colorize`: different hue family each (not shades of one hue). Vary chroma and contrast strategy.
+- `layout`: different structural arrangement (stacked / side-by-side / grid / asymmetric). Not spacing tweaks.
+- `adapt`: different target context per variant (mobile-first / tablet / desktop / print or low-data). Don't make three mobile layouts.
+- `animate`: different motion vocabulary (cascade stagger / clip wipe / scale-and-focus / morph / parallax). Not three staggered fades.
+- `delight`: different flavor of personality (unexpected micro-interaction / typographic surprise / illustrated accent / sonic-or-haptic moment / easter-egg interaction).
+- `overdrive`: different convention broken (scale / structure / motion / input model / state transitions). Skip `overdrive.md`'s "propose and ask" step; live mode is non-interactive.
+
+### 5. Apply the freeform prompt (if present)
+
+`event.freeformPrompt` is the user's ceiling on direction (all variants must honor it), but still explore meaningfully different *interpretations*. The interpretations stay within whichever mode you picked in Phase B.
+
+In **default mode**, the prompt narrows the axes you choose, not the identity. *"Make it feel more confident"* → variant 1 amplifies hierarchy (one element commands the eye), variant 2 commits the existing accent color (Committed strategy on the brand's hue), variant 3 tightens density and removes decorative slack. Three different axes, same brand.
+
+In **departure mode**, the prompt narrows the lanes you draw from, not the families. *"Make it feel like a newspaper front page"* would itself be a departure-mode prompt; honor it but pick three meaningfully different newspaper-adjacent lanes (broadsheet vs. tabloid vs. trade journal), and run the family pass to confirm they don't collapse into one.
+
+When the prompt and PRODUCT.md anti-references conflict (the prompt asks for X, the anti-references ban X), the anti-references win; they describe the brand's standing position, the prompt is one moment.
+
+### 6. Write all variants in a single edit
+
+Complete HTML replacement of the original element for each variant, not a CSS-only patch. Consider the element's context (computed styles, parent structure, CSS variables from `event.element`).
+
+Write CSS + all variants in ONE edit at the `insertLine` reported by `wrap`. Colocate CSS as a `<style>` tag inside the variant wrapper; `<style>` works anywhere in modern browsers and this ensures CSS and HTML arrive atomically (no FOUC).
+
+Use the `cssAuthoring` object returned by `live-wrap.mjs` to author the temporary preview CSS. The style opening tag shown below is the common case; replace it with `cssAuthoring.styleTag` when the tool returns a different one. The variant markup shape is otherwise stable:
+
+```html
+<!-- Variants: insert below this line -->
+<style data-impeccable-css="SESSION_ID">
+  /* rules matching cssAuthoring.rulePattern */
+</style>
+<div data-impeccable-variant="1">
+  <!-- variant 1: full element replacement (single top-level element) -->
+</div>
+<div data-impeccable-variant="2" style="display: none">
+  <!-- variant 2: full element replacement -->
+</div>
+<div data-impeccable-variant="3" style="display: none">
+  <!-- variant 3: full element replacement -->
+</div>
+```
+
+**Each variant div contains exactly one top-level element: the full replacement for the original.** Use the same tag as the original (e.g. `<section>` if the user picked a `<section>`). Loose siblings (heading + paragraph + div as direct children of the variant div) break the outline tracking and the accept flow, which both assume one child.
+
+The first variant has no `display: none` (visible by default). All others do. If variants use only inline styles and no preview CSS, omit the `<style>` tag entirely.
+
+One edit, all variants; the browser's MutationObserver picks everything up in one pass.
+
+For `styleMode: "scoped"`, author every `:scope` rule with a descendant combinator. The `@scope` boundary is the **variant wrapper `<div data-impeccable-variant="N">`**, not the element you're designing. A bare `:scope { background: cream; }` styles the wrapper, not the inner replacement, so the cream lands on a `display: contents` shell while the actual element keeps page defaults. Always step in: `:scope > .card`, `:scope > section`, `:scope .hero-title`, etc. The fake test agent's CSS in `tests/live-e2e/agent.mjs` is a faithful template; every scoped rule starts `:scope > ...`.
+
+**JSX / TSX target files.** Wrap `<style>` content in a template literal so the CSS `{` / `}` aren't parsed as JSX expressions, and use `className=` / `style={{…}}` on every variant element. Keep `data-impeccable-*` attributes as-is; they're plain strings:
+
+```tsx
+<style data-impeccable-css="SESSION_ID">{`
+  @scope ([data-impeccable-variant="1"]) { ... }
+  @scope ([data-impeccable-variant="2"]) { ... }
+`}</style>
+<div data-impeccable-variant="1">
+  {/* variant 1 */}
+</div>
+<div data-impeccable-variant="2" style={{ display: 'none' }}>
+  {/* variant 2 */}
+</div>
+```
+
+The wrap script already gives you a single-rooted JSX wrapper: a `<div data-impeccable-variants="…">` outer element with the marker comments tucked inside. Drop the variants block above into the "Variants: insert below this line" comment and the source stays valid TSX.
+
+### 7. Parameters (composition-sized, 0–4 per variant)
+
+Each variant can expose **coarse** knobs alongside the full HTML/CSS replacement. The browser docks a small panel to the right of the outline with one control per parameter. The user drags/clicks and sees instant feedback: there is zero regeneration cost because the knob toggles a CSS variable or data attribute that the variant's scoped CSS is already authored against.
+
+**What “optional” does not mean.** Parameters are not nice-to-have decoration on large work. The word meant “omit controls that are redundant or cosmetic,” not “default to zero because three variants were enough work.”
+
+**When to add.** As soon as the variant’s scoped CSS has a meaningful continuous or stepped axis: density, color amount, type scale, motion intensity, column weight, and so on. If you can imagine the user muttering “a bit tighter” or “a touch more accent” **without** wanting a full regeneration, wire that axis. **Not** micro-margins or one-off nudges; those are not parameters.
+
+**Freeform (`action` is `impeccable`) bias.** You did not load a sub-command reference, so you must **choose** signature axes yourself. Match the budget table: for a hero or large composition, that means **2–3 axes per variant**, not 1. Prefer knobs that sit on the dimensions where your three variants actually differ (if density varies, expose it as a `steps` knob; if color commitment varies, expose it as a `range`). A hero that ships with **0** params is almost always a mistake, not a judgment call. A hero with exactly **1** param is underweight unless the design is genuinely a fixed-point comparison. Start from the budget table, not from zero.
+
+**Budget scales with the element's visual weight, not token budget.** Knobs need real estate to read as tunable; three sliders on a single control are noise.
+
+- **Leaf / tiny**: a single button, icon, input, bare heading, solitary paragraph: **0 params.**
+- **Small composition**: labeled input, simple card, short callout (≤ ~5 visual children): **0–1** params when one dominant axis is obvious; otherwise **0.**
+- **Medium composition**: section component, nav cluster, dense card, short feature block (6–15 visual children): **target 2**; **1** is acceptable if the block is simple; **0** only when variants are truly fixed points.
+- **Large composition**: hero section, full page region, spread layout, strong internal structure (16+ visual children or multiple sub-sections): **target 2–3**; **up to 4** when several independent axes (e.g. structure `steps` + `density` + one accent) are all authored in scoped CSS.
+
+**When in doubt, ask whether a dial exists before defaulting to zero.** The user can always request more variants, but the point of live mode is instant tuning without another Go. Crowding the panel is bad; **under-shipping** knobs on a dense composition is the more common failure for freeform. Count by **visual** children, not DOM depth; a shallow-but-wide hero is still large.
+
+**Hard cap per variant**: at most **four** parameters so the panel stays legible; rare fifth only if the reference explicitly allows it.
+
+**How to declare.** Put a JSON manifest on the variant wrapper:
+
+```html
+<div data-impeccable-variant="1" data-impeccable-params='[
+  {"id":"color-amount","kind":"range","min":0,"max":1,"step":0.05,"default":0.5,"label":"Color amount"},
+  {"id":"density","kind":"steps","default":"snug","label":"Density","options":[
+    {"value":"airy","label":"Airy"},
+    {"value":"snug","label":"Snug"},
+    {"value":"packed","label":"Packed"}
+  ]},
+  {"id":"serif","kind":"toggle","default":false,"label":"Serif display"}
+]'>
+  ...variant content...
+</div>
+```
+
+**Three kinds:**
+
+- `range`: smooth slider. Drives a CSS custom property `--p-<id>` on the variant wrapper. Author CSS with `var(--p-color-amount, 0.5)`. Fields: `min`, `max`, `step`, `default` (number), `label`.
+- `steps`: segmented radio. Drives a data attribute `data-p-<id>` on the variant wrapper. Author CSS with `:scope[data-p-density="airy"] .grid { ... }`. Fields: `options` (array of `{value, label}`), `default` (string), `label`.
+- `toggle`: on/off switch. Drives BOTH a CSS var (`--p-<id>: 0|1`) and a data attribute (present when on, absent when off). Use whichever is more convenient. Fields: `default` (boolean), `label`.
+
+**Signature params per action.** For named sub-commands, read that action’s `reference/<action>.md` for one or two **MUST** params (e.g. `layout` → `density`). Those are non-negotiable when the design can express them. **Freeform has no file-level MUST**; the **Freeform (`impeccable`) bias** in this section is the stand-in. If the user’s action is both stylized and sub-command (e.g. `colorize`), the sub-command’s MUST list takes precedence for its axes; still respect the **Hard cap** and add no redundant duplicate knobs.
+
+**Reset on variant switch.** User dials density on v1, flips to v2, v2 starts at v2's declared defaults. Known limitation; preservation across variants may land later.
+
+**On accept**, the browser sends the user's current values in the accept event. `live-accept.mjs` writes them as a sibling comment:
+
+```html
+<!-- impeccable-param-values SESSION_ID: {"color-amount":0.7,"density":"packed"} -->
+```
+
+The carbonize cleanup step (see below) reads that comment and bakes the chosen values into the final CSS. For `steps`/`toggle` attribute selectors: keep only the branch matching the chosen value, drop the others, collapse `:scope[data-p-density="packed"] .grid` to a semantic class rule. For `range` vars: either substitute the literal or keep the var with the chosen value as its new default.
+
+### 8. Signal done
+
+```bash
+node .agents/skills/impeccable/scripts/live-poll.mjs --reply EVENT_ID done --file RELATIVE_PATH
+```
+
+`RELATIVE_PATH` is relative to project root (`public/index.html`, `src/App.tsx`, etc.); the browser fetches source directly if the dev server lacks HMR.
+
+Then run `live-poll.mjs` again immediately.
+
+### Aborting an in-flight session
+
+If wrap or generation fails after the browser has flipped to GENERATING (e.g. wrap landed on the wrong source branch and you've already reverted it, or generation hit an unrecoverable error), tell the **browser** so its bar resets to PICKING:
+
+```bash
+node .agents/skills/impeccable/scripts/live-poll.mjs --reply EVENT_ID error "Short reason"
+```
+
+Don't run `live-accept --discard` for this; that's a pure file mutator, the browser doesn't see it, and the bar gets stuck on the GENERATING dots forever (the user has to refresh). `--discard` is only correct when the **browser** initiated the discard (user clicked ✕ during CYCLING) and the agent is just running source-side cleanup the browser already triggered.
+
+## Handle fallback
+
+When wrap returns `fallback: "agent-driven"`, the deterministic flow doesn't apply. Pick up here.
+
+The goal is the same: give the user three variants to choose from AND persist the accepted one in a place the next build won't wipe. The difference is that you have to pick the right source file yourself.
+
+### Step 1: Identify where the element actually lives
+
+Use the error payload:
+
+- `element_not_in_source` with `generatedMatch: "public/docs/foo.html"`: the served HTML is generated. Find the generator (grep for writers of that path, e.g. `scripts/build-sub-pages.js`, an Astro/Next template) and locate the template or partial that emits this element.
+- `element_not_found`: the element is runtime-injected. Look for the component that renders it (React/Vue/Svelte), the JS that assembles it, or the data source that feeds it.
+- `file_is_generated` with `file: "..."`: user pointed at a generated file explicitly. Same resolution as `element_not_in_source`.
+
+Read the candidate source until you're confident where a change to the element would belong. If the change is purely visual, that source might be a shared stylesheet, not the template.
+
+### Step 2: Show three variants in the DOM for preview
+
+The browser bar is waiting for variants. Even without a wrapper in source, you still need to show something:
+
+1. Manually write the wrapper scaffold into the **served** file (the one the browser actually loaded). Use the same structure `live-wrap.mjs` produces; `<!-- impeccable-variants-start ID --><div data-impeccable-variants="ID" data-impeccable-variant-count="3" style="display: contents">…</div><!-- end -->`.
+2. Insert your three variant divs inside it, same shape as the deterministic path.
+3. Signal done with `--reply EVENT_ID done --file <served file>`. The browser's no-HMR fallback will fetch and inject.
+
+This served-file edit is **temporary**: next regen wipes it, and that's fine. The real work happens on accept.
+
+### Step 3: On accept, write to true source
+
+When the accept event arrives (`_acceptResult.handled` will usually be `false` here because accept also refuses to persist into generated files; see Handle accept for the carbonize branch), extract the accepted variant's content and write it into the source you identified in Step 1:
+
+- Structural change → edit the template / component source.
+- Visual-only change → add or update rules in the appropriate stylesheet; remove the inline `<style>` scope.
+- Dynamic from data → update the data source or the render logic.
+
+Then remove the temporary wrapper from the served file if it's still there.
+
+### Step 4: On discard, clean up the served file
+
+Remove the wrapper you inserted in Step 2. Nothing else to do.
+
+## Handle `accept`
+
+Event: `{id, variantId, _acceptResult, _completionAck}`. The poll script already ran `live-accept.mjs` to handle the file operation deterministically, then acknowledged event delivery to the helper. The browser DOM is already updated.
+
+- `_completionAck.ok !== true`: do not poll yet. Run `live-status.mjs` / `live-resume.mjs`, complete the cleanup manually if needed, then run `live-complete.mjs --id EVENT_ID`.
+- `_acceptResult.handled: true` and `carbonize: false`: nothing to do. Poll again.
+- `_acceptResult.handled: true` and `carbonize: true`: **post-accept cleanup is required before the next poll.** See the "Required after accept (carbonize)" section below. The `event._acceptResult.todo` field, `_completionAck.requiresComplete`, and a stderr banner all point at this required follow-up; none are decorative. After cleanup, run `live-complete.mjs --id EVENT_ID`, then poll again.
+- `_acceptResult.handled: false, mode: "fallback"`: the session lived in a generated file and the script refused to persist there. You've already written the accepted variant into true source during Handle fallback Step 3; just clean up the temporary wrapper in the served file if any, and poll again.
+- `_acceptResult.handled: false` without `mode`: manual cleanup: read file, find markers, edit.
+
+### Required after accept (carbonize)
+
+When `_acceptResult.carbonize === true`, the accepted variant was stitched into source with helper markers and inline CSS so the browser can render it immediately with no visual gap. That stitch-in is **temporary**. The agent must rewrite it into permanent form before doing anything else. Skipping this leaves dead `@scope` rules for unaccepted variants, a pointless `data-impeccable-variant` wrapper, and `impeccable-carbonize-start/end` comment noise in the source file; all of which accumulate across sessions.
+
+Do these five steps in the current thread, synchronously, before the next poll. Do not poll again until the file is clean.
+
+1. **Locate the carbonize block** in the source file (`_acceptResult.file`). It's bracketed by `<!-- impeccable-carbonize-start SESSION_ID -->` and `<!-- impeccable-carbonize-end SESSION_ID -->` and contains a `<style data-impeccable-css="SESSION_ID">` element. If the variant declared parameters, an `<!-- impeccable-param-values SESSION_ID: {...} -->` comment sits alongside the style tag with the user's chosen values; read it first; it drives steps 3 and 4 below.
+2. **Move the CSS rules** into the project's real stylesheet. Which stylesheet depends on the project (e.g. `public/css/workflow.css` for this repo, or the component's co-located CSS file for a Vite/Next project; pick whichever already owns styling for the surrounding element).
+3. **Bake in parameter values while rewriting selectors.** For `@scope ([data-impeccable-variant="N"])` wrappers: retarget to real, semantic classes on the accepted HTML (`.why-visual--v2 .v2-label { … }`). For `:scope[data-p-<id>="VALUE"]` selectors: keep only the branch matching the chosen value from the param-values comment; drop the others (they're dead after accept). For `var(--p-<id>, DEFAULT)` in the CSS: either substitute the literal value, or if the param is still useful as a knob going forward, leave the var and update its initial declaration to the chosen value.
+4. **Unwrap the accepted content.** Delete the `<div data-impeccable-variant="N" style="display: contents">` that wraps it. Drop `data-impeccable-params` and any `data-p-*` attributes from it; those are live-mode plumbing, not source.
+5. **Delete the inline `<style>` block, the `<!-- impeccable-param-values -->` comment if present, and both `<!-- impeccable-carbonize-start/end -->` markers.** Also drop any `@scope` rules for variants other than the accepted one; those are dead code now.
+
+After the file is clean, run `live-complete.mjs --id SESSION_ID`, verify it reports `phase: "completed"`, then poll again.
+
+A background agent may be used for the rewrite, but the current thread is responsible for verifying the five steps are complete before issuing the next poll. In practice, inline is usually faster and less error-prone.
+
+## Handle `discard`
+
+Event: `{id, _acceptResult, _completionAck}`. The poll script already restored the original, removed all variant markers, and acknowledged `discarded` durable completion. Nothing to do unless `_completionAck.ok !== true`; in that case run `live-complete.mjs --id EVENT_ID --discarded`, then poll again.
+
+## Handle `prefetch`
+
+Event: `{pageUrl}`. The browser fires this the first time the user selects an element on a given route, as a latency shortcut; it signals the user is likely about to Go on a page you haven't read yet.
+
+Resolve `pageUrl` to the underlying file:
+
+- Root `/` → the `pageFile` returned by `live.mjs` (usually `public/index.html` or equivalent).
+- Sub-routes (e.g. `/docs`, `/docs/live`) → the generated or source file for that route. Use your knowledge of the project layout (multi-page static sites often resolve `/foo` → `public/foo/index.html`; SPAs may map all routes to a single entry).
+
+Read the file into context, then poll again. No `--reply`: this is speculative pre-work; Go will come later. If you can't confidently resolve the route to a file, skip and poll again.
+
+Dedupe is the browser's job (one prefetch per unique pathname per session); trust it. If the same file shows up twice from different routes mapping to the same file, the second Read is cached anyway.
+
+## Exit
+
+The user can stop live mode by:
+- Saying "stop live mode" / "exit live" in chat
+- Closing the browser tab (SSE drops, poll returns `exit` after 8s)
+- The browser's exit button
+
+When the poll returns `exit`, proceed to cleanup. If the poll is still running as a background task, kill it first.
+
+## Cleanup
+
+```bash
+node .agents/skills/impeccable/scripts/live-server.mjs stop
+```
+
+Stops the HTTP server and runs `live-inject.mjs --remove` to strip `localhost:…/live.js` from the HTML entry. To stop the server but keep the inject tag (for a quick restart), use `stop --keep-inject`. `.impeccable/live/config.json` persists as project config for future sessions.
+
+Then:
+- Remove any leftover variant wrappers (search for `impeccable-variants-start` markers).
+- Remove any leftover carbonize blocks (search for `impeccable-carbonize-start` markers).
+
+## First-time setup (config missing or invalid)
+
+If `live.mjs` outputs `{ ok: false, error: "config_missing" | "config_invalid", path }`, write the live config at the reported path. By default this is `.impeccable/live/config.json`.
+
+Schema:
+
+```json
+{
+  "files": ["<path-or-glob>", "<path-or-glob>", ...],
+  "exclude": ["<optional-glob>", ...],
+  "insertBefore": "</body>",
+  "commentSyntax": "html",
+  "cspChecked": true
+}
+```
+
+`files` is the inject target; **the HTML files the browser actually loads**, not necessarily source. Each entry is either a literal path (`"public/index.html"`) or a glob pattern (`"public/**/*.html"`). Tracked or generated doesn't matter here; wrap has its own generated-file guard and routes accepts through the fallback flow.
+
+`exclude` (optional) is a list of glob patterns matching files to skip, even if a `files` glob would have included them. Use for email templates, demo fixtures, or any HTML that isn't a live page.
+
+`cspChecked` tracks whether the CSP detection step below has already run. Absent on first setup; set to `true` after CSP is checked (whether patched, declined, or not needed).
+
+**Hard-excluded paths (cannot be overridden).** `**/node_modules/**` and `**/.git/**` are never matched regardless of what the user writes. These are vendor/metadata directories and injecting into them would silently instrument third-party code.
+
+**Glob syntax.** `**` matches any number of path segments (including zero), `*` matches any characters except `/`, `?` matches a single character except `/`. Paths are always relative to the project root with forward slashes.
+
+| Framework | `files` | `insertBefore` | `commentSyntax` |
+|-----------|---------|----------------|-----------------|
+| SPA with single shell (Vite / React / Plain HTML) | `["index.html"]` | `</body>` | `html` |
+| Next.js (App Router) | `["app/layout.tsx"]` | `</body>` | `jsx` |
+| Next.js (Pages) | `["pages/_document.tsx"]` | `</body>` | `jsx` |
+| Nuxt | `["app.vue"]` | `</body>` | `html` |
+| Svelte / SvelteKit | `["src/app.html"]` | `</body>` | `html` |
+| Astro | `[" <root layout .astro>"]` | `</body>` | `html` |
+| Multi-page (separate HTML per route) | `["public/**/*.html"]`: a glob covering the served directory | `</body>` | `html` |
+
+Pick an anchor that exists in every file (`</body>` almost always works). Use `insertAfter` if the anchor should match **after** a specific line.
+
+For multi-page sites, **prefer a glob over a literal file list**. New pages added later are picked up automatically on the next `live-inject.mjs` run; no config maintenance needed.
+
+For multi-page sites whose pages are *rebuilt* by a generator (Astro, static-site generators, custom scripts like `build-sub-pages.js`), the inject survives only until the next regeneration. Re-run `live.mjs` after each build. Accept is unaffected; it writes to true source via the fallback flow.
+
+### Drift-heal warning
+
+On every `live.mjs` boot, after inject, the project is scanned for HTML files under common page-source roots (`public/`, `src/`, `app/`, `pages/`). If any exist that aren't covered by the resolved `files` list, the output includes a `configDrift` field:
+
+```json
+{
+  "ok": true,
+  "serverPort": 8400,
+  "pageFiles": [ "..." ],
+  "configDrift": {
+    "orphans": ["public/new-section/index.html", "public/docs/new-command.html"],
+    "orphanCount": 2,
+    "hint": "2 HTML file(s) exist but aren't in config.files. Consider adding them, or use a glob pattern like \"public/**/*.html\"."
+  }
+}
+```
+
+When `configDrift` is present, surface it to the user once per session before entering the poll loop:
+
+> Noticed N HTML file(s) in the project that aren't in `config.files`:
+>
+> - `public/new-section/index.html`
+> - `public/docs/new-command.html`
+>
+> Add them, or switch `files` to a glob like `["public/**/*.html"]` and let it track new pages automatically?
+
+Don't auto-update the config; let the user decide. `configDrift` is `null` when there's no drift.
+
+### CSP detection (first-time only)
+
+If `config.cspChecked === true`, skip this entire section. You already asked this user once; the answer sticks.
+
+Otherwise, run the detection helper:
+
+```bash
+node .agents/skills/impeccable/scripts/detect-csp.mjs
+```
+
+Output: `{ shape, signals }` where `shape` is one of `append-arrays`, `append-string`, `middleware`, `meta-tag`, or `null`. The shape is named by *patch mechanism*, so one template covers many frameworks.
+
+- **`null`**: no CSP; skip to writing `.impeccable/live/config.json` with `cspChecked: true`.
+- **`append-arrays`**: CSP defined as structured directive arrays. Auto-patchable. See *append-arrays* below. Covers:
+  - Monorepo helpers with `additionalScriptSrc` / `additionalConnectSrc` options (Next.js + shared config package)
+  - SvelteKit `kit.csp.directives`
+  - Nuxt `nuxt-security` module's `contentSecurityPolicy`
+- **`append-string`**: CSP written as a literal value string. Auto-patchable. See *append-string* below. Covers:
+  - Inline `next.config.*` `headers()` with a CSP literal
+  - Nuxt `routeRules` / `nitro.routeRules` headers
+- **`middleware`** or **`meta-tag`**: rarer. Detected but not auto-patched in v1. Show the user the detected files and ask them to add `http://localhost:8400` to `script-src` and `connect-src` manually, then mark `cspChecked: true` and proceed.
+
+#### Consent prompt template
+
+Use this phrasing so the experience is consistent across agents:
+
+> **CSP patch needed.** I detected a Content Security Policy in your project that blocks `http://localhost:8400`: the live picker won't load without an allowance. Here's the change I'd make:
+>
+> ```diff
+> [file: <patchTarget>]
+> [exact diff, 2–5 lines]
+> ```
+>
+> It's guarded by `NODE_ENV === "development"` so the extra entry only appears in dev and never reaches production. You can remove it any time by reverting this file. Apply? [y/n]
+
+On "no": skip the patch, mention live won't work until the user adds the allowance manually, still write `cspChecked: true` (the question's been asked).
+
+On "yes": apply the Shape-specific patch below, then write `cspChecked: true`.
+
+#### append-arrays
+
+CSP expressed as structured directive arrays. Patch mechanism: declare a dev-only array, spread it into the script-src and connect-src arrays.
+
+**Declare near the top of the file that holds the CSP arrays:**
+
+```ts
+// Dev-only allowance so impeccable live mode can load. Guarded by NODE_ENV.
+const __impeccableLiveDev =
+  process.env.NODE_ENV === "development" ? ["http://localhost:8400"] : [];
+```
+
+**Append `...__impeccableLiveDev` to the script-src and connect-src directive arrays.** Per-framework specifics:
+
+- **Next.js + monorepo helper**: edit the *app's* `next.config.*` (not the shared helper), appending to `additionalScriptSrc` and `additionalConnectSrc` passed into `createBaseNextConfig` (or equivalent). Keeps the shared package clean.
+- **SvelteKit**: edit `svelte.config.js`, appending to `kit.csp.directives['script-src']` and `kit.csp.directives['connect-src']`.
+- **Nuxt + nuxt-security**: edit `nuxt.config.*`, appending to `security.headers.contentSecurityPolicy['script-src']` and `['connect-src']`.
+
+Reference outputs:
+- `tests/framework-fixtures/nextjs-turborepo/expected-after-patch.ts` (Next.js)
+- `tests/framework-fixtures/sveltekit-csp/expected-after-patch.js` (SvelteKit)
+
+Idempotency: if `__impeccableLiveDev` already exists in the file, the patch is already applied; skip asking and just mark `cspChecked: true`.
+
+#### append-string
+
+CSP built as a literal value string. Two-point patch: declare a dev-only string near the top, interpolate it into the CSP at the `script-src` and `connect-src` directives.
+
+```ts
+// Dev-only allowance so impeccable live mode can load.
+const __impeccableLiveDev =
+  process.env.NODE_ENV === "development" ? " http://localhost:8400" : "";
+```
+
+Then in the CSP value string:
+- `script-src 'self' 'unsafe-inline'` → `` `script-src 'self' 'unsafe-inline'${__impeccableLiveDev}` ``
+- `connect-src 'self'` → `` `connect-src 'self'${__impeccableLiveDev}` ``
+
+(Leading space on the dev string so it concatenates cleanly into the existing value. Convert the literal CSP directives into template strings as part of the edit if they aren't already.)
+
+Per-framework specifics:
+- **Next.js inline `headers()`**: edit `next.config.*`, splicing the variable into the CSP value.
+- **Nuxt `routeRules`**: edit `nuxt.config.*`, splicing into the CSP in `routeRules['/**'].headers['Content-Security-Policy']`.
+
+Reference outputs:
+- `tests/framework-fixtures/nextjs-inline-csp/expected-after-patch.js` (Next.js)
+- `tests/framework-fixtures/nuxt-csp/expected-after-patch.ts` (Nuxt)
+
+### Troubleshooting
+
+If a user says "no" to the CSP patch at setup time and later complains that live doesn't work: their dev CSP blocks `http://localhost:8400`. Fix: delete `cspChecked` from `.impeccable/live/config.json` and re-run `live.mjs`: setup will ask again.
+
+Then re-run `live.mjs`.
diff --git a/.agents/skills/impeccable/reference/motion-design.md b/.agents/skills/impeccable/reference/motion-design.md
new file mode 100644
index 00000000..78b6fd26
--- /dev/null
+++ b/.agents/skills/impeccable/reference/motion-design.md
@@ -0,0 +1,109 @@
+# Motion Design
+
+## Duration: The 100/300/500 Rule
+
+Timing matters more than easing. These durations feel right for most UI:
+
+| Duration | Use Case | Examples |
+|----------|----------|----------|
+| **100-150ms** | Instant feedback | Button press, toggle, color change |
+| **200-300ms** | State changes | Menu open, tooltip, hover states |
+| **300-500ms** | Layout changes | Accordion, modal, drawer |
+| **500-800ms** | Entrance animations | Page load, hero reveals |
+
+**Exit animations are faster than entrances.** Use ~75% of enter duration.
+
+## Easing: Pick the Right Curve
+
+**Don't use `ease`.** It's a compromise that's rarely optimal. Instead:
+
+| Curve | Use For | CSS |
+|-------|---------|-----|
+| **ease-out** | Elements entering | `cubic-bezier(0.16, 1, 0.3, 1)` |
+| **ease-in** | Elements leaving | `cubic-bezier(0.7, 0, 0.84, 0)` |
+| **ease-in-out** | State toggles (there → back) | `cubic-bezier(0.65, 0, 0.35, 1)` |
+
+**For micro-interactions, use exponential curves.** They feel natural because they mimic real physics (friction, deceleration):
+
+```css
+/* Quart out - smooth, refined (recommended default) */
+--ease-out-quart: cubic-bezier(0.25, 1, 0.5, 1);
+
+/* Quint out - slightly more dramatic */
+--ease-out-quint: cubic-bezier(0.22, 1, 0.36, 1);
+
+/* Expo out - snappy, confident */
+--ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);
+```
+
+**Avoid bounce and elastic curves.** They were trendy in 2015 but now feel tacky and amateurish. Real objects don't bounce when they stop; they decelerate smoothly. Overshoot effects draw attention to the animation itself rather than the content.
+
+## Premium Motion Materials
+
+Transform and opacity are reliable defaults, not the whole palette. Premium interfaces often need atmospheric properties: blur reveals, backdrop-filter panels, saturation or brightness shifts, shadow bloom, SVG filters, masks, clip paths, gradient-position movement, and variable font or shader-driven effects.
+
+Use the right material for the effect:
+
+- **Transform / opacity**: movement, press feedback, simple reveals, list choreography.
+- **Blur / filter / backdrop-filter**: focus pulls, depth, glass or lens effects, softened entrances, atmospheric transitions.
+- **Clip path / masks**: wipes, reveals, editorial cropping, product-like transitions.
+- **Shadow / glow / color filters**: energy, affordance, focus, warmth, active state.
+- **Grid-template rows or FLIP-style transforms**: expanding and reflowing layout without animating `height` directly.
+
+The hard rule is not "transform and opacity only." The hard rule is: avoid animating layout-driving properties casually (`width`, `height`, `top`, `left`, margins), keep expensive effects bounded to small or isolated areas, and verify in-browser that the result is smooth on the target viewports. If blur/filter makes the interaction feel significantly more premium and remains smooth, use it.
+
+## Staggered Animations
+
+Use CSS custom properties for cleaner stagger: `animation-delay: calc(var(--i, 0) * 50ms)` with `style="--i: 0"` on each item. **Cap total stagger time**: 10 items at 50ms = 500ms total. For many items, reduce per-item delay or cap staggered count.
+
+## Reduced Motion
+
+This is not optional. Vestibular disorders affect ~35% of adults over 40.
+
+```css
+/* Define animations normally */
+.card {
+  animation: slide-up 500ms ease-out;
+}
+
+/* Provide alternative for reduced motion */
+@media (prefers-reduced-motion: reduce) {
+  .card {
+    animation: fade-in 200ms ease-out;  /* Crossfade instead of motion */
+  }
+}
+
+/* Or disable entirely */
+@media (prefers-reduced-motion: reduce) {
+  *, *::before, *::after {
+    animation-duration: 0.01ms !important;
+    transition-duration: 0.01ms !important;
+  }
+}
+```
+
+**What to preserve**: Functional animations like progress bars, loading spinners (slowed down), and focus indicators should still work, just without spatial movement.
+
+## Perceived Performance
+
+**Nobody cares how fast your site is, just how fast it feels.** Perception can be as effective as actual performance.
+
+**The 80ms threshold**: Our brains buffer sensory input for ~80ms to synchronize perception. Anything under 80ms feels instant and simultaneous. This is your target for micro-interactions.
+
+**Active vs passive time**: Passive waiting (staring at a spinner) feels longer than active engagement. Strategies to shift the balance:
+
+- **Preemptive start**: Begin transitions immediately while loading (iOS app zoom, skeleton UI). Users perceive work happening.
+- **Early completion**: Show content progressively, don't wait for everything. Video buffering, progressive images, streaming HTML.
+- **Optimistic UI**: Update the interface immediately, handle failures gracefully. Instagram likes work offline; the UI updates instantly, syncs later. Use for low-stakes actions; avoid for payments or destructive operations.
+
+**Easing affects perceived duration**: Ease-in (accelerating toward completion) makes tasks feel shorter because the peak-end effect weights final moments heavily. Ease-out feels satisfying for entrances, but ease-in toward a task's end compresses perceived time.
+
+**Caution**: Too-fast responses can decrease perceived value. Users may distrust instant results for complex operations (search, analysis). Sometimes a brief delay signals "real work" is happening.
+
+## Performance
+
+Don't use `will-change` preemptively, only when animation is imminent (`:hover`, `.animating`). For scroll-triggered animations, use Intersection Observer instead of scroll events; unobserve after animating once. Create motion tokens for consistency (durations, easings, common transitions).
+
+---
+
+**Avoid**: Animating everything (animation fatigue is real). Using >500ms for UI feedback. Ignoring `prefers-reduced-motion`. Using animation to hide slow loading.
diff --git a/.agents/skills/impeccable/reference/onboard.md b/.agents/skills/impeccable/reference/onboard.md
new file mode 100644
index 00000000..90e33916
--- /dev/null
+++ b/.agents/skills/impeccable/reference/onboard.md
@@ -0,0 +1,234 @@
+> **Additional context needed**: the "aha moment" you want users to reach, and users' experience level.
+
+Get users to first value as fast as possible. Onboarding's job is not to teach the product. Its job is to get people to the moment that proves the product is worth their time.
+
+## Assess Onboarding Needs
+
+Understand what users need to learn and why:
+
+1. **Identify the challenge**:
+   - What are users trying to accomplish?
+   - What's confusing or unclear about current experience?
+   - Where do users get stuck or drop off?
+   - What's the "aha moment" we want users to reach?
+
+2. **Understand the users**:
+   - What's their experience level? (Beginners, power users, mixed?)
+   - What's their motivation? (Excited and exploring? Required by work?)
+   - What's their time commitment? (5 minutes? 30 minutes?)
+   - What alternatives do they know? (Coming from competitor? New to category?)
+
+3. **Define success**:
+   - What's the minimum users need to learn to be successful?
+   - What's the key action we want them to take? (First project? First invite?)
+   - How do we know onboarding worked? (Completion rate? Time to value?)
+
+**CRITICAL**: Onboarding should get users to value as quickly as possible, not teach everything possible.
+
+## Onboarding Principles
+
+Follow these core principles:
+
+### Show, Don't Tell
+- Demonstrate with working examples, not just descriptions
+- Provide real functionality in onboarding, not separate tutorial mode
+- Use progressive disclosure, teach one thing at a time
+
+### Make It Optional (When Possible)
+- Let experienced users skip onboarding
+- Don't block access to product
+- Provide "Skip" or "I'll explore on my own" options
+
+### Time to Value
+- Get users to their "aha moment" ASAP
+- Front-load most important concepts
+- Teach 20% that delivers 80% of value
+- Save advanced features for contextual discovery
+
+### Context Over Ceremony
+- Teach features when users need them, not upfront
+- Empty states are onboarding opportunities
+- Tooltips and hints at point of use
+
+### Respect User Intelligence
+- Don't patronize or over-explain
+- Be concise and clear
+- Assume users can figure out standard patterns
+
+## Design Onboarding Experiences
+
+Create appropriate onboarding for the context:
+
+### Initial Product Onboarding
+
+**Welcome Screen**:
+- Clear value proposition (what is this product?)
+- What users will learn/accomplish
+- Time estimate (honest about commitment)
+- Option to skip (for experienced users)
+
+**Account Setup**:
+- Minimal required information (collect more later)
+- Explain why you're asking for each piece of information
+- Smart defaults where possible
+- Social login when appropriate
+
+**Core Concept Introduction**:
+- Introduce 1-3 core concepts (not everything)
+- Use simple language and examples
+- Interactive when possible (do, don't just read)
+- Progress indication (step 1 of 3)
+
+**First Success**:
+- Guide users to accomplish something real
+- Pre-populated examples or templates
+- Celebrate completion (but don't overdo it)
+- Clear next steps
+
+### Feature Discovery & Adoption
+
+**Empty States**:
+Instead of blank space, show:
+- What will appear here (description + screenshot/illustration)
+- Why it's valuable
+- Clear CTA to create first item
+- Example or template option
+
+Example:
+```
+No projects yet
+Projects help you organize your work and collaborate with your team.
+[Create your first project] or [Start from template]
+```
+
+**Contextual Tooltips**:
+- Appear at relevant moment (first time user sees feature)
+- Point directly at relevant UI element
+- Brief explanation + benefit
+- Dismissable (with "Don't show again" option)
+- Optional "Learn more" link
+
+**Feature Announcements**:
+- Highlight new features when they're released
+- Show what's new and why it matters
+- Let users try immediately
+- Dismissable
+
+**Progressive Onboarding**:
+- Teach features when users encounter them
+- Badges or indicators on new/unused features
+- Unlock complexity gradually (don't show all options immediately)
+
+### Guided Tours & Walkthroughs
+
+**When to use**:
+- Complex interfaces with many features
+- Significant changes to existing product
+- Industry-specific tools needing domain knowledge
+
+**How to design**:
+- Spotlight specific UI elements (dim rest of page)
+- Keep steps short (3-7 steps max per tour)
+- Allow users to click through tour freely
+- Include "Skip tour" option
+- Make replayable (help menu)
+
+**Best practices**:
+- Interactive over passive (let users click real buttons)
+- Focus on workflow, not features ("Create a project" not "This is the project button")
+- Provide sample data so actions work
+
+### Interactive Tutorials
+
+**When to use**:
+- Users need hands-on practice
+- Concepts are complex or unfamiliar
+- High stakes (better to practice in safe environment)
+
+**How to design**:
+- Sandbox environment with sample data
+- Clear objectives ("Create a chart showing sales by region")
+- Step-by-step guidance
+- Validation (confirm they did it right)
+- Graduation moment (you're ready!)
+
+### Documentation & Help
+
+**In-product help**:
+- Contextual help links throughout interface
+- Keyboard shortcut reference
+- Search-able help center
+- Video tutorials for complex workflows
+
+**Help patterns**:
+- `?` icon near complex features
+- "Learn more" links in tooltips
+- Keyboard shortcut hints (`⌘K` shown on search box)
+
+## Empty State Design
+
+Every empty state needs:
+
+### What Will Be Here
+"Your recent projects will appear here"
+
+### Why It Matters
+"Projects help you organize your work and collaborate with your team"
+
+### How to Get Started
+[Create project] or [Import from template]
+
+### Visual Interest
+Illustration or icon (not just text on blank page)
+
+### Contextual Help
+"Need help getting started? [Watch 2-min tutorial]"
+
+**Empty state types**:
+- **First use**: Never used this feature (emphasize value, provide template)
+- **User cleared**: Intentionally deleted everything (light touch, easy to recreate)
+- **No results**: Search or filter returned nothing (suggest different query, clear filters)
+- **No permissions**: Can't access (explain why, how to get access)
+- **Error state**: Failed to load (explain what happened, retry option)
+
+## Implementation Patterns
+
+### Technical approaches:
+
+**Tooltip libraries**: Tippy.js, Popper.js
+**Tour libraries**: Intro.js, Shepherd.js, React Joyride
+**Modal patterns**: Focus trap, backdrop, ESC to close
+**Progress tracking**: LocalStorage for "seen" states
+**Analytics**: Track completion, drop-off points
+
+**Storage patterns**:
+```javascript
+// Track which onboarding steps user has seen
+localStorage.setItem('onboarding-completed', 'true');
+localStorage.setItem('feature-tooltip-seen-reports', 'true');
+```
+
+**IMPORTANT**: Don't show same onboarding twice (annoying). Track completion and respect dismissals.
+
+**NEVER**:
+- Force users through long onboarding before they can use product
+- Patronize users with obvious explanations
+- Show same tooltip repeatedly (respect dismissals)
+- Block all UI during tour (let users explore)
+- Create separate tutorial mode disconnected from real product
+- Overwhelm with information upfront (progressive disclosure!)
+- Hide "Skip" or make it hard to find
+- Forget about returning users (don't show initial onboarding again)
+
+## Verify Onboarding Quality
+
+Test with real users:
+
+- **Time to completion**: Can users complete onboarding quickly?
+- **Comprehension**: Do users understand after completing?
+- **Action**: Do users take desired next step?
+- **Skip rate**: Are too many users skipping? (Maybe it's too long or not valuable)
+- **Completion rate**: Are users completing? (If low, simplify)
+- **Time to value**: How long until users get first value?
+
+When users hit the aha moment fast and don't drop off, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/optimize.md b/.agents/skills/impeccable/reference/optimize.md
new file mode 100644
index 00000000..d0abeea4
--- /dev/null
+++ b/.agents/skills/impeccable/reference/optimize.md
@@ -0,0 +1,258 @@
+Performance is a feature. Identify the actual bottleneck for THIS interface, fix it, then measure. Don't optimize what isn't slow.
+
+## Assess Performance Issues
+
+Understand current performance and identify problems:
+
+1. **Measure current state**:
+   - **Core Web Vitals**: LCP, FID/INP, CLS scores
+   - **Load time**: Time to interactive, first contentful paint
+   - **Bundle size**: JavaScript, CSS, image sizes
+   - **Runtime performance**: Frame rate, memory usage, CPU usage
+   - **Network**: Request count, payload sizes, waterfall
+
+2. **Identify bottlenecks**:
+   - What's slow? (Initial load? Interactions? Animations?)
+   - What's causing it? (Large images? Expensive JavaScript? Layout thrashing?)
+   - How bad is it? (Perceivable? Annoying? Blocking?)
+   - Who's affected? (All users? Mobile only? Slow connections?)
+
+**CRITICAL**: Measure before and after. Premature optimization wastes time. Optimize what actually matters.
+
+## Optimization Strategy
+
+Create systematic improvement plan:
+
+### Loading Performance
+
+**Optimize Images**:
+- Use modern formats (WebP, AVIF)
+- Proper sizing (don't load 3000px image for 300px display)
+- Lazy loading for below-fold images
+- Responsive images (`srcset`, `picture` element)
+- Compress images (80-85% quality is usually imperceptible)
+- Use CDN for faster delivery
+
+```html
+<img 
+  src="hero.webp"
+  srcset="hero-400.webp 400w, hero-800.webp 800w, hero-1200.webp 1200w"
+  sizes="(max-width: 400px) 400px, (max-width: 800px) 800px, 1200px"
+  loading="lazy"
+  alt="Hero image"
+/>
+```
+
+**Reduce JavaScript Bundle**:
+- Code splitting (route-based, component-based)
+- Tree shaking (remove unused code)
+- Remove unused dependencies
+- Lazy load non-critical code
+- Use dynamic imports for large components
+
+```javascript
+// Lazy load heavy component
+const HeavyChart = lazy(() => import('./HeavyChart'));
+```
+
+**Optimize CSS**:
+- Remove unused CSS
+- Critical CSS inline, rest async
+- Minimize CSS files
+- Use CSS containment for independent regions
+
+**Optimize Fonts**:
+- Use `font-display: swap` or `optional`
+- Subset fonts (only characters you need)
+- Preload critical fonts
+- Use system fonts when appropriate
+- Limit font weights loaded
+
+```css
+@font-face {
+  font-family: 'CustomFont';
+  src: url('/fonts/custom.woff2') format('woff2');
+  font-display: swap; /* Show fallback immediately */
+  unicode-range: U+0020-007F; /* Basic Latin only */
+}
+```
+
+**Optimize Loading Strategy**:
+- Critical resources first (async/defer non-critical)
+- Preload critical assets
+- Prefetch likely next pages
+- Service worker for offline/caching
+- HTTP/2 or HTTP/3 for multiplexing
+
+### Rendering Performance
+
+**Avoid Layout Thrashing**:
+```javascript
+// ❌ Bad: Alternating reads and writes (causes reflows)
+elements.forEach(el => {
+  const height = el.offsetHeight; // Read (forces layout)
+  el.style.height = height * 2; // Write
+});
+
+// ✅ Good: Batch reads, then batch writes
+const heights = elements.map(el => el.offsetHeight); // All reads
+elements.forEach((el, i) => {
+  el.style.height = heights[i] * 2; // All writes
+});
+```
+
+**Optimize Rendering**:
+- Use CSS `contain` property for independent regions
+- Minimize DOM depth (flatter is faster)
+- Reduce DOM size (fewer elements)
+- Use `content-visibility: auto` for long lists
+- Virtual scrolling for very long lists (react-window, react-virtualized)
+
+**Reduce Paint & Composite**:
+- Use `transform` and `opacity` for reliable movement, but allow blur, filters, masks, clip paths, shadows, and color shifts when they create meaningful polish
+- Avoid casual animation of layout-driving properties (`width`, `height`, `top`, `left`, margins)
+- Use `will-change` sparingly for known expensive operations
+- Bound expensive paint areas for blur/filter/shadow effects (smaller and isolated is faster)
+
+### Animation Performance
+
+**GPU Acceleration**:
+```css
+/* ✅ GPU-accelerated (fast) */
+.animated {
+  transform: translateX(100px);
+  opacity: 0.5;
+}
+
+/* ❌ CPU-bound (slow) */
+.animated {
+  left: 100px;
+  width: 300px;
+}
+```
+
+**Smooth 60fps**:
+- Target 16ms per frame (60fps)
+- Use `requestAnimationFrame` for JS animations
+- Debounce/throttle scroll handlers
+- Use CSS animations when possible
+- Avoid long-running JavaScript during animations
+
+**Intersection Observer**:
+```javascript
+// Efficiently detect when elements enter viewport
+const observer = new IntersectionObserver((entries) => {
+  entries.forEach(entry => {
+    if (entry.isIntersecting) {
+      // Element is visible, lazy load or animate
+    }
+  });
+});
+```
+
+### React/Framework Optimization
+
+**React-specific**:
+- Use `memo()` for expensive components
+- `useMemo()` and `useCallback()` for expensive computations
+- Virtualize long lists
+- Code split routes
+- Avoid inline function creation in render
+- Use React DevTools Profiler
+
+**Framework-agnostic**:
+- Minimize re-renders
+- Debounce expensive operations
+- Memoize computed values
+- Lazy load routes and components
+
+### Network Optimization
+
+**Reduce Requests**:
+- Combine small files
+- Use SVG sprites for icons
+- Inline small critical assets
+- Remove unused third-party scripts
+
+**Optimize APIs**:
+- Use pagination (don't load everything)
+- GraphQL to request only needed fields
+- Response compression (gzip, brotli)
+- HTTP caching headers
+- CDN for static assets
+
+**Optimize for Slow Connections**:
+- Adaptive loading based on connection (navigator.connection)
+- Optimistic UI updates
+- Request prioritization
+- Progressive enhancement
+
+## Core Web Vitals Optimization
+
+### Largest Contentful Paint (LCP < 2.5s)
+- Optimize hero images
+- Inline critical CSS
+- Preload key resources
+- Use CDN
+- Server-side rendering
+
+### First Input Delay (FID < 100ms) / INP (< 200ms)
+- Break up long tasks
+- Defer non-critical JavaScript
+- Use web workers for heavy computation
+- Reduce JavaScript execution time
+
+### Cumulative Layout Shift (CLS < 0.1)
+- Set dimensions on images and videos
+- Don't inject content above existing content
+- Use `aspect-ratio` CSS property
+- Reserve space for ads/embeds
+- Avoid animations that cause layout shifts
+
+```css
+/* Reserve space for image */
+.image-container {
+  aspect-ratio: 16 / 9;
+}
+```
+
+## Performance Monitoring
+
+**Tools to use**:
+- Chrome DevTools (Lighthouse, Performance panel)
+- WebPageTest
+- Core Web Vitals (Chrome UX Report)
+- Bundle analyzers (webpack-bundle-analyzer)
+- Performance monitoring (Sentry, DataDog, New Relic)
+
+**Key metrics**:
+- LCP, FID/INP, CLS (Core Web Vitals)
+- Time to Interactive (TTI)
+- First Contentful Paint (FCP)
+- Total Blocking Time (TBT)
+- Bundle size
+- Request count
+
+**IMPORTANT**: Measure on real devices with real network conditions. Desktop Chrome with fast connection isn't representative.
+
+**NEVER**:
+- Optimize without measuring (premature optimization)
+- Sacrifice accessibility for performance
+- Break functionality while optimizing
+- Use `will-change` everywhere (creates new layers, uses memory)
+- Lazy load above-fold content
+- Optimize micro-optimizations while ignoring major issues (optimize the biggest bottleneck first)
+- Forget about mobile performance (often slower devices, slower connections)
+
+## Verify Improvements
+
+Test that optimizations worked:
+
+- **Before/after metrics**: Compare Lighthouse scores
+- **Real user monitoring**: Track improvements for real users
+- **Different devices**: Test on low-end Android, not just flagship iPhone
+- **Slow connections**: Throttle to 3G, test experience
+- **No regressions**: Ensure functionality still works
+- **User perception**: Does it *feel* faster?
+
+When the user-facing numbers move, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/overdrive.md b/.agents/skills/impeccable/reference/overdrive.md
new file mode 100644
index 00000000..f08bcaee
--- /dev/null
+++ b/.agents/skills/impeccable/reference/overdrive.md
@@ -0,0 +1,130 @@
+Start your response with:
+
+```
+──────────── ⚡ OVERDRIVE ─────────────
+》》》 Entering overdrive mode...
+```
+
+Push an interface past conventional limits. This isn't just about visual effects. It's about using the full power of the browser to make any part of an interface feel extraordinary: a table that handles a million rows, a dialog that morphs from its trigger, a form that validates in real-time with streaming feedback, a page transition that feels cinematic.
+
+**EXTRA IMPORTANT FOR THIS COMMAND**: Context determines what "extraordinary" means. A particle system on a creative portfolio is impressive. The same particle system on a settings page is embarrassing. But a settings page with instant optimistic saves and animated state transitions? That's extraordinary too. Understand the project's personality and goals before deciding what's appropriate.
+
+### Propose Before Building
+
+This command has the highest potential to misfire. Do NOT jump straight into implementation. You MUST:
+
+1. **Think through 2-3 different directions**: consider different techniques, levels of ambition, and aesthetic approaches. For each direction, briefly describe what the result would look and feel like.
+2. **STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.** to present these directions and get the user's pick before writing any code. Explain trade-offs (browser support, performance cost, complexity).
+3. Only proceed with the direction the user confirms.
+
+Skipping this step risks building something embarrassing that needs to be thrown away.
+
+### Iterate with Browser Automation
+
+Technically ambitious effects almost never work on the first try. You MUST actively use browser automation tools to preview your work, visually verify the result, and iterate. Do not assume the effect looks right, check it. Expect multiple rounds of refinement. The gap between "technically works" and "looks extraordinary" is closed through visual iteration, not code alone.
+
+---
+
+## Assess What "Extraordinary" Means Here
+
+The right kind of technical ambition depends entirely on what you're working with. Before choosing a technique, ask: **what would make a user of THIS specific interface say "wow, that's nice"?**
+
+### For visual/marketing surfaces
+Pages, hero sections, landing pages, portfolios: the "wow" is often sensory: a scroll-driven reveal, a shader background, a cinematic page transition, generative art that responds to the cursor.
+
+### For functional UI
+Tables, forms, dialogs, navigation: the "wow" is in how it FEELS: a dialog that morphs from the button that triggered it via View Transitions, a data table that renders 100k rows at 60fps via virtual scrolling, a form with streaming validation that feels instant, drag-and-drop with spring physics.
+
+### For performance-critical UI
+The "wow" is invisible but felt: a search that filters 50k items without a flicker, a complex form that never blocks the main thread, an image editor that processes in near-real-time. The interface just never hesitates.
+
+### For data-heavy interfaces
+Charts and dashboards: the "wow" is in fluidity: GPU-accelerated rendering via Canvas/WebGL for massive datasets, animated transitions between data states, force-directed graph layouts that settle naturally.
+
+**The common thread**: something about the implementation goes beyond what users expect from a web interface. The technique serves the experience, not the other way around.
+
+## The Toolkit
+
+Organized by what you're trying to achieve, not by technology name.
+
+### Make transitions feel cinematic
+- **View Transitions API** (same-document: all browsers; cross-document: no Firefox): shared element morphing between states. A list item expanding into a detail page. A button morphing into a dialog. This is the closest thing to native FLIP animations.
+- **`@starting-style`** (all browsers): animate elements from `display: none` to visible with CSS only, including entry keyframes
+- **Spring physics**: natural motion with mass, tension, and damping instead of cubic-bezier. Libraries: motion (formerly Framer Motion), GSAP, or roll your own spring solver.
+
+### Tie animation to scroll position
+- **Scroll-driven animations** (`animation-timeline: scroll()`): CSS-only, no JS. Parallax, progress bars, reveal sequences all driven by scroll position. (Chrome/Edge/Safari; Firefox: flag only; always provide a static fallback)
+
+### Render beyond CSS
+- **WebGL** (all browsers): shader effects, post-processing, particle systems. Libraries: Three.js, OGL (lightweight), regl. Use for effects CSS can't express.
+- **WebGPU** (Chrome/Edge; Safari partial; Firefox: flag only): next-gen GPU compute. More powerful than WebGL but limited browser support. Always fall back to WebGL2.
+- **Canvas 2D / OffscreenCanvas**: custom rendering, pixel manipulation, or moving heavy rendering off the main thread entirely via Web Workers + OffscreenCanvas.
+- **SVG filter chains**: displacement maps, turbulence, morphology for organic distortion effects. CSS-animatable.
+
+### Make data feel alive
+- **Virtual scrolling**: render only visible rows for tables/lists with tens of thousands of items. No library required for simple cases; TanStack Virtual for complex ones.
+- **GPU-accelerated charts**: Canvas or WebGL-rendered data visualization for datasets too large for SVG/DOM. Libraries: deck.gl, regl-based custom renderers.
+- **Animated data transitions**: morph between chart states rather than replacing. D3's `transition()` or View Transitions for DOM-based charts.
+
+### Animate complex properties
+- **`@property`** (all browsers): register custom CSS properties with types, enabling animation of gradients, colors, and complex values that CSS can't normally interpolate.
+- **Web Animations API** (all browsers): JavaScript-driven animations with the performance of CSS. Composable, cancellable, reversible. The foundation for complex choreography.
+
+### Push performance boundaries
+- **Web Workers**: move computation off the main thread. Heavy data processing, image manipulation, search indexing: anything that would cause jank.
+- **OffscreenCanvas**: render in a Worker thread. The main thread stays free while complex visuals render in the background.
+- **WASM**: near-native performance for computation-heavy features. Image processing, physics simulations, codecs.
+
+### Interact with the device
+- **Web Audio API**: spatial audio, audio-reactive visualizations, sonic feedback. Requires user gesture to start.
+- **Device APIs**: orientation, ambient light, geolocation. Use sparingly and always with user permission.
+
+**NOTE**: This command is about enhancing how an interface FEELS, not changing what a product DOES. Adding real-time collaboration, offline support, or new backend capabilities are product decisions, not UI enhancements. Focus on making existing features feel extraordinary.
+
+## Implement with Discipline
+
+### Progressive enhancement is non-negotiable
+
+Every technique must degrade gracefully. The experience without the enhancement must still be good.
+
+```css
+@supports (animation-timeline: scroll()) {
+  .hero { animation-timeline: scroll(); }
+}
+```
+
+```javascript
+if ('gpu' in navigator) { /* WebGPU */ }
+else if (canvas.getContext('webgl2')) { /* WebGL2 fallback */ }
+/* CSS-only fallback must still look good */
+```
+
+### Performance rules
+
+- Target 60fps. If dropping below 50, simplify.
+- Respect `prefers-reduced-motion`, always. Provide a beautiful static alternative.
+- Lazy-initialize heavy resources (WebGL contexts, WASM modules) only when near viewport.
+- Pause off-screen rendering. Kill what you can't see.
+- Test on real mid-range devices, not just your development machine.
+
+### Polish is the difference
+
+The gap between "cool" and "extraordinary" is in the last 20% of refinement: the easing curve on a spring animation, the timing offset in a staggered reveal, the subtle secondary motion that makes a transition feel physical. Don't ship the first version that works; ship the version that feels inevitable.
+
+**NEVER**:
+- Ignore `prefers-reduced-motion`. This is an accessibility requirement, not a suggestion
+- Ship effects that cause jank on mid-range devices
+- Use bleeding-edge APIs without a functional fallback
+- Add sound without explicit user opt-in
+- Use technical ambition to mask weak design fundamentals; fix those first with other commands
+- Layer multiple competing extraordinary moments. Focus creates impact, excess creates noise
+
+## Verify the Result
+
+- **The wow test**: Show it to someone who hasn't seen it. Do they react?
+- **The removal test**: Take it away. Does the experience feel diminished, or does nobody notice?
+- **The device test**: Run it on a phone, a tablet, a Chromebook. Still smooth?
+- **The accessibility test**: Enable reduced motion. Still beautiful?
+- **The context test**: Does this make sense for THIS brand and audience?
+
+"Technically extraordinary" isn't about using the newest API. It's about making an interface do something users didn't think a website could do.
diff --git a/.agents/skills/impeccable/reference/personas.md b/.agents/skills/impeccable/reference/personas.md
new file mode 100644
index 00000000..43ae8eb2
--- /dev/null
+++ b/.agents/skills/impeccable/reference/personas.md
@@ -0,0 +1,179 @@
+# Persona-Based Design Testing
+
+Test the interface through the eyes of 5 distinct user archetypes. Each persona exposes different failure modes that a single "design director" perspective would miss.
+
+**How to use**: Select 2–3 personas most relevant to the interface being critiqued. Walk through the primary user action as each persona. Report specific red flags, not generic concerns.
+
+---
+
+## 1. Impatient Power User: "Alex"
+
+
+**Profile**: Expert with similar products. Expects efficiency, hates hand-holding. Will find shortcuts or leave.
+
+**Behaviors**:
+- Skips all onboarding and instructions
+- Looks for keyboard shortcuts immediately
+- Tries to bulk-select, batch-edit, and automate
+- Gets frustrated by required steps that feel unnecessary
+- Abandons if anything feels slow or patronizing
+
+**Test Questions**:
+- Can Alex complete the core task in under 60 seconds?
+- Are there keyboard shortcuts for common actions?
+- Can onboarding be skipped entirely?
+- Do modals have keyboard dismiss (Esc)?
+- Is there a "power user" path (shortcuts, bulk actions)?
+
+**Red Flags** (report these specifically):
+- Forced tutorials or unskippable onboarding
+- No keyboard navigation for primary actions
+- Slow animations that can't be skipped
+- One-item-at-a-time workflows where batch would be natural
+- Redundant confirmation steps for low-risk actions
+
+---
+
+## 2. Confused First-Timer: "Jordan"
+
+**Profile**: Never used this type of product. Needs guidance at every step. Will abandon rather than figure it out.
+
+**Behaviors**:
+- Reads all instructions carefully
+- Hesitates before clicking anything unfamiliar
+- Looks for help or support constantly
+- Misunderstands jargon and abbreviations
+- Takes the most literal interpretation of any label
+
+**Test Questions**:
+- Is the first action obviously clear within 5 seconds?
+- Are all icons labeled with text?
+- Is there contextual help at decision points?
+- Does terminology assume prior knowledge?
+- Is there a clear "back" or "undo" at every step?
+
+**Red Flags** (report these specifically):
+- Icon-only navigation with no labels
+- Technical jargon without explanation
+- No visible help option or guidance
+- Ambiguous next steps after completing an action
+- No confirmation that an action succeeded
+
+---
+
+## 3. Accessibility-Dependent User: "Sam"
+
+**Profile**: Uses screen reader (VoiceOver/NVDA), keyboard-only navigation. May have low vision, motor impairment, or cognitive differences.
+
+**Behaviors**:
+- Tabs through the interface linearly
+- Relies on ARIA labels and heading structure
+- Cannot see hover states or visual-only indicators
+- Needs adequate color contrast (4.5:1 minimum)
+- May use browser zoom up to 200%
+
+**Test Questions**:
+- Can the entire primary flow be completed keyboard-only?
+- Are all interactive elements focusable with visible focus indicators?
+- Do images have meaningful alt text?
+- Is color contrast WCAG AA compliant (4.5:1 for text)?
+- Does the screen reader announce state changes (loading, success, errors)?
+
+**Red Flags** (report these specifically):
+- Click-only interactions with no keyboard alternative
+- Missing or invisible focus indicators
+- Meaning conveyed by color alone (red = error, green = success)
+- Unlabeled form fields or buttons
+- Time-limited actions without extension option
+- Custom components that break screen reader flow
+
+---
+
+## 4. Deliberate Stress Tester: "Riley"
+
+**Profile**: Methodical user who pushes interfaces beyond the happy path. Tests edge cases, tries unexpected inputs, and probes for gaps in the experience.
+
+**Behaviors**:
+- Tests edge cases intentionally (empty states, long strings, special characters)
+- Submits forms with unexpected data (emoji, RTL text, very long values)
+- Tries to break workflows by navigating backwards, refreshing mid-flow, or opening in multiple tabs
+- Looks for inconsistencies between what the UI promises and what actually happens
+- Documents problems methodically
+
+**Test Questions**:
+- What happens at the edges (0 items, 1000 items, very long text)?
+- Do error states recover gracefully or leave the UI in a broken state?
+- What happens on refresh mid-workflow? Is state preserved?
+- Are there features that appear to work but produce broken results?
+- How does the UI handle unexpected input (emoji, special chars, paste from Excel)?
+
+**Red Flags** (report these specifically):
+- Features that appear to work but silently fail or produce wrong results
+- Error handling that exposes technical details or leaves UI in a broken state
+- Empty states that show nothing useful ("No results" with no guidance)
+- Workflows that lose user data on refresh or navigation
+- Inconsistent behavior between similar interactions in different parts of the UI
+
+---
+
+## 5. Distracted Mobile User: "Casey"
+
+**Profile**: Using phone one-handed on the go. Frequently interrupted. Possibly on a slow connection.
+
+**Behaviors**:
+- Uses thumb only; prefers bottom-of-screen actions
+- Gets interrupted mid-flow and returns later
+- Switches between apps frequently
+- Has limited attention span and low patience
+- Types as little as possible, prefers taps and selections
+
+**Test Questions**:
+- Are primary actions in the thumb zone (bottom half of screen)?
+- Is state preserved if the user leaves and returns?
+- Does it work on slow connections (3G)?
+- Can forms use autocomplete and smart defaults?
+- Are touch targets at least 44×44pt?
+
+**Red Flags** (report these specifically):
+- Important actions positioned at the top of the screen (unreachable by thumb)
+- No state persistence; progress lost on tab switch or interruption
+- Large text inputs required where selection would work
+- Heavy assets loading on every page (no lazy loading)
+- Tiny tap targets or targets too close together
+
+---
+
+## Selecting Personas
+
+Choose personas based on the interface type:
+
+| Interface Type | Primary Personas | Why |
+|---------------|-----------------|-----|
+| Landing page / marketing | Jordan, Riley, Casey | First impressions, trust, mobile |
+| Dashboard / admin | Alex, Sam | Power users, accessibility |
+| E-commerce / checkout | Casey, Riley, Jordan | Mobile, edge cases, clarity |
+| Onboarding flow | Jordan, Casey | Confusion, interruption |
+| Data-heavy / analytics | Alex, Sam | Efficiency, keyboard nav |
+| Form-heavy / wizard | Jordan, Sam, Casey | Clarity, accessibility, mobile |
+
+---
+
+## Project-Specific Personas
+
+If `AGENTS.md` contains a `## Design Context` section (generated by `impeccable teach`), derive 1–2 additional personas from the audience and brand information:
+
+1. Read the target audience description
+2. Identify the primary user archetype not covered by the 5 predefined personas
+3. Create a persona following this template:
+
+```
+### [Role]: "[Name]"
+
+**Profile**: [2-3 key characteristics derived from Design Context]
+
+**Behaviors**: [3-4 specific behaviors based on the described audience]
+
+**Red Flags**: [3-4 things that would alienate this specific user type]
+```
+
+Only generate project-specific personas when real Design Context data is available. Don't invent audience details; use the 5 predefined personas when no context exists.
diff --git a/.agents/skills/impeccable/reference/polish.md b/.agents/skills/impeccable/reference/polish.md
new file mode 100644
index 00000000..a2a409e4
--- /dev/null
+++ b/.agents/skills/impeccable/reference/polish.md
@@ -0,0 +1,233 @@
+> **Additional context needed**: quality bar (MVP vs flagship).
+
+Perform a meticulous final pass to catch all the small details that separate good work from great work. The difference between shipped and polished.
+
+## Design System Discovery
+
+Aligning the feature to the design system is **not optional**. Polish without alignment is decoration on top of drift, and it makes the next person's job harder. Discovery comes before any other polish work.
+
+1. **Find the design system**: Search for design system documentation, component libraries, style guides, or token definitions. Study the core patterns: design principles, target audience, color tokens, spacing scale, typography styles, component API, motion conventions.
+2. **Note the conventions**: How are shared components imported? What spacing scale is used? Which colors come from tokens vs hard-coded values? What motion and interaction patterns are established? What flow shapes are used for comparable actions (modal vs full-page, inline vs route, save-on-blur vs explicit submit)?
+3. **Identify drift, then name the root cause**: For every deviation, classify it as a **missing token** (the value should exist in the system but doesn't), a **one-off implementation** (a shared component already exists but wasn't used), or a **conceptual misalignment** (the feature's flow, IA, or hierarchy doesn't match neighboring features). The fix differs by category: patch the value, swap to the shared component, or rework the flow. Fixing the symptom without naming the cause is how drift compounds.
+
+If a design system exists, polish **must** align the feature with it. If none exists, polish against the conventions visible in the codebase. **If anything about the system is ambiguous, ask. Never guess at design system principles.**
+
+## Pre-Polish Assessment
+
+Understand the current state and goals before touching anything:
+
+1. **Review completeness**:
+   - Is it functionally complete?
+   - Are there known issues to preserve (mark with TODOs)?
+   - What's the quality bar? (MVP vs flagship feature?)
+   - When does it ship? (How much time for polish?)
+
+2. **Think experience-first**: Who actually uses this, and what's the best possible experience for them? Effective design beats decorative polish; a feature that looks beautiful but fights the user's flow is not polished. Walk the path from their perspective before opening DevTools.
+
+3. **Identify polish areas**:
+   - Visual inconsistencies
+   - Spacing and alignment issues
+   - Interaction state gaps
+   - Copy inconsistencies
+   - Edge cases and error states
+   - Loading and transition smoothness
+   - Information architecture and flow drift (does this feature reveal complexity the way neighboring features do?)
+
+4. **Triage cosmetic vs functional**: Classify each issue as **cosmetic** (looks off, doesn't impede the user) or **functional** (breaks, blocks, or confuses the experience). When polish time is tight, functional issues ship first; cosmetic ones can land in a follow-up. Quality should be consistent; never perfect one corner while leaving another rough.
+
+**CRITICAL**: Polish is the last step, not the first. Don't polish work that's not functionally complete.
+
+## Polish Systematically
+
+Work through these dimensions methodically:
+
+### Visual Alignment & Spacing
+
+- **Pixel-perfect alignment**: Everything lines up to grid
+- **Consistent spacing**: All gaps use spacing scale (no random 13px gaps)
+- **Optical alignment**: Adjust for visual weight (icons may need offset for optical centering)
+- **Responsive consistency**: Spacing and alignment work at all breakpoints
+- **Grid adherence**: Elements snap to baseline grid
+
+**Check**:
+- Enable grid overlay and verify alignment
+- Check spacing with browser inspector
+- Test at multiple viewport sizes
+- Look for elements that "feel" off
+
+### Information Architecture & Flow
+
+Visual polish on a misshapen flow is wasted work. Match the *shape* of the experience to the system, not just the surface.
+
+- **Progressive disclosure**: Match how much is revealed when, compared to neighboring features. A settings page exposing 40 fields when the rest of the app reveals 5 at a time is drift, even if every field is perfectly styled.
+- **Established user flows**: Multi-step actions follow the same shape as comparable flows elsewhere: modal vs full-page, inline edit vs separate route, save-on-blur vs explicit submit, optimistic vs pessimistic updates.
+- **Hierarchy & complexity**: The same conceptual weight gets the same visual weight throughout. Primary actions don't become tertiary in one corner of the product, and tertiary actions don't shout.
+- **Empty, loading, and arrival transitions**: How content arrives, updates, and leaves matches how it does in adjacent features.
+- **Naming and mental model**: The feature uses the same nouns and verbs as the rest of the system. A "Workspace" here shouldn't be a "Project" three screens away.
+
+### Typography Refinement
+
+- **Hierarchy consistency**: Same elements use same sizes/weights throughout
+- **Line length**: 45-75 characters for body text
+- **Line height**: Appropriate for font size and context
+- **Widows & orphans**: No single words on last line
+- **Hyphenation**: Appropriate for language and column width
+- **Kerning**: Adjust letter spacing where needed (especially headlines)
+- **Font loading**: No FOUT/FOIT flashes
+
+### Color & Contrast
+
+- **Contrast ratios**: All text meets WCAG standards
+- **Consistent token usage**: No hard-coded colors, all use design tokens
+- **Theme consistency**: Works in all theme variants
+- **Color meaning**: Same colors mean same things throughout
+- **Accessible focus**: Focus indicators visible with sufficient contrast
+- **Tinted neutrals**: No pure gray or pure black; add subtle color tint (0.01 chroma)
+- **Gray on color**: Never put gray text on colored backgrounds; use a shade of that color or transparency
+
+### Interaction States
+
+Every interactive element needs all states:
+
+- **Default**: Resting state
+- **Hover**: Subtle feedback (color, scale, shadow)
+- **Focus**: Keyboard focus indicator (never remove without replacement)
+- **Active**: Click/tap feedback
+- **Disabled**: Clearly non-interactive
+- **Loading**: Async action feedback
+- **Error**: Validation or error state
+- **Success**: Successful completion
+
+**Missing states create confusion and broken experiences**.
+
+### Micro-interactions & Transitions
+
+- **Smooth transitions**: All state changes animated appropriately (150-300ms)
+- **Consistent easing**: Use ease-out-quart/quint/expo for natural deceleration. Never bounce or elastic; they feel dated.
+- **No jank**: Smooth animations; use atmospheric blur/filter/mask/shadow effects when they add polish, but bound expensive paint areas and avoid casual layout-property animation
+- **Appropriate motion**: Motion serves purpose, not decoration
+- **Reduced motion**: Respects `prefers-reduced-motion`
+
+### Content & Copy
+
+- **Consistent terminology**: Same things called same names throughout
+- **Consistent capitalization**: Title Case vs Sentence case applied consistently
+- **Grammar & spelling**: No typos
+- **Appropriate length**: Not too wordy, not too terse
+- **Punctuation consistency**: Periods on sentences, not on labels (unless all labels have them)
+
+### Icons & Images
+
+- **Consistent style**: All icons from same family or matching style
+- **Appropriate sizing**: Icons sized consistently for context
+- **Proper alignment**: Icons align with adjacent text optically
+- **Alt text**: All images have descriptive alt text
+- **Loading states**: Images don't cause layout shift, proper aspect ratios
+- **Retina support**: 2x assets for high-DPI screens
+
+### Forms & Inputs
+
+- **Label consistency**: All inputs properly labeled
+- **Required indicators**: Clear and consistent
+- **Error messages**: Helpful and consistent
+- **Tab order**: Logical keyboard navigation
+- **Auto-focus**: Appropriate (don't overuse)
+- **Validation timing**: Consistent (on blur vs on submit)
+
+### Edge Cases & Error States
+
+- **Loading states**: All async actions have loading feedback
+- **Empty states**: Helpful empty states, not just blank space
+- **Error states**: Clear error messages with recovery paths
+- **Success states**: Confirmation of successful actions
+- **Long content**: Handles very long names, descriptions, etc.
+- **No content**: Handles missing data gracefully
+- **Offline**: Appropriate offline handling (if applicable)
+
+### Responsiveness
+
+- **All breakpoints**: Test mobile, tablet, desktop
+- **Touch targets**: 44x44px minimum on touch devices
+- **Readable text**: No text smaller than 14px on mobile
+- **No horizontal scroll**: Content fits viewport
+- **Appropriate reflow**: Content adapts logically
+
+### Performance
+
+- **Fast initial load**: Optimize critical path
+- **No layout shift**: Elements don't jump after load (CLS)
+- **Smooth interactions**: No lag or jank
+- **Optimized images**: Appropriate formats and sizes
+- **Lazy loading**: Off-screen content loads lazily
+
+### Code Quality
+
+- **Remove console logs**: No debug logging in production
+- **Remove commented code**: Clean up dead code
+- **Remove unused imports**: Clean up unused dependencies
+- **Consistent naming**: Variables and functions follow conventions
+- **Type safety**: No TypeScript `any` or ignored errors
+- **Accessibility**: Proper ARIA labels and semantic HTML
+
+## Polish Checklist
+
+Go through systematically:
+
+- [ ] Aligned to the design system (drift named and resolved by root cause)
+- [ ] Information architecture and flow shape match neighboring features
+- [ ] Visual alignment perfect at all breakpoints
+- [ ] Spacing uses design tokens consistently
+- [ ] Typography hierarchy consistent
+- [ ] All interactive states implemented
+- [ ] All transitions smooth (60fps)
+- [ ] Copy is consistent and polished
+- [ ] Icons are consistent and properly sized
+- [ ] All forms properly labeled and validated
+- [ ] Error states are helpful
+- [ ] Loading states are clear
+- [ ] Empty states are welcoming
+- [ ] Touch targets are 44x44px minimum
+- [ ] Contrast ratios meet WCAG AA
+- [ ] Keyboard navigation works
+- [ ] Focus indicators visible
+- [ ] No console errors or warnings
+- [ ] No layout shift on load
+- [ ] Works in all supported browsers
+- [ ] Respects reduced motion preference
+- [ ] Code is clean (no TODOs, console.logs, commented code)
+
+**IMPORTANT**: Polish is about details. Zoom in. Squint at it. Use it yourself. The little things add up.
+
+Sweat the details. Zoom in until the alignment is right and the spacing reads as deliberate. Then ship.
+
+**NEVER**:
+- Polish before it's functionally complete
+- Polish without aligning to the design system; that's decoration on drift
+- Guess at design system principles instead of asking when something is ambiguous
+- Spend hours on polish if it ships in 30 minutes (triage)
+- Introduce bugs while polishing (test thoroughly)
+- Ignore systematic issues (if spacing is off everywhere, fix the system, not just one screen)
+- Perfect one thing while leaving others rough (consistent quality level)
+- Create new one-off components when design system equivalents exist
+- Hard-code values that should use design tokens
+- Introduce new patterns or flows that diverge from established ones
+
+## Final Verification
+
+Before marking as done:
+
+- **Use it yourself**: Actually interact with the feature
+- **Test on real devices**: Not just browser DevTools
+- **Ask someone else to review**: Fresh eyes catch things
+- **Compare to design**: Match intended design
+- **Check all states**: Don't just test happy path
+
+## Clean Up
+
+After polishing, ensure code quality:
+
+- **Replace custom implementations**: If the design system provides a component you reimplemented, switch to the shared version.
+- **Remove orphaned code**: Delete unused styles, components, or files made obsolete by polish.
+- **Consolidate tokens**: If you introduced new values, check whether they should be tokens.
+- **Verify DRYness**: Look for duplication introduced during polishing and consolidate.
+
diff --git a/.agents/skills/impeccable/reference/product.md b/.agents/skills/impeccable/reference/product.md
new file mode 100644
index 00000000..64b3b016
--- /dev/null
+++ b/.agents/skills/impeccable/reference/product.md
@@ -0,0 +1,62 @@
+# Product register
+
+When design SERVES the product: app UIs, admin dashboards, settings panels, data tables, tools, authenticated surfaces, anything where the user is in a task.
+
+## The product slop test
+
+Not "would someone say AI made this." Familiarity is often a feature here. The test is: would a user fluent in the category's best tools (Linear, Figma, Notion, Raycast, Stripe come to mind) sit down and trust this interface, or pause at every subtly-off component?
+
+Product UI's failure mode isn't flatness, it's strangeness without purpose: over-decorated buttons, mismatched form controls, gratuitous motion, display fonts where labels should be, invented affordances for standard tasks. The bar is earned familiarity. The tool should disappear into the task.
+
+## Typography
+
+- **System fonts are legitimate.** `-apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, sans-serif` gives you native feel on every platform. Inter is the common cross-platform default for a reason.
+- **One family is often right.** Product UIs don't need display/body pairing. A well-tuned sans carries headings, buttons, labels, body, data.
+- **Fixed rem scale, not fluid.** Clamp-sized headings don't serve product UI. Users view at consistent DPI, and a fluid h1 that shrinks in a sidebar looks worse, not better.
+- **Tighter scale ratio.** 1.125–1.2 between steps is typical. More type elements here than on brand surfaces; exaggerated contrast creates noise.
+- **Line length still applies for prose** (65–75ch). Data and compact UI can run denser; tables at 120ch+ are fine.
+
+## Color
+
+Product defaults to Restrained. A single surface can earn Committed (a dashboard where one category color carries a report, an onboarding flow with a drenched welcome screen), but Restrained is the floor.
+
+- State-rich semantic vocabulary: hover, focus, active, disabled, selected, loading, error, warning, success, info. Standardize these.
+- Accent color used for primary actions, current selection, and state indicators only, not decoration.
+- A second neutral layer for sidebars, toolbars, and panels (slightly cooler or warmer than the content surface).
+
+## Layout
+
+- Predictable grids. Consistency IS an affordance; users navigate faster when the structure is expected.
+- Familiar patterns are features. Standard navigation (top bar, side nav), breadcrumbs, tabs, and form layouts have established user expectations. Don't reinvent for flavor.
+- Responsive behavior is structural (collapse sidebar, responsive table, breakpoint-driven columns), not fluid typography.
+
+## Components
+
+Every interactive component has: default, hover, focus, active, disabled, loading, error. Don't ship with half of these.
+
+- Skeleton states for loading, not spinners in the middle of content.
+- Empty states that teach the interface, not "nothing here."
+- Consistent affordances across the surface. Same button shape. Same form-control vocabulary. Same icon style.
+
+## Motion
+
+- 150–250 ms on most transitions. Users are in flow; don't make them wait for choreography.
+- Motion conveys state, not decoration. State change, feedback, loading, reveal: nothing else.
+- No orchestrated page-load sequences. Product loads into a task; users don't want to watch it load.
+
+## Product bans (on top of the shared absolute bans)
+
+- Decorative motion that doesn't convey state.
+- Inconsistent component vocabulary across screens. If the "save" button looks different in two places, one is wrong.
+- Display fonts in UI labels, buttons, data.
+- Reinventing standard affordances for flavor (custom scrollbars, weird form controls, non-standard modals).
+- Heavy color or full-saturation accents on inactive states.
+
+## Product permissions
+
+Product can afford things brand surfaces can't.
+
+- System fonts and familiar sans defaults (Inter, SF Pro, system-ui stacks).
+- Standard navigation patterns: top bar + side nav, breadcrumbs, tabs, command palettes.
+- Density. Tables with many rows, panels with many labels, dense information when users need it.
+- Consistency over surprise. The same visual vocabulary screen to screen is a virtue; delight is saved for moments, not pages.
diff --git a/.agents/skills/impeccable/reference/quieter.md b/.agents/skills/impeccable/reference/quieter.md
new file mode 100644
index 00000000..897c1e50
--- /dev/null
+++ b/.agents/skills/impeccable/reference/quieter.md
@@ -0,0 +1,99 @@
+Quiet design is harder than bold design. Subtlety needs precision. Reduce visual intensity in designs that are too loud, aggressive, or overstimulating without losing personality or making the result generic.
+
+---
+
+## Register
+
+Brand: "quieter" means more restrained palette, more whitespace, more typographic air. Drama is reduced, not eliminated; the POV stays intact.
+
+Product: "quieter" means reducing visual noise. Fewer background accents, flatter cards, less color, less motion. The tool should disappear more completely into the task.
+
+---
+
+## Assess Current State
+
+Analyze what makes the design feel too intense:
+
+1. **Identify intensity sources**:
+   - **Color saturation**: Overly bright or saturated colors
+   - **Contrast extremes**: Too much high-contrast juxtaposition
+   - **Visual weight**: Too many bold, heavy elements competing
+   - **Animation excess**: Too much motion or overly dramatic effects
+   - **Complexity**: Too many visual elements, patterns, or decorations
+   - **Scale**: Everything is large and loud with no hierarchy
+
+2. **Understand the context**:
+   - What's the purpose? (Marketing vs tool vs reading experience)
+   - Who's the audience? (Some contexts need energy)
+   - What's working? (Don't throw away good ideas)
+   - What's the core message? (Preserve what matters)
+
+If any of these are unclear from the codebase, STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+**CRITICAL**: "Quieter" doesn't mean boring or generic. It means refined and easier on the eyes. Think luxury, not laziness.
+
+## Plan Refinement
+
+Create a strategy to reduce intensity while maintaining impact:
+
+- **Color approach**: Desaturate or shift to more restrained tones?
+- **Hierarchy approach**: Which elements should stay bold (very few), which should recede?
+- **Simplification approach**: What can be removed entirely?
+- **Sophistication approach**: How can we signal quality through restraint?
+
+**IMPORTANT**: Subtlety requires precision. Quiet without intent collapses to generic.
+
+## Refine the Design
+
+Systematically reduce intensity across these dimensions:
+
+### Color Refinement
+- **Reduce saturation**: Shift from fully saturated to 70-85% saturation
+- **Soften palette**: Replace bright colors with muted tones
+- **Reduce color variety**: Use fewer colors more thoughtfully
+- **Neutral dominance**: Let neutrals do more work, use color as accent (10% rule)
+- **Gentler contrasts**: High contrast only where it matters most
+- **Tinted grays**: Use warm or cool tinted grays instead of pure gray. Adds depth without loudness
+- **Never gray on color**: If you have gray text on a colored background, use a darker shade of that color or transparency instead
+
+### Visual Weight Reduction
+- **Typography**: Reduce font weights (900 → 600, 700 → 500), decrease sizes where appropriate
+- **Hierarchy through subtlety**: Use weight, size, and space instead of color and boldness
+- **White space**: Increase breathing room, reduce density
+- **Borders & lines**: Reduce thickness, decrease opacity, or remove entirely
+
+### Simplification
+- **Remove decorative elements**: Gradients, shadows, patterns, textures that don't serve purpose
+- **Simplify shapes**: Reduce border radius extremes, simplify custom shapes
+- **Reduce layering**: Flatten visual hierarchy where possible
+- **Clean up effects**: Reduce or remove blur effects, glows, multiple shadows
+
+### Motion Reduction
+- **Reduce animation intensity**: Shorter distances (10-20px instead of 40px), gentler easing
+- **Remove decorative animations**: Keep functional motion, remove flourishes
+- **Subtle micro-interactions**: Replace dramatic effects with gentle feedback
+- **Refined easing**: Use ease-out-quart for smooth, understated motion. Never bounce or elastic
+- **Remove animations entirely** if they're not serving a clear purpose
+
+### Composition Refinement
+- **Reduce scale jumps**: Smaller contrast between sizes creates calmer feeling
+- **Align to grid**: Bring rogue elements back into systematic alignment
+- **Even out spacing**: Replace extreme spacing variations with consistent rhythm
+
+**NEVER**:
+- Make everything the same size/weight (hierarchy still matters)
+- Remove all color (quiet ≠ grayscale)
+- Eliminate all personality (maintain character through refinement)
+- Sacrifice usability for aesthetics (functional elements still need clear affordances)
+- Make everything small and light (some anchors needed)
+
+## Verify Quality
+
+Ensure refinement maintains quality:
+
+- **Still functional**: Can users still accomplish tasks easily?
+- **Still distinctive**: Does it have character, or is it generic now?
+- **Better reading**: Is text easier to read for extended periods?
+- **Restrained, not absent**: Does the POV survive the cuts?
+
+When the result feels right, hand off to `$impeccable polish` for the final pass.
diff --git a/.agents/skills/impeccable/reference/responsive-design.md b/.agents/skills/impeccable/reference/responsive-design.md
new file mode 100644
index 00000000..f079e5e5
--- /dev/null
+++ b/.agents/skills/impeccable/reference/responsive-design.md
@@ -0,0 +1,114 @@
+# Responsive Design
+
+## Mobile-First: Write It Right
+
+Start with base styles for mobile, use `min-width` queries to layer complexity. Desktop-first (`max-width`) means mobile loads unnecessary styles first.
+
+## Breakpoints: Content-Driven
+
+Don't chase device sizes; let content tell you where to break. Start narrow, stretch until design breaks, add breakpoint there. Three breakpoints usually suffice (640, 768, 1024px). Use `clamp()` for fluid values without breakpoints.
+
+## Detect Input Method, Not Just Screen Size
+
+**Screen size doesn't tell you input method.** A laptop with touchscreen, a tablet with keyboard. Use pointer and hover queries:
+
+```css
+/* Fine pointer (mouse, trackpad) */
+@media (pointer: fine) {
+  .button { padding: 8px 16px; }
+}
+
+/* Coarse pointer (touch, stylus) */
+@media (pointer: coarse) {
+  .button { padding: 12px 20px; }  /* Larger touch target */
+}
+
+/* Device supports hover */
+@media (hover: hover) {
+  .card:hover { transform: translateY(-2px); }
+}
+
+/* Device doesn't support hover (touch) */
+@media (hover: none) {
+  .card { /* No hover state - use active instead */ }
+}
+```
+
+**Critical**: Don't rely on hover for functionality. Touch users can't hover.
+
+## Safe Areas: Handle the Notch
+
+Modern phones have notches, rounded corners, and home indicators. Use `env()`:
+
+```css
+body {
+  padding-top: env(safe-area-inset-top);
+  padding-bottom: env(safe-area-inset-bottom);
+  padding-left: env(safe-area-inset-left);
+  padding-right: env(safe-area-inset-right);
+}
+
+/* With fallback */
+.footer {
+  padding-bottom: max(1rem, env(safe-area-inset-bottom));
+}
+```
+
+**Enable viewport-fit** in your meta tag:
+```html
+<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+```
+
+## Responsive Images: Get It Right
+
+### srcset with Width Descriptors
+
+```html
+<img
+  src="hero-800.jpg"
+  srcset="
+    hero-400.jpg 400w,
+    hero-800.jpg 800w,
+    hero-1200.jpg 1200w
+  "
+  sizes="(max-width: 768px) 100vw, 50vw"
+  alt="Hero image"
+>
+```
+
+**How it works**:
+- `srcset` lists available images with their actual widths (`w` descriptors)
+- `sizes` tells the browser how wide the image will display
+- Browser picks the best file based on viewport width AND device pixel ratio
+
+### Picture Element for Art Direction
+
+When you need different crops/compositions (not just resolutions):
+
+```html
+<picture>
+  <source media="(min-width: 768px)" srcset="wide.jpg">
+  <source media="(max-width: 767px)" srcset="tall.jpg">
+  <img src="fallback.jpg" alt="...">
+</picture>
+```
+
+## Layout Adaptation Patterns
+
+**Navigation**: Three stages: hamburger + drawer on mobile, horizontal compact on tablet, full with labels on desktop. **Tables**: Transform to cards on mobile using `display: block` and `data-label` attributes. **Progressive disclosure**: Use `<details>/<summary>` for content that can collapse on mobile.
+
+## Testing: Don't Trust DevTools Alone
+
+DevTools device emulation is useful for layout but misses:
+
+- Actual touch interactions
+- Real CPU/memory constraints
+- Network latency patterns
+- Font rendering differences
+- Browser chrome/keyboard appearances
+
+**Test on at least**: One real iPhone, one real Android, a tablet if relevant. Cheap Android phones reveal performance issues you'll never see on simulators.
+
+---
+
+**Avoid**: Desktop-first design. Device detection instead of feature detection. Separate mobile/desktop codebases. Ignoring tablet and landscape. Assuming all mobile devices are powerful.
diff --git a/.agents/skills/impeccable/reference/shape.md b/.agents/skills/impeccable/reference/shape.md
new file mode 100644
index 00000000..4eaa99a3
--- /dev/null
+++ b/.agents/skills/impeccable/reference/shape.md
@@ -0,0 +1,151 @@
+Shape the UX and UI for a feature before any code is written. This command produces a **design brief**: a structured artifact that guides implementation through discovery, not guesswork.
+
+**Scope**: Design planning only. This command does NOT write code. It produces the thinking that makes code good.
+
+**Output**: A design brief that can be handed off to $impeccable craft, or directly to $impeccable for freeform implementation. When visual direction probes are used, the images are supporting artifacts, not the primary output.
+
+## Philosophy
+
+Most AI-generated UIs fail not because of bad code, but because of skipped thinking. They jump to "here's a card grid" without asking "what is the user trying to accomplish?" This command inverts that: understand deeply first, so implementation is precise.
+
+## Phase 1: Discovery Interview
+
+**Do NOT write any code or make any design decisions during this phase.** Your only job is to understand the feature deeply enough to make excellent design decisions later.
+
+This is a required interaction, not optional guidance. Ask these questions in conversation, adapting based on answers. Don't dump them all at once; have a natural dialogue. STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer.
+
+### Interview cadence
+
+Discovery must include at least one user-answer round unless PRODUCT.md, DESIGN.md, or an already-confirmed brief directly answers the needed design inputs. With a sparse prompt, do **not** synthesize a complete brief for confirmation on the first response.
+
+- Use the harness's structured question tool when one exists. Otherwise, ask directly in chat and stop.
+- Ask **2-3 questions per round**, then wait for answers.
+- Treat PRODUCT.md and DESIGN.md as anchors; they reduce repeated questions but do **not** replace shape for craft. Shape is task-specific.
+- Round 1 should clarify purpose, audience/context, and success or emotional outcome.
+- Round 2 should clarify content/data/states and scope/fidelity.
+- Round 3 should clarify visual direction, constraints, and anti-goals when still unresolved.
+
+### Purpose & Context
+- What is this feature for? What problem does it solve?
+- Who specifically will use it? (Not "users"; be specific: role, context, frequency)
+- What does success look like? How will you know this feature is working?
+- What's the user's state of mind when they reach this feature? (Rushed? Exploring? Anxious? Focused?)
+
+### Content & Data
+- What content or data does this feature display or collect?
+- What are the realistic ranges? (Minimum, typical, maximum, e.g., 0 items, 5 items, 500 items)
+- What are the edge cases? (Empty state, error state, first-time use, power user)
+- Is any content dynamic? What changes and how often?
+
+### Design Direction
+
+Force a visual decision on three fronts. Skip anything PRODUCT.md or DESIGN.md already answers; ask only what's missing.
+
+- **Color strategy for this surface.** Pick one: Restrained / Committed / Full palette / Drenched. Can override the project default if the surface earns it (e.g. a drenched hero inside an otherwise Restrained product).
+- **Theme via scene sentence.** Write one sentence of physical context for this surface: who uses it, where, under what ambient light, in what mood. The sentence forces dark vs light. If it doesn't, add detail until it does.
+- **Two or three named anchor references.** Specific products, brands, objects. Not adjectives like "modern" or "clean."
+
+### Scope
+
+Always ask. Sketch quality and shipped quality are different outputs; don't guess between them.
+
+- **Fidelity.** Sketch / mid-fi / high-fi / production-ready?
+- **Breadth.** One screen / a flow / a whole surface?
+- **Interactivity.** Static visual / interactive prototype / shipped-quality component?
+- **Time intent.** Quick exploration, or polish until it ships?
+
+Scope answers are task-scoped. Don't write them to PRODUCT.md or DESIGN.md; carry them through the design brief only.
+
+### Constraints
+- Are there technical constraints? (Framework, performance budget, browser support)
+- Are there content constraints? (Localization, dynamic text length, user-generated content)
+- Mobile/responsive requirements?
+- Accessibility requirements beyond WCAG AA?
+
+### Anti-Goals
+- What should this NOT be? What would be a wrong direction?
+- What's the biggest risk of getting this wrong?
+
+## Phase 1.5: Visual Direction Probe (Capability-Gated)
+
+After the discovery interview, generate a small set of visual direction probes **before** writing the final brief when all of these are true:
+
+- The work is **net-new** or directionally ambiguous enough that visual exploration will clarify the brief.
+- The requested fidelity is **mid-fi, high-fi, or production-ready**. Skip for sketch-only planning.
+- The current harness has **built-in image generation capability** (for example, Codex with a native image tool). Do **not** ask the user to set up external APIs, shell scripts, or one-off tooling just to do this.
+
+When those conditions are met, this step is mandatory for Codex and any harness with built-in image generation. Use native image generation; in Codex, use the built-in `image_gen` tool via the imagegen skill. If image generation is unavailable, do not ask the user to install APIs or tooling. State in one line that the image step is skipped because the harness lacks native image generation, then proceed.
+
+Use probes to explore visual lanes, not to replace the brief.
+
+Do not skip probes because the final UI will be semantic, editable, code-native, responsive, or accessible. Those are implementation requirements, not reasons to avoid visual exploration.
+
+### What to generate
+
+Generate **2 to 4** distinct direction probes based on the discovery answers, especially:
+
+- Color strategy
+- Theme scene sentence
+- Named anchor references
+- Scope and fidelity
+
+The probes should differ in primary visual direction (hierarchy, topology, density, typographic voice, or color strategy), not just palette tweaks.
+
+### How to use the probes
+
+- Treat them as **direction tests**, not final designs.
+- Use them to pressure-test whether the brief is pointing at the right lane.
+- Ask the user which direction feels closest, what feels off, and what should carry forward.
+- If the probes reveal a mismatch, revise the brief inputs before finalizing the brief.
+
+### Important limits
+
+- Do **not** skip discovery because image generation is available.
+- Do **not** treat generated imagery as final UX specification, final copy, or final accessibility behavior.
+- Do **not** use this step for minor refinements of existing work. It's for shaping a new surface or clarifying a big directional choice.
+
+If image generation is unavailable, or the task doesn't benefit from it, skip this phase only with a one-line reason and proceed directly to the design brief.
+
+## Phase 2: Design Brief
+
+After the interview and any required probes, synthesize everything into a structured design brief. Present it to the user for explicit confirmation before considering this command complete. Stop after asking for confirmation; do not proceed to craft or implementation in the same response unless the user has already approved the brief.
+
+### Brief Structure
+
+**1. Feature Summary** (2-3 sentences)
+What this is, who it's for, what it needs to accomplish.
+
+**2. Primary User Action**
+The single most important thing a user should do or understand here.
+
+**3. Design Direction**
+Color strategy (Restrained / Committed / Full palette / Drenched) + the theme scene sentence + 2–3 named anchor references. Reference PRODUCT.md and DESIGN.md where they already answer, and note any per-surface overrides.
+
+If you ran the Visual Direction Probe step, name which probe direction won and what changed in the brief because of it.
+
+**4. Scope**
+Fidelity, breadth, interactivity, and time intent from the Scope section of the interview. Task-scoped; these don't persist beyond the brief.
+
+**5. Layout Strategy**
+High-level spatial approach: what gets emphasis, what's secondary, how information flows. Describe the visual hierarchy and rhythm, not specific CSS.
+
+**6. Key States**
+List every state the feature needs: default, empty, loading, error, success, edge cases. For each, note what the user needs to see and feel.
+
+**7. Interaction Model**
+How users interact with this feature. What happens on click, hover, scroll? What feedback do they get? What's the flow from entry to completion?
+
+**8. Content Requirements**
+What copy, labels, empty state messages, error messages, and microcopy are needed. Note any dynamic content and its realistic ranges.
+
+**9. Recommended References**
+Based on the brief, list which impeccable reference files would be most valuable during implementation (e.g., spatial-design.md for complex layouts, motion-design.md for animated features, interaction-design.md for form-heavy features).
+
+**10. Open Questions**
+Anything unresolved that the implementer should resolve during build.
+
+---
+
+STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. Ask for explicit confirmation of the brief before finishing. If the user disagrees with any part, revisit the relevant discovery questions. A shape run is incomplete until the brief is confirmed.
+
+Once confirmed, the brief is complete. The user can now hand it to $impeccable, or use it to guide any other implementation approach. (If the user wants the full discovery-then-build flow in one step, they should use $impeccable craft instead, which runs this command internally.)
diff --git a/.agents/skills/impeccable/reference/spatial-design.md b/.agents/skills/impeccable/reference/spatial-design.md
new file mode 100644
index 00000000..4d4b83af
--- /dev/null
+++ b/.agents/skills/impeccable/reference/spatial-design.md
@@ -0,0 +1,100 @@
+# Spatial Design
+
+## Spacing Systems
+
+### Use 4pt Base, Not 8pt
+
+8pt systems are too coarse; you'll frequently need 12px (between 8 and 16). Use 4pt for granularity: 4, 8, 12, 16, 24, 32, 48, 64, 96px.
+
+### Name Tokens Semantically
+
+Name by relationship (`--space-sm`, `--space-lg`), not value (`--spacing-8`). Use `gap` instead of margins for sibling spacing; it eliminates margin collapse and cleanup hacks.
+
+## Grid Systems
+
+### The Self-Adjusting Grid
+
+Use `repeat(auto-fit, minmax(280px, 1fr))` for responsive grids without breakpoints. Columns are at least 280px, as many as fit per row, leftovers stretch. For complex layouts, use named grid areas (`grid-template-areas`) and redefine them at breakpoints.
+
+## Visual Hierarchy
+
+### The Squint Test
+
+Blur your eyes (or screenshot and blur). Can you still identify:
+- The most important element?
+- The second most important?
+- Clear groupings?
+
+If everything looks the same weight blurred, you have a hierarchy problem.
+
+### Hierarchy Through Multiple Dimensions
+
+Don't rely on size alone. Combine:
+
+| Tool | Strong Hierarchy | Weak Hierarchy |
+|------|------------------|----------------|
+| **Size** | 3:1 ratio or more | <2:1 ratio |
+| **Weight** | Bold vs Regular | Medium vs Regular |
+| **Color** | High contrast | Similar tones |
+| **Position** | Top/left (primary) | Bottom/right |
+| **Space** | Surrounded by white space | Crowded |
+
+**The best hierarchy uses 2-3 dimensions at once**: A heading that's larger, bolder, AND has more space above it.
+
+### Cards Are Not Required
+
+Cards are overused. Spacing and alignment create visual grouping naturally. Use cards only when content is truly distinct and actionable, items need visual comparison in a grid, or content needs clear interaction boundaries. **Never nest cards inside cards.** Use spacing, typography, and subtle dividers for hierarchy within a card.
+
+## Container Queries
+
+Viewport queries are for page layouts. **Container queries are for components**:
+
+```css
+.card-container {
+  container-type: inline-size;
+}
+
+.card {
+  display: grid;
+  gap: var(--space-md);
+}
+
+/* Card layout changes based on its container, not viewport */
+@container (min-width: 400px) {
+  .card {
+    grid-template-columns: 120px 1fr;
+  }
+}
+```
+
+**Why this matters**: A card in a narrow sidebar stays compact, while the same card in a main content area expands automatically, without viewport hacks.
+
+## Optical Adjustments
+
+Text at `margin-left: 0` looks indented due to letterform whitespace; use negative margin (`-0.05em`) to optically align. Geometrically centered icons often look off-center; play icons need to shift right, arrows shift toward their direction.
+
+### Touch Targets vs Visual Size
+
+Buttons can look small but need large touch targets (44px minimum). Use padding or pseudo-elements:
+
+```css
+.icon-button {
+  width: 24px;  /* Visual size */
+  height: 24px;
+  position: relative;
+}
+
+.icon-button::before {
+  content: '';
+  position: absolute;
+  inset: -10px;  /* Expand tap target to 44px */
+}
+```
+
+## Depth & Elevation
+
+Create semantic z-index scales (dropdown → sticky → modal-backdrop → modal → toast → tooltip) instead of arbitrary numbers. For shadows, create a consistent elevation scale (sm → md → lg → xl). **Key insight**: Shadows should be subtle. If you can clearly see it, it's probably too strong.
+
+---
+
+**Avoid**: Arbitrary spacing values outside your scale. Making all spacing equal (variety creates hierarchy). Creating hierarchy through size alone - combine size, weight, color, and space.
diff --git a/.agents/skills/impeccable/reference/teach.md b/.agents/skills/impeccable/reference/teach.md
new file mode 100644
index 00000000..6b7df209
--- /dev/null
+++ b/.agents/skills/impeccable/reference/teach.md
@@ -0,0 +1,156 @@
+# Teach Flow
+
+Gathers design context for a project and writes two complementary files at the project root:
+
+- **PRODUCT.md** (strategic): root project file for register, target users, product purpose, brand personality, anti-references, strategic design principles. Answers "who/what/why".
+- **DESIGN.md** (visual): root project file for visual theme, color palette, typography, components, layout. Follows the [Google Stitch DESIGN.md format](https://stitch.withgoogle.com/docs/design-md/format/). Answers "how it looks".
+
+Every other impeccable command reads these files before doing any work.
+
+## Step 1: Load current state
+
+Run the shared loader first so you know what already exists:
+
+```bash
+node .agents/skills/impeccable/scripts/load-context.mjs
+```
+
+The output tells you whether PRODUCT.md and/or DESIGN.md already exist. If `migrated: true`, legacy `.impeccable.md` was auto-renamed to `PRODUCT.md`. Mention this once to the user.
+
+Decision tree:
+- **Neither file exists (empty project or no context yet)**: do Steps 2-4 (write PRODUCT.md), then decide on DESIGN.md based on whether there's code to analyze.
+- **PRODUCT.md exists, DESIGN.md missing**: skip to Step 5 and offer to run `$impeccable document` for DESIGN.md.
+- **PRODUCT.md exists but has no `## Register` section (legacy)**: add it. Infer a hypothesis from the codebase (see Step 2), confirm with the user, write the field.
+- **Both exist**: STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. Ask which file to refresh. Skip the one the user doesn't want changed.
+- **Just DESIGN.md exists (unusual)**: do Steps 2-4 to produce PRODUCT.md.
+
+Never silently overwrite an existing file. Always confirm first.
+
+If teach was invoked as a setup blocker by another command, such as `$impeccable craft landing page`, pause that command here. Complete teach, re-run the loader, then resume the original command with the freshly loaded context. For craft, resume into shape next; teach creates project context, but it is not a substitute for the task-specific shape interview and confirmed design brief.
+
+## Step 2: Explore the codebase
+
+Before asking questions, thoroughly scan the project to discover what you can:
+
+- **README and docs**: Project purpose, target audience, any stated goals
+- **Package.json / config files**: Tech stack, dependencies, existing design libraries
+- **Existing components**: Current design patterns, spacing, typography in use
+- **Brand assets**: Logos, favicons, color values already defined
+- **Design tokens / CSS variables**: Existing color palettes, font stacks, spacing scales
+- **Any style guides or brand documentation**
+
+Also form a **register hypothesis** from what you find:
+
+- Brand signals: `/`, `/about`, `/pricing`, `/blog/*`, `/docs/*`, hero sections, big typography, scroll-driven sections, landing-page-shaped content.
+- Product signals: `/app/*`, `/dashboard`, `/settings`, `/(auth)`, forms, data tables, side/top nav, app-shell components.
+
+Register is a hypothesis at this point, not a decision; Step 3 confirms it.
+
+Note what you've learned and what remains unclear. This exploration feeds both PRODUCT.md and DESIGN.md.
+
+## Step 3: Ask strategic questions (for PRODUCT.md)
+
+STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. Ask only about what you couldn't infer from the codebase.
+
+### Interview mode, not confirmation mode
+
+If the repo is empty or the user's brief is sparse, run a short interview before proposing PRODUCT.md. Do **not** turn a one-sentence request into a complete inferred PRODUCT.md and ask for blanket confirmation.
+
+- Use the harness's structured question tool when one exists. Otherwise, ask directly in chat and stop.
+- Ask **2-3 questions per round**, then wait for answers.
+- Use inferred answers as hypotheses or options, not as finished facts.
+- Complete at least one real user-answer round before drafting PRODUCT.md, unless every required answer is directly discoverable from repo docs.
+- Round 1 should establish register, users/purpose, and desired outcome.
+- Round 2 should establish brand personality or references, anti-references, and accessibility needs.
+
+### Minimum viable interview
+
+Ask enough to complete PRODUCT.md. At minimum, cover register confirmation, users and purpose, brand personality, anti-references, and accessibility needs unless each answer is directly discoverable from repo context. After at least one interview round, you may propose inferred answers, but the user must confirm them before you write PRODUCT.md. Never synthesize PRODUCT.md from the original task prompt alone.
+
+### Register (ask first; it shapes everything below)
+
+Every design task is either **brand** (marketing, landing, campaign, long-form content, portfolio: design IS the product) or **product** (app UI, admin, dashboards, tools: design SERVES the product).
+
+If Step 2 produced a clear hypothesis, lead with it: *"From the codebase, this looks like a [brand / product] surface. Does that match your intent, or should we treat it differently?"*
+
+If the signal is genuinely split (e.g. a product with a big marketing landing), STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. Ask which register describes the **primary** surface. The register can be overridden per task later, but PRODUCT.md carries one default.
+
+### Users & Purpose
+- Who uses this? What's their context when using it?
+- What job are they trying to get done?
+- For brand: what emotions should the interface evoke? (confidence, delight, calm, urgency)
+- For product: what workflow are they in? What's the primary task on any given screen?
+
+### Brand & Personality
+- How would you describe the brand personality in 3 words?
+- Reference sites or apps that capture the right feel? What specifically about them?
+  - For brand, push for real-world references in the right lane (tech-minimal, editorial-magazine, consumer-warm, brutalist-grid, etc.), not generic "modern" adjectives.
+  - For product, push for category best-tool references (Linear, Figma, Notion, Raycast, Stripe).
+- What should this explicitly NOT look like? Any anti-references?
+
+### Accessibility & Inclusion
+- Specific accessibility requirements? (WCAG level, known user needs)
+- Considerations for reduced motion, color blindness, or other accommodations?
+
+Skip questions where the answer is already clear. **Do NOT ask about colors, fonts, radii, or visual styling here.** Those belong in DESIGN.md, not PRODUCT.md.
+
+## Step 4: Write PRODUCT.md
+
+Write PRODUCT.md only after the user has confirmed the strategic answers from Step 3. If an inferred answer is uncertain or unconfirmed, ask before writing.
+
+Synthesize into a strategic document:
+
+```markdown
+# Product
+
+## Register
+
+product
+
+## Users
+[Who they are, their context, the job to be done]
+
+## Product Purpose
+[What this product does, why it exists, what success looks like]
+
+## Brand Personality
+[Voice, tone, 3-word personality, emotional goals]
+
+## Anti-references
+[What this should NOT look like. Specific bad-example sites or patterns to avoid.]
+
+## Design Principles
+[3-5 strategic principles derived from the conversation. Principles like "practice what you preach", "show, don't tell", "expert confidence". NOT visual rules like "use OKLCH" or "magenta accent".]
+
+## Accessibility & Inclusion
+[WCAG level, known user needs, considerations]
+```
+
+Register is either `brand` or `product` as a bare value. No prose, no commentary.
+
+Write to `PROJECT_ROOT/PRODUCT.md`. If `.impeccable.md` existed, the loader already renamed it; merge into that content rather than starting from scratch.
+
+## Step 5: Decide on DESIGN.md
+
+Offer `$impeccable document` either way. Two paths:
+
+- **Code exists** (CSS tokens, components, a running site): "I can generate a DESIGN.md that captures your visual system (colors, typography, components) so variants stay on-brand. Want to do that now?"
+- **Pre-implementation** (empty project): "I can seed a starter DESIGN.md from five quick questions about color strategy, type direction, motion energy, and references. You can re-run once there's code, to capture the real tokens. Want to do that now?"
+
+If the user agrees, delegate to `$impeccable document` (it auto-detects scan vs seed). Load its reference and follow that flow.
+
+If the user prefers to skip, mention they can run `$impeccable document` any time later.
+
+## Step 6: Confirm and wrap up
+
+Summarize:
+- Register captured (brand / product)
+- What was written (PRODUCT.md, DESIGN.md, or both)
+- The 3-5 strategic principles from PRODUCT.md that will guide future work
+- If DESIGN.md is pending, remind the user how to generate it later
+
+**Critical: re-run the loader to refresh session context.** After writing PRODUCT.md, run `node .agents/skills/impeccable/scripts/load-context.mjs` one final time and let its full JSON output land in conversation. This ensures subsequent commands in this session use the freshly-written PRODUCT.md, not a stale earlier version.
+
+If teach was invoked as a blocker by another impeccable command (e.g. the user ran `$impeccable polish` with no PRODUCT.md), resume that original task now with the fresh context.
+
+Optionally STOP and use Codex's structured user-input/question tool when available; if unavailable, ask directly in chat to clarify what you cannot infer. Ask whether they'd like a brief summary of PRODUCT.md appended to AGENTS.md for easier agent reference. If yes, append a short **Design Context** pointer section there.
diff --git a/.agents/skills/impeccable/reference/typeset.md b/.agents/skills/impeccable/reference/typeset.md
new file mode 100644
index 00000000..a44772ec
--- /dev/null
+++ b/.agents/skills/impeccable/reference/typeset.md
@@ -0,0 +1,124 @@
+Typography carries most of the information on the page. Replace generic defaults (Inter, Roboto, system fallback at flat scale) with type that reflects the brand and scales with intentional contrast.
+
+---
+
+## Register
+
+Brand: run the font selection procedure in [brand.md](brand.md). Pairing follows the brand's lane (display serif + sans body for editorial/luxury, one committed sans for tech, etc.). Fluid `clamp()` scale, ≥1.25 ratio between steps.
+
+Product: system fonts and familiar sans stacks are legitimate here. One well-tuned family typically carries the whole UI. Fixed `rem` scale, 1.125–1.2 ratio between more closely-spaced steps.
+
+---
+
+## Assess Current Typography
+
+Analyze what's weak or generic about the current type:
+
+1. **Font choices**:
+   - Are we using invisible defaults? (Inter, Roboto, Arial, Open Sans, system defaults)
+   - Does the font match the brand personality? (A playful brand shouldn't use a corporate typeface)
+   - Are there too many font families? (More than 2-3 is almost always a mess)
+
+2. **Hierarchy**:
+   - Can you tell headings from body from captions at a glance?
+   - Are font sizes too close together? (14px, 15px, 16px = muddy hierarchy)
+   - Are weight contrasts strong enough? (Medium vs Regular is barely visible)
+
+3. **Sizing & scale**:
+   - Is there a consistent type scale, or are sizes arbitrary?
+   - Does body text meet minimum readability? (16px+)
+   - Is the sizing strategy appropriate for the context? (Fixed `rem` scales for app UIs; fluid `clamp()` for marketing/content page headings)
+
+4. **Readability**:
+   - Are line lengths comfortable? (45-75 characters ideal)
+   - Is line-height appropriate for the font and context?
+   - Is there enough contrast between text and background?
+
+5. **Consistency**:
+   - Are the same elements styled the same way throughout?
+   - Are font weights used consistently? (Not bold in one section, semibold in another for the same role)
+   - Is letter-spacing intentional or default everywhere?
+
+**CRITICAL**: The goal isn't to make text "fancier." It's to make it clearer, more readable, and more intentional. Good typography is invisible; bad typography is distracting.
+
+## Plan Typography Improvements
+
+Consult the [typography reference](typography.md) for detailed guidance on scales, pairing, and loading strategies.
+
+Create a systematic plan:
+
+- **Font selection**: Do fonts need replacing? What fits the brand/context?
+- **Type scale**: Establish a modular scale (e.g., 1.25 ratio) with clear hierarchy
+- **Weight strategy**: Which weights serve which roles? (Regular for body, Semibold for labels, Bold for headings, or whatever fits)
+- **Spacing**: Line-heights, letter-spacing, and margins between typographic elements
+
+## Improve Typography Systematically
+
+### Font Selection
+
+If fonts need replacing:
+- Choose fonts that reflect the brand personality
+- Pair with genuine contrast (serif + sans, geometric + humanist), or use a single family in multiple weights
+- Ensure web font loading doesn't cause layout shift (`font-display: swap`, metric-matched fallbacks)
+
+### Establish Hierarchy
+
+Build a clear type scale:
+- **5 sizes cover most needs**: caption, secondary, body, subheading, heading
+- **Use a consistent ratio** between levels (1.25, 1.333, or 1.5)
+- **Combine dimensions**: Size + weight + color + space for strong hierarchy. Don't rely on size alone
+- **App UIs**: Use a fixed `rem`-based type scale, optionally adjusted at 1-2 breakpoints. Fluid sizing undermines the spatial predictability that dense, container-based layouts need
+- **Marketing / content pages**: Use fluid sizing via `clamp(min, preferred, max)` for headings and display text. Keep body text fixed
+
+### Fix Readability
+
+- Set `max-width` on text containers using `ch` units (`max-width: 65ch`)
+- Adjust line-height per context: tighter for headings (1.1-1.2), looser for body (1.5-1.7)
+- Increase line-height slightly for light-on-dark text
+- Ensure body text is at least 16px / 1rem
+
+### Refine Details
+
+- Use `tabular-nums` for data tables and numbers that should align
+- Apply proper `letter-spacing`: slightly open for small caps and uppercase, default or tight for large display text
+- Use semantic token names (`--text-body`, `--text-heading`), not value names (`--font-16`)
+- Set `font-kerning: normal` and consider OpenType features where appropriate
+
+### Weight Consistency
+
+- Define clear roles for each weight and stick to them
+- Don't use more than 3-4 weights (Regular, Medium, Semibold, Bold is plenty)
+- Load only the weights you actually use (each weight adds to page load)
+
+**NEVER**:
+- Use more than 2-3 font families
+- Pick sizes arbitrarily; commit to a scale
+- Set body text below 16px
+- Use decorative/display fonts for body text
+- Disable browser zoom (`user-scalable=no`)
+- Use `px` for font sizes; use `rem` to respect user settings
+- Default to Inter/Roboto/Open Sans when personality matters
+- Pair fonts that are similar but not identical (two geometric sans-serifs)
+
+## Verify Typography Improvements
+
+- **Hierarchy**: Can you identify heading vs body vs caption instantly?
+- **Readability**: Is body text comfortable to read in long passages?
+- **Consistency**: Are same-role elements styled identically throughout?
+- **Personality**: Does the typography reflect the brand?
+- **Performance**: Are web fonts loading efficiently without layout shift?
+- **Accessibility**: Does text meet WCAG contrast ratios? Is it zoomable to 200%?
+
+When the type carries the hierarchy on its own, hand off to `$impeccable polish` for the final pass.
+
+## Live-mode signature params
+
+Each variant MUST declare a `scale` param controlling the hierarchy ratio. Express all font sizes in the variant's scoped CSS through `calc(var(--p-scale, 1) * <base>)` or, better, scale the type ramp via `clamp(min, calc(var(--p-scale, 1) * Npx), max)`. Users slide from subdued to commanding.
+
+```json
+{"id":"scale","kind":"range","min":0.85,"max":1.3,"step":0.05,"default":1,"label":"Scale"}
+```
+
+Where the variant riffs on a specific pairing, expose the pairing choice as a `steps` param (e.g. "serif display + sans body" vs. "mono display + sans body" vs. "all-sans"). Each branch routes through `:scope[data-p-pairing="X"]` selectors in scoped CSS.
+
+See `reference/live.md` for the full params contract.
diff --git a/.agents/skills/impeccable/reference/typography.md b/.agents/skills/impeccable/reference/typography.md
new file mode 100644
index 00000000..ed5ca272
--- /dev/null
+++ b/.agents/skills/impeccable/reference/typography.md
@@ -0,0 +1,159 @@
+# Typography
+
+## Classic Typography Principles
+
+### Vertical Rhythm
+
+Your line-height should be the base unit for ALL vertical spacing. If body text has `line-height: 1.5` on `16px` type (= 24px), spacing values should be multiples of 24px. This creates subconscious harmony; text and space share a mathematical foundation.
+
+### Modular Scale & Hierarchy
+
+The common mistake: too many font sizes that are too close together (14px, 15px, 16px, 18px...). This creates muddy hierarchy.
+
+**Use fewer sizes with more contrast.** A 5-size system covers most needs:
+
+| Role | Typical Ratio | Use Case |
+|------|---------------|----------|
+| xs | 0.75rem | Captions, legal |
+| sm | 0.875rem | Secondary UI, metadata |
+| base | 1rem | Body text |
+| lg | 1.25-1.5rem | Subheadings, lead text |
+| xl+ | 2-4rem | Headlines, hero text |
+
+Popular ratios: 1.25 (major third), 1.333 (perfect fourth), 1.5 (perfect fifth). Pick one and commit.
+
+### Readability & Measure
+
+Use `ch` units for character-based measure (`max-width: 65ch`). Line-height scales inversely with line length: narrow columns need tighter leading, wide columns need more.
+
+**Non-obvious**: Light text on dark backgrounds needs compensation on three axes, not just one. Bump line-height by 0.05–0.1, add a touch of letter-spacing (0.01–0.02em), and optionally step the body weight up one notch (regular → medium). The perceived weight drops across all three; fix all three.
+
+**Paragraph rhythm**: Pick either space between paragraphs OR first-line indentation. Never both. Digital usually wants space; editorial/long-form can justify indent-only.
+
+## Font Selection & Pairing
+
+The tactical selection procedure and the reflex-reject list live in [reference/brand.md](brand.md) under **Font selection procedure** and **Reflex-reject list** (loaded for brand-register tasks). The rest of this section covers the adjacent knowledge: anti-reflex corrections, system font use, and pairing rules.
+
+### Anti-reflexes worth defending against
+
+- A technical/utilitarian brief does NOT need a serif "for warmth." Most tech tools should look like tech tools.
+- An editorial/premium brief does NOT need the same expressive serif everyone is using right now. Premium can be Swiss-modern, can be neo-grotesque, can be a literal monospace, can be a quiet humanist sans.
+- A children's product does NOT need a rounded display font. Kids' books use real type.
+- A "modern" brief does NOT need a geometric sans. The most modern thing you can do is not use the font everyone else is using.
+
+**System fonts are underrated**: `-apple-system, BlinkMacSystemFont, "Segoe UI", system-ui` looks native, loads instantly, and is highly readable. Consider this for apps where performance > personality.
+
+### Pairing Principles
+
+**The non-obvious truth**: You often don't need a second font. One well-chosen font family in multiple weights creates cleaner hierarchy than two competing typefaces. Only add a second font when you need genuine contrast (e.g., display headlines + body serif).
+
+When pairing, contrast on multiple axes:
+- Serif + Sans (structure contrast)
+- Geometric + Humanist (personality contrast)
+- Condensed display + Wide body (proportion contrast)
+
+**Never pair fonts that are similar but not identical** (e.g., two geometric sans-serifs). They create visual tension without clear hierarchy.
+
+### Web Font Loading
+
+The layout shift problem: fonts load late, text reflows, and users see content jump. Here's the fix:
+
+```css
+/* 1. Use font-display: swap for visibility */
+@font-face {
+  font-family: 'CustomFont';
+  src: url('font.woff2') format('woff2');
+  font-display: swap;
+}
+
+/* 2. Match fallback metrics to minimize shift */
+@font-face {
+  font-family: 'CustomFont-Fallback';
+  src: local('Arial');
+  size-adjust: 105%;        /* Scale to match x-height */
+  ascent-override: 90%;     /* Match ascender height */
+  descent-override: 20%;    /* Match descender depth */
+  line-gap-override: 10%;   /* Match line spacing */
+}
+
+body {
+  font-family: 'CustomFont', 'CustomFont-Fallback', sans-serif;
+}
+```
+
+Tools like [Fontaine](https://github.com/unjs/fontaine) calculate these overrides automatically.
+
+**`swap` vs `optional`**: `swap` shows fallback text immediately and FOUT-swaps when the web font arrives. `optional` uses the fallback if the web font misses a small load budget (~100ms) and avoids the shift entirely. Pick `optional` when zero layout shift matters more than seeing the branded font on slow networks.
+
+**Preload the critical weight only**: typically the regular-weight body font used above the fold. Preloading every weight costs more bandwidth than it saves.
+
+**Variable fonts for 3+ weights or styles**: a single variable font file is usually smaller than three static weight files, gives fractional weight control, and pairs well with `font-optical-sizing: auto`. For 1–2 weights, static is fine.
+
+## Modern Web Typography
+
+### Fluid Type
+
+Fluid typography via `clamp(min, preferred, max)` scales text smoothly with the viewport. The middle value (e.g., `5vw + 1rem`) controls scaling rate (higher vw = faster scaling). Add a rem offset so it doesn't collapse to 0 on small screens.
+
+**Use fluid type for**: Headings and display text on marketing/content pages where text dominates the layout and needs to breathe across viewport sizes.
+
+**Use fixed `rem` scales for**: App UIs, dashboards, and data-dense interfaces. No major app design system (Material, Polaris, Primer, Carbon) uses fluid type in product UI; fixed scales with optional breakpoint adjustments give the spatial predictability that container-based layouts need. Body text should also be fixed even on marketing pages, since the size difference across viewports is too small to warrant it.
+
+**Bound your clamp()**: keep `max-size ≤ ~2.5 × min-size`. Wider ratios break the browser's zoom and reflow behaviour and make large viewports feel like the page is shouting.
+
+**Scale container width and font-size together** so effective character measure stays in the 45–75ch band at every viewport. A heading that widens faster than its container drifts out of the comfortable measure at the top end.
+
+### OpenType Features
+
+Most developers don't know these exist. Use them for polish:
+
+```css
+/* Tabular numbers for data alignment */
+.data-table { font-variant-numeric: tabular-nums; }
+
+/* Proper fractions */
+.recipe-amount { font-variant-numeric: diagonal-fractions; }
+
+/* Small caps for abbreviations */
+abbr { font-variant-caps: all-small-caps; }
+
+/* Disable ligatures in code */
+code { font-variant-ligatures: none; }
+
+/* Enable kerning (usually on by default, but be explicit) */
+body { font-kerning: normal; }
+```
+
+Check what features your font supports at [Wakamai Fondue](https://wakamaifondue.com/).
+
+### Rendering polish
+
+```css
+/* Even out heading line lengths (browser picks better break points) */
+h1, h2, h3 { text-wrap: balance; }
+
+/* Reduce orphans and ragged endings in long prose */
+article p { text-wrap: pretty; }
+
+/* Variable fonts: pick the right optical-size master automatically */
+body { font-optical-sizing: auto; }
+```
+
+**ALL-CAPS tracking**: capitals sit too close at default spacing. Add 5–12% letter-spacing (`letter-spacing: 0.05em` to `0.12em`) to short all-caps labels, eyebrows, and small headings. Real small caps (via `font-variant-caps`) need the same treatment, slightly gentler.
+
+## Typography System Architecture
+
+Name tokens semantically (`--text-body`, `--text-heading`), not by value (`--font-size-16`). Include font stacks, size scale, weights, line-heights, and letter-spacing in your token system.
+
+## Accessibility Considerations
+
+Beyond contrast ratios (which are well-documented), consider:
+
+- **Never disable zoom**: `user-scalable=no` breaks accessibility. If your layout breaks at 200% zoom, fix the layout.
+- **Use rem/em for font sizes**: This respects user browser settings. Never `px` for body text.
+- **Minimum 16px body text**: Smaller than this strains eyes and fails WCAG on mobile.
+- **Adequate touch targets**: Text links need padding or line-height that creates 44px+ tap targets.
+
+---
+
+**Avoid**: More than 2-3 font families per project. Skipping fallback font definitions. Ignoring font loading performance (FOUT/FOIT). Using decorative fonts for body text.
diff --git a/.agents/skills/impeccable/reference/ux-writing.md b/.agents/skills/impeccable/reference/ux-writing.md
new file mode 100644
index 00000000..417b5f56
--- /dev/null
+++ b/.agents/skills/impeccable/reference/ux-writing.md
@@ -0,0 +1,107 @@
+# UX Writing
+
+## The Button Label Problem
+
+**Never use "OK", "Submit", or "Yes/No".** These are lazy and ambiguous. Use specific verb + object patterns:
+
+| Bad | Good | Why |
+|-----|------|-----|
+| OK | Save changes | Says what will happen |
+| Submit | Create account | Outcome-focused |
+| Yes | Delete message | Confirms the action |
+| Cancel | Keep editing | Clarifies what "cancel" means |
+| Click here | Download PDF | Describes the destination |
+
+**For destructive actions**, name the destruction:
+- "Delete" not "Remove" (delete is permanent, remove implies recoverable)
+- "Delete 5 items" not "Delete selected" (show the count)
+
+## Error Messages: The Formula
+
+Every error message should answer: (1) What happened? (2) Why? (3) How to fix it? Example: "Email address isn't valid. Please include an @ symbol." not "Invalid input".
+
+### Error Message Templates
+
+| Situation | Template |
+|-----------|----------|
+| **Format error** | "[Field] needs to be [format]. Example: [example]" |
+| **Missing required** | "Please enter [what's missing]" |
+| **Permission denied** | "You don't have access to [thing]. [What to do instead]" |
+| **Network error** | "We couldn't reach [thing]. Check your connection and [action]." |
+| **Server error** | "Something went wrong on our end. We're looking into it. [Alternative action]" |
+
+### Don't Blame the User
+
+Reframe errors: "Please enter a date in MM/DD/YYYY format" not "You entered an invalid date".
+
+## Empty States Are Opportunities
+
+Empty states are onboarding moments: (1) Acknowledge briefly, (2) Explain the value of filling it, (3) Provide a clear action. "No projects yet. Create your first one to get started." not just "No items".
+
+## Voice vs Tone
+
+**Voice** is your brand's personality, consistent everywhere.
+**Tone** adapts to the moment.
+
+| Moment | Tone Shift |
+|--------|------------|
+| Success | Celebratory, brief: "Done! Your changes are live." |
+| Error | Empathetic, helpful: "That didn't work. Here's what to try..." |
+| Loading | Reassuring: "Saving your work..." |
+| Destructive confirm | Serious, clear: "Delete this project? This can't be undone." |
+
+**Never use humor for errors.** Users are already frustrated. Be helpful, not cute.
+
+## Writing for Accessibility
+
+**Link text** must have standalone meaning: "View pricing plans" not "Click here". **Alt text** describes information, not the image: "Revenue increased 40% in Q4" not "Chart". Use `alt=""` for decorative images. **Icon buttons** need `aria-label` for screen reader context.
+
+## Writing for Translation
+
+### Plan for Expansion
+
+German text is ~30% longer than English. Allocate space:
+
+| Language | Expansion |
+|----------|-----------|
+| German | +30% |
+| French | +20% |
+| Finnish | +30-40% |
+| Chinese | -30% (fewer chars, but same width) |
+
+### Translation-Friendly Patterns
+
+Keep numbers separate ("New messages: 3" not "You have 3 new messages"). Use full sentences as single strings (word order varies by language). Avoid abbreviations ("5 minutes ago" not "5 mins ago"). Give translators context about where strings appear.
+
+## Consistency: The Terminology Problem
+
+Pick one term and stick with it:
+
+| Inconsistent | Consistent |
+|--------------|------------|
+| Delete / Remove / Trash | Delete |
+| Settings / Preferences / Options | Settings |
+| Sign in / Log in / Enter | Sign in |
+| Create / Add / New | Create |
+
+Build a terminology glossary and enforce it. Variety creates confusion.
+
+## Avoid Redundant Copy
+
+If the heading explains it, the intro is redundant. If the button is clear, don't explain it again. Say it once, say it well.
+
+## Loading States
+
+Be specific: "Saving your draft..." not "Loading...". For long waits, set expectations ("This usually takes 30 seconds") or show progress.
+
+## Confirmation Dialogs: Use Sparingly
+
+Most confirmation dialogs are design failures; consider undo instead. When you must confirm: name the action, explain consequences, use specific button labels ("Delete project" / "Keep project", not "Yes" / "No").
+
+## Form Instructions
+
+Show format with placeholders, not instructions. For non-obvious fields, explain why you're asking.
+
+---
+
+**Avoid**: Jargon without explanation. Blaming users ("You made an error" → "This field is required"). Vague errors ("Something went wrong"). Varying terminology for variety. Humor for errors.
diff --git a/.agents/skills/impeccable/scripts/cleanup-deprecated.mjs b/.agents/skills/impeccable/scripts/cleanup-deprecated.mjs
new file mode 100644
index 00000000..6aee4710
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/cleanup-deprecated.mjs
@@ -0,0 +1,284 @@
+#!/usr/bin/env node
+/**
+ * Cleans up deprecated Impeccable skill files, symlinks, and
+ * skills-lock.json entries left over from previous versions.
+ *
+ * Safe to run repeatedly -- it is a no-op when nothing needs cleaning.
+ *
+ * Usage (from the project root):
+ *   node {{scripts_path}}/cleanup-deprecated.mjs
+ *
+ * What it does:
+ *   1. Finds every harness-specific skills directory (.claude/skills,
+ *      .cursor/skills, .agents/skills, etc.).
+ *   2. For each deprecated skill name (with and without i- prefix),
+ *      checks if the directory exists and its SKILL.md mentions
+ *      "impeccable" (to avoid deleting unrelated user skills).
+ *   3. Deletes confirmed matches (files, directories, or symlinks).
+ *   4. Removes the corresponding entries from skills-lock.json.
+ */
+
+import { existsSync, readFileSync, writeFileSync, rmSync, readdirSync, statSync, lstatSync, unlinkSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+
+// Skills that were renamed, merged, or folded in v2.0, v2.1, and v3.0.
+const DEPRECATED_NAMES = [
+  // v2.0 renames
+  'frontend-design',    // renamed to impeccable
+  'teach-impeccable',   // folded into /impeccable teach
+  // v2.1 merges
+  'arrange',            // renamed to layout
+  'normalize',          // merged into polish
+  'onboard',            // merged into harden
+  'extract',            // merged into /impeccable extract
+  // v3.0 consolidation: all standalone skills -> /impeccable sub-commands
+  'adapt',
+  'animate',
+  'audit',
+  'bolder',
+  'clarify',
+  'colorize',
+  'critique',
+  'delight',
+  'distill',
+  'harden',
+  'layout',
+  'optimize',
+  'overdrive',
+  'polish',
+  'quieter',
+  'shape',
+  'typeset',
+];
+
+// All known harness directories that may contain a skills/ subfolder.
+const HARNESS_DIRS = [
+  '.claude', '.cursor', '.gemini', '.codex', '.agents',
+  '.trae', '.trae-cn', '.pi', '.opencode', '.kiro', '.rovodev',
+];
+
+// Per-skill fingerprints for SKILL.md bodies that never mentioned
+// "impeccable" in their v2.x source. Used as a last-resort match
+// when no skills-lock.json exists and the word heuristic fails.
+// The strings are lifted verbatim from the v2.x frontmatter
+// descriptions, so collisions with hand-written user skills are
+// vanishingly unlikely.
+const SKILL_FINGERPRINTS = {
+  harden: 'Make interfaces production-ready: error handling, empty states',
+  optimize: 'Diagnoses and fixes UI performance across loading speed',
+};
+
+/**
+ * Walk up from startDir until we find a directory that looks like a
+ * project root (has package.json, .git, or skills-lock.json).
+ */
+export function findProjectRoot(startDir = process.cwd()) {
+  let dir = resolve(startDir);
+  const { root } = { root: '/' };
+  while (dir !== root) {
+    if (
+      existsSync(join(dir, 'package.json')) ||
+      existsSync(join(dir, '.git')) ||
+      existsSync(join(dir, 'skills-lock.json'))
+    ) {
+      return dir;
+    }
+    const parent = resolve(dir, '..');
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return resolve(startDir);
+}
+
+/**
+ * Load skills-lock.json from the project root, or null if missing/unreadable.
+ */
+export function loadLock(projectRoot) {
+  const lockPath = join(projectRoot, 'skills-lock.json');
+  if (!existsSync(lockPath)) return null;
+  try {
+    return JSON.parse(readFileSync(lockPath, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Check whether a skill directory belongs to Impeccable. Three layered
+ * signals, in order of reliability:
+ *   1. Lock source equals "pbakaus/impeccable" (authoritative).
+ *   2. SKILL.md body contains the word "impeccable".
+ *   3. SKILL.md body contains a per-skill fingerprint (for harden and
+ *      optimize, whose v2.x SKILL.md never mentioned the pack name).
+ */
+export function isImpeccableSkill(skillDir, { skillName, lock } = {}) {
+  // 1. Authoritative: the lock file claims this skill is ours.
+  if (skillName && lock?.skills?.[skillName]?.source === 'pbakaus/impeccable') {
+    return true;
+  }
+  const skillMd = join(skillDir, 'SKILL.md');
+  if (!existsSync(skillMd)) return false;
+  let content;
+  try {
+    content = readFileSync(skillMd, 'utf-8');
+  } catch {
+    return false;
+  }
+  // 2. Word-level content heuristic.
+  if (/impeccable/i.test(content)) return true;
+  // 3. Per-skill fingerprint for old skills that never mentioned the pack.
+  //    Strip the i- prefix so both `harden` and `i-harden` resolve to the
+  //    same fingerprint entry.
+  const unprefixed = skillName?.startsWith('i-') ? skillName.slice(2) : skillName;
+  const fingerprint = unprefixed && SKILL_FINGERPRINTS[unprefixed];
+  if (fingerprint && content.includes(fingerprint)) return true;
+  return false;
+}
+
+/**
+ * Build the full list of names to check: each deprecated name, plus
+ * its i-prefixed variant.
+ */
+export function buildTargetNames() {
+  const names = [];
+  for (const name of DEPRECATED_NAMES) {
+    names.push(name);
+    names.push(`i-${name}`);
+  }
+  return names;
+}
+
+/**
+ * Find every skills directory across all harness dirs in the project.
+ * Returns absolute paths that exist on disk.
+ */
+export function findSkillsDirs(projectRoot) {
+  const dirs = [];
+  for (const harness of HARNESS_DIRS) {
+    const candidate = join(projectRoot, harness, 'skills');
+    if (existsSync(candidate)) {
+      dirs.push(candidate);
+    }
+  }
+  return dirs;
+}
+
+/**
+ * Remove deprecated skill directories/symlinks from all harness dirs.
+ * Reads skills-lock.json so the authoritative "source" field can
+ * drive deletion even when SKILL.md never mentions impeccable.
+ * Returns an array of paths that were deleted.
+ */
+export function removeDeprecatedSkills(projectRoot, lock) {
+  if (lock === undefined) lock = loadLock(projectRoot);
+  const targets = buildTargetNames();
+  const skillsDirs = findSkillsDirs(projectRoot);
+  const deleted = [];
+
+  for (const skillsDir of skillsDirs) {
+    for (const name of targets) {
+      const skillPath = join(skillsDir, name);
+
+      // Use lstat to detect symlinks (existsSync follows symlinks and
+      // returns false for dangling ones).
+      let stat;
+      try {
+        stat = lstatSync(skillPath);
+      } catch {
+        continue; // does not exist at all
+      }
+
+      if (stat.isSymbolicLink()) {
+        // Symlink: check the target if it's alive, otherwise treat
+        // dangling symlinks to deprecated names as safe to remove.
+        const targetAlive = existsSync(skillPath);
+        const isMatch = targetAlive
+          ? isImpeccableSkill(skillPath, { skillName: name, lock })
+          : true;
+        if (isMatch) {
+          unlinkSync(skillPath);
+          deleted.push(skillPath);
+        }
+        continue;
+      }
+
+      // Regular directory -- verify it belongs to impeccable
+      if (isImpeccableSkill(skillPath, { skillName: name, lock })) {
+        rmSync(skillPath, { recursive: true, force: true });
+        deleted.push(skillPath);
+      }
+    }
+  }
+
+  return deleted;
+}
+
+/**
+ * Remove deprecated entries from skills-lock.json.
+ * Only removes entries whose source is "pbakaus/impeccable".
+ * Returns the list of removed skill names.
+ */
+export function cleanSkillsLock(projectRoot) {
+  const lockPath = join(projectRoot, 'skills-lock.json');
+  if (!existsSync(lockPath)) return [];
+
+  let lock;
+  try {
+    lock = JSON.parse(readFileSync(lockPath, 'utf-8'));
+  } catch {
+    return [];
+  }
+
+  if (!lock.skills || typeof lock.skills !== 'object') return [];
+
+  const targets = buildTargetNames();
+  const removed = [];
+
+  for (const name of targets) {
+    const entry = lock.skills[name];
+    if (!entry) continue;
+    // Only remove if it belongs to impeccable
+    if (entry.source === 'pbakaus/impeccable') {
+      delete lock.skills[name];
+      removed.push(name);
+    }
+  }
+
+  if (removed.length > 0) {
+    writeFileSync(lockPath, JSON.stringify(lock, null, 2) + '\n', 'utf-8');
+  }
+
+  return removed;
+}
+
+/**
+ * Run the full cleanup. Returns a summary object.
+ *
+ * Order matters: read the lock and delete directories first, then
+ * strip lock entries. Otherwise the authoritative signal is gone by
+ * the time directory deletion runs.
+ */
+export function cleanup(projectRoot) {
+  const root = projectRoot || findProjectRoot();
+  const lock = loadLock(root);
+  const deletedPaths = removeDeprecatedSkills(root, lock);
+  const removedLockEntries = cleanSkillsLock(root);
+  return { deletedPaths, removedLockEntries, projectRoot: root };
+}
+
+// CLI entry point
+if (process.argv[1] && resolve(process.argv[1]) === resolve(new URL(import.meta.url).pathname)) {
+  const result = cleanup();
+  if (result.deletedPaths.length === 0 && result.removedLockEntries.length === 0) {
+    console.log('No deprecated Impeccable skills found. Nothing to clean up.');
+  } else {
+    if (result.deletedPaths.length > 0) {
+      console.log(`Removed ${result.deletedPaths.length} deprecated skill(s):`);
+      for (const p of result.deletedPaths) console.log(`  - ${p}`);
+    }
+    if (result.removedLockEntries.length > 0) {
+      console.log(`Cleaned ${result.removedLockEntries.length} entry/entries from skills-lock.json:`);
+      for (const name of result.removedLockEntries) console.log(`  - ${name}`);
+    }
+  }
+}
diff --git a/.agents/skills/impeccable/scripts/command-metadata.json b/.agents/skills/impeccable/scripts/command-metadata.json
new file mode 100644
index 00000000..1488bd5f
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/command-metadata.json
@@ -0,0 +1,94 @@
+{
+  "craft": {
+    "description": "Full confirmed-brief-then-build flow. Runs multi-round shape discovery first, resolves visual probe and north-star mock gates when available, then builds and visually iterates. Use when building a new feature end-to-end.",
+    "argumentHint": "[feature description]"
+  },
+  "teach": {
+    "description": "Gathers design context for a project. Runs a multi-round discovery interview when context is missing and writes PRODUCT.md (strategic: users, brand, principles) and, when code exists to analyze, DESIGN.md (visual: colors, typography, components). Every other command reads these files before doing work. Use once per project.",
+    "argumentHint": ""
+  },
+  "document": {
+    "description": "Generate a DESIGN.md file that captures the current visual design system. Auto-extracts colors, typography, spacing, radii, and component patterns from the codebase, then asks the user to confirm descriptive language for atmosphere and color character. Follows the Google Stitch DESIGN.md format so the file is tool-compatible. Use when you need a visual design spec an AI agent can follow to stay on-brand.",
+    "argumentHint": ""
+  },
+  "extract": {
+    "description": "Pull reusable patterns, components, and design tokens into the design system. Identifies repeated patterns and consolidates them. Use when you have drift across the codebase and want to bring things back to a consistent system.",
+    "argumentHint": "[target]"
+  },
+  "live": {
+    "description": "Interactive live variant mode. Select elements in the browser, pick a design action, and get AI-generated HTML+CSS variants hot-swapped via HMR. Requires a running dev server. Use when you want to visually experiment with design alternatives in real time.",
+    "argumentHint": ""
+  },
+  "adapt": {
+    "description": "Adapt designs to work across different screen sizes, devices, contexts, or platforms. Implements breakpoints, fluid layouts, and touch targets. Use when the user mentions responsive design, mobile layouts, breakpoints, viewport adaptation, or cross-device compatibility.",
+    "argumentHint": "[target] [context (mobile, tablet, print...)]"
+  },
+  "animate": {
+    "description": "Review a feature and enhance it with purposeful animations, micro-interactions, and motion effects that improve usability and delight. Use when the user mentions adding animation, transitions, micro-interactions, motion design, hover effects, or making the UI feel more alive.",
+    "argumentHint": "[target]"
+  },
+  "audit": {
+    "description": "Run technical quality checks across accessibility, performance, theming, responsive design, and anti-patterns. Generates a scored report with P0-P3 severity ratings and actionable plan. Use when the user wants an accessibility check, performance audit, or technical quality review.",
+    "argumentHint": "[area (feature, page, component...)]"
+  },
+  "bolder": {
+    "description": "Amplify safe or boring designs to make them more visually interesting and stimulating. Increases impact while maintaining usability. Use when the user says the design looks bland, generic, too safe, lacks personality, or wants more visual impact and character.",
+    "argumentHint": "[target]"
+  },
+  "clarify": {
+    "description": "Improve unclear UX copy, error messages, microcopy, labels, and instructions to make interfaces easier to understand. Use when the user mentions confusing text, unclear labels, bad error messages, hard-to-follow instructions, or wanting better UX writing.",
+    "argumentHint": "[target]"
+  },
+  "colorize": {
+    "description": "Add strategic color to features that are too monochromatic or lack visual interest, making interfaces more engaging and expressive. Use when the user mentions the design looking gray, dull, lacking warmth, needing more color, or wanting a more vibrant or expressive palette.",
+    "argumentHint": "[target]"
+  },
+  "critique": {
+    "description": "Evaluate design from a UX perspective, assessing visual hierarchy, information architecture, emotional resonance, cognitive load, and overall quality with quantitative scoring, persona-based testing, automated anti-pattern detection, and actionable feedback. Use when the user asks to review, critique, evaluate, or give feedback on a design or component.",
+    "argumentHint": "[area (feature, page, component...)]"
+  },
+  "delight": {
+    "description": "Add moments of joy, personality, and unexpected touches that make interfaces memorable and enjoyable to use. Elevates functional to delightful. Use when the user asks to add polish, personality, animations, micro-interactions, delight, or make an interface feel fun or memorable.",
+    "argumentHint": "[target]"
+  },
+  "distill": {
+    "description": "Strip designs to their essence by removing unnecessary complexity. Great design is simple, powerful, and clean. Use when the user asks to simplify, declutter, reduce noise, remove elements, or make a UI cleaner and more focused.",
+    "argumentHint": "[target]"
+  },
+  "harden": {
+    "description": "Make interfaces production-ready: error handling, i18n, text overflow, edge case management, and resilience under real-world data. Use when the user asks to harden, make production-ready, handle edge cases, add error states, or fix overflow and i18n issues.",
+    "argumentHint": "[target]"
+  },
+  "onboard": {
+    "description": "Design onboarding flows, first-run experiences, and empty states that guide new users to value. Covers welcome screens, account setup, progressive disclosure, contextual tooltips, feature announcements, and activation moments. Use when the user mentions onboarding, first-time users, empty states, activation, getting started, new user flows, or the aha moment.",
+    "argumentHint": "[target]"
+  },
+  "layout": {
+    "description": "Improve layout, spacing, and visual rhythm. Fixes monotonous grids, inconsistent spacing, and weak visual hierarchy. Use when the user mentions layout feeling off, spacing issues, visual hierarchy, crowded UI, alignment problems, or wanting better composition.",
+    "argumentHint": "[target]"
+  },
+  "optimize": {
+    "description": "Diagnoses and fixes UI performance across loading speed, rendering, animations, images, and bundle size. Use when the user mentions slow, laggy, janky, performance, bundle size, load time, or wants a faster, smoother experience.",
+    "argumentHint": "[target]"
+  },
+  "overdrive": {
+    "description": "Pushes interfaces past conventional limits with technically ambitious implementations — shaders, spring physics, scroll-driven reveals, 60fps animations. Use when the user wants to wow, impress, go all-out, or make something that feels extraordinary.",
+    "argumentHint": "[target]"
+  },
+  "polish": {
+    "description": "Performs a final quality pass fixing alignment, spacing, consistency, and micro-detail issues before shipping. Use when the user mentions polish, finishing touches, pre-launch review, something looks off, or wants to go from good to great.",
+    "argumentHint": "[target]"
+  },
+  "quieter": {
+    "description": "Tones down visually aggressive or overstimulating designs, reducing intensity while preserving quality. Use when the user mentions too bold, too loud, overwhelming, aggressive, garish, or wants a calmer, more refined aesthetic.",
+    "argumentHint": "[target]"
+  },
+  "shape": {
+    "description": "Plan UX and UI before code. Runs a required multi-round discovery interview, uses visual probes when available, and produces a user-confirmed design brief for implementation.",
+    "argumentHint": "[feature to shape]"
+  },
+  "typeset": {
+    "description": "Improves typography by fixing font choices, hierarchy, sizing, weight, and readability so text feels intentional. Use when the user mentions fonts, type, readability, text hierarchy, sizing looks off, or wants more polished, intentional typography.",
+    "argumentHint": "[target]"
+  }
+}
diff --git a/.agents/skills/impeccable/scripts/design-parser.mjs b/.agents/skills/impeccable/scripts/design-parser.mjs
new file mode 100644
index 00000000..b6875664
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/design-parser.mjs
@@ -0,0 +1,820 @@
+// Parse a DESIGN.md (Stitch-spec format) into a structured JSON model that
+// the live-mode design-system panel can render. Deterministic, dependency-free.
+//
+// Two-layer: YAML frontmatter (machine-readable tokens) + markdown body
+// (prose with six canonical H2 sections). When frontmatter is present, it's
+// exposed on `model.frontmatter` alongside the prose-scraped sections;
+// consumers can prefer frontmatter values and fall back to prose.
+
+const CANONICAL_SECTIONS = [
+  'Overview',
+  'Colors',
+  'Typography',
+  'Elevation',
+  'Components',
+  "Do's and Don'ts",
+];
+
+// ---------- Frontmatter (Stitch YAML subset) ----------
+
+function parseFrontmatter(md) {
+  const lines = md.split(/\r?\n/);
+  if (lines[0]?.trim() !== '---') return { frontmatter: null, body: md };
+
+  let end = -1;
+  for (let i = 1; i < lines.length; i++) {
+    if (lines[i].trim() === '---') { end = i; break; }
+  }
+  if (end === -1) return { frontmatter: null, body: md };
+
+  const yaml = lines.slice(1, end).join('\n');
+  const body = lines.slice(end + 1).join('\n');
+  try {
+    return { frontmatter: parseYamlSubset(yaml), body };
+  } catch {
+    return { frontmatter: null, body: md };
+  }
+}
+
+// Minimal YAML reader for the Stitch frontmatter subset: scalar maps with
+// one level of nested objects (typography roles, components). Indent-based,
+// 2-space convention. No arrays, no anchors, no multi-line scalars — Stitch's
+// schema doesn't need them and accepting them would require a real YAML
+// dependency we don't want to vendor.
+function parseYamlSubset(yaml) {
+  const lines = yaml.split(/\r?\n/);
+  const root = {};
+  const stack = [{ indent: -1, obj: root }];
+
+  for (const raw of lines) {
+    // Skip blanks and line-only comments. Don't strip inline comments:
+    // unquoted hex values start with `#` and can't be safely distinguished
+    // from a comment after whitespace.
+    if (!raw.trim() || /^\s*#/.test(raw)) continue;
+
+    const indent = raw.match(/^\s*/)[0].length;
+    const content = raw.slice(indent);
+
+    const colonIdx = findTopLevelColon(content);
+    if (colonIdx === -1) continue;
+
+    while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
+      stack.pop();
+    }
+
+    const key = content.slice(0, colonIdx).trim();
+    const rest = content.slice(colonIdx + 1).trim();
+    const parent = stack[stack.length - 1].obj;
+
+    if (rest === '') {
+      const obj = {};
+      parent[key] = obj;
+      stack.push({ indent, obj });
+    } else {
+      parent[key] = parseScalar(rest);
+    }
+  }
+
+  return root;
+}
+
+function findTopLevelColon(s) {
+  let inQuote = null;
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (inQuote) {
+      if (ch === inQuote && s[i - 1] !== '\\') inQuote = null;
+    } else if (ch === '"' || ch === "'") {
+      inQuote = ch;
+    } else if (ch === ':') {
+      return i;
+    }
+  }
+  return -1;
+}
+
+function parseScalar(raw) {
+  const s = raw.trim();
+  if ((s.startsWith('"') && s.endsWith('"')) || (s.startsWith("'") && s.endsWith("'"))) {
+    return s.slice(1, -1);
+  }
+  if (s === 'true') return true;
+  if (s === 'false') return false;
+  if (s === 'null' || s === '~') return null;
+  if (/^-?\d+$/.test(s)) return Number(s);
+  if (/^-?\d*\.\d+$/.test(s)) return Number(s);
+  return s;
+}
+
+const HEX_RE = /#[0-9a-fA-F]{3,8}\b/g;
+const OKLCH_RE = /oklch\([^)]+\)/gi;
+const RGBA_RE = /rgba?\([^)]+\)/gi;
+const BOX_SHADOW_RE = /(?:box-shadow:\s*)?((?:-?\d[\w\d\s\-.,/()#%]*)+)/;
+const NAMED_RULE_RE = /\*\*(The [^*]+?Rule)\.\*\*\s*(.+)/;
+
+// ---------- Section splitting ----------
+
+function splitSections(md) {
+  const lines = md.split(/\r?\n/);
+  let title = null;
+  const sections = {};
+  let current = null;
+
+  for (const raw of lines) {
+    const line = raw.trimEnd();
+
+    if (!title && line.startsWith('# ') && !line.startsWith('## ')) {
+      title = line.replace(/^#\s+/, '').trim();
+      continue;
+    }
+
+    const h2 = line.match(/^##\s+(?:\d+\.\s*)?([^:\n]+?)(?::\s*(.+))?$/);
+    if (h2) {
+      const rawName = normalizeApostrophes(h2[1].trim());
+      const subtitle = h2[2] ? h2[2].trim() : null;
+      const canonical = matchCanonicalSection(rawName);
+      if (canonical) {
+        current = { name: canonical, subtitle, lines: [] };
+        sections[canonical] = current;
+        continue;
+      }
+      // non-canonical H2 — ignore but stop feeding into current
+      current = null;
+      continue;
+    }
+
+    if (current) current.lines.push(raw);
+  }
+
+  return { title, sections };
+}
+
+function normalizeApostrophes(s) {
+  return s.replace(/[\u2018\u2019]/g, "'");
+}
+
+function matchCanonicalSection(name) {
+  const normalized = normalizeApostrophes(name).toLowerCase();
+  // Exact match first
+  for (const c of CANONICAL_SECTIONS) {
+    if (normalizeApostrophes(c).toLowerCase() === normalized) return c;
+  }
+  // Keyword-contained match: "Overview & Creative North Star" -> "Overview",
+  // "Elevation & Depth" -> "Elevation", etc.
+  for (const c of CANONICAL_SECTIONS) {
+    const key = normalizeApostrophes(c).toLowerCase();
+    const pattern = new RegExp(`\\b${key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+    if (pattern.test(normalized)) return c;
+  }
+  return null;
+}
+
+// ---------- Subsection splitting (inside a canonical section) ----------
+
+function splitSubsections(lines) {
+  const subs = [];
+  let current = { name: null, lines: [] };
+  subs.push(current);
+
+  for (const raw of lines) {
+    const h3 = raw.match(/^###\s+(.+?)\s*$/);
+    if (h3) {
+      current = { name: h3[1].trim(), lines: [] };
+      subs.push(current);
+      continue;
+    }
+    current.lines.push(raw);
+  }
+
+  return subs;
+}
+
+// ---------- Generic helpers ----------
+
+function collectParagraphs(lines) {
+  const paragraphs = [];
+  let buf = [];
+  const flush = () => {
+    if (buf.length) {
+      paragraphs.push(buf.join(' ').trim());
+      buf = [];
+    }
+  };
+  for (const raw of lines) {
+    const trimmed = raw.trim();
+    if (trimmed === '') { flush(); continue; }
+    // Horizontal rules (---, ***) and headings/bullets end a paragraph.
+    if (/^(?:-{3,}|\*{3,}|_{3,})$/.test(trimmed)) { flush(); continue; }
+    if (raw.startsWith('#') || raw.match(/^[-*]\s/)) { flush(); continue; }
+    buf.push(trimmed);
+  }
+  flush();
+  return paragraphs.filter(Boolean);
+}
+
+function collectBullets(lines) {
+  const bullets = [];
+  let current = null;
+  for (const raw of lines) {
+    const m = raw.match(/^\s*[-*]\s+(.+)$/);
+    if (m) {
+      if (current) bullets.push(current);
+      current = m[1];
+      continue;
+    }
+    // continuation of a bullet (indented line)
+    if (current && raw.match(/^\s{2,}\S/)) {
+      current += ' ' + raw.trim();
+      continue;
+    }
+    // blank line ends a bullet
+    if (raw.trim() === '' && current) {
+      bullets.push(current);
+      current = null;
+    }
+  }
+  if (current) bullets.push(current);
+  return bullets;
+}
+
+function stripBold(s) {
+  return s.replace(/\*\*(.+?)\*\*/g, '$1');
+}
+
+function extractNamedRules(lines) {
+  const rules = [];
+  const seen = new Set();
+
+  // Style A (Impeccable): "**The X Rule.** body body body" — can span lines.
+  const joined = lines.join('\n');
+  const inlineStart = /\*\*(The [^*]+?Rule)\.\*\*/g;
+  const inlineMatches = [];
+  let m;
+  while ((m = inlineStart.exec(joined)) !== null) {
+    inlineMatches.push({ name: m[1], start: m.index, end: inlineStart.lastIndex });
+  }
+  for (let i = 0; i < inlineMatches.length; i++) {
+    const mm = inlineMatches[i];
+    const bodyEnd = i + 1 < inlineMatches.length ? inlineMatches[i + 1].start : joined.length;
+    const body = joined
+      .slice(mm.end, bodyEnd)
+      .replace(/\n##[^\n]*$/s, '')
+      .replace(/\n###[^\n]*$/s, '')
+      .trim();
+    const name = stripBold(mm.name).trim();
+    seen.add(name.toLowerCase());
+    rules.push({ name, body: stripBold(body) });
+  }
+
+  // Style B (Stitch): `### The "X" Rule` or `### The X Fallback`, body is the
+  // bullets/paragraphs until the next heading. Accept Rule / Fallback / Principle.
+  for (let i = 0; i < lines.length; i++) {
+    const h3 = lines[i].match(/^###\s+(.+?)\s*$/);
+    if (!h3) continue;
+    const headerName = stripBold(h3[1]).replace(/["“”]/g, '').trim();
+    if (!/^The\b.*\b(Rule|Fallback|Principle)\b/i.test(headerName)) continue;
+    if (seen.has(headerName.toLowerCase())) continue;
+
+    const bodyLines = [];
+    for (let j = i + 1; j < lines.length; j++) {
+      if (/^##\s|^###\s/.test(lines[j])) break;
+      bodyLines.push(lines[j]);
+    }
+    const body = stripBold(bodyLines.join('\n').replace(/\n+/g, ' ')).trim();
+    if (body) {
+      seen.add(headerName.toLowerCase());
+      rules.push({ name: headerName, body });
+    }
+  }
+
+  // Style C (Stitch bullet form): "*   **The Layering Principle:** body"
+  // Colon/period lives inside the bold, so match "**...**" then inspect.
+  for (const b of collectBullets(lines)) {
+    const mm = b.match(/^\*\*([^*]+?)\*\*\s*(.+)$/);
+    if (!mm) continue;
+    const nameRaw = mm[1].replace(/[.:]\s*$/, '').replace(/["“”]/g, '').trim();
+    if (!/^The\b.+\b(Rule|Fallback|Principle)$/i.test(nameRaw)) continue;
+    if (seen.has(nameRaw.toLowerCase())) continue;
+    seen.add(nameRaw.toLowerCase());
+    rules.push({ name: nameRaw, body: stripBold(mm[2]).trim() });
+  }
+
+  return rules;
+}
+
+// ---------- Per-section extractors ----------
+
+function extractOverview(section) {
+  if (!section) return null;
+  const text = section.lines.join('\n');
+  const northStar = text.match(/\*\*Creative North Star:\s*"([^"]+)"\*\*/);
+  const keyChars = [];
+  const keyCharMatch = text.match(/\*\*Key Characteristics:\*\*\s*\n([\s\S]+?)(?:\n##|\n###|$)/);
+  if (keyCharMatch) {
+    for (const line of keyCharMatch[1].split('\n')) {
+      const m = line.match(/^\s*[-*]\s+(.+)$/);
+      if (m) keyChars.push(stripBold(m[1].trim()));
+    }
+  }
+
+  // Philosophy paragraphs: everything that isn't a rule header or key-char block
+  const paragraphs = collectParagraphs(section.lines).filter(
+    (p) =>
+      !p.startsWith('**Creative North Star') &&
+      !p.startsWith('**Key Characteristics')
+  );
+
+  return {
+    subtitle: section.subtitle,
+    creativeNorthStar: northStar ? northStar[1] : null,
+    philosophy: paragraphs,
+    keyCharacteristics: keyChars,
+  };
+}
+
+function extractColors(section) {
+  if (!section) return null;
+  const subs = splitSubsections(section.lines);
+
+  const description = collectParagraphs(subs[0].lines).join(' ');
+  const groups = [];
+  const ROLE_KEYWORDS = /^(primary|secondary|tertiary|neutral|accent)\b/i;
+
+  for (const sub of subs.slice(1)) {
+    if (!sub.name || /Named Rules?/i.test(sub.name) || /^The\s/i.test(sub.name)) continue;
+
+    const bullets = collectBullets(sub.lines);
+    const parsed = bullets.map((b) => parseColorBullet(b)).filter(Boolean);
+    if (parsed.length === 0) continue;
+
+    // If every bullet starts with a role keyword (Primary/Secondary/...), promote
+    // each bullet to its own group. Otherwise keep the subsection as the group.
+    const allRoleBullets =
+      parsed.length > 0 && parsed.every((p) => p.name && ROLE_KEYWORDS.test(p.name));
+
+    if (allRoleBullets) {
+      for (const p of parsed) {
+        groups.push({ role: p.name, colors: [p] });
+      }
+    } else {
+      groups.push({ role: sub.name, colors: parsed });
+    }
+  }
+
+  // If the Colors section has no subsections at all (unlikely), fall back to
+  // scanning the whole section as a flat bullet list.
+  if (groups.length === 0) {
+    const flat = collectBullets(section.lines)
+      .map((b) => parseColorBullet(b))
+      .filter(Boolean);
+    if (flat.length) {
+      for (const p of flat) {
+        if (p.name && ROLE_KEYWORDS.test(p.name)) {
+          groups.push({ role: p.name, colors: [p] });
+        } else {
+          const fallback = groups.find((g) => g.role === 'Palette');
+          if (fallback) fallback.colors.push(p);
+          else groups.push({ role: 'Palette', colors: [p] });
+        }
+      }
+    }
+  }
+
+  return {
+    subtitle: section.subtitle,
+    description: description || null,
+    groups,
+    rules: extractNamedRules(section.lines),
+  };
+}
+
+function parseColorBullet(bullet) {
+  const text = bullet.trim();
+
+  // Case 1 (Impeccable): **Name** (value-with-maybe-nested-parens): description
+  const bold = text.match(/^\*\*(.+?)\*\*\s*(.*)$/);
+  if (bold && bold[2].startsWith('(')) {
+    const value = extractParenGroup(bold[2]);
+    if (value !== null) {
+      const after = bold[2].slice(value.length + 2).trimStart();
+      if (after.startsWith(':')) {
+        return buildColor(bold[1], value, after.slice(1).trim());
+      }
+    }
+  }
+
+  // Case 2 (Stitch): **Name (values):** description   — value embedded in bold.
+  const stitch = text.match(/^\*\*([^*]+?)\s*\(([^)]+)\):\*\*\s*(.*)$/);
+  if (stitch) {
+    return buildColor(stitch[1].trim(), stitch[2], stitch[3]);
+  }
+
+  // Case 3: bullet without bold, just hex/oklch inside.
+  const values = collectColorValues(text);
+  if (values.length) {
+    return buildColor(null, values.join(' to '), text);
+  }
+  return null;
+}
+
+function extractParenGroup(s) {
+  if (s[0] !== '(') return null;
+  let depth = 0;
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === '(') depth++;
+    else if (s[i] === ')') {
+      depth--;
+      if (depth === 0) return s.slice(1, i);
+    }
+  }
+  return null;
+}
+
+function buildColor(name, rawValue, description) {
+  const values = collectColorValues(rawValue);
+  const primary = values[0] ?? rawValue.trim();
+  return {
+    name: name ? stripBold(name).trim() : null,
+    value: primary,
+    valueRange: values.length > 1 ? values : null,
+    format: detectFormat(primary),
+    description: stripBold(description || '').trim() || null,
+  };
+}
+
+function collectColorValues(s) {
+  const out = [];
+  s.replace(HEX_RE, (v) => {
+    out.push(v);
+    return v;
+  });
+  s.replace(OKLCH_RE, (v) => {
+    out.push(v);
+    return v;
+  });
+  return out;
+}
+
+function detectFormat(v) {
+  if (!v) return 'unknown';
+  if (v.startsWith('#')) return 'hex';
+  if (/^oklch/i.test(v)) return 'oklch';
+  if (/^rgb/i.test(v)) return 'rgb';
+  return 'unknown';
+}
+
+function scanInlineColors(lines) {
+  const out = [];
+  for (const line of lines) {
+    if (!/^\s*[-*]\s/.test(line)) continue;
+    const trimmed = line.replace(/^\s*[-*]\s+/, '');
+    const color = parseColorBullet(trimmed);
+    if (color) out.push(color);
+  }
+  return out;
+}
+
+function parseStitchInlineGroups(lines) {
+  // Stitch writes: `*   **Primary (`#00478d` to `#005eb8`):** Use for "..."`
+  // Each bullet IS its own role. Group them under the spoken role name.
+  const out = [];
+  for (const line of lines) {
+    if (!/^\s*[-*]\s/.test(line)) continue;
+    const trimmed = line.replace(/^\s*[-*]\s+/, '').trim();
+    const m = trimmed.match(
+      /^\*\*([A-Z][a-zA-Z]+)\s*\(([^)]+)\):\*\*\s*(.*)$/
+    );
+    if (m) {
+      const role = m[1];
+      const color = buildColor(role, m[2], m[3]);
+      out.push({ role, colors: [color] });
+    }
+  }
+  return out;
+}
+
+function extractTypography(section) {
+  if (!section) return null;
+  const text = section.lines.join('\n');
+
+  const fonts = {};
+  // Pattern A: **Display Font:** Family (with fallback)
+  const fontLineRe = /\*\*([\w\s/]+?)Font:\*\*\s*([^\n(]+?)(?:\s*\(with\s+([^)]+)\))?\s*$/gm;
+  let fm;
+  while ((fm = fontLineRe.exec(text)) !== null) {
+    const rawRole = fm[1].trim().toLowerCase().replace(/\s+/g, '-');
+    const role = normalizeFontRole(rawRole) || 'display';
+    fonts[role] = {
+      family: fm[2].trim(),
+      fallback: fm[3] ? fm[3].trim() : null,
+    };
+  }
+
+  // Pattern B (Stitch): *   **Display & Headlines (Noto Serif):** description
+  if (Object.keys(fonts).length === 0) {
+    const stitchRe = /\*\*([\w\s&/]+?)\s*\(([^)]+)\):\*\*\s*(.+)/g;
+    let sm;
+    while ((sm = stitchRe.exec(text)) !== null) {
+      const rawRole = sm[1]
+        .trim()
+        .toLowerCase()
+        .replace(/\s*&\s*/g, '-')
+        .replace(/\s+/g, '-');
+      const role = normalizeFontRole(rawRole) || rawRole;
+      fonts[role] = { family: sm[2].trim(), fallback: null, purpose: sm[3].trim() };
+    }
+  }
+
+  // Character paragraph — either a **Character:** label, or fall back to the
+  // first free paragraph under the section header (Stitch style).
+  const characterMatch = text.match(/\*\*Character:\*\*\s*([^\n]+(?:\n[^\n]+)*?)(?=\n\n|\n###|\n##|$)/);
+  let character = characterMatch ? characterMatch[1].replace(/\n/g, ' ').trim() : null;
+  if (!character) {
+    const paragraphs = collectParagraphs(section.lines).filter(
+      (p) => !/^\*\*[\w\s/&]+Font/i.test(p) && !/^\*\*[\w\s/&]+\([^)]+\)/.test(p)
+    );
+    if (paragraphs.length) character = paragraphs[0];
+  }
+
+  // Hierarchy bullets under ### Hierarchy
+  const subs = splitSubsections(section.lines);
+  let hierarchy = [];
+  const hierSub = subs.find((s) => s.name && /hierarch/i.test(s.name));
+  if (hierSub) {
+    const bullets = collectBullets(hierSub.lines);
+    hierarchy = bullets.map(parseTypeBullet).filter(Boolean);
+  }
+
+  return {
+    subtitle: section.subtitle,
+    fonts,
+    character,
+    hierarchy,
+    rules: extractNamedRules(section.lines),
+  };
+}
+
+function normalizeFontRole(raw) {
+  // Canonical roles the panel cares about: display, body, label, mono.
+  // Stitch often writes compound roles like "display-&-headlines" or "ui-&-body"
+  // — collapse them to the first canonical role present.
+  const tokens = raw.split(/[-/&\s]+/).filter(Boolean);
+  const priority = ['display', 'headline', 'body', 'ui', 'label', 'mono'];
+  const canonical = { headline: 'display', ui: 'body' };
+  for (const p of priority) {
+    if (tokens.includes(p)) return canonical[p] || p;
+  }
+  return null;
+}
+
+function parseTypeBullet(bullet) {
+  // - **Display** (family, weight 300, italic, clamp(...), line-height 1): purpose
+  const m = bullet.match(/^\*\*(.+?)\*\*\s*\(([^)]+)\):\s*(.*)$/);
+  if (!m) return null;
+  const name = m[1].trim();
+  const specs = m[2].split(',').map((s) => s.trim());
+  return {
+    name,
+    specs,
+    purpose: stripBold(m[3] || '').trim() || null,
+  };
+}
+
+function extractElevation(section) {
+  if (!section) return null;
+  const subs = splitSubsections(section.lines);
+
+  const description = collectParagraphs(subs[0].lines).join(' ') || null;
+
+  const shadows = [];
+  const seen = new Set();
+  const dedupe = (entry) => {
+    const key = (entry.name || '') + '::' + entry.value;
+    if (seen.has(key)) return;
+    seen.add(key);
+    shadows.push(entry);
+  };
+
+  for (const b of collectBullets(section.lines)) {
+    const parsed = parseShadowBullet(b);
+    if (parsed) dedupe(parsed);
+  }
+
+  // Fallback: extract shadows written inline in prose. Stitch style is
+  //   "...use an extra-diffused shadow: `box-shadow: 0 12px 40px rgba(...)`."
+  for (const p of collectParagraphs(section.lines)) {
+    for (const inline of extractInlineShadows(p)) dedupe(inline);
+  }
+  for (const b of collectBullets(section.lines)) {
+    for (const inline of extractInlineShadows(b)) dedupe(inline);
+  }
+
+  return {
+    subtitle: section.subtitle,
+    description,
+    shadows,
+    rules: extractNamedRules(section.lines),
+  };
+}
+
+function extractInlineShadows(text) {
+  // Find `box-shadow: ...` anywhere in prose and capture the value. Work on the
+  // raw string so it handles both backtick-fenced and unfenced variants.
+  const out = [];
+  const re = /box-shadow\s*:\s*([^`;\n]+)/gi;
+  let m;
+  while ((m = re.exec(text)) !== null) {
+    const value = m[1].replace(/[`.)]+$/, '').trim();
+    if (!value) continue;
+    // Name heuristic: the noun immediately before the shadow phrase.
+    // e.g. "an extra-diffused shadow: ..." -> "extra-diffused shadow"
+    const before = text.slice(0, m.index);
+    const nameMatch = before.match(/\b([A-Za-z][A-Za-z\- ]{2,40})\s+shadow\b[^A-Za-z0-9]*$/i);
+    let name = null;
+    if (nameMatch) {
+      const stripped = nameMatch[1]
+        .replace(/^(?:use|using|apply|applying|is|are|looks? like)\s+/i, '')
+        .replace(/^(?:a|an|the)\s+/i, '')
+        .trim();
+      if (stripped) {
+        name =
+          stripped.charAt(0).toUpperCase() + stripped.slice(1) + ' shadow';
+      }
+    }
+    out.push({
+      name,
+      value,
+      purpose: null,
+    });
+  }
+  return out;
+}
+
+function parseShadowBullet(bullet) {
+  // - **Name** (`box-shadow: value`): purpose
+  // - **Name** (`value`): purpose
+  // Only accept if the paren content looks like a shadow value (contains px,
+  // rem, rgba, or box-shadow). This filters out `**Rule Name:**` bullets.
+  const m = bullet.match(/^\*\*(.+?)\*\*\s*\(`?([^`]+?)`?\):\s*(.*)$/);
+  if (!m) return null;
+  const rawValue = m[2].replace(/^box-shadow:\s*/i, '').trim();
+  const looksLikeShadow =
+    /box-shadow|rgba?\(|\bpx\b|\brem\b|^-?\d+\s/i.test(rawValue) &&
+    /\d/.test(rawValue);
+  if (!looksLikeShadow) return null;
+  const name = stripBold(m[1]).trim();
+  return {
+    name,
+    value: rawValue,
+    purpose: stripBold(m[3] || '').trim() || null,
+  };
+}
+
+function extractComponents(section) {
+  if (!section) return null;
+  const subs = splitSubsections(section.lines);
+  const components = [];
+
+  for (const sub of subs.slice(1)) {
+    if (!sub.name) continue;
+
+    const bullets = collectBullets(sub.lines);
+    const paragraphs = collectParagraphs(sub.lines);
+
+    const variants = [];
+    const properties = {};
+
+    for (const b of bullets) {
+      // - **Key:** value
+      const m = b.match(/^\*\*(.+?):?\*\*:?\s*(.+)$/);
+      if (m) {
+        const key = stripBold(m[1]).trim();
+        const value = stripBold(m[2]).trim();
+        // Heuristic: "Primary", "Secondary", "Hover", "Focus" etc are variants;
+        // "Shape", "Background", "Padding" are properties.
+        if (/^(primary|secondary|tertiary|ghost|hover|focus|active|disabled|default|error|selected|unselected|state)$/i.test(key.split(/[\s/]/)[0])) {
+          variants.push({ name: key, description: value });
+        } else {
+          properties[key.toLowerCase()] = value;
+        }
+      }
+    }
+
+    components.push({
+      name: sub.name,
+      description: paragraphs.join(' ') || null,
+      properties,
+      variants,
+    });
+  }
+
+  return {
+    subtitle: section.subtitle,
+    components,
+  };
+}
+
+function extractDosDonts(section) {
+  if (!section) return null;
+  const subs = splitSubsections(section.lines);
+  const dos = [];
+  const donts = [];
+
+  for (const sub of subs.slice(1)) {
+    if (!sub.name) continue;
+    const subName = normalizeApostrophes(sub.name);
+    const bullets = collectBullets(sub.lines).map((b) => stripBold(b).trim());
+    if (/^do'?t?:?$/i.test(subName) || /^do:?$/i.test(subName)) {
+      dos.push(...bullets);
+    } else if (/^don'?t:?$/i.test(subName)) {
+      donts.push(...bullets);
+    }
+  }
+
+  // Classify by bullet prefix as a backup (catches loose bullets outside H3 wrappers)
+  for (const b of collectBullets(section.lines)) {
+    const stripped = normalizeApostrophes(stripBold(b).trim());
+    if (/^don'?t\b/i.test(stripped)) {
+      if (!donts.some((d) => normalizeApostrophes(d) === stripped)) donts.push(stripped);
+    } else if (/^do\b/i.test(stripped)) {
+      if (!dos.some((d) => normalizeApostrophes(d) === stripped)) dos.push(stripped);
+    }
+  }
+
+  return { dos, donts };
+}
+
+// ---------- Coverage assessment ----------
+
+function assessCoverage(model) {
+  const report = {};
+
+  report.overview = model.overview
+    ? {
+        northStar: Boolean(model.overview.creativeNorthStar),
+        philosophy: model.overview.philosophy.length > 0,
+        keyCharacteristics: model.overview.keyCharacteristics.length,
+      }
+    : 'missing';
+
+  report.colors = model.colors
+    ? {
+        groups: model.colors.groups.length,
+        totalColors: model.colors.groups.reduce((n, g) => n + g.colors.length, 0),
+        rules: model.colors.rules.length,
+      }
+    : 'missing';
+
+  report.typography = model.typography
+    ? {
+        fonts: Object.keys(model.typography.fonts).length,
+        hierarchyEntries: model.typography.hierarchy.length,
+        character: Boolean(model.typography.character),
+        rules: model.typography.rules.length,
+      }
+    : 'missing';
+
+  report.elevation = model.elevation
+    ? {
+        shadows: model.elevation.shadows.length,
+        rules: model.elevation.rules.length,
+        description: Boolean(model.elevation.description),
+      }
+    : 'missing';
+
+  report.components = model.components
+    ? {
+        count: model.components.components.length,
+        variantTotal: model.components.components.reduce((n, c) => n + c.variants.length, 0),
+      }
+    : 'missing';
+
+  report.dosDonts = model.dosDonts
+    ? {
+        dos: model.dosDonts.dos.length,
+        donts: model.dosDonts.donts.length,
+      }
+    : 'missing';
+
+  return report;
+}
+
+// ---------- Main ----------
+
+export function parseDesignMd(md) {
+  const { frontmatter, body } = parseFrontmatter(md);
+  const { title, sections } = splitSections(body);
+  return {
+    schemaVersion: 2,
+    title,
+    frontmatter,
+    overview: extractOverview(sections['Overview']),
+    colors: extractColors(sections['Colors']),
+    typography: extractTypography(sections['Typography']),
+    elevation: extractElevation(sections['Elevation']),
+    components: extractComponents(sections['Components']),
+    dosDonts: extractDosDonts(sections["Do's and Don'ts"]),
+  };
+}
+
+export { assessCoverage };
diff --git a/.agents/skills/impeccable/scripts/detect-csp.mjs b/.agents/skills/impeccable/scripts/detect-csp.mjs
new file mode 100644
index 00000000..a13505d2
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/detect-csp.mjs
@@ -0,0 +1,198 @@
+/**
+ * Scan a project tree for Content-Security-Policy signals and classify the
+ * shape so the agent knows which patch template to propose.
+ *
+ * Used at first-time `live.mjs` setup. Mechanical (grep-based) — no network,
+ * no dev server, no JS evaluation. The classification drives a user-facing
+ * consent prompt; the agent does the actual patch writing.
+ *
+ * Shapes are named by patch mechanism, not framework origin:
+ *   - "append-arrays":  CSP defined as structured directive arrays. Patch
+ *                       appends a dev-only localhost entry. Covers:
+ *                         - Monorepo helpers with additional*Src options
+ *                           (e.g. createBaseNextConfig for Next)
+ *                         - SvelteKit kit.csp.directives
+ *                         - nuxt-security module's contentSecurityPolicy
+ *   - "append-string":  CSP built as a literal value string. Patch splices
+ *                       a dev-only token into script-src and connect-src.
+ *                       Covers:
+ *                         - Inline Next.js headers() with CSP string
+ *                         - Nuxt routeRules / nitro.routeRules CSP headers
+ *   - "middleware":     CSP set dynamically in middleware.{ts,js}.
+ *                       Detected but not auto-patched in v1.
+ *   - "meta-tag":       <meta http-equiv="Content-Security-Policy"> in
+ *                       layout files. Detected but not auto-patched in v1.
+ *   - null:             no CSP signals found; no patch needed.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+
+const SKIP_DIRS = new Set([
+  'node_modules',
+  '.git',
+  '.next',
+  '.turbo',
+  '.svelte-kit',
+  '.nuxt',
+  '.astro',
+  'dist',
+  'build',
+  'out',
+  '.vercel',
+]);
+
+const SCAN_EXTS = new Set(['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts', '.tsx', '.jsx']);
+const LAYOUT_EXTS = new Set(['.tsx', '.jsx', '.astro', '.vue', '.svelte', '.html']);
+const MAX_DEPTH = 6;
+const MAX_READ_BYTES = 64 * 1024;
+
+// append-arrays signals: CSP expressed as structured directive arrays
+const MONOREPO_HELPER_SIGNALS = [
+  /\bbuildCSPConfig\b/,
+  /\bbuildSecurityHeaders\b/,
+  /\badditionalScriptSrc\b/,
+  /\badditionalConnectSrc\b/,
+  /\bcreateBaseNextConfig\b/,
+];
+const SVELTEKIT_CSP_SIGNALS = [
+  /\bkit\s*:/,
+  /\bcsp\s*:/,
+  /\bdirectives\s*:/,
+];
+const NUXT_SECURITY_SIGNALS = [
+  /['"]nuxt-security['"]/,
+  /\bcontentSecurityPolicy\b/,
+];
+
+// append-string signals: CSP written as a literal value string
+const INLINE_HEADER_SIGNALS = [
+  /["']Content-Security-Policy["']/i,
+  /\bscript-src\b/,
+  /\bconnect-src\b/,
+];
+const NUXT_ROUTE_RULES_SIGNALS = [
+  /\brouteRules\b/,
+  /Content-Security-Policy/i,
+  /\bscript-src\b/,
+];
+
+const MIDDLEWARE_HINT = /headers\.set\(\s*["']Content-Security-Policy["']/i;
+const META_TAG_HINT = /http-equiv\s*=\s*["']Content-Security-Policy["']/i;
+
+/**
+ * @param {string} cwd Project root.
+ * @returns {{ shape: string|null, signals: string[] }}
+ */
+export function detectCsp(cwd = process.cwd()) {
+  const hits = { appendArrays: [], appendString: [], middleware: [], metaTag: [] };
+
+  walk(cwd, cwd, 0, (absPath, relPath, body) => {
+    const ext = path.extname(absPath);
+    const base = path.basename(absPath).toLowerCase();
+    const isConfig = (name) =>
+      new RegExp('(^|/)' + name + '\\.config\\.').test(relPath);
+
+    // === append-arrays candidates ===
+
+    // Monorepo CSP helper: packages/*/src/.../(config|security)/*
+    if (SCAN_EXTS.has(ext) &&
+        /packages\/[^/]+\/src\/.*(config|next-config|security)/.test(relPath) &&
+        MONOREPO_HELPER_SIGNALS.some((re) => re.test(body))) {
+      hits.appendArrays.push(relPath);
+      return;
+    }
+
+    // SvelteKit kit.csp.directives
+    if (SCAN_EXTS.has(ext) && isConfig('svelte') &&
+        SVELTEKIT_CSP_SIGNALS.every((re) => re.test(body))) {
+      hits.appendArrays.push(relPath);
+      return;
+    }
+
+    // Nuxt nuxt-security module
+    if (SCAN_EXTS.has(ext) && isConfig('nuxt') &&
+        NUXT_SECURITY_SIGNALS.every((re) => re.test(body))) {
+      hits.appendArrays.push(relPath);
+      return;
+    }
+
+    // === append-string candidates ===
+
+    // Inline headers in Next/Nuxt/SvelteKit/Astro/Vite config
+    if (SCAN_EXTS.has(ext) &&
+        /(^|\/)(next|nuxt|vite|astro|svelte)\.config\./.test(relPath) &&
+        INLINE_HEADER_SIGNALS.every((re) => re.test(body))) {
+      // Nuxt routeRules is a sub-shape of append-string; we already covered
+      // nuxt-security above via return, so any remaining Nuxt CSP match here
+      // is a route-rules / inline-headers case. Either way, same patch
+      // mechanism.
+      hits.appendString.push(relPath);
+      return;
+    }
+
+    // === detect-only shapes ===
+
+    if ((base === 'middleware.ts' || base === 'middleware.js' || base === 'middleware.mjs') &&
+        MIDDLEWARE_HINT.test(body)) {
+      hits.middleware.push(relPath);
+    }
+
+    if (LAYOUT_EXTS.has(ext) && META_TAG_HINT.test(body)) {
+      hits.metaTag.push(relPath);
+    }
+  });
+
+  // Priority: append-arrays > append-string > middleware > meta-tag.
+  // Structured patches are safer than string splices; runtime and HTML
+  // injection patches are less reliable and v1 doesn't auto-apply them.
+  if (hits.appendArrays.length > 0) {
+    return { shape: 'append-arrays', signals: hits.appendArrays };
+  }
+  if (hits.appendString.length > 0) {
+    return { shape: 'append-string', signals: hits.appendString };
+  }
+  if (hits.middleware.length > 0) {
+    return { shape: 'middleware', signals: hits.middleware };
+  }
+  if (hits.metaTag.length > 0) {
+    return { shape: 'meta-tag', signals: hits.metaTag };
+  }
+  return { shape: null, signals: [] };
+}
+
+function walk(root, dir, depth, visit) {
+  if (depth > MAX_DEPTH) return;
+  let entries;
+  try { entries = fs.readdirSync(dir, { withFileTypes: true }); }
+  catch { return; }
+
+  for (const entry of entries) {
+    const abs = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (SKIP_DIRS.has(entry.name)) continue;
+      walk(root, abs, depth + 1, visit);
+      continue;
+    }
+    if (!entry.isFile()) continue;
+    const ext = path.extname(entry.name);
+    if (!SCAN_EXTS.has(ext) && !LAYOUT_EXTS.has(ext)) continue;
+    let body;
+    try {
+      const fd = fs.openSync(abs, 'r');
+      try {
+        const buf = Buffer.alloc(MAX_READ_BYTES);
+        const n = fs.readSync(fd, buf, 0, MAX_READ_BYTES, 0);
+        body = buf.slice(0, n).toString('utf-8');
+      } finally { fs.closeSync(fd); }
+    } catch { continue; }
+    visit(abs, path.relative(root, abs), body);
+  }
+}
+
+// CLI mode
+const _running = process.argv[1];
+if (_running?.endsWith('detect-csp.mjs') || _running?.endsWith('detect-csp.mjs/')) {
+  const result = detectCsp(process.cwd());
+  console.log(JSON.stringify(result, null, 2));
+}
diff --git a/.agents/skills/impeccable/scripts/impeccable-paths.mjs b/.agents/skills/impeccable/scripts/impeccable-paths.mjs
new file mode 100644
index 00000000..ba852bae
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/impeccable-paths.mjs
@@ -0,0 +1,105 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+export const IMPECCABLE_DIR = '.impeccable';
+export const LIVE_DIR = 'live';
+
+export function getImpeccableDir(cwd = process.cwd()) {
+  return path.join(cwd, IMPECCABLE_DIR);
+}
+
+export function getDesignSidecarPath(cwd = process.cwd()) {
+  return path.join(getImpeccableDir(cwd), 'design.json');
+}
+
+export function getDesignSidecarCandidates(cwd = process.cwd(), contextDir = cwd) {
+  const candidates = [
+    getDesignSidecarPath(cwd),
+    path.join(cwd, 'DESIGN.json'),
+  ];
+  const contextLegacy = path.join(contextDir, 'DESIGN.json');
+  if (!candidates.includes(contextLegacy)) candidates.push(contextLegacy);
+  return candidates;
+}
+
+export function resolveDesignSidecarPath(cwd = process.cwd(), contextDir = cwd) {
+  return firstExisting(getDesignSidecarCandidates(cwd, contextDir));
+}
+
+export function getLiveDir(cwd = process.cwd()) {
+  return path.join(getImpeccableDir(cwd), LIVE_DIR);
+}
+
+export function getLiveConfigPath(cwd = process.cwd()) {
+  return path.join(getLiveDir(cwd), 'config.json');
+}
+
+export function getLegacyLiveConfigPath(scriptsDir) {
+  return path.join(scriptsDir, 'config.json');
+}
+
+export function resolveLiveConfigPath({ cwd = process.cwd(), scriptsDir, env = process.env } = {}) {
+  if (env.IMPECCABLE_LIVE_CONFIG && env.IMPECCABLE_LIVE_CONFIG.trim()) {
+    const configured = env.IMPECCABLE_LIVE_CONFIG.trim();
+    return path.isAbsolute(configured) ? configured : path.resolve(cwd, configured);
+  }
+  const primary = getLiveConfigPath(cwd);
+  if (fs.existsSync(primary)) return primary;
+  if (scriptsDir) {
+    const legacy = getLegacyLiveConfigPath(scriptsDir);
+    if (fs.existsSync(legacy)) return legacy;
+  }
+  return primary;
+}
+
+export function getLiveServerPath(cwd = process.cwd()) {
+  return path.join(getLiveDir(cwd), 'server.json');
+}
+
+export function getLegacyLiveServerPath(cwd = process.cwd()) {
+  return path.join(cwd, '.impeccable-live.json');
+}
+
+export function readLiveServerInfo(cwd = process.cwd()) {
+  for (const filePath of [getLiveServerPath(cwd), getLegacyLiveServerPath(cwd)]) {
+    try {
+      return { info: JSON.parse(fs.readFileSync(filePath, 'utf-8')), path: filePath };
+    } catch {
+      /* try next */
+    }
+  }
+  return null;
+}
+
+export function writeLiveServerInfo(cwd = process.cwd(), info) {
+  const filePath = getLiveServerPath(cwd);
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, JSON.stringify(info));
+  return filePath;
+}
+
+export function removeLiveServerInfo(cwd = process.cwd()) {
+  for (const filePath of [getLiveServerPath(cwd), getLegacyLiveServerPath(cwd)]) {
+    try { fs.unlinkSync(filePath); } catch {}
+  }
+}
+
+export function getLiveSessionsDir(cwd = process.cwd()) {
+  return path.join(getLiveDir(cwd), 'sessions');
+}
+
+export function getLegacyLiveSessionsDir(cwd = process.cwd()) {
+  return path.join(cwd, '.impeccable-live', 'sessions');
+}
+
+export function getLiveAnnotationsDir(cwd = process.cwd()) {
+  return path.join(getLiveDir(cwd), 'annotations');
+}
+
+export function getLegacyLiveAnnotationsDir(cwd = process.cwd()) {
+  return path.join(cwd, '.impeccable-live', 'annotations');
+}
+
+function firstExisting(paths) {
+  return paths.find((filePath) => fs.existsSync(filePath)) || null;
+}
diff --git a/.agents/skills/impeccable/scripts/is-generated.mjs b/.agents/skills/impeccable/scripts/is-generated.mjs
new file mode 100644
index 00000000..165e1ca8
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/is-generated.mjs
@@ -0,0 +1,69 @@
+/**
+ * Decide whether a given file is "generated" (regenerated by a build step,
+ * unsafe to write variants into) or "source" (safe to edit, changes persist).
+ *
+ * Why this matters: when the user picks an element on a page whose underlying
+ * file is regenerated by a build step (e.g. `scripts/build-sub-pages.js`
+ * rewriting `public/docs/*.html`), writing variants or accepted changes into
+ * that file is silent data loss — the next build wipes them.
+ *
+ * Signals, in order of reliability:
+ *   1. Git check-ignore: gitignored files are assumed generated.
+ *   2. File-header markers ("GENERATED", "DO NOT EDIT", "AUTO-GENERATED")
+ *      within the first ~300 characters — catches non-git projects.
+ */
+
+import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const HEADER_SCAN_BYTES = 300;
+const HEADER_MARKERS = [
+  /@generated\b/i,
+  /\bGENERATED\s+FILE\b/,
+  /\bAUTO-?GENERATED\b/i,
+  /\bDO\s+NOT\s+EDIT\b/i,
+];
+
+/**
+ * @param {string} filePath - absolute or cwd-relative path
+ * @param {object} [options]
+ * @param {string} [options.cwd] - project root (defaults to process.cwd())
+ */
+export function isGeneratedFile(filePath, options = {}) {
+  const cwd = options.cwd || process.cwd();
+  const absPath = path.isAbsolute(filePath) ? filePath : path.resolve(cwd, filePath);
+
+  if (isGitIgnored(absPath, cwd)) return true;
+  if (hasGeneratedHeader(absPath)) return true;
+  return false;
+}
+
+function isGitIgnored(absPath, cwd) {
+  try {
+    execSync(`git check-ignore --quiet ${JSON.stringify(absPath)}`, {
+      cwd,
+      stdio: 'ignore',
+    });
+    return true; // exit 0 = ignored
+  } catch (err) {
+    // Exit code 1 = not ignored. Exit code 128 = not a git repo or other error.
+    // In both cases, treat as "not known to be ignored."
+    return false;
+  }
+}
+
+function hasGeneratedHeader(absPath) {
+  let fd;
+  try {
+    fd = fs.openSync(absPath, 'r');
+    const buf = Buffer.alloc(HEADER_SCAN_BYTES);
+    const bytesRead = fs.readSync(fd, buf, 0, HEADER_SCAN_BYTES, 0);
+    const head = buf.slice(0, bytesRead).toString('utf-8');
+    return HEADER_MARKERS.some((re) => re.test(head));
+  } catch {
+    return false;
+  } finally {
+    if (fd !== undefined) { try { fs.closeSync(fd); } catch {} }
+  }
+}
diff --git a/.agents/skills/impeccable/scripts/live-accept.mjs b/.agents/skills/impeccable/scripts/live-accept.mjs
new file mode 100644
index 00000000..f3cb1b48
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-accept.mjs
@@ -0,0 +1,595 @@
+/**
+ * CLI helper: deterministic accept/discard of variant sessions.
+ *
+ * Usage:
+ *   node live-accept.mjs --id SESSION_ID --discard
+ *   node live-accept.mjs --id SESSION_ID --variant N
+ *
+ * For discard: removes the entire variant wrapper and restores the original.
+ * For accept: replaces the wrapper with the chosen variant's content. If the
+ * session had a colocated <style> block, it's preserved with carbonize markers
+ * for a background agent to integrate into the project's CSS.
+ *
+ * Output: JSON to stdout.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { isGeneratedFile } from './is-generated.mjs';
+
+const EXTENSIONS = ['.html', '.jsx', '.tsx', '.vue', '.svelte', '.astro'];
+
+// ---------------------------------------------------------------------------
+// CLI
+// ---------------------------------------------------------------------------
+
+export async function acceptCli() {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`Usage: node live-accept.mjs [options]
+
+Deterministic accept/discard for live variant sessions.
+
+Modes:
+  --discard          Remove variants, restore original
+  --variant N        Accept variant N, discard the rest
+
+Required:
+  --id SESSION_ID    Session ID of the variant wrapper
+
+Output (JSON):
+  { handled, file, carbonize }`);
+    process.exit(0);
+  }
+
+  const id = argVal(args, '--id');
+  const variantNum = argVal(args, '--variant');
+  const paramValuesRaw = argVal(args, '--param-values');
+  const isDiscard = args.includes('--discard');
+
+  if (!id) { console.error('Missing --id'); process.exit(1); }
+  if (!isDiscard && !variantNum) { console.error('Need --discard or --variant N'); process.exit(1); }
+
+  let paramValues = null;
+  if (paramValuesRaw) {
+    try { paramValues = JSON.parse(paramValuesRaw); }
+    catch { paramValues = null; } // malformed blob: skip the comment rather than failing the accept
+  }
+
+  // Find the file containing this session's markers
+  const found = findSessionFile(id, process.cwd());
+  if (!found) {
+    console.log(JSON.stringify({ handled: false, error: 'Session markers not found for id: ' + id }));
+    process.exit(0);
+  }
+
+  const { file: targetFile, content, lines } = found;
+  const relFile = path.relative(process.cwd(), targetFile);
+
+  // Bail if the session lives in a generated file. The agent manually wrote
+  // the wrapper there for preview, and is responsible for writing the
+  // accepted variant to true source (or cleaning up on discard). See
+  // "Handle fallback" in live.md.
+  if (isGeneratedFile(targetFile, { cwd: process.cwd() })) {
+    console.log(JSON.stringify({
+      handled: false,
+      mode: 'fallback',
+      file: relFile,
+      hint: 'Session is in a generated file. Persist the accepted variant in source; do not rely on this script.',
+    }));
+    process.exit(0);
+  }
+
+  if (isDiscard) {
+    const result = handleDiscard(id, lines, targetFile);
+    console.log(JSON.stringify({ handled: true, file: relFile, carbonize: false, ...result }));
+  } else {
+    const result = handleAccept(id, variantNum, lines, targetFile, paramValues);
+    // Single-line attention-grabber when cleanup is required. The full
+    // five-step checklist lives in reference/live.md (loaded once per
+    // session); repeating it per-event would waste tokens.
+    if (result.carbonize) {
+      result.todo = 'REQUIRED before next poll: carbonize cleanup in ' + relFile + '. See reference/live.md "Required after accept".';
+    }
+    console.log(JSON.stringify({ handled: true, file: relFile, ...result }));
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Discard
+// ---------------------------------------------------------------------------
+
+function handleDiscard(id, lines, targetFile) {
+  const block = findMarkerBlock(id, lines);
+  if (!block) return { handled: false, error: 'Markers not found' };
+
+  const original = extractOriginal(lines, block);
+  const isJsx = detectCommentSyntax(targetFile).open === '{/*';
+  const replaceRange = expandReplaceRange(block, lines, isJsx);
+
+  // Restore at the line we're actually replacing FROM, not the marker line.
+  // For JSX wrappers the marker comments live INSIDE the outer `<div>`, so
+  // `block.start` sits 2 spaces deeper than the original element. Using that
+  // as the deindent base would push the restored content 2 spaces too far
+  // right on every JSX/TSX session. `replaceRange.start` is the outer wrapper
+  // line, which is at the original element's indent for both HTML and JSX.
+  const indent = lines[replaceRange.start].match(/^(\s*)/)[1];
+  const restored = deindentContent(original, indent);
+
+  const newLines = [
+    ...lines.slice(0, replaceRange.start),
+    ...restored,
+    ...lines.slice(replaceRange.end + 1),
+  ];
+  fs.writeFileSync(targetFile, newLines.join('\n'), 'utf-8');
+  return {};
+}
+
+// ---------------------------------------------------------------------------
+// Accept
+// ---------------------------------------------------------------------------
+
+function handleAccept(id, variantNum, lines, targetFile, paramValues) {
+  const block = findMarkerBlock(id, lines);
+  if (!block) return { handled: false, error: 'Markers not found' };
+
+  const commentSyntax = detectCommentSyntax(targetFile);
+  const isJsx = commentSyntax.open === '{/*';
+  // Anchor indent on the line we're replacing FROM (the outer wrapper),
+  // not on `block.start` — for JSX that's the marker comment 2 spaces
+  // deeper than the original element. See handleDiscard for the full
+  // rationale.
+  const replaceRange = expandReplaceRange(block, lines, isJsx);
+  const indent = lines[replaceRange.start].match(/^(\s*)/)[1];
+
+  // Extract the chosen variant's inner content
+  const variantContent = extractVariant(lines, block, variantNum);
+  if (!variantContent) return { handled: false, error: 'Variant ' + variantNum + ' not found' };
+
+  // Extract CSS block if present
+  const cssContent = extractCss(lines, block, id);
+
+  // Check if carbonizing is needed:
+  // - CSS block exists, OR
+  // - variant HTML contains helper classes/attributes that need cleanup
+  const variantText = variantContent.join('\n');
+  const hasHelperAttrs = variantText.includes('data-impeccable-variant');
+  const needsCarbonize = !!(cssContent || hasHelperAttrs);
+
+  // Build the replacement
+  const restored = deindentContent(variantContent, indent);
+  const replacement = [];
+
+  if (cssContent) {
+    replacement.push(indent + commentSyntax.open + ' impeccable-carbonize-start ' + id + ' ' + commentSyntax.close);
+    // JSX targets need the CSS body wrapped in a template literal so that the
+    // `{` and `}` in CSS rules don't get parsed as JSX expressions.
+    replacement.push(indent + '<style data-impeccable-css="' + id + '">' + (isJsx ? '{`' : ''));
+    // Re-indent CSS content to match
+    for (const cssLine of cssContent) {
+      replacement.push(indent + cssLine.trimStart());
+    }
+    replacement.push(indent + (isJsx ? '`}</style>' : '</style>'));
+    if (paramValues && Object.keys(paramValues).length > 0) {
+      // Preserve the user's knob positions for the carbonize-cleanup agent
+      // to bake into the final CSS when it collapses scoped rules.
+      replacement.push(indent + commentSyntax.open + ' impeccable-param-values ' + id + ': ' + JSON.stringify(paramValues) + ' ' + commentSyntax.close);
+    }
+    replacement.push(indent + commentSyntax.open + ' impeccable-carbonize-end ' + id + ' ' + commentSyntax.close);
+  }
+
+  // Keep the `@scope ([data-impeccable-variant="N"])` selectors in the
+  // carbonize CSS block working visually by re-wrapping the accepted content
+  // in a data-impeccable-variant="N" div with `display: contents` (so layout
+  // isn't affected). The carbonize agent strips this attribute + wrapper when
+  // it moves the CSS to a proper stylesheet.
+  //
+  // Style attribute syntax has to follow the host file's flavor — JSX files
+  // need the object form, otherwise React 19 throws "Failed to set indexed
+  // property [0] on CSSStyleDeclaration" while parsing the string char-by-char.
+  if (cssContent) {
+    const styleAttr = isJsx ? "style={{ display: 'contents' }}" : 'style="display: contents"';
+    replacement.push(indent + '<div data-impeccable-variant="' + variantNum + '" ' + styleAttr + '>');
+    replacement.push(...restored);
+    replacement.push(indent + '</div>');
+  } else {
+    replacement.push(...restored);
+  }
+
+  const newLines = [
+    ...lines.slice(0, replaceRange.start),
+    ...replacement,
+    ...lines.slice(replaceRange.end + 1),
+  ];
+  fs.writeFileSync(targetFile, newLines.join('\n'), 'utf-8');
+
+  return { carbonize: needsCarbonize };
+}
+
+// ---------------------------------------------------------------------------
+// Parsing helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Find the start/end marker lines for a session.
+ * Returns { start, end } (0-indexed line numbers) or null.
+ */
+function findMarkerBlock(id, lines) {
+  let start = -1;
+  let end = -1;
+  const startPattern = 'impeccable-variants-start ' + id;
+  const endPattern = 'impeccable-variants-end ' + id;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (start === -1 && lines[i].includes(startPattern)) start = i;
+    if (lines[i].includes(endPattern)) { end = i; break; }
+  }
+
+  return (start !== -1 && end !== -1) ? { start, end } : null;
+}
+
+/**
+ * Compute the line range to REPLACE (vs. just the marker range to extract
+ * from). For JSX/TSX wrappers, live-wrap places the marker comments INSIDE
+ * the `<div data-impeccable-variants="ID">` outer wrapper so the picked
+ * element's JSX slot keeps a single child — a Fragment `<></>` would have
+ * solved the multi-sibling case but failed inside `asChild` / cloneElement
+ * parents with "Invalid prop supplied to React.Fragment".
+ *
+ * That means the marker block is enclosed by the wrapper `<div>` opener
+ * (with `data-impeccable-variants="ID"`) and its matching `</div>`. We
+ * walk back to the opener and forward to the closer so accept/discard
+ * remove the entire scaffold, not just the inner markers.
+ *
+ * Marker lines themselves stay where they were so extractOriginal /
+ * extractVariant / extractCss continue to walk the same range.
+ */
+function expandReplaceRange(block, lines, isJsx) {
+  if (!isJsx) return { start: block.start, end: block.end };
+
+  let { start, end } = block;
+
+  // Walk back for the wrapper `<div data-impeccable-variants="..."` opener.
+  // The attr may sit on a continuation line of a multi-line opening tag, so
+  // also walk to the line that actually contains `<div`.
+  for (let i = start - 1; i >= Math.max(0, start - 12); i--) {
+    if (/data-impeccable-variants=/.test(lines[i])) {
+      let opener = i;
+      while (opener > 0 && !/<div\b/.test(lines[opener])) opener--;
+      start = opener;
+      break;
+    }
+  }
+
+  // Walk forward to the matching `</div>` by div-depth tracking from the
+  // wrapper opener. Operate on JOINED text instead of per-line: a
+  // multi-line self-closing JSX `<div\n  className="spacer"\n/>` would
+  // fool per-line regex tracking (the `<div` line matches openRe but the
+  // `/>` line never matches selfCloseRe since it needs `<div` on the same
+  // line). That left depth permanently over-counted and the wrapper's
+  // outer `</div>` orphaned after accept/discard. Single regex with
+  // `[^>]*?` (which spans newlines in JS) handles either form correctly.
+  const joined = lines.slice(start).join('\n');
+  // Match either `<div … />` (self-close, group 1 is `/`), `<div … >`
+  // (open, group 1 is empty), or `</div>`.
+  const tagRe = /<div\b[^>]*?(\/?)>|<\/div\s*>/g;
+  let depth = 0;
+  let m;
+  while ((m = tagRe.exec(joined)) !== null) {
+    const isClose = m[0].startsWith('</');
+    const isSelfClose = !isClose && m[1] === '/';
+    if (isClose) depth--;
+    else if (!isSelfClose) depth++;
+    if (depth <= 0) {
+      // m.index is offset within `joined`; convert back to a file line.
+      const linesBefore = joined.slice(0, m.index + m[0].length).split('\n').length - 1;
+      const candidateEnd = start + linesBefore;
+      if (candidateEnd >= end) {
+        end = candidateEnd;
+        break;
+      }
+    }
+  }
+
+  return { start, end };
+}
+
+/**
+ * Join wrapper lines into a single string with `<style>` elements removed so
+ * marker matching and div-depth tracking aren't confused by:
+ *   - CSS `@scope ([data-impeccable-variant="N"])` strings that look like the
+ *     HTML marker we're searching for
+ *   - JSX self-closing `<style ... />` (no separate `</style>` to close on)
+ *   - Same-line `<style>…</style>` blocks
+ *   - Multi-line `<style>\n…\n</style>` blocks
+ */
+function stripStyleAndJoin(lines, block) {
+  const out = [];
+  let inStyle = false;
+  for (let i = block.start; i <= block.end; i++) {
+    let line = lines[i];
+
+    if (!inStyle) {
+      // Strip any complete <style> elements on this line (self-closed or
+      // same-line-closed), including their body content.
+      line = line
+        .replace(/<style\b[^>]*>[\s\S]*?<\/style\s*>/g, '')
+        .replace(/<style\b[^>]*\/\s*>/g, '');
+
+      // If a <style> opener remains (multi-line body starts here), strip from
+      // the opener to end-of-line and flip into skip mode.
+      const openerIdx = line.search(/<style\b/);
+      if (openerIdx !== -1) {
+        line = line.slice(0, openerIdx);
+        inStyle = true;
+      }
+      out.push(line);
+    } else {
+      // In multi-line style body; drop everything until we see </style>.
+      const closeIdx = line.search(/<\/style\s*>/);
+      if (closeIdx !== -1) {
+        inStyle = false;
+        out.push(line.slice(closeIdx).replace(/<\/style\s*>/, ''));
+      }
+      // else: skip line entirely
+    }
+  }
+  return out.join('\n');
+}
+
+/**
+ * Find the inner content of `<TAG ...attrMatch...>…</TAG>` inside `text`,
+ * handling nested same-tag elements via depth counting. `attrMatch` is a
+ * regex source fragment that must appear inside the opener tag.
+ * Returns the inner string (may be empty), or null if not found.
+ */
+function extractInnerByAttr(text, attrMatch) {
+  const openerRe = new RegExp('<([A-Za-z][A-Za-z0-9]*)\\b[^>]*' + attrMatch + '[^>]*>');
+  const openMatch = text.match(openerRe);
+  if (!openMatch) return null;
+
+  const tagName = openMatch[1];
+  const innerStart = openMatch.index + openMatch[0].length;
+
+  // Match any opener or closer of this tag name after innerStart.
+  // (Does not match self-closing <TAG … />, which doesn't contribute to depth.)
+  const tagRe = new RegExp('<(?:/)?' + tagName + '\\b[^>]*>', 'g');
+  tagRe.lastIndex = innerStart;
+
+  let depth = 1;
+  let m;
+  while ((m = tagRe.exec(text))) {
+    const isClose = m[0].startsWith('</');
+    const isSelfClose = !isClose && /\/\s*>$/.test(m[0]);
+    if (isClose) {
+      depth--;
+      if (depth === 0) return text.slice(innerStart, m.index);
+    } else if (!isSelfClose) {
+      depth++;
+    }
+  }
+  return null;
+}
+
+/**
+ * Extract the original element content from within the variant wrapper.
+ * Returns an array of lines.
+ */
+function extractOriginal(lines, block) {
+  const text = stripStyleAndJoin(lines, block);
+  const inner = extractInnerByAttr(text, 'data-impeccable-variant="original"');
+  if (inner === null) return [];
+  return inner.split('\n');
+}
+
+/**
+ * Extract a specific variant's inner content (stripping the wrapper div).
+ * Returns an array of lines, or null if not found.
+ */
+function extractVariant(lines, block, variantNum) {
+  const text = stripStyleAndJoin(lines, block);
+  const inner = extractInnerByAttr(text, 'data-impeccable-variant="' + variantNum + '"');
+  if (inner === null) return null;
+  const result = inner.split('\n');
+  // Collapse a lone empty leading/trailing line (common after string splice).
+  while (result.length > 1 && result[0].trim() === '') result.shift();
+  while (result.length > 1 && result[result.length - 1].trim() === '') result.pop();
+  return result.length > 0 ? result : null;
+}
+
+/**
+ * Extract the colocated <style> block content (between the style tags).
+ * Returns an array of CSS lines, or null if no style block found.
+ *
+ * Handles three shapes of `<style data-impeccable-css="ID" ...>`:
+ *   1. Self-closing: `<style ... />` — no body; return null (nothing to carbonize).
+ *   2. Same-line open+close: `<style>...</style>` — return the inner content.
+ *   3. Multi-line: `<style>` on one line, `</style>` on a later line — return
+ *      the lines between them.
+ */
+function extractCss(lines, block, id) {
+  const styleAttr = 'data-impeccable-css="' + id + '"';
+  let inStyle = false;
+  const content = [];
+
+  for (let i = block.start; i <= block.end; i++) {
+    const line = lines[i];
+
+    if (!inStyle && line.includes(styleAttr)) {
+      // Self-closing: nothing to carbonize.
+      if (/<style\b[^>]*\/\s*>/.test(line)) return null;
+      // Same-line open + close: extract inner text.
+      const sameLine = line.match(/<style\b[^>]*>([\s\S]*?)<\/style\s*>/);
+      if (sameLine) {
+        const inner = stripJsxTemplateWrap(sameLine[1]);
+        return inner.length > 0 ? inner.split('\n') : null;
+      }
+      inStyle = true;
+      continue; // skip the <style> opening tag
+    }
+
+    if (inStyle) {
+      // Detect </style> anywhere on the line — JSX template-literal closes
+      // (`}</style>`) put the close mid-line, and we don't want to absorb the
+      // template-literal punctuation as CSS content.
+      const closeIdx = line.indexOf('</style>');
+      if (closeIdx !== -1) break;
+      content.push(line);
+    }
+  }
+
+  if (content.length === 0) return null;
+  return stripJsxTemplateLines(content);
+}
+
+/**
+ * Strip a JSX template-literal wrap (`{` … `}`) from CSS extracted out of a
+ * `<style>` element in a JSX/TSX file. The agent may write the wrap with
+ * `{` and `}` directly attached to the `<style>` tags, on their own lines,
+ * or attached to the first/last CSS lines — all three are JSX-legal.
+ *
+ * Stripping is required because handleAccept re-wraps the CSS itself when
+ * carbonizing. Without this, two consecutive accepts (or a previously-
+ * accepted variants block being carbonized) would produce nested
+ * `{` `{` … `}` `}`, which oxc rejects with "Expected `}` but found `@`".
+ */
+function stripJsxTemplateLines(content) {
+  const out = content.slice();
+
+  // Drop any leading blank lines so we don't miss a `{` line buried below
+  // them; same for trailing.
+  while (out.length > 0 && out[0].trim() === '') out.shift();
+  while (out.length > 0 && out[out.length - 1].trim() === '') out.pop();
+  if (out.length === 0) return null;
+
+  // Leading `{`: own line, or attached to the first CSS line.
+  const firstTrim = out[0].trimStart();
+  if (firstTrim === '{`') {
+    out.shift();
+  } else if (firstTrim.startsWith('{`')) {
+    const idx = out[0].indexOf('{`');
+    out[0] = out[0].slice(0, idx) + out[0].slice(idx + 2);
+    if (out[0].trim() === '') out.shift();
+  }
+  if (out.length === 0) return null;
+
+  // Trailing `` ` `` `}`: own line, or attached to the last CSS line.
+  const lastIdx = out.length - 1;
+  const lastTrim = out[lastIdx].trimEnd();
+  if (lastTrim === '`}') {
+    out.pop();
+  } else if (lastTrim.endsWith('`}')) {
+    const text = out[lastIdx];
+    const idx = text.lastIndexOf('`}');
+    out[lastIdx] = text.slice(0, idx) + text.slice(idx + 2);
+    if (out[lastIdx].trim() === '') out.pop();
+  }
+
+  return out.length > 0 ? out : null;
+}
+
+function stripJsxTemplateWrap(text) {
+  const lines = text.split('\n');
+  const stripped = stripJsxTemplateLines(lines);
+  return stripped ? stripped.join('\n') : '';
+}
+
+/**
+ * De-indent content that was indented by live-wrap.mjs.
+ * The wrap script adds `indent + '    '` (4 extra spaces) to each line.
+ * We restore to just `indent` level.
+ */
+function deindentContent(contentLines, baseIndent) {
+  // Find the minimum indentation in the content to determine how much was added
+  let minIndent = Infinity;
+  for (const line of contentLines) {
+    if (line.trim() === '') continue;
+    const leadingSpaces = line.match(/^(\s*)/)[1].length;
+    minIndent = Math.min(minIndent, leadingSpaces);
+  }
+  if (minIndent === Infinity) minIndent = 0;
+
+  // Strip the extra indentation and re-add base indent
+  return contentLines.map(line => {
+    if (line.trim() === '') return '';
+    return baseIndent + line.slice(minIndent);
+  });
+}
+
+function detectCommentSyntax(filePath) {
+  const ext = path.extname(filePath).toLowerCase();
+  if (ext === '.jsx' || ext === '.tsx') {
+    return { open: '{/*', close: '*/}' };
+  }
+  return { open: '<!--', close: '-->' };
+}
+
+// ---------------------------------------------------------------------------
+// File search (find the file containing session markers)
+// ---------------------------------------------------------------------------
+
+function findSessionFile(id, cwd) {
+  const marker = 'impeccable-variants-start ' + id;
+  const searchDirs = ['src', 'app', 'pages', 'components', 'public', 'views', 'templates', '.'];
+  const seen = new Set();
+
+  for (const dir of searchDirs) {
+    const absDir = path.join(cwd, dir);
+    if (!fs.existsSync(absDir)) continue;
+    const result = searchDir(absDir, marker, seen, 0);
+    if (result) {
+      const content = fs.readFileSync(result, 'utf-8');
+      return { file: result, content, lines: content.split('\n') };
+    }
+  }
+  return null;
+}
+
+function searchDir(dir, query, seen, depth) {
+  if (depth > 5) return null;
+  let realDir;
+  try { realDir = fs.realpathSync(dir); } catch { return null; }
+  if (seen.has(realDir)) return null;
+  seen.add(realDir);
+
+  let entries;
+  try { entries = fs.readdirSync(dir, { withFileTypes: true }); }
+  catch { return null; }
+
+  for (const entry of entries) {
+    if (!entry.isFile()) continue;
+    if (!EXTENSIONS.includes(path.extname(entry.name).toLowerCase())) continue;
+    const filePath = path.join(dir, entry.name);
+    try {
+      const content = fs.readFileSync(filePath, 'utf-8');
+      if (content.includes(query)) return filePath;
+    } catch { /* skip */ }
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    if (['node_modules', '.git', 'dist', 'build'].includes(entry.name)) continue;
+    const result = searchDir(path.join(dir, entry.name), query, seen, depth + 1);
+    if (result) return result;
+  }
+
+  return null;
+}
+
+// ---------------------------------------------------------------------------
+// Utilities
+// ---------------------------------------------------------------------------
+
+function argVal(args, flag) {
+  const idx = args.indexOf(flag);
+  return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : null;
+}
+
+// Auto-execute when run directly
+const _running = process.argv[1];
+if (_running?.endsWith('live-accept.mjs') || _running?.endsWith('live-accept.mjs/')) {
+  acceptCli();
+}
+
+export { findMarkerBlock, extractOriginal, extractVariant, extractCss, deindentContent, detectCommentSyntax };
diff --git a/.agents/skills/impeccable/scripts/live-browser-session.js b/.agents/skills/impeccable/scripts/live-browser-session.js
new file mode 100644
index 00000000..0e362d6b
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-browser-session.js
@@ -0,0 +1,123 @@
+/**
+ * Browser-side durable session helpers for Impeccable live mode.
+ *
+ * Kept separate from live-browser.js so recovery state can be tested without
+ * booting the full overlay UI. Served before live-browser.js and attached to
+ * window.__IMPECCABLE_LIVE_SESSION__.
+ */
+(function (root) {
+  'use strict';
+
+  function createLiveBrowserSessionState({ prefix, storage, idFactory }) {
+    if (!prefix) throw new Error('prefix required');
+    const store = storage || root.localStorage;
+    const makeId = idFactory || function () { return Math.random().toString(16).slice(2, 10); };
+    const sessionKey = prefix + '-session';
+    const handledKey = sessionKey + '-handled';
+    const scrollKey = sessionKey + '-scroll';
+    let checkpointRevision = 0;
+    const owner = makeId();
+
+    function safeRead(key) {
+      try { return store.getItem(key); } catch { return null; }
+    }
+
+    function safeWrite(key, value) {
+      try { store.setItem(key, value); } catch { /* quota exceeded or private mode */ }
+    }
+
+    function safeRemove(key) {
+      try { store.removeItem(key); } catch { /* unavailable storage */ }
+    }
+
+    function loadSession() {
+      try {
+        const raw = safeRead(sessionKey);
+        if (!raw) return null;
+        const parsed = JSON.parse(raw);
+        if (Number.isInteger(parsed.checkpointRevision)) {
+          checkpointRevision = Math.max(checkpointRevision, parsed.checkpointRevision);
+        }
+        return parsed;
+      } catch { return null; }
+    }
+
+    function saveSession(session) {
+      if (!session || !session.id) return;
+      const payload = {
+        ...session,
+        checkpointRevision,
+      };
+      safeWrite(sessionKey, JSON.stringify(payload));
+    }
+
+    function clearSession() {
+      safeRemove(sessionKey);
+    }
+
+    function nextCheckpointRevision() {
+      checkpointRevision += 1;
+      const existing = loadSession();
+      if (existing?.id) saveSession(existing);
+      return checkpointRevision;
+    }
+
+    function seedCheckpointRevision(value) {
+      if (Number.isInteger(value)) checkpointRevision = Math.max(checkpointRevision, value);
+      return checkpointRevision;
+    }
+
+    function currentCheckpointRevision() {
+      return checkpointRevision;
+    }
+
+    function markHandled(id) {
+      if (!id) return;
+      safeWrite(handledKey, id);
+    }
+
+    function isHandled(id) {
+      return !!id && safeRead(handledKey) === id;
+    }
+
+    function clearHandled() {
+      safeRemove(handledKey);
+    }
+
+    function writeScrollY(y) {
+      safeWrite(scrollKey, String(y));
+    }
+
+    function readScrollY() {
+      const raw = safeRead(scrollKey);
+      if (raw == null) return null;
+      const n = parseFloat(raw);
+      return isFinite(n) ? n : null;
+    }
+
+    function clearScrollY() {
+      safeRemove(scrollKey);
+    }
+
+    return {
+      owner,
+      sessionKey,
+      handledKey,
+      scrollKey,
+      saveSession,
+      loadSession,
+      clearSession,
+      nextCheckpointRevision,
+      seedCheckpointRevision,
+      currentCheckpointRevision,
+      markHandled,
+      isHandled,
+      clearHandled,
+      writeScrollY,
+      readScrollY,
+      clearScrollY,
+    };
+  }
+
+  root.__IMPECCABLE_LIVE_SESSION__ = { createLiveBrowserSessionState };
+})(typeof window !== 'undefined' ? window : globalThis);
diff --git a/.agents/skills/impeccable/scripts/live-browser.js b/.agents/skills/impeccable/scripts/live-browser.js
new file mode 100644
index 00000000..e67cd01e
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-browser.js
@@ -0,0 +1,4860 @@
+/**
+ * Impeccable Live Variant Mode — Browser Script
+ *
+ * Injected into the user's page via <script src="http://localhost:PORT/live.js">.
+ * The server prepends window.__IMPECCABLE_TOKEN__ and window.__IMPECCABLE_PORT__
+ * before this code.
+ *
+ * UI: a single floating bar that morphs between three states —
+ * configure (pick action + go), generating (progressive dots), and cycling
+ * (prev/next + accept/discard). Feels like Spotlight, not a modal.
+ */
+(function () {
+  'use strict';
+  if (typeof window === 'undefined') return;
+
+  // Guard against double-init. Bun's HTML loader may process the <script> tag
+  // and create a bundled copy alongside the external load, or HMR may re-execute.
+  // Check BEFORE reading token/port to catch all cases.
+  if (window.__IMPECCABLE_LIVE_INIT__) return;
+  window.__IMPECCABLE_LIVE_INIT__ = true;
+
+  const TOKEN = window.__IMPECCABLE_TOKEN__;
+  const PORT = window.__IMPECCABLE_PORT__;
+  if (!TOKEN || !PORT) {
+    window.__IMPECCABLE_LIVE_INIT__ = false; // reset so the real load can init
+    return;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Design tokens
+  // ---------------------------------------------------------------------------
+
+  // Brand magenta is pinned to the site token (--color-accent in main.css)
+  // so Accept / knobs / cycle-dots match the site's accent, not a washed
+  // theme-adjusted one.
+  const C = {
+    brand:     'oklch(60% 0.25 350)',
+    brandHov:  'oklch(52% 0.25 350)',
+    brandSoft: 'oklch(60% 0.25 350 / 0.15)',
+    ink:       'oklch(15% 0.01 350)',
+    ash:       'oklch(55% 0 0)',
+    paper:     'oklch(98% 0.005 350 / 0.92)',
+    paperSolid:'oklch(98% 0.005 350)',
+    mist:      'oklch(90% 0.01 350 / 0.6)',
+    white:     'oklch(99% 0 0)',
+  };
+  const FONT = 'system-ui, -apple-system, sans-serif';
+  const MONO = 'ui-monospace, SFMono-Regular, Menlo, monospace';
+  // z-index: detect overlays use 99999, so our UI must be above them
+  const Z = { highlight: 100001, bar: 100005, picker: 100007, toast: 100010 };
+  const EASE = 'cubic-bezier(0.22, 1, 0.36, 1)'; // ease-out-quint
+  const PREFIX = 'impeccable-live';
+  const sessionState = window.__IMPECCABLE_LIVE_SESSION__?.createLiveBrowserSessionState({
+    prefix: PREFIX,
+    storage: localStorage,
+    idFactory: () => crypto.randomUUID().replace(/-/g, '').slice(0, 8),
+  });
+  if (!sessionState) {
+    console.error('[impeccable] live-browser-session.js was not loaded. Live mode cannot start safely.');
+    window.__IMPECCABLE_LIVE_INIT__ = false;
+    return;
+  }
+  const HIGHLIGHT_TRANSITION =
+    'top 140ms ' + EASE +
+    ', left 140ms ' + EASE +
+    ', width 140ms ' + EASE +
+    ', height 140ms ' + EASE +
+    ', opacity 150ms ease';
+  const TOOLTIP_TRANSITION =
+    'top 140ms ' + EASE + ', left 140ms ' + EASE + ', opacity 150ms ease';
+
+  const SKIP_TAGS = new Set([
+    'html', 'head', 'body', 'script', 'style', 'link', 'meta', 'noscript', 'br', 'wbr',
+  ]);
+
+  // SVG icons stack above each chip label. All strokes use currentColor so the
+  // icon recolors to C.brand when its chip is selected. 20x20 render, 24-viewBox,
+  // 1.5 stroke — visually consistent with the Foundation grid on the homepage.
+  const ICON_ATTRS = 'width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" style="display:block"';
+  const ICONS = {
+    impeccable: `<svg ${ICON_ATTRS}><path d="M4 20l4-1L18 9l-3-3L5 16z"/><path d="M14 7l3 3"/></svg>`,
+    bolder:     `<svg ${ICON_ATTRS}><rect x="6" y="12" width="4" height="7" rx="0.5"/><rect x="14" y="5" width="4" height="14" rx="0.5"/></svg>`,
+    quieter:    `<svg ${ICON_ATTRS}><rect x="6" y="5" width="4" height="14" rx="0.5"/><rect x="14" y="12" width="4" height="7" rx="0.5"/></svg>`,
+    distill:    `<svg ${ICON_ATTRS}><path d="M4 5h16l-6 8v7l-4-2v-5z"/></svg>`,
+    polish:     `<svg ${ICON_ATTRS}><path d="M15 3l1 3 3 1-3 1-1 3-1-3-3-1 3-1z"/><path d="M7 13l0.6 1.8 1.8 0.6-1.8 0.6-0.6 1.8-0.6-1.8-1.8-0.6 1.8-0.6z"/></svg>`,
+    typeset:    `<svg ${ICON_ATTRS}><path d="M5 6h14" stroke-width="2.6"/><path d="M5 12h9" stroke-width="1.9"/><path d="M5 18h5" stroke-width="1.3"/></svg>`,
+    colorize:   `<svg ${ICON_ATTRS}><circle cx="9" cy="10" r="5"/><circle cx="15" cy="10" r="5"/><circle cx="12" cy="15" r="5"/></svg>`,
+    layout:     `<svg ${ICON_ATTRS}><rect x="3" y="4" width="8" height="16" rx="0.5"/><rect x="13" y="4" width="8" height="7" rx="0.5"/><rect x="13" y="13" width="8" height="7" rx="0.5"/></svg>`,
+    adapt:      `<svg ${ICON_ATTRS}><rect x="2.5" y="5" width="12" height="11" rx="1"/><line x1="2.5" y1="19" x2="14.5" y2="19"/><rect x="16.5" y="8" width="5" height="11" rx="1"/></svg>`,
+    animate:    `<svg ${ICON_ATTRS}><path d="M3 18c4-4 6-10 10-10"/><path d="M13 8c3 0 5 5 8 10"/><circle cx="13" cy="8" r="1.6" fill="currentColor" stroke="none"/></svg>`,
+    delight:    `<svg ${ICON_ATTRS}><path d="M12 3l2 6 6 2-6 2-2 6-2-6-6-2 6-2z"/></svg>`,
+    overdrive:  `<svg ${ICON_ATTRS}><path d="M13 3L5 13h5l-1 8 9-12h-6z"/></svg>`,
+  };
+
+  const ACTIONS = [
+    { value: 'impeccable', label: 'Freeform' },
+    { value: 'bolder',     label: 'Bolder' },
+    { value: 'quieter',    label: 'Quieter' },
+    { value: 'distill',    label: 'Distill' },
+    { value: 'polish',     label: 'Polish' },
+    { value: 'typeset',    label: 'Typeset' },
+    { value: 'colorize',   label: 'Colorize' },
+    { value: 'layout',     label: 'Layout' },
+    { value: 'adapt',      label: 'Adapt' },
+    { value: 'animate',    label: 'Animate' },
+    { value: 'delight',    label: 'Delight' },
+    { value: 'overdrive',  label: 'Overdrive' },
+  ];
+
+  // ---------------------------------------------------------------------------
+  // State
+  // ---------------------------------------------------------------------------
+
+  let state = 'IDLE';
+  let hoveredElement = null;
+  let selectedElement = null;
+  let currentSessionId = null;
+  let expectedVariants = 0;
+  let arrivedVariants = 0;
+  let visibleVariant = 0;
+  let variantObserver = null;
+  let hasProjectContext = false;
+  let selectedAction = 'impeccable';
+  let selectedCount = 3;
+  const browserOwner = sessionState.owner;
+  let checkpointTimer = null;
+
+  // Scroll lock — holds window.scrollY at a fixed value while the session is
+  // active, so HMR DOM patches and variant swaps can't drift the page. See
+  // startScrollLock / stopScrollLock below.
+  let scrollLockObserver = null;
+  let scrollLockTargetY = null;
+  let scrollLockRaf = null;
+  let scrollLockAbort = null;
+
+  // Dedicated key for scroll position — SEPARATE from LS_KEY so that
+  // saveSession's state updates don't clobber a carefully-captured scrollY.
+  // (Previously: saveSession wrote scrollY alongside state, so every call
+  // during resume overwrote the pre-reload value with whatever the browser
+  // had landed on, typically 0.)
+  function writeScrollY(y) { sessionState.writeScrollY(y); }
+  function readScrollY() { return sessionState.readScrollY(); }
+  function clearScrollY() { sessionState.clearScrollY(); }
+
+  // Pre-empt the browser: apply manual scroll restoration and jump to the
+  // saved scrollY at script-parse time. Retries on fonts.ready and load
+  // are essential: scrollTo(y) clamps to the current document.scrollHeight,
+  // which is often hundreds of pixels short of the final value until
+  // async-loaded fonts swap in and reflow.
+  try {
+    history.scrollRestoration = 'manual';
+    const savedY = readScrollY();
+    if (savedY != null) {
+      const apply = () => {
+        if (Math.abs(window.scrollY - savedY) > 0.5) {
+          console.log('[impeccable.scroll] early restore', { from: window.scrollY, to: savedY });
+          window.scrollTo(0, savedY);
+        }
+      };
+      apply();
+      if (document.fonts?.ready) document.fonts.ready.then(apply).catch(() => {});
+      window.addEventListener('load', apply, { once: true });
+    }
+  } catch {}
+
+  // UI refs
+  let highlightEl = null;
+  let tooltipEl = null;
+  let barEl = null;
+  let pickerEl = null;
+  let toastEl = null;
+  let scrollRaf = null;
+
+  // ---------------------------------------------------------------------------
+  // Helpers
+  // ---------------------------------------------------------------------------
+
+  function own(el) {
+    return el && (el.id?.startsWith(PREFIX) || el.closest?.('[id^="' + PREFIX + '"]'));
+  }
+
+  function pickable(el) {
+    if (!el || el.nodeType !== 1) return false;
+    if (SKIP_TAGS.has(el.tagName.toLowerCase())) return false;
+    if (own(el)) return false;
+    const r = el.getBoundingClientRect();
+    return r.width >= 20 && r.height >= 20;
+  }
+
+  function desc(el) {
+    if (!el) return '';
+    let s = el.tagName.toLowerCase();
+    if (el.id) s += '#' + el.id;
+    else if (el.classList.length) s += '.' + [...el.classList].slice(0, 2).join('.');
+    return s;
+  }
+
+  function id8() { return crypto.randomUUID().replace(/-/g, '').slice(0, 8); }
+
+  // Modal-aware chrome: keep our floating UI clickable inside Radix /
+  // Headless UI / vaul portals.
+  //
+  // Two host-page behaviors break us when the picked element lives inside a
+  // modal dialog:
+  //
+  //   1. Modal scroll-lock disables outside pointer events. Radix's
+  //      `DismissableLayer` sets `document.body.style.pointerEvents = 'none'`
+  //      while a modal is open and only restores `auto` on the layer. Our
+  //      chrome inherits `none` from <body> and becomes unclickable.
+  //   2. The dialog's outside-interaction handler (Radix's
+  //      `usePointerDownOutside`) listens at document level and dismisses
+  //      the dialog whenever a `pointerdown` lands outside the layer node.
+  //      Our chrome is a sibling of <body>, so Radix classifies our clicks
+  //      as outside and tears the dialog down mid-task.
+  //
+  // We can't reliably re-parent our chrome into the dialog subtree (z-index
+  // stacking, scroll containers, theming all become host-page concerns), so
+  // we defang both behaviors at our root:
+  //
+  //   - `pointer-events: auto !important` overrides the inherited `none`.
+  //   - Stop `pointerdown` / `mousedown` propagation so the document-level
+  //     dismiss listener never fires for our clicks.
+  //   - Stop `focusin` propagation so any focus shifts inside our chrome
+  //     don't read as "focus moved outside the dialog" to focus traps.
+  //
+  // Click events still bubble normally — only the early pointer/focus
+  // signals that drive outside-interaction detection are silenced.
+  function defangOutsideHandlers(rootEl, { setPointerEvents = true } = {}) {
+    if (!rootEl) return;
+    if (setPointerEvents) {
+      rootEl.style.setProperty('pointer-events', 'auto', 'important');
+    }
+    const stop = (e) => e.stopPropagation();
+    rootEl.addEventListener('pointerdown', stop);
+    rootEl.addEventListener('mousedown', stop);
+    rootEl.addEventListener('focusin', stop);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Highlight overlay
+  // ---------------------------------------------------------------------------
+
+  function initHighlight() {
+    highlightEl = document.createElement('div');
+    highlightEl.id = PREFIX + '-highlight';
+    Object.assign(highlightEl.style, {
+      position: 'fixed', top: '0', left: '0', width: '0', height: '0',
+      border: '2px solid ' + C.brand, borderRadius: '3px',
+      pointerEvents: 'none', zIndex: Z.highlight, boxSizing: 'border-box',
+      transition: HIGHLIGHT_TRANSITION,
+      display: 'none', opacity: '0',
+    });
+    document.body.appendChild(highlightEl);
+
+    tooltipEl = document.createElement('div');
+    tooltipEl.id = PREFIX + '-tooltip';
+    Object.assign(tooltipEl.style, {
+      position: 'fixed',
+      background: C.ink, color: C.white,
+      fontFamily: MONO, fontSize: '10px', fontWeight: '500',
+      padding: '2px 6px', borderRadius: '3px',
+      zIndex: Z.highlight + 1, pointerEvents: 'none',
+      whiteSpace: 'nowrap', display: 'none',
+      letterSpacing: '0.02em',
+      transition: TOOLTIP_TRANSITION,
+    });
+    document.body.appendChild(tooltipEl);
+  }
+
+  function showHighlight(el) {
+    if (!el || !highlightEl) return;
+    const r = el.getBoundingClientRect();
+    const top = (r.top - 2) + 'px', left = (r.left - 2) + 'px';
+    const width = (r.width + 4) + 'px', height = (r.height + 4) + 'px';
+    const tipTop = r.top - 20;
+    const tipY = (tipTop < 4 ? r.bottom + 4 : tipTop) + 'px';
+    const tipX = Math.max(4, r.left) + 'px';
+    tooltipEl.textContent = desc(el);
+
+    const hiWasHidden = highlightEl.style.display === 'none' || highlightEl.style.opacity === '0';
+    if (hiWasHidden) {
+      // Snap to first target without animating from (0,0), then fade in.
+      highlightEl.style.transition = 'none';
+      Object.assign(highlightEl.style, { top, left, width, height, display: 'block' });
+      tooltipEl.style.transition = 'none';
+      Object.assign(tooltipEl.style, { top: tipY, left: tipX, display: 'block' });
+      void highlightEl.offsetWidth;
+      highlightEl.style.transition = HIGHLIGHT_TRANSITION;
+      highlightEl.style.opacity = '1';
+      tooltipEl.style.transition = TOOLTIP_TRANSITION;
+      tooltipEl.style.opacity = '1';
+    } else {
+      Object.assign(highlightEl.style, { top, left, width, height, display: 'block', opacity: '1' });
+      Object.assign(tooltipEl.style, { top: tipY, left: tipX, display: 'block', opacity: '1' });
+    }
+  }
+
+  function hideHighlight() {
+    if (highlightEl) { highlightEl.style.opacity = '0'; highlightEl.style.display = 'none'; }
+    if (tooltipEl) { tooltipEl.style.opacity = '0'; tooltipEl.style.display = 'none'; }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Annotation overlay (comment pins + magenta strokes)
+  //
+  // Active while state === 'CONFIGURING'. The overlay is a fixed-positioned
+  // sibling of <body> mirroring selectedElement's bounding rect. Click (no
+  // drag) drops a comment pin; drag paints a magenta SVG stroke. All coords
+  // are stored in element-local CSS px so they survive scroll / resize and
+  // correlate directly with the captured PNG.
+  // ---------------------------------------------------------------------------
+
+  const DRAG_THRESHOLD = 5;       // px — below this, treat pointerup as a click
+  const PIN_DBL_CLICK_MS = 300;   // two clicks on the same pin within this delete it
+  let annotOverlayEl = null;
+  let annotSvgEl = null;
+  let annotPinsEl = null;
+  let annotClearChipEl = null;
+  let annotState = { comments: [], strokes: [] };
+  let annotActive = false;
+  // `annotPointer` is either:
+  //   { kind: 'new',   x0, y0, moved, strokeEl, strokePoints }   creating a stroke/pin
+  //   { kind: 'pin',   idx, startPointer, startPin, moved }     dragging an existing pin
+  let annotPointer = null;
+  let annotEditing = null;        // { idx, input, wrapEl }
+  let annotLastPinClick = { idx: -1, time: 0 }; // for click-click-to-delete
+
+  function initAnnotOverlay() {
+    annotOverlayEl = document.createElement('div');
+    annotOverlayEl.id = PREFIX + '-annot';
+    Object.assign(annotOverlayEl.style, {
+      position: 'fixed', top: '0', left: '0', width: '0', height: '0',
+      pointerEvents: 'auto', zIndex: Z.highlight + 2,
+      display: 'none', overflow: 'visible',
+      cursor: 'crosshair', touchAction: 'none',
+    });
+
+    annotSvgEl = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+    annotSvgEl.id = PREFIX + '-annot-svg';
+    Object.assign(annotSvgEl.style, {
+      position: 'absolute', top: '0', left: '0',
+      width: '100%', height: '100%',
+      // The SVG itself doesn't absorb clicks; individual hit-paths opt-in via
+      // pointer-events=stroke so gaps still fall through to the overlay.
+      pointerEvents: 'none', overflow: 'visible',
+    });
+    annotOverlayEl.appendChild(annotSvgEl);
+
+    annotPinsEl = document.createElement('div');
+    annotPinsEl.id = PREFIX + '-annot-pins';
+    Object.assign(annotPinsEl.style, {
+      position: 'absolute', inset: '0',
+      pointerEvents: 'none',
+    });
+    annotOverlayEl.appendChild(annotPinsEl);
+
+    annotClearChipEl = document.createElement('div');
+    annotClearChipEl.id = PREFIX + '-annot-clear';
+    annotClearChipEl.dataset.annotClear = 'true';
+    annotClearChipEl.textContent = 'Clear';
+    Object.assign(annotClearChipEl.style, {
+      position: 'absolute', top: '8px', right: '8px',
+      background: C.ink, color: C.white,
+      fontFamily: FONT, fontSize: '10px', fontWeight: '500',
+      letterSpacing: '0.08em', textTransform: 'uppercase',
+      padding: '5px 12px', borderRadius: '999px',
+      cursor: 'pointer', pointerEvents: 'auto',
+      display: 'none', userSelect: 'none',
+      boxShadow: '0 1px 3px rgba(0,0,0,0.2)',
+    });
+    annotOverlayEl.appendChild(annotClearChipEl);
+
+    annotOverlayEl.addEventListener('pointerdown', onAnnotDown);
+    annotOverlayEl.addEventListener('pointermove', onAnnotMove);
+    annotOverlayEl.addEventListener('pointerup', onAnnotUp);
+    annotOverlayEl.addEventListener('pointercancel', onAnnotUp);
+    document.body.appendChild(annotOverlayEl);
+    // Modal-host friendliness: pointer-events is already 'auto' on this
+    // overlay; we only need to silence the host's outside-interaction
+    // listeners. Don't override pointer-events here (the overlay toggles
+    // visibility via display:none, which is fine).
+    defangOutsideHandlers(annotOverlayEl, { setPointerEvents: false });
+  }
+
+  function updateClearChip() {
+    if (!annotClearChipEl) return;
+    const hasAny = annotState.comments.length > 0 || annotState.strokes.length > 0;
+    annotClearChipEl.style.display = hasAny ? 'block' : 'none';
+  }
+
+  function showAnnotOverlay(el) {
+    if (!annotOverlayEl || !el) return;
+    annotActive = true;
+    positionAnnotOverlay(el);
+    annotOverlayEl.style.display = 'block';
+  }
+
+  function hideAnnotOverlay() {
+    annotActive = false;
+    if (annotOverlayEl) annotOverlayEl.style.display = 'none';
+    // Drop any in-progress edit without touching annotState — clearAnnotations
+    // (if the caller is exiting configure mode) handles state reset.
+    annotEditing = null;
+  }
+
+  function positionAnnotOverlay(el) {
+    if (!annotOverlayEl || !el) return;
+    const r = el.getBoundingClientRect();
+    Object.assign(annotOverlayEl.style, {
+      top: r.top + 'px', left: r.left + 'px',
+      width: r.width + 'px', height: r.height + 'px',
+    });
+    annotSvgEl.setAttribute('viewBox', '0 0 ' + r.width + ' ' + r.height);
+  }
+
+  function clearAnnotations() {
+    annotState.comments = [];
+    annotState.strokes = [];
+    if (annotSvgEl) while (annotSvgEl.firstChild) annotSvgEl.removeChild(annotSvgEl.firstChild);
+    if (annotPinsEl) annotPinsEl.innerHTML = '';
+    annotPointer = null;
+    annotEditing = null;
+    annotLastPinClick = { idx: -1, time: 0 };
+    updateClearChip();
+  }
+
+  // Rebuild the SVG layer. Each stroke gets a wider invisible hit path
+  // beneath the visible magenta path so clicks register on thin lines.
+  function redrawStrokes() {
+    while (annotSvgEl.firstChild) annotSvgEl.removeChild(annotSvgEl.firstChild);
+    annotState.strokes.forEach((s, idx) => {
+      const d = pointsToPath(s.points);
+      const hit = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+      hit.setAttribute('d', d);
+      hit.setAttribute('stroke', 'transparent');
+      hit.setAttribute('stroke-width', '16');
+      hit.setAttribute('stroke-linecap', 'round');
+      hit.setAttribute('stroke-linejoin', 'round');
+      hit.setAttribute('fill', 'none');
+      hit.setAttribute('pointer-events', 'stroke');
+      hit.style.cursor = 'pointer';
+      hit.dataset.annotStroke = String(idx);
+      annotSvgEl.appendChild(hit);
+      const visible = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+      visible.setAttribute('d', d);
+      visible.setAttribute('stroke', C.brand);
+      visible.setAttribute('stroke-width', '3');
+      visible.setAttribute('stroke-linecap', 'round');
+      visible.setAttribute('stroke-linejoin', 'round');
+      visible.setAttribute('fill', 'none');
+      visible.setAttribute('pointer-events', 'none');
+      annotSvgEl.appendChild(visible);
+    });
+    updateClearChip();
+  }
+
+  function localCoords(e) {
+    const rect = annotOverlayEl.getBoundingClientRect();
+    return { x: e.clientX - rect.left, y: e.clientY - rect.top };
+  }
+
+  function onAnnotDown(e) {
+    if (!annotActive) return;
+
+    // 1) Clear chip → wipe all annotations
+    if (e.target.closest?.('[data-annot-clear]')) {
+      if (annotEditing) annotEditing = null;
+      clearAnnotations();
+      renderAllPins();
+      redrawStrokes();
+      e.stopPropagation(); e.preventDefault();
+      return;
+    }
+
+    // 2) Stroke hit path → delete that stroke
+    const strokeHit = e.target.closest?.('[data-annot-stroke]');
+    if (strokeHit) {
+      const idx = parseInt(strokeHit.dataset.annotStroke, 10);
+      if (Number.isInteger(idx)) {
+        annotState.strokes.splice(idx, 1);
+        redrawStrokes();
+      }
+      e.stopPropagation(); e.preventDefault();
+      return;
+    }
+
+    // 3) Pin → drag, edit, or delete-on-double-click
+    const pinWrap = e.target.closest?.('[data-annot-pin]');
+    if (pinWrap) {
+      const idx = parseInt(pinWrap.dataset.annotPin, 10);
+      if (!Number.isInteger(idx)) return;
+      // Double-click (two pointerdowns on the same pin within window) → delete.
+      const now = Date.now();
+      if (annotLastPinClick.idx === idx && now - annotLastPinClick.time < PIN_DBL_CLICK_MS) {
+        if (annotEditing && annotEditing.idx === idx) annotEditing = null;
+        annotState.comments.splice(idx, 1);
+        annotLastPinClick = { idx: -1, time: 0 };
+        renderAllPins();
+        e.stopPropagation(); e.preventDefault();
+        return;
+      }
+      annotLastPinClick = { idx, time: now };
+      // If editing a different pin, commit that edit before starting here.
+      if (annotEditing && annotEditing.idx !== idx) finalizeEditingPin();
+      // If already editing THIS pin and the user clicked the dot, let the
+      // input keep focus (don't start a drag — the click wasn't meant as one).
+      if (annotEditing && annotEditing.idx === idx) return;
+      const p = localCoords(e);
+      const pin = annotState.comments[idx];
+      annotPointer = {
+        kind: 'pin', idx,
+        startPointer: p,
+        startPin: { x: pin.x, y: pin.y },
+        moved: false,
+      };
+      try { annotOverlayEl.setPointerCapture(e.pointerId); } catch {}
+      e.stopPropagation(); e.preventDefault();
+      return;
+    }
+
+    // 4) Empty area → commit any open edit, then start new annotation
+    if (annotEditing) {
+      finalizeEditingPin();
+      e.stopPropagation(); e.preventDefault();
+      return;
+    }
+    const p = localCoords(e);
+    annotPointer = { kind: 'new', x0: p.x, y0: p.y, moved: false, strokeEl: null, strokePoints: null };
+    try { annotOverlayEl.setPointerCapture(e.pointerId); } catch {}
+    e.stopPropagation(); e.preventDefault();
+  }
+
+  function onAnnotMove(e) {
+    if (!annotActive || !annotPointer) return;
+    const p = localCoords(e);
+
+    if (annotPointer.kind === 'pin') {
+      const dx = p.x - annotPointer.startPointer.x;
+      const dy = p.y - annotPointer.startPointer.y;
+      if (!annotPointer.moved) {
+        if (Math.hypot(dx, dy) < DRAG_THRESHOLD) return;
+        annotPointer.moved = true;
+      }
+      const pin = annotState.comments[annotPointer.idx];
+      if (!pin) { annotPointer = null; return; }
+      pin.x = annotPointer.startPin.x + dx;
+      pin.y = annotPointer.startPin.y + dy;
+      renderAllPins();
+      e.stopPropagation();
+      return;
+    }
+
+    // kind === 'new'
+    const dx = p.x - annotPointer.x0, dy = p.y - annotPointer.y0;
+    if (!annotPointer.moved) {
+      if (Math.hypot(dx, dy) < DRAG_THRESHOLD) return;
+      annotPointer.moved = true;
+      const strokeEl = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+      strokeEl.setAttribute('stroke', C.brand);
+      strokeEl.setAttribute('stroke-width', '3');
+      strokeEl.setAttribute('stroke-linecap', 'round');
+      strokeEl.setAttribute('stroke-linejoin', 'round');
+      strokeEl.setAttribute('fill', 'none');
+      strokeEl.setAttribute('pointer-events', 'none');
+      annotSvgEl.appendChild(strokeEl);
+      annotPointer.strokeEl = strokeEl;
+      annotPointer.strokePoints = [[annotPointer.x0, annotPointer.y0]];
+    }
+    annotPointer.strokePoints.push([p.x, p.y]);
+    annotPointer.strokeEl.setAttribute('d', pointsToPath(annotPointer.strokePoints));
+    e.stopPropagation();
+  }
+
+  function onAnnotUp(e) {
+    if (!annotActive || !annotPointer) return;
+
+    if (annotPointer.kind === 'pin') {
+      const wasDrag = annotPointer.moved;
+      const idx = annotPointer.idx;
+      try { annotOverlayEl.releasePointerCapture(e.pointerId); } catch {}
+      annotPointer = null;
+      if (wasDrag) {
+        // A drag is an intentional reposition; a follow-up click shouldn't be
+        // interpreted as a double-click-to-delete.
+        annotLastPinClick = { idx: -1, time: 0 };
+      } else {
+        beginEditPin(idx);
+      }
+      e.stopPropagation();
+      return;
+    }
+
+    // kind === 'new'
+    const wasDrag = annotPointer.moved;
+    if (wasDrag) {
+      annotState.strokes.push({ points: annotPointer.strokePoints });
+      // Swap the temporary preview SVG path for the full render with hit paths.
+      redrawStrokes();
+    } else {
+      const idx = annotState.comments.length;
+      annotState.comments.push({ x: annotPointer.x0, y: annotPointer.y0, text: '' });
+      renderAllPins();
+      beginEditPin(idx);
+    }
+    try { annotOverlayEl.releasePointerCapture(e.pointerId); } catch {}
+    annotPointer = null;
+    e.stopPropagation();
+  }
+
+  function pointsToPath(points) {
+    if (!points || points.length === 0) return '';
+    let d = 'M' + points[0][0].toFixed(1) + ' ' + points[0][1].toFixed(1);
+    for (let i = 1; i < points.length; i++) {
+      d += ' L' + points[i][0].toFixed(1) + ' ' + points[i][1].toFixed(1);
+    }
+    return d;
+  }
+
+  function renderAllPins() {
+    annotPinsEl.innerHTML = '';
+    annotState.comments.forEach((c, idx) => {
+      annotPinsEl.appendChild(buildPinElement(c, idx));
+    });
+    updateClearChip();
+  }
+
+  function buildPinElement(comment, idx) {
+    const interactive = idx >= 0;
+    const wrap = document.createElement('div');
+    if (interactive) wrap.dataset.annotPin = String(idx);
+    Object.assign(wrap.style, {
+      position: 'absolute',
+      left: (comment.x - 7) + 'px', top: (comment.y - 7) + 'px',
+      pointerEvents: interactive ? 'auto' : 'none',
+      display: 'flex', alignItems: 'flex-start', gap: '6px',
+      cursor: interactive ? 'grab' : 'default',
+      touchAction: 'none',
+    });
+    const dot = document.createElement('div');
+    Object.assign(dot.style, {
+      width: '14px', height: '14px', borderRadius: '50%',
+      background: C.brand, border: '2px solid ' + C.white,
+      boxShadow: '0 1px 3px rgba(0,0,0,0.25)',
+      flexShrink: '0',
+    });
+    wrap.appendChild(dot);
+
+    if (comment.text) {
+      const bubble = document.createElement('div');
+      bubble.textContent = comment.text;
+      Object.assign(bubble.style, {
+        background: C.ink, color: C.white,
+        fontFamily: FONT, fontSize: '12px', lineHeight: '1.4',
+        padding: '4px 8px', borderRadius: '3px',
+        marginTop: '-2px', maxWidth: '220px',
+        pointerEvents: 'none', whiteSpace: 'pre-wrap',
+        wordBreak: 'break-word',
+      });
+      wrap.appendChild(bubble);
+    }
+    return wrap;
+  }
+
+  function beginEditPin(idx) {
+    const wrapEl = annotPinsEl.querySelector('[data-annot-pin="' + idx + '"]');
+    if (!wrapEl) return;
+    // Strip any existing bubble (but keep the dot)
+    wrapEl.querySelectorAll('div:not(:first-child)').forEach(n => n.remove());
+    const input = document.createElement('input');
+    input.type = 'text';
+    input.placeholder = 'Note…';
+    Object.assign(input.style, {
+      background: C.ink, color: C.white,
+      fontFamily: FONT, fontSize: '12px', lineHeight: '1.4',
+      padding: '4px 8px', borderRadius: '3px',
+      border: '1px solid ' + C.brand,
+      outline: 'none', marginTop: '-2px',
+      width: '220px', pointerEvents: 'auto',
+    });
+    const originalText = annotState.comments[idx].text || '';
+    input.value = originalText;
+    wrapEl.appendChild(input);
+    annotEditing = { idx, input, wrapEl, originalText };
+    input.addEventListener('keydown', onAnnotInputKey, true);
+    input.addEventListener('blur', () => {
+      // Fires on both focus-loss and programmatic blur; commit unless we
+      // already handled it.
+      if (annotEditing && annotEditing.input === input) finalizeEditingPin();
+    });
+    // Stop clicks/pointerdowns inside the input from bubbling to the overlay
+    ['pointerdown', 'click'].forEach(ev => {
+      input.addEventListener(ev, e => e.stopPropagation());
+    });
+    setTimeout(() => input.focus(), 0);
+  }
+
+  function onAnnotInputKey(e) {
+    if (e.key === 'Enter') {
+      e.preventDefault(); e.stopPropagation();
+      finalizeEditingPin();
+    } else if (e.key === 'Escape') {
+      e.preventDefault(); e.stopPropagation();
+      cancelEditingPin();
+    } else {
+      // Keep arrows / backspace from hitting global handlers
+      e.stopPropagation();
+    }
+  }
+
+  function finalizeEditingPin() {
+    if (!annotEditing) return;
+    const { idx, input } = annotEditing;
+    const text = input.value.trim();
+    annotEditing = null;
+    if (text) annotState.comments[idx].text = text;
+    else annotState.comments.splice(idx, 1);
+    renderAllPins();
+  }
+
+  function cancelEditingPin() {
+    if (!annotEditing) return;
+    const { idx, originalText } = annotEditing;
+    annotEditing = null;
+    // If the pin had text before this edit, revert to it. If it was a
+    // just-created empty pin, Escape removes it.
+    if (originalText) {
+      annotState.comments[idx].text = originalText;
+    } else {
+      annotState.comments.splice(idx, 1);
+    }
+    renderAllPins();
+  }
+
+  // Build a detached annotation subtree suitable for injection into the clone
+  // modern-screenshot creates. Coordinates are element-local so this slots
+  // straight into an element that's been made position:relative. Takes an
+  // explicit snapshot so it works after annotState has been cleared.
+  function buildAnnotationsForCapture(rect, snapshot) {
+    const comments = snapshot ? snapshot.comments : annotState.comments;
+    const strokes = snapshot ? snapshot.strokes : annotState.strokes;
+    if (comments.length === 0 && strokes.length === 0) return null;
+    const wrap = document.createElement('div');
+    Object.assign(wrap.style, {
+      position: 'absolute', top: '0', left: '0',
+      width: rect.width + 'px', height: rect.height + 'px',
+      pointerEvents: 'none', overflow: 'visible',
+    });
+    if (strokes.length > 0) {
+      const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+      svg.setAttribute('viewBox', '0 0 ' + rect.width + ' ' + rect.height);
+      Object.assign(svg.style, {
+        position: 'absolute', top: '0', left: '0',
+        width: '100%', height: '100%', overflow: 'visible',
+      });
+      for (const s of strokes) {
+        const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+        path.setAttribute('stroke', C.brand);
+        path.setAttribute('stroke-width', '3');
+        path.setAttribute('stroke-linecap', 'round');
+        path.setAttribute('stroke-linejoin', 'round');
+        path.setAttribute('fill', 'none');
+        path.setAttribute('d', pointsToPath(s.points));
+        svg.appendChild(path);
+      }
+      wrap.appendChild(svg);
+    }
+    for (const c of comments) {
+      // idx=-1 means non-interactive; pointerEvents stay off in the clone
+      wrap.appendChild(buildPinElement(c, -1));
+    }
+    return wrap;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Element context extraction
+  // ---------------------------------------------------------------------------
+
+  function extractContext(el) {
+    const cs = getComputedStyle(el);
+    const r = el.getBoundingClientRect();
+    const props = {};
+    for (const sheet of document.styleSheets) {
+      try {
+        for (const rule of sheet.cssRules) {
+          if (rule.style) for (let i = 0; i < rule.style.length; i++) {
+            const p = rule.style[i];
+            if (p.startsWith('--') && !props[p]) {
+              const v = cs.getPropertyValue(p).trim();
+              if (v) props[p] = v;
+            }
+          }
+        }
+      } catch { /* cross-origin */ }
+    }
+    return {
+      tagName: el.tagName.toLowerCase(), id: el.id || null,
+      classes: [...el.classList],
+      textContent: (el.textContent || '').slice(0, 500),
+      outerHTML: el.outerHTML.slice(0, 10000),
+      computedStyles: {
+        'font-family': cs.fontFamily, 'font-size': cs.fontSize,
+        'font-weight': cs.fontWeight, 'line-height': cs.lineHeight,
+        'color': cs.color, 'background': cs.background,
+        'background-color': cs.backgroundColor,
+        'padding': cs.padding, 'margin': cs.margin,
+        'display': cs.display, 'position': cs.position,
+        'gap': cs.gap, 'border-radius': cs.borderRadius,
+        'box-shadow': cs.boxShadow,
+      },
+      cssCustomProperties: props,
+      parentContext: el.parentElement
+        ? '<' + el.parentElement.tagName.toLowerCase()
+          + (el.parentElement.id ? ' id="' + el.parentElement.id + '"' : '')
+          + (el.parentElement.className ? ' class="' + el.parentElement.className + '"' : '')
+          + '>'
+        : null,
+      boundingRect: { width: Math.round(r.width), height: Math.round(r.height) },
+    };
+  }
+
+  // ---------------------------------------------------------------------------
+  // The Bar — one floating element, three modes
+  // ---------------------------------------------------------------------------
+
+  // Contextual-bar palette. Cached at init so every build*Row reads a
+  // consistent set of colors; detectPageTheme runs once rather than on every
+  // phase transition.
+  let BP = null;
+
+  // Bar shadow variants. The default projects down + subtle around. When
+  // the Tune popover opens below the bar, a downward shadow lands on the
+  // dark popover and reads as a bright ghost line. We swap to UP-only while
+  // tune is open below so the popover's top edge is clean.
+  const BAR_SHADOW_DEFAULT = '0 4px 20px oklch(0% 0 0 / 0.08), 0 1px 3px oklch(0% 0 0 / 0.06)';
+  const BAR_SHADOW_UP = '0 -4px 20px oklch(0% 0 0 / 0.08), 0 -1px 3px oklch(0% 0 0 / 0.06)';
+  const BAR_SHADOW_DOWN = BAR_SHADOW_DEFAULT;
+
+  function initBar() {
+    BP = barPaletteForTheme(detectPageTheme());
+    barEl = document.createElement('div');
+    barEl.id = PREFIX + '-bar';
+    Object.assign(barEl.style, {
+      position: 'fixed', zIndex: Z.bar,
+      display: 'none', opacity: '0',
+      transform: 'translateY(6px)',
+      transition: 'opacity 0.25s ' + EASE + ', transform 0.3s ' + EASE,
+      background: BP.surface,
+      backdropFilter: 'blur(16px)', WebkitBackdropFilter: 'blur(16px)',
+      border: '1px solid ' + BP.hairline,
+      borderRadius: '10px',
+      boxShadow: BAR_SHADOW_DEFAULT,
+      transition: 'box-shadow 0.2s ease, opacity 0.25s ' + EASE + ', transform 0.3s ' + EASE,
+      fontFamily: FONT, fontSize: '13px', color: BP.text,
+      padding: '6px',
+      maxWidth: '520px', minWidth: '320px',
+    });
+    document.body.appendChild(barEl);
+    defangOutsideHandlers(barEl);
+  }
+
+  function positionBar() {
+    if (!barEl || !selectedElement) return;
+    const r = selectedElement.getBoundingClientRect();
+    const barH = barEl.offsetHeight || 44;
+    const barW = barEl.offsetWidth || 380;
+    const GLOBAL_BAR_RESERVE = 64; // global bar height + bottom margin + breathing room
+    const GAP = 8;
+
+    // Prefer below the element; fall back to above; if neither fits (element
+    // taller than viewport), pin to a stable viewport anchor so the bar
+    // doesn't teleport between top and bottom as the user scrolls.
+    let top;
+    const belowTop = r.bottom + GAP;
+    const aboveTop = r.top - barH - GAP;
+    if (belowTop + barH + GAP <= window.innerHeight - GLOBAL_BAR_RESERVE) {
+      top = belowTop;
+    } else if (aboveTop >= GAP) {
+      top = aboveTop;
+    } else {
+      top = window.innerHeight - barH - GLOBAL_BAR_RESERVE;
+    }
+
+    let left = r.left + (r.width - barW) / 2;
+    if (left < GAP) left = GAP;
+    if (left + barW > window.innerWidth - GAP) left = window.innerWidth - barW - GAP;
+    Object.assign(barEl.style, { top: top + 'px', left: left + 'px' });
+  }
+
+  function showBar(mode) {
+    barEl.innerHTML = '';
+    if (mode === 'configure') barEl.appendChild(buildConfigureRow());
+    else if (mode === 'generating') barEl.appendChild(buildGeneratingRow());
+    else if (mode === 'cycling') barEl.appendChild(buildCyclingRow());
+    barEl.style.display = 'block';
+    positionBar();
+    requestAnimationFrame(() => {
+      barEl.style.opacity = '1';
+      barEl.style.transform = 'translateY(0)';
+    });
+  }
+
+  function hideBar() {
+    if (!barEl) return;
+    barEl.style.opacity = '0';
+    barEl.style.transform = 'translateY(6px)';
+    setTimeout(() => { if (barEl) barEl.style.display = 'none'; }, 250);
+    hideActionPicker();
+    closeTunePopover();
+  }
+
+  function updateBarContent(mode) {
+    if (!barEl || barEl.style.display === 'none') return;
+    barEl.innerHTML = '';
+    // Reset bar styling to the theme-aware palette
+    barEl.style.background = BP.surface;
+    barEl.style.border = '1px solid ' + BP.hairline;
+    if (mode === 'configure') barEl.appendChild(buildConfigureRow());
+    else if (mode === 'generating') barEl.appendChild(buildGeneratingRow());
+    else if (mode === 'cycling') barEl.appendChild(buildCyclingRow());
+    else if (mode === 'saving') barEl.appendChild(buildSavingRow());
+    else if (mode === 'confirmed') {
+      barEl.appendChild(buildConfirmedRow());
+      barEl.style.background = 'oklch(95% 0.05 145)';
+      barEl.style.border = '1px solid oklch(75% 0.12 145 / 0.4)';
+    }
+  }
+
+  // --- Configure row ---
+
+  function buildConfigureRow() {
+    const row = el('div', {
+      display: 'flex', alignItems: 'center', gap: '4px',
+    });
+
+    // Action pill
+    const pill = el('button', {
+      display: 'inline-flex', alignItems: 'center', gap: '4px',
+      padding: '5px 10px', borderRadius: '6px',
+      background: BP.mark, color: BP.markText,
+      fontFamily: FONT, fontSize: '12px', fontWeight: '500',
+      border: 'none', cursor: 'pointer',
+      transition: 'background 0.12s ease, transform 0.1s ease',
+      whiteSpace: 'nowrap', flexShrink: '0',
+    });
+    pill.textContent = actionLabel() + ' \u25BE';
+    pill.addEventListener('mouseenter', () => pill.style.background = BP.accent);
+    pill.addEventListener('mouseleave', () => pill.style.background = BP.mark);
+    pill.addEventListener('mousedown', () => pill.style.transform = 'scale(0.97)');
+    pill.addEventListener('mouseup', () => pill.style.transform = 'scale(1)');
+    pill.addEventListener('click', (e) => { e.stopPropagation(); toggleActionPicker(); });
+    row.appendChild(pill);
+
+    // Freeform input. Focus state shows an accent-colored border only —
+    // an earlier version tinted the background with `BP.accentSoft`, which
+    // composited against the dark bar surface to a murky purple where the
+    // browser's default placeholder gray was unreadable. Placeholder color
+    // is set explicitly via a one-shot stylesheet keyed off this input's id
+    // so it picks up the bar's `textDim` token in both themes.
+    const input = document.createElement('input');
+    input.id = PREFIX + '-input';
+    input.type = 'text';
+    input.placeholder = selectedAction === 'impeccable' ? 'describe what you want...' : 'refine further (optional)...';
+    Object.assign(input.style, {
+      flex: '1', minWidth: '0',
+      padding: '5px 8px', borderRadius: '6px',
+      border: '1px solid transparent', background: 'transparent',
+      fontFamily: FONT, fontSize: '12px', color: BP.text,
+      outline: 'none',
+      transition: 'border-color 0.15s ease',
+    });
+    if (!document.getElementById(PREFIX + '-input-style')) {
+      const s = document.createElement('style');
+      s.id = PREFIX + '-input-style';
+      s.textContent =
+        '#' + PREFIX + '-input::placeholder { color: ' + BP.textDim + '; opacity: 1; }';
+      document.head.appendChild(s);
+    }
+    input.addEventListener('focus', () => {
+      input.style.borderColor = BP.accent;
+    });
+    input.addEventListener('blur', () => {
+      input.style.borderColor = 'transparent';
+    });
+    input.addEventListener('keydown', (e) => {
+      if (e.key === 'Enter') { e.stopPropagation(); e.preventDefault(); handleGo(); return; }
+      if (e.key === 'Escape') { e.stopPropagation(); e.preventDefault(); input.blur(); hideBar(); state = 'PICKING'; return; }
+      // Let arrow keys pass through to the element picker when the input is empty
+      if ((e.key === 'ArrowUp' || e.key === 'ArrowDown') && !input.value) return;
+      e.stopPropagation();
+    });
+    row.appendChild(input);
+
+    // Variant count toggle
+    const count = el('button', {
+      padding: '4px 6px', borderRadius: '5px',
+      border: '1px solid ' + BP.hairline, background: 'transparent',
+      fontFamily: MONO, fontSize: '11px', fontWeight: '600',
+      color: BP.textDim, cursor: 'pointer',
+      transition: 'color 0.12s ease, border-color 0.12s ease',
+      flexShrink: '0', whiteSpace: 'nowrap',
+    });
+    count.textContent = '\u00D7' + selectedCount;
+    count.title = 'Variants: click to change';
+    count.addEventListener('mouseenter', () => { count.style.color = BP.text; count.style.borderColor = BP.text; });
+    count.addEventListener('mouseleave', () => { count.style.color = BP.textDim; count.style.borderColor = BP.hairline; });
+    count.addEventListener('click', (e) => {
+      e.stopPropagation();
+      selectedCount = selectedCount >= 4 ? 2 : selectedCount + 1;
+      count.textContent = '\u00D7' + selectedCount;
+    });
+    row.appendChild(count);
+
+    // Go button
+    const go = el('button', {
+      padding: '5px 12px', borderRadius: '6px',
+      border: 'none', background: BP.accent, color: BP.mark,
+      fontFamily: FONT, fontSize: '12px', fontWeight: '600',
+      cursor: 'pointer',
+      transition: 'filter 0.12s ease, transform 0.1s ease',
+      flexShrink: '0', whiteSpace: 'nowrap',
+    });
+    go.textContent = 'Go \u2192';
+    go.addEventListener('mouseenter', () => go.style.filter = 'brightness(1.1)');
+    go.addEventListener('mouseleave', () => go.style.filter = 'none');
+    go.addEventListener('mousedown', () => go.style.transform = 'scale(0.97)');
+    go.addEventListener('mouseup', () => go.style.transform = 'scale(1)');
+    go.addEventListener('click', (e) => { e.stopPropagation(); handleGo(); });
+    row.appendChild(go);
+
+    // Auto-focus input after a beat
+    setTimeout(() => input.focus(), 60);
+    return row;
+  }
+
+  // --- Generating row ---
+
+  function buildGeneratingRow() {
+    const row = el('div', {
+      display: 'flex', alignItems: 'center', gap: '8px',
+      padding: '2px 4px',
+    });
+
+    // Action label
+    const label = el('span', {
+      fontWeight: '600', fontSize: '12px', color: BP.text,
+      flexShrink: '0', whiteSpace: 'nowrap',
+    });
+    label.textContent = actionLabel();
+    row.appendChild(label);
+
+    // Dots
+    row.appendChild(buildDots(false));
+
+    // Status
+    const status = el('span', {
+      fontSize: '11px', color: BP.textDim, whiteSpace: 'nowrap',
+      marginLeft: 'auto',
+    });
+    // Variants currently arrive atomically in a single file edit, so a
+    // per-variant counter would lie. Say what's true.
+    status.textContent = arrivedVariants < expectedVariants
+      ? 'Generating ' + expectedVariants + ' variants...'
+      : 'Done';
+    row.appendChild(status);
+
+    return row;
+  }
+
+  // --- Cycling row ---
+
+  const TUNE_ICON_SVG = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" style="flex-shrink:0"><line x1="4" y1="8" x2="20" y2="8"/><circle cx="14" cy="8" r="2.4" fill="currentColor" stroke="none"/><line x1="4" y1="16" x2="20" y2="16"/><circle cx="10" cy="16" r="2.4" fill="currentColor" stroke="none"/></svg>';
+
+  function buildCyclingRow() {
+    const row = el('div', {
+      display: 'flex', alignItems: 'center', gap: '6px',
+      padding: '1px 2px',
+    });
+
+    // Prev
+    const prev = navBtn('\u2190');
+    prev.addEventListener('click', (e) => { e.stopPropagation(); cycleVariant(-1); });
+    if (visibleVariant <= 1) prev.style.opacity = '0.3';
+    row.appendChild(prev);
+
+    // Dots (clickable)
+    row.appendChild(buildDots(true));
+
+    // Counter
+    const counter = el('span', {
+      fontFamily: MONO, fontSize: '11px', fontWeight: '500',
+      color: BP.textDim, minWidth: '24px', textAlign: 'center',
+    });
+    counter.textContent = visibleVariant + '/' + arrivedVariants;
+    row.appendChild(counter);
+
+    // Next
+    const next = navBtn('\u2192');
+    next.addEventListener('click', (e) => { e.stopPropagation(); cycleVariant(1); });
+    if (visibleVariant >= arrivedVariants) next.style.opacity = '0.3';
+    row.appendChild(next);
+
+    // Tune chip — only when the visible variant exposes params
+    const visParams = parseVariantParams(getVisibleVariantEl());
+    const hasParams = visParams.length > 0;
+    if (hasParams) {
+      const tune = el('button', {
+        display: 'inline-flex', alignItems: 'center', gap: '6px',
+        padding: '4px 10px', borderRadius: '5px',
+        border: '1px solid transparent',
+        background: tuneOpen ? BP.accentSoft : 'transparent',
+        color: tuneOpen ? BP.accent : BP.text,
+        fontFamily: FONT, fontSize: '11px', fontWeight: '500',
+        cursor: 'pointer',
+        transition: 'color 0.12s ease, background 0.12s ease',
+        whiteSpace: 'nowrap',
+      });
+      tune.innerHTML = TUNE_ICON_SVG;
+      const tuneLabel = document.createElement('span');
+      tuneLabel.textContent = 'Tune';
+      tune.appendChild(tuneLabel);
+      const tuneBadge = document.createElement('span');
+      Object.assign(tuneBadge.style, {
+        display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
+        minWidth: '16px', height: '16px', padding: '0 4px',
+        borderRadius: '999px',
+        background: tuneOpen ? C.brand : BP.hairline,
+        color: tuneOpen ? 'oklch(98% 0 0)' : 'inherit',
+        fontFamily: MONO, fontSize: '9.5px', fontWeight: '600',
+        lineHeight: '1',
+        boxSizing: 'border-box',
+      });
+      tuneBadge.textContent = String(visParams.length);
+      tune.appendChild(tuneBadge);
+      tune.title = 'Tune this variant (' + visParams.length + ' knob' + (visParams.length === 1 ? '' : 's') + ')';
+      tune.addEventListener('mouseenter', () => {
+        if (!tuneOpen) tune.style.background = BP.accentSoft;
+      });
+      tune.addEventListener('mouseleave', () => {
+        if (!tuneOpen) tune.style.background = 'transparent';
+      });
+      tune.addEventListener('click', (e) => { e.stopPropagation(); toggleTunePopover(); });
+      tune.dataset.iceqTune = '1';
+      row.appendChild(tune);
+    }
+
+    // Spacer
+    row.appendChild(el('div', { flex: '1' }));
+
+    // Accept — primary action, uses the site's saturated brand magenta
+    // with paper-white text, not the theme-muted BP.accent.
+    const accept = el('button', {
+      padding: '5px 14px', borderRadius: '5px',
+      border: 'none', background: C.brand, color: 'oklch(98% 0 0)',
+      fontFamily: FONT, fontSize: '11px', fontWeight: '600',
+      cursor: 'pointer', transition: 'filter 0.12s ease, transform 0.1s ease',
+      whiteSpace: 'nowrap',
+    });
+    accept.textContent = '\u2713 Accept';
+    accept.addEventListener('mouseenter', () => accept.style.filter = 'brightness(1.08)');
+    accept.addEventListener('mouseleave', () => accept.style.filter = 'none');
+    accept.addEventListener('mousedown', () => accept.style.transform = 'scale(0.97)');
+    accept.addEventListener('mouseup', () => accept.style.transform = 'scale(1)');
+    accept.addEventListener('click', (e) => { e.stopPropagation(); handleAccept(); });
+    if (arrivedVariants === 0) { accept.style.opacity = '0.3'; accept.style.pointerEvents = 'none'; }
+    row.appendChild(accept);
+
+    // Discard
+    const discard = el('button', {
+      padding: '4px 6px', borderRadius: '5px',
+      border: '1px solid ' + BP.hairline, background: 'transparent',
+      fontFamily: FONT, fontSize: '11px', color: BP.textDim,
+      cursor: 'pointer', transition: 'color 0.12s ease, border-color 0.12s ease',
+    });
+    discard.textContent = '\u2715';
+    discard.title = 'Discard all variants';
+    discard.addEventListener('mouseenter', () => { discard.style.color = BP.text; discard.style.borderColor = BP.text; });
+    discard.addEventListener('mouseleave', () => { discard.style.color = BP.textDim; discard.style.borderColor = BP.hairline; });
+    discard.addEventListener('click', (e) => { e.stopPropagation(); handleDiscard(); });
+    row.appendChild(discard);
+
+    return row;
+  }
+
+  // --- Shared UI builders ---
+
+  // --- Saving row (waiting for agent to process accept/discard) ---
+
+  function buildSavingRow() {
+    const row = el('div', {
+      display: 'flex', alignItems: 'center', gap: '8px',
+      padding: '2px 8px',
+    });
+    const spinner = el('div', {
+      width: '14px', height: '14px', borderRadius: '50%',
+      border: '2px solid ' + BP.hairline,
+      borderTopColor: BP.accent,
+      animation: 'impeccable-spin 0.6s linear infinite',
+      flexShrink: '0',
+    });
+    row.appendChild(spinner);
+    const label = el('span', {
+      fontSize: '12px', color: BP.textDim, fontWeight: '500',
+    });
+    label.textContent = 'Applying variant...';
+    row.appendChild(label);
+
+    // Inject the keyframes if not already present
+    if (!document.getElementById(PREFIX + '-keyframes')) {
+      const style = document.createElement('style');
+      style.id = PREFIX + '-keyframes';
+      style.textContent = '@keyframes impeccable-spin { to { transform: rotate(360deg); } }';
+      document.head.appendChild(style);
+    }
+    return row;
+  }
+
+  // --- Confirmed row (green success, auto-dismisses) ---
+
+  function buildConfirmedRow() {
+    const row = el('div', {
+      display: 'flex', alignItems: 'center', gap: '8px',
+      padding: '2px 8px',
+    });
+    const check = el('span', {
+      fontSize: '15px', lineHeight: '1', flexShrink: '0',
+      color: 'oklch(45% 0.15 145)',
+    });
+    check.textContent = '\u2713';
+    row.appendChild(check);
+    const label = el('span', {
+      fontSize: '12px', color: 'oklch(35% 0.1 145)', fontWeight: '600',
+    });
+    label.textContent = 'Variant applied';
+    row.appendChild(label);
+    return row;
+  }
+
+  // --- Shared UI builders ---
+
+  function buildDots(clickable) {
+    const container = el('div', {
+      display: 'flex', alignItems: 'center', gap: '4px',
+    });
+    for (let i = 1; i <= expectedVariants; i++) {
+      const arrived = i <= arrivedVariants;
+      const active = i === visibleVariant;
+      // active: solid site-brand magenta dot. arrived+inactive: muted neutral.
+      // pending (not yet arrived): faint outline ring. No borders on arrived
+      // dots — the previous "accent ring + ash fill" combo read as noisy
+      // magenta chips, especially when all variants had arrived and every
+      // dot wore an accent ring.
+      const dotBg = active ? C.brand
+        : arrived ? BP.textDim
+        : 'transparent';
+      const dotBorder = arrived ? 'none' : '1.5px solid ' + BP.hairline;
+      const dot = el('div', {
+        width: active ? '8px' : '6px',
+        height: active ? '8px' : '6px',
+        borderRadius: '50%',
+        background: dotBg,
+        border: dotBorder,
+        boxSizing: 'border-box',
+        transition: 'all 0.2s ' + EASE,
+        cursor: (clickable && arrived) ? 'pointer' : 'default',
+        transform: arrived ? 'scale(1)' : 'scale(0.85)',
+        opacity: arrived ? (active ? '1' : '0.6') : '0.4',
+      });
+      if (clickable && arrived) {
+        const idx = i;
+        dot.addEventListener('click', (e) => {
+          e.stopPropagation();
+          visibleVariant = idx;
+          showVariantInDOM(currentSessionId, idx);
+          updateSelectedElement();
+          updateBarContent('cycling');
+        });
+      }
+      container.appendChild(dot);
+    }
+    return container;
+  }
+
+  function navBtn(text) {
+    const b = el('button', {
+      width: '26px', height: '26px', borderRadius: '5px',
+      border: '1px solid ' + BP.hairline, background: 'transparent',
+      color: BP.text, fontFamily: FONT, fontSize: '13px',
+      cursor: 'pointer', display: 'flex', alignItems: 'center', justifyContent: 'center',
+      transition: 'border-color 0.12s ease, background 0.12s ease',
+      padding: '0', lineHeight: '1',
+    });
+    b.textContent = text;
+    b.addEventListener('mouseenter', () => { b.style.borderColor = BP.text; });
+    b.addEventListener('mouseleave', () => { b.style.borderColor = BP.hairline; });
+    return b;
+  }
+
+  function actionLabel() {
+    const a = ACTIONS.find(a => a.value === selectedAction);
+    return a ? a.label : 'Freeform';
+  }
+
+  function el(tag, styles) {
+    const e = document.createElement(tag);
+    if (styles) Object.assign(e.style, styles);
+    return e;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Action picker popover
+  // ---------------------------------------------------------------------------
+
+  function initActionPicker() {
+    const P = barPaletteForTheme(detectPageTheme());
+    pickerEl = document.createElement('div');
+    pickerEl.id = PREFIX + '-picker';
+    Object.assign(pickerEl.style, {
+      position: 'fixed', zIndex: Z.picker,
+      display: 'none', opacity: '0',
+      transform: 'scale(0.96) translateY(4px)',
+      transformOrigin: 'bottom left',
+      transition: 'opacity 0.18s ' + EASE + ', transform 0.2s ' + EASE,
+      background: P.surface,
+      border: '1px solid ' + P.hairline,
+      borderRadius: '10px',
+      boxShadow: '0 8px 30px oklch(0% 0 0 / 0.10), 0 2px 6px oklch(0% 0 0 / 0.06)',
+      padding: '6px',
+      fontFamily: FONT,
+      backdropFilter: 'blur(10px)',
+      WebkitBackdropFilter: 'blur(10px)',
+    });
+
+    // Build the chip grid
+    const grid = el('div', {
+      display: 'grid', gridTemplateColumns: 'repeat(4, 1fr)', gap: '3px',
+    });
+
+    ACTIONS.forEach(action => {
+      const chip = el('button', {
+        display: 'flex', flexDirection: 'column', alignItems: 'center',
+        gap: '4px',
+        padding: '8px 6px', borderRadius: '6px',
+        border: 'none',
+        background: action.value === selectedAction ? P.accentSoft : 'transparent',
+        color: action.value === selectedAction ? P.accent : P.text,
+        fontFamily: FONT, fontSize: '11px', fontWeight: '500',
+        cursor: 'pointer',
+        transition: 'background 0.1s ease, color 0.1s ease',
+        textAlign: 'center', whiteSpace: 'nowrap',
+      });
+      const iconWrap = el('span', {
+        display: 'flex', alignItems: 'center', justifyContent: 'center',
+        height: '20px', opacity: '0.9',
+      });
+      iconWrap.innerHTML = ICONS[action.value] || '';
+      const labelEl = el('span', { lineHeight: '1' });
+      labelEl.textContent = action.label;
+      chip.appendChild(iconWrap);
+      chip.appendChild(labelEl);
+      chip.dataset.action = action.value;
+      chip.addEventListener('mouseenter', () => {
+        if (action.value !== selectedAction) chip.style.background = P.accentSoft;
+      });
+      chip.addEventListener('mouseleave', () => {
+        chip.style.background = action.value === selectedAction ? P.accentSoft : 'transparent';
+      });
+      chip.addEventListener('click', (e) => {
+        e.stopPropagation();
+        selectedAction = action.value;
+        hideActionPicker();
+        updateBarContent('configure');
+      });
+      grid.appendChild(chip);
+    });
+
+    pickerEl.appendChild(grid);
+    document.body.appendChild(pickerEl);
+    defangOutsideHandlers(pickerEl);
+
+    // Cache the palette on the picker so toggleActionPicker's state refresh
+    // uses the same theme-aware colors when it repaints chips.
+    pickerEl.__iceq_palette = P;
+  }
+
+  function toggleActionPicker() {
+    if (pickerEl.style.display !== 'none') { hideActionPicker(); return; }
+    // Rebuild chips to reflect current selection
+    const P = pickerEl.__iceq_palette || barPaletteForTheme(detectPageTheme());
+    pickerEl.querySelectorAll('button').forEach(chip => {
+      const isActive = chip.dataset.action === selectedAction;
+      chip.style.background = isActive ? P.accentSoft : 'transparent';
+      chip.style.color = isActive ? P.accent : P.text;
+    });
+    // Position above the bar
+    const barRect = barEl.getBoundingClientRect();
+    const pickerH = 170; // approximate; grows with icon + label rows
+    let top = barRect.top - pickerH - 6;
+    if (top < 8) top = barRect.bottom + 6;
+    Object.assign(pickerEl.style, {
+      top: top + 'px', left: barRect.left + 'px',
+      display: 'block',
+    });
+    requestAnimationFrame(() => {
+      pickerEl.style.opacity = '1';
+      pickerEl.style.transform = 'scale(1) translateY(0)';
+    });
+  }
+
+  function hideActionPicker() {
+    if (!pickerEl) return;
+    pickerEl.style.opacity = '0';
+    pickerEl.style.transform = 'scale(0.96) translateY(4px)';
+    setTimeout(() => { if (pickerEl) pickerEl.style.display = 'none'; }, 180);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Params panel (per-variant coarse controls)
+  //
+  // Variants may declare a parameter manifest via a JSON attribute on the
+  // variant wrapper:
+  //
+  //   <div data-impeccable-variant="1"
+  //        data-impeccable-params='[{"id":"density","kind":"steps",...}]'>
+  //
+  // The panel docks to the right edge of the outline during CYCLING and
+  // exposes 2-5 coarse knobs. Values apply to the variant wrapper so scoped
+  // CSS can respond instantly without regeneration:
+  //
+  //   range  / numeric toggle  → CSS var  (`--p-<id>`)  used via var(--p-foo, N)
+  //   steps  / boolean toggle  → data-p-<id> attribute  used via :scope[data-p-foo="..."]
+  //
+  // On variant switch, values reset to that variant's declared defaults.
+  // On accept, current values are sent in the event payload so the agent
+  // can bake them into the source-file write.
+  // ---------------------------------------------------------------------------
+
+  let paramsPanelEl = null;     // outer wrapper (overflow:hidden, clips the slide)
+  let paramsPanelInner = null;  // translating content (carries bg, padding, knobs)
+  let paramsPanelBody = null;   // grid holding the knob cells
+  let paramsCurrentValues = {}; // {paramId: value} — mirror of the visible variant's live values
+  let tuneOpen = false;         // whether the Tune popover is open right now
+
+  // Theme-aware Tune popover. Appears as a drawer that slides out from the
+  // contextual bar's bar-facing edge (below if the bar sits below the
+  // element, above otherwise). Same width as the bar. Auto-wraps to extra
+  // rows when the knobs exceed one row. The bar's border-radius on the
+  // popover side goes flat while open so the two shapes read as one.
+  let paramsPanelPalette = null;
+
+  function initParamsPanel() {
+    paramsPanelPalette = barPaletteForTheme(detectPageTheme());
+    const P = paramsPanelPalette;
+
+    // Single element, always in the DOM. The slide animation is a CSS mask
+    // with mask-size growing from 0% to 100% along the bar-facing axis — no
+    // display toggle, no opacity toggle, no transform trickery. The mask
+    // hides everything initially; as it grows, content is revealed from
+    // the bar edge outward.
+    paramsPanelEl = document.createElement('div');
+    paramsPanelEl.id = PREFIX + '-params-panel';
+    Object.assign(paramsPanelEl.style, {
+      position: 'fixed', zIndex: String(Z.bar - 1),
+      background: P.surfaceDeep,
+      color: P.text,
+      fontFamily: FONT,
+      padding: '14px 18px',
+      boxSizing: 'border-box',
+      borderRadius: '0 0 10px 10px',
+      pointerEvents: 'none',
+      backdropFilter: 'blur(16px)', WebkitBackdropFilter: 'blur(16px)',
+
+      // clip-path is the same conceptual reveal as mask but with rock-solid
+      // transition support across engines. Closed state clips from the far
+      // edge; open = inset(0) shows everything.
+      clipPath: 'inset(0 0 100% 0)',
+      transition: 'clip-path 0.44s ' + EASE,
+
+      // Park off-screen until positionParamsPanel places it. These are NOT
+      // in the transition list, so they snap instantly — no fly-in from the
+      // top-left when first shown.
+      top: '-9999px', left: '-9999px', width: '0',
+    });
+
+    paramsPanelBody = el('div', {
+      display: 'grid',
+      gridTemplateColumns: 'repeat(auto-fit, minmax(120px, 1fr))',
+      gap: '12px 16px',
+    });
+
+    paramsPanelEl.appendChild(paramsPanelBody);
+    document.body.appendChild(paramsPanelEl);
+    // Don't override pointer-events: the panel toggles between 'none' (closed,
+    // click-through) and 'auto' (open) on its own. Just silence the host's
+    // outside-interaction listeners while the panel is open.
+    defangOutsideHandlers(paramsPanelEl, { setPointerEvents: false });
+    paramsPanelInner = paramsPanelEl; // compatibility alias for the rest of the code
+  }
+
+  function getVisibleVariantEl() {
+    if (!currentSessionId) return null;
+    const wrapper = document.querySelector('[data-impeccable-variants="' + currentSessionId + '"]');
+    if (!wrapper) return null;
+    return wrapper.querySelector('[data-impeccable-variant="' + visibleVariant + '"]');
+  }
+
+  function parseVariantParams(variantEl) {
+    if (!variantEl) return [];
+    const raw = variantEl.getAttribute('data-impeccable-params');
+    if (!raw) return [];
+    try {
+      const parsed = JSON.parse(raw);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch (err) {
+      console.warn('[impeccable] Invalid data-impeccable-params JSON:', err.message);
+      return [];
+    }
+  }
+
+  function applyParamValue(variantEl, param, value) {
+    if (!variantEl) return;
+    const attr = 'data-p-' + param.id;
+    if (param.kind === 'range') {
+      variantEl.style.setProperty('--p-' + param.id, String(value));
+    } else if (param.kind === 'toggle') {
+      const on = !!value;
+      variantEl.style.setProperty('--p-' + param.id, on ? '1' : '0');
+      if (on) variantEl.setAttribute(attr, 'on');
+      else variantEl.removeAttribute(attr);
+    } else if (param.kind === 'steps') {
+      variantEl.setAttribute(attr, String(value));
+    }
+  }
+
+  function applyParamDefaults(variantEl, params) {
+    paramsCurrentValues = {};
+    for (const p of params) {
+      paramsCurrentValues[p.id] = p.default;
+      applyParamValue(variantEl, p, p.default);
+    }
+  }
+
+  function formatRangeValue(input) {
+    const max = parseFloat(input.max), min = parseFloat(input.min);
+    const v = parseFloat(input.value);
+    if (!isFinite(v)) return input.value;
+    return (max - min) <= 2 ? v.toFixed(2) : String(Math.round(v));
+  }
+
+  function buildParamsPanel(variantEl, params) {
+    const P = paramsPanelPalette || barPaletteForTheme(detectPageTheme());
+    paramsPanelBody.innerHTML = '';
+    for (const p of params) {
+      const row = el('div', { display: 'flex', flexDirection: 'column', gap: '6px' });
+      const labelRow = el('div', {
+        display: 'flex', justifyContent: 'space-between',
+        alignItems: 'baseline', gap: '8px',
+      });
+      const lbl = el('span', {
+        fontSize: '10.5px', fontWeight: '600', color: P.text,
+        letterSpacing: '0.03em',
+      });
+      lbl.textContent = p.label || p.id;
+      labelRow.appendChild(lbl);
+      const readout = el('span', {
+        fontSize: '10.5px', color: P.textDim,
+        fontFamily: 'ui-monospace, SFMono-Regular, Menlo, monospace',
+      });
+      labelRow.appendChild(readout);
+      row.appendChild(labelRow);
+
+      if (p.kind === 'range') {
+        const input = document.createElement('input');
+        input.type = 'range';
+        input.min = String(p.min != null ? p.min : 0);
+        input.max = String(p.max != null ? p.max : 1);
+        input.step = String(p.step != null ? p.step : 0.05);
+        input.value = String(p.default);
+        Object.assign(input.style, {
+          width: '100%', accentColor: C.brand, cursor: 'pointer',
+        });
+        readout.textContent = formatRangeValue(input);
+        input.addEventListener('input', (e) => {
+          e.stopPropagation();
+          const v = parseFloat(input.value);
+          paramsCurrentValues[p.id] = v;
+          readout.textContent = formatRangeValue(input);
+          applyParamValue(variantEl, p, v);
+          queueCheckpoint('param_changed');
+        });
+        row.appendChild(input);
+      } else if (p.kind === 'toggle') {
+        const initial = !!p.default;
+        readout.textContent = initial ? 'On' : 'Off';
+        const track = el('button', {
+          position: 'relative', width: '36px', height: '20px',
+          borderRadius: '10px', border: 'none', padding: '0',
+          cursor: 'pointer',
+          background: initial ? C.brand : P.hairline,
+          transition: 'background 0.15s ease',
+          alignSelf: 'flex-start',
+        });
+        const knob = el('span', {
+          position: 'absolute', top: '2px',
+          left: initial ? '18px' : '2px',
+          width: '16px', height: '16px', borderRadius: '50%',
+          background: 'oklch(98% 0 0)',
+          transition: 'left 0.18s ' + EASE,
+          boxShadow: '0 1px 2px oklch(0% 0 0 / 0.2)',
+        });
+        track.appendChild(knob);
+        track.addEventListener('click', (e) => {
+          e.stopPropagation();
+          const next = !paramsCurrentValues[p.id];
+          paramsCurrentValues[p.id] = next;
+          track.style.background = next ? C.brand : P.hairline;
+          knob.style.left = next ? '18px' : '2px';
+          readout.textContent = next ? 'On' : 'Off';
+          applyParamValue(variantEl, p, next);
+          queueCheckpoint('param_changed');
+        });
+        row.appendChild(track);
+      } else if (p.kind === 'steps') {
+        const opts = (p.options || []).map(o =>
+          typeof o === 'string' ? { value: o, label: o } : o
+        );
+        const activeOpt = opts.find(o => o.value === p.default) || opts[0];
+        readout.textContent = activeOpt ? activeOpt.label : String(p.default);
+        const segRow = el('div', {
+          display: 'grid',
+          gridTemplateColumns: 'repeat(' + opts.length + ', 1fr)',
+          gap: '1px', padding: '2px',
+          background: P.hairline, borderRadius: '5px',
+        });
+        const segBtns = [];
+        opts.forEach(o => {
+          const active = o.value === p.default;
+          const b = el('button', {
+            padding: '5px 4px', border: 'none', borderRadius: '3px',
+            background: active ? C.brand : 'transparent',
+            color: active ? 'oklch(98% 0 0)' : P.text,
+            fontFamily: FONT, fontSize: '10.5px', fontWeight: '500',
+            cursor: 'pointer', whiteSpace: 'nowrap',
+            transition: 'background 0.1s ease, color 0.1s ease',
+          });
+          b.textContent = o.label;
+          b.addEventListener('click', (e) => {
+            e.stopPropagation();
+            paramsCurrentValues[p.id] = o.value;
+            readout.textContent = o.label;
+            segBtns.forEach(({ btn, val }) => {
+              const on = val === o.value;
+              btn.style.background = on ? C.brand : 'transparent';
+              btn.style.color = on ? 'oklch(98% 0 0)' : P.text;
+            });
+            applyParamValue(variantEl, p, o.value);
+            queueCheckpoint('param_changed');
+          });
+          segRow.appendChild(b);
+          segBtns.push({ btn: b, val: o.value });
+        });
+        row.appendChild(segRow);
+      }
+
+      paramsPanelBody.appendChild(row);
+    }
+  }
+
+  // Decide which way the popover opens: away from the picked element. If the
+  // bar landed below the element, popover slides DOWN from the bar's bottom.
+  // If the bar landed above, popover slides UP from the bar's top.
+  function popoverDirection() {
+    if (!barEl || !selectedElement) return 'below';
+    const br = barEl.getBoundingClientRect();
+    const er = selectedElement.getBoundingClientRect();
+    return br.top >= er.bottom - 4 ? 'below' : 'above';
+  }
+
+  // The popover overlaps the bar by OVERLAP px on the bar-facing side. With
+  // popover z-index below bar, that overlap sits behind bar (invisible) and
+  // reinforces the "tucked behind" feel. Padding compensates so the real
+  // content starts flush with bar's outer edge.
+  const TUNE_OVERLAP = 6;
+
+  // Closed clip-path depends on direction: for 'below' clip from the far
+  // (bottom) edge so the reveal grows downward from the bar; for 'above'
+  // clip from the top edge so the reveal grows upward from the bar.
+  function closedClipPath(direction) {
+    return direction === 'below' ? 'inset(0 0 100% 0)' : 'inset(100% 0 0 0)';
+  }
+
+  function setClipPath(value, withTransition) {
+    const saved = paramsPanelEl.style.transition;
+    if (!withTransition) paramsPanelEl.style.transition = 'none';
+    paramsPanelEl.style.clipPath = value;
+    if (!withTransition) {
+      void paramsPanelEl.offsetHeight;
+      paramsPanelEl.style.transition = saved;
+    }
+  }
+
+  function positionParamsPanel() {
+    if (!paramsPanelEl || !barEl || barEl.style.display === 'none') return;
+    const br = barEl.getBoundingClientRect();
+    const direction = popoverDirection();
+    const prevDirection = paramsPanelEl.dataset.tuneDirection;
+
+    // top/left/width are NOT in the transition list, so they snap instantly.
+    paramsPanelEl.style.left = br.left + 'px';
+    paramsPanelEl.style.width = br.width + 'px';
+
+    if (direction === 'below') {
+      paramsPanelEl.style.top = (br.bottom - TUNE_OVERLAP) + 'px';
+      paramsPanelEl.style.borderRadius = '0 0 10px 10px';
+      paramsPanelEl.style.paddingTop = (14 + TUNE_OVERLAP) + 'px';
+      paramsPanelEl.style.paddingBottom = '14px';
+    } else {
+      const ih = paramsPanelEl.offsetHeight || 80;
+      paramsPanelEl.style.top = (br.top - ih + TUNE_OVERLAP) + 'px';
+      paramsPanelEl.style.borderRadius = '10px 10px 0 0';
+      paramsPanelEl.style.paddingTop = '14px';
+      paramsPanelEl.style.paddingBottom = (14 + TUNE_OVERLAP) + 'px';
+    }
+    paramsPanelEl.dataset.tuneDirection = direction;
+
+    // If currently closed and direction flipped (or first-time setup),
+    // snap the clip-path to the new direction's closed pose without
+    // transitioning (so the clip doesn't slide across the element).
+    if (!tuneOpen && (!prevDirection || prevDirection !== direction)) {
+      setClipPath(closedClipPath(direction), false);
+    }
+  }
+
+  function showParamsPanel() {
+    if (!paramsPanelEl) return;
+    positionParamsPanel();
+    paramsPanelEl.style.pointerEvents = 'auto';
+    // rAF so the positioning paint commits before the transition fires.
+    requestAnimationFrame(() => {
+      setClipPath('inset(0 0 0 0)', true);
+    });
+  }
+
+  function hideParamsPanel() {
+    if (!paramsPanelEl) return;
+    paramsPanelEl.style.pointerEvents = 'none';
+    const direction = paramsPanelEl.dataset.tuneDirection || 'below';
+    setClipPath(closedClipPath(direction), true);
+  }
+
+  // Build/rebuild the panel's contents for the current variant AND apply
+  // its defaults to the variant wrapper (so scoped CSS responds even before
+  // the user opens the popover). Visibility is governed by tuneOpen.
+  function refreshParamsPanel() {
+    if (state !== 'CYCLING') {
+      paramsCurrentValues = {};
+      tuneOpen = false;
+      hideParamsPanel();
+      return;
+    }
+    const variantEl = getVisibleVariantEl();
+    const params = parseVariantParams(variantEl);
+    if (!variantEl || params.length === 0) {
+      paramsCurrentValues = {};
+      tuneOpen = false;
+      hideParamsPanel();
+      return;
+    }
+    applyParamDefaults(variantEl, params);
+    buildParamsPanel(variantEl, params);
+    if (tuneOpen) {
+      // If already visible (variant cycled while open), refresh in place
+      // instead of re-running the clip-path animation.
+      const alreadyVisible = paramsPanelEl.style.display === 'block'
+        && paramsPanelEl.style.opacity === '1';
+      if (alreadyVisible) positionParamsPanel();
+      else showParamsPanel();
+    } else {
+      hideParamsPanel();
+    }
+  }
+
+  function toggleTunePopover() {
+    if (tuneOpen) { closeTunePopover(); return; }
+    openTunePopover();
+  }
+
+  function openTunePopover() {
+    if (state !== 'CYCLING') return;
+    const variantEl = getVisibleVariantEl();
+    const params = parseVariantParams(variantEl);
+    if (!variantEl || params.length === 0) return;
+    // Build fresh to ensure the current variant's controls are shown.
+    applyParamDefaults(variantEl, params);
+    buildParamsPanel(variantEl, params);
+    tuneOpen = true;
+    showParamsPanel();
+    // Kill the bar's shadow on the popover-facing side so the dark popover
+    // doesn't pick up a bright glow line.
+    if (barEl) {
+      const direction = paramsPanelEl?.dataset.tuneDirection || 'below';
+      barEl.style.boxShadow = direction === 'below' ? BAR_SHADOW_UP : BAR_SHADOW_DOWN;
+    }
+    // Re-render the bar so the Tune chip picks up the active styling.
+    updateBarContent('cycling');
+  }
+
+  function closeTunePopover() {
+    tuneOpen = false;
+    hideParamsPanel();
+    if (barEl) barEl.style.boxShadow = BAR_SHADOW_DEFAULT;
+    if (barEl && barEl.style.display !== 'none' && state === 'CYCLING') {
+      updateBarContent('cycling');
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Variant cycling in DOM
+  // ---------------------------------------------------------------------------
+
+  function showVariantInDOM(sessionId, num) {
+    const wrapper = document.querySelector('[data-impeccable-variants="' + sessionId + '"]');
+    if (!wrapper) return;
+    for (const child of wrapper.children) {
+      const v = child.dataset ? child.dataset.impeccableVariant : null;
+      if (!v) continue;
+      child.style.display = (v === String(num)) ? '' : 'none';
+    }
+    // Unconditional refresh — covers first-reveal (no-op if state isn't
+    // CYCLING yet, the subsequent CYCLING transition triggers its own
+    // refresh) and every cycle step.
+    refreshParamsPanel();
+  }
+
+  /**
+   * No-HMR fallback: fetch the raw source file from the live server,
+   * parse it, extract the variant wrapper, and inject it into the live DOM.
+   * This works even when the dev server caches HTML (Bun, static servers).
+   */
+  function injectVariantsFromSource(filePath, sessionId) {
+    const url = 'http://localhost:' + PORT + '/source?token=' + TOKEN + '&path=' + encodeURIComponent(filePath);
+    fetch(url)
+      .then(r => { if (!r.ok) throw new Error(r.status); return r.text(); })
+      .then(html => {
+        // Parse the raw source HTML
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(html, 'text/html');
+        const srcWrapper = doc.querySelector('[data-impeccable-variants="' + sessionId + '"]');
+        if (!srcWrapper) {
+          console.error('[impeccable] Variant wrapper not found in source file.');
+          return;
+        }
+
+        // Find the original element in the live DOM.
+        // The original is inside the wrapper in the source. We find the
+        // corresponding element in the live DOM by matching the first child's
+        // tag + classes from the original snapshot.
+        const origContent = srcWrapper.querySelector('[data-impeccable-variant="original"] > :first-child');
+        if (!origContent) return;
+
+        const tag = origContent.tagName.toLowerCase();
+        const cls = origContent.className;
+        let liveEl = null;
+        if (origContent.id) {
+          liveEl = document.getElementById(origContent.id);
+        } else if (cls) {
+          // Find by tag + exact class match
+          const candidates = document.querySelectorAll(tag + '.' + cls.split(' ')[0]);
+          for (const c of candidates) {
+            if (c.className === cls && !own(c)) { liveEl = c; break; }
+          }
+        }
+
+        if (!liveEl) {
+          console.error('[impeccable] Could not find original element in live DOM.');
+          return;
+        }
+
+        const previousVisibleVariant = currentSessionId === sessionId ? visibleVariant : 0;
+
+        // Replace the live element with the full wrapper from source
+        const wrapper = srcWrapper.cloneNode(true);
+        liveEl.parentElement.replaceChild(wrapper, liveEl);
+
+        // Update state: count variants, preserving the user's current variant
+        // when a late HMR/source reinjection lands after they have cycled.
+        const variants = wrapper.querySelectorAll('[data-impeccable-variant]:not([data-impeccable-variant="original"])');
+        arrivedVariants = variants.length;
+        expectedVariants = parseInt(wrapper.dataset.impeccableVariantCount || arrivedVariants);
+        const saved = loadSession();
+        const savedVisibleVariant = saved && saved.id === sessionId ? saved.visible : 0;
+        visibleVariant = previousVisibleVariant > 0 && previousVisibleVariant <= arrivedVariants
+          ? previousVisibleVariant
+          : (savedVisibleVariant > 0 && savedVisibleVariant <= arrivedVariants ? savedVisibleVariant : 1);
+        showVariantInDOM(sessionId, visibleVariant);
+
+        // Update selectedElement to the visible variant's content
+        selectedElement = pickVariantContent(wrapper, visibleVariant) || wrapper.parentElement;
+
+        state = 'CYCLING';
+        hideShaderOverlay();
+        updateBarContent('cycling');
+        refreshParamsPanel();
+        saveSession();
+        console.log('[impeccable] Injected ' + arrivedVariants + ' variants from source file.');
+      })
+      .catch(err => {
+        console.error('[impeccable] Failed to fetch source:', err);
+        showToast('Could not load variants. Try refreshing the page.', 5000);
+      });
+  }
+
+  function cycleVariant(dir) {
+    const next = visibleVariant + dir;
+    if (next < 1 || next > arrivedVariants) return;
+    visibleVariant = next;
+    showVariantInDOM(currentSessionId, next); // calls refreshParamsPanel itself
+    updateSelectedElement();
+    updateBarContent('cycling');
+    saveSession();
+    queueCheckpoint('variant_changed');
+  }
+
+  function updateSelectedElement() {
+    if (!currentSessionId) return;
+    const wrapper = document.querySelector('[data-impeccable-variants="' + currentSessionId + '"]');
+    if (!wrapper) return;
+    const visEl = pickVariantContent(wrapper, visibleVariant);
+    if (visEl) selectedElement = visEl;
+  }
+
+  function readVisibleVariantFromDOM(sessionId) {
+    const wrapper = document.querySelector('[data-impeccable-variants="' + sessionId + '"]');
+    if (!wrapper) return 0;
+    const variants = wrapper.querySelectorAll('[data-impeccable-variant]:not([data-impeccable-variant="original"])');
+    for (const variant of variants) {
+      if (variant.style.display === 'none') continue;
+      const idx = parseInt(variant.dataset.impeccableVariant || '0', 10);
+      if (idx > 0) return idx;
+    }
+    return 0;
+  }
+
+  // Resolve the element that represents the variant's visible content.
+  // Contract: each variant div should contain exactly one top-level element
+  // (the full replacement). In practice a model may ship loose siblings or
+  // lead with <style>/<script>. Be defensive: skip non-visual elements, and
+  // if the variant has multiple element children, use the variant div itself
+  // (it wraps all of them and gets correct bounds).
+  function pickVariantContent(wrapper, index) {
+    if (!wrapper) return null;
+    const variantDiv = wrapper.querySelector('[data-impeccable-variant="' + index + '"]');
+    if (!variantDiv) return null;
+    const NON_VISUAL = new Set(['STYLE', 'SCRIPT', 'LINK', 'META', 'TEMPLATE']);
+    const visual = [];
+    for (const child of variantDiv.children) {
+      if (!NON_VISUAL.has(child.tagName)) visual.push(child);
+    }
+    if (visual.length === 1) return visual[0];
+    return variantDiv;
+  }
+
+  // Hold window.scrollY at a fixed value across DOM mutations inside the
+  // session's wrapper (HMR patches, variant inserts, cycle swaps).
+  function startScrollLock(sessionId, initialTargetY) {
+    stopScrollLock();
+    scrollLockTargetY = typeof initialTargetY === 'number' && isFinite(initialTargetY)
+      ? initialTargetY
+      : window.scrollY;
+    console.log('[impeccable.scroll] startScrollLock', { sessionId, scrollY: window.scrollY, targetY: scrollLockTargetY, initialOverride: initialTargetY });
+
+    try { history.scrollRestoration = 'manual'; } catch {}
+
+    const prevHtmlAnchor = document.documentElement.style.overflowAnchor;
+    const prevBodyAnchor = document.body.style.overflowAnchor;
+    document.documentElement.style.overflowAnchor = 'none';
+    document.body.style.overflowAnchor = 'none';
+
+    const correct = (why) => {
+      scrollLockRaf = null;
+      if (scrollLockTargetY == null) return;
+      const before = window.scrollY;
+      const delta = before - scrollLockTargetY;
+      if (Math.abs(delta) < 0.5) {
+        console.log('[impeccable.scroll] correct noop', { why, scrollY: before, targetY: scrollLockTargetY });
+        return;
+      }
+      window.scrollTo({ top: scrollLockTargetY, left: window.scrollX, behavior: 'instant' });
+      console.log('[impeccable.scroll] corrected', { why, from: before, to: scrollLockTargetY, delta, nowAt: window.scrollY });
+    };
+    const schedule = (why) => {
+      if (scrollLockRaf != null) return;
+      scrollLockRaf = requestAnimationFrame(() => correct(why));
+    };
+
+    scrollLockObserver = new MutationObserver((mutations) => {
+      for (const m of mutations) {
+        if (m.target?.closest?.('[data-impeccable-variants="' + sessionId + '"]')) {
+          const childAdds = Array.from(m.addedNodes).map(n => n.nodeType === 1 ? (n.tagName + (n.dataset?.impeccableVariant ? ('[variant=' + n.dataset.impeccableVariant + ']') : '')) : n.nodeType).join(',');
+          console.log('[impeccable.scroll] mutation inside wrapper', { type: m.type, target: m.target?.tagName, adds: childAdds, scrollYBefore: window.scrollY, targetY: scrollLockTargetY });
+          schedule('mutation-in-wrapper');
+          return;
+        }
+        for (const n of m.addedNodes) {
+          if (n.nodeType === 1 && (n.matches?.('[data-impeccable-variants="' + sessionId + '"]') || n.querySelector?.('[data-impeccable-variants="' + sessionId + '"]'))) {
+            console.log('[impeccable.scroll] wrapper node added', { tag: n.tagName, scrollYBefore: window.scrollY, targetY: scrollLockTargetY });
+            schedule('wrapper-added');
+            return;
+          }
+        }
+      }
+    });
+    scrollLockObserver.observe(document.body, { childList: true, subtree: true });
+
+    scrollLockAbort = new AbortController();
+    scrollLockAbort.signal.addEventListener('abort', () => {
+      document.documentElement.style.overflowAnchor = prevHtmlAnchor;
+      document.body.style.overflowAnchor = prevBodyAnchor;
+    }, { once: true });
+    const sig = { signal: scrollLockAbort.signal };
+    // Track whether the most recent scroll came from a user gesture. We
+    // gate user-scroll re-anchoring on this flag so programmatic smooth
+    // scrolls (browser reload-restore, scrollIntoView from other scripts)
+    // don't accidentally update our target.
+    let userGestureAt = 0;
+    const USER_GESTURE_WINDOW_MS = 250;
+
+    const reanchor = (why) => {
+      if (scrollLockRaf != null) { cancelAnimationFrame(scrollLockRaf); scrollLockRaf = null; }
+      const prevTarget = scrollLockTargetY;
+      scrollLockTargetY = window.scrollY;
+      writeScrollY(scrollLockTargetY);
+      console.log('[impeccable.scroll] reanchor', { why, prevTarget, newTarget: scrollLockTargetY });
+    };
+    const markGesture = (why) => {
+      userGestureAt = performance.now();
+      reanchor(why);
+    };
+    window.addEventListener('wheel', () => markGesture('wheel'), { passive: true, ...sig });
+    window.addEventListener('touchstart', () => markGesture('touchstart'), { passive: true, ...sig });
+    window.addEventListener('touchmove', () => markGesture('touchmove'), { passive: true, ...sig });
+    window.addEventListener('keydown', (e) => {
+      if (['PageDown', 'PageUp', ' ', 'End', 'Home', 'ArrowDown', 'ArrowUp'].includes(e.key)) markGesture('key:' + e.key);
+    }, sig);
+
+    // Correct on EVERY scroll event: whether it's the browser's
+    // post-reload animated restore or some other script calling
+    // scrollIntoView, we want to snap back immediately. Only skip if a
+    // user gesture fired in the last 250ms.
+    let lastLoggedScrollY = window.scrollY;
+    window.addEventListener('scroll', () => {
+      const now = window.scrollY;
+      if (Math.abs(now - lastLoggedScrollY) > 5) {
+        console.log('[impeccable.scroll] scroll event', { from: lastLoggedScrollY, to: now, targetY: scrollLockTargetY });
+        lastLoggedScrollY = now;
+      }
+      if (scrollLockTargetY == null) return;
+      if (performance.now() - userGestureAt < USER_GESTURE_WINDOW_MS) return;
+      if (Math.abs(now - scrollLockTargetY) < 0.5) return;
+      console.log('[impeccable.scroll] scroll-event snap', { from: now, to: scrollLockTargetY });
+      window.scrollTo({ top: scrollLockTargetY, left: window.scrollX, behavior: 'instant' });
+    }, { passive: true, ...sig });
+
+    // Apply target synchronously, not via rAF — racing the browser's
+    // restore or a smooth-scroll animation means we want to win now.
+    if (Math.abs(window.scrollY - scrollLockTargetY) > 0.5) {
+      window.scrollTo({ top: scrollLockTargetY, left: window.scrollX, behavior: 'instant' });
+      console.log('[impeccable.scroll] startScrollLock initial apply', { to: scrollLockTargetY });
+    }
+  }
+
+  function stopScrollLock() {
+    if (scrollLockObserver) { scrollLockObserver.disconnect(); scrollLockObserver = null; }
+    if (scrollLockRaf != null) { cancelAnimationFrame(scrollLockRaf); scrollLockRaf = null; }
+    if (scrollLockAbort) { scrollLockAbort.abort(); scrollLockAbort = null; }
+    scrollLockTargetY = null;
+    // NOTE: do NOT clear the persistent scroll key here. startScrollLock
+    // calls us as a reset, and clearing the key would nuke the Go-time
+    // scrollY that the next resume needs to read.
+  }
+
+  // ---------------------------------------------------------------------------
+  // MutationObserver for progressive variant reveal
+  // ---------------------------------------------------------------------------
+
+  function startVariantObserver(sessionId) {
+    let updating = false; // re-entrancy guard
+
+    const obs = new MutationObserver((mutations) => {
+      if (updating) return;
+
+      // Only react to mutations that add nodes with data-impeccable-variant,
+      // or mutations inside the variant wrapper. Ignore our own bar/UI changes.
+      let dominated = false;
+      for (const m of mutations) {
+        if (m.target.closest?.('[data-impeccable-variants]')) { dominated = true; break; }
+        for (const n of m.addedNodes) {
+          if (n.nodeType !== 1) continue;
+          // Direct hit: the added node itself is the wrapper or a variant.
+          if (n.dataset?.impeccableVariants || n.dataset?.impeccableVariant) {
+            dominated = true; break;
+          }
+          // Subtree hit: framework HMR (notably SvelteKit) sometimes replaces
+          // a whole subtree where the wrapper is a descendant of the added
+          // node. Without this check, the observer ignores those mutations
+          // and the session stays in GENERATING forever.
+          if (n.querySelector?.('[data-impeccable-variants],[data-impeccable-variant]')) {
+            dominated = true; break;
+          }
+        }
+        if (dominated) break;
+      }
+      if (!dominated) return;
+
+      const wrapper = document.querySelector('[data-impeccable-variants="' + sessionId + '"]');
+      if (!wrapper) return;
+
+      // Re-anchor selectedElement if it was detached by live-wrap's HMR swap.
+      // Without this, the shader / highlight / bar track a zero-rect phantom
+      // and the overlay appears frozen.
+      if (selectedElement && !document.body.contains(selectedElement)) {
+        selectedElement = pickVariantContent(wrapper, 'original') || wrapper;
+      }
+
+      const variants = wrapper.querySelectorAll('[data-impeccable-variant]:not([data-impeccable-variant="original"])');
+      const count = variants.length;
+
+      // Nothing new
+      if (count <= arrivedVariants) return;
+
+      updating = true;
+      arrivedVariants = count;
+      if (visibleVariant === 0 && arrivedVariants > 0) {
+        const saved = loadSession();
+        const savedVisibleVariant = saved && saved.id === sessionId ? saved.visible : 0;
+        visibleVariant = savedVisibleVariant > 0 && savedVisibleVariant <= arrivedVariants ? savedVisibleVariant : 1;
+        showVariantInDOM(sessionId, visibleVariant);
+        // showVariantInDOM hid the original (display:none); if we were still
+        // anchored to the original's content, its boundingRect is now zero
+        // and the bar snaps to (0,0). Re-point at the visible variant instead.
+        const visEl = pickVariantContent(wrapper, visibleVariant);
+        if (visEl) selectedElement = visEl;
+      }
+
+      const expected = parseInt(wrapper.dataset.impeccableVariantCount || '0');
+      if (expected > 0) expectedVariants = expected;
+
+      if (arrivedVariants >= expectedVariants && expectedVariants > 0) {
+        state = 'CYCLING';
+        hideShaderOverlay();
+        updateBarContent('cycling');
+        refreshParamsPanel();
+      } else if (state === 'GENERATING') {
+        updateBarContent('generating');
+      }
+      saveSession();
+      queueCheckpoint(state === 'CYCLING' ? 'variants_ready' : 'variants_progress');
+      updating = false;
+    });
+
+    obs.observe(document.body, { childList: true, subtree: true });
+    return obs;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Bar scroll tracking
+  // ---------------------------------------------------------------------------
+
+  function startScrollTracking() {
+    function tick() {
+      if (state === 'CONFIGURING' || state === 'GENERATING' || state === 'CYCLING') {
+        positionBar();
+        showHighlight(selectedElement);
+        if (tuneOpen) positionParamsPanel();
+      }
+      if (annotActive) positionAnnotOverlay(selectedElement);
+      // Shader overlay (via debug P toggle or generation) is repositioned
+      // by its own branch below; debug no longer has a separate overlay.
+      if (shaderState) positionShaderOverlay();
+      scrollRaf = requestAnimationFrame(tick);
+    }
+    scrollRaf = requestAnimationFrame(tick);
+  }
+
+  function stopScrollTracking() {
+    if (scrollRaf) { cancelAnimationFrame(scrollRaf); scrollRaf = null; }
+  }
+
+  // ---------------------------------------------------------------------------
+  // SSE (server→browser) + fetch POST (browser→server)
+  // Zero-dependency replacement for WebSocket.
+  // ---------------------------------------------------------------------------
+
+  let evtSource = null;
+  let sseRetries = 0;
+  const SSE_MAX_RETRIES = 20;  // generous: heartbeats keep the connection alive, so retries mean real trouble
+
+  function connectSSE() {
+    evtSource = new EventSource('http://localhost:' + PORT + '/events?token=' + TOKEN);
+
+    evtSource.onopen = () => {
+      sseRetries = 0; // reset on successful (re)connect
+    };
+
+    evtSource.onmessage = (e) => {
+      sseRetries = 0; // reset on any successful message
+      let msg; try { msg = JSON.parse(e.data); } catch { return; }
+      switch (msg.type) {
+        case 'connected':
+          hasProjectContext = !!msg.hasProjectContext;
+          if (!hasProjectContext) showToast('No PRODUCT.md found. Variants will be brand-agnostic. Run /impeccable teach to generate one.', 7000);
+          console.log('[impeccable] Live mode connected.');
+          if (state === 'IDLE') state = 'PICKING';
+          break;
+        case 'done':
+          // Variants already arrived via HMR → normal transition.
+          if (arrivedVariants >= expectedVariants && expectedVariants > 0) {
+            if (state === 'GENERATING') {
+              state = 'CYCLING';
+              updateBarContent('cycling');
+              refreshParamsPanel();
+            }
+            break;
+          }
+          // Variants are in source but not in the DOM yet. Common when the
+          // picked element lived inside conditional render (closed modal,
+          // hidden tab, a route the user navigated away from). The variant
+          // MutationObserver stays armed and auto-transitions to CYCLING
+          // the moment the wrapper actually mounts. Nudge the user toward
+          // that path with a toast — better than the prior force-reload
+          // which reset framework state and left the session stuck.
+          setTimeout(() => {
+            if (arrivedVariants >= expectedVariants && expectedVariants > 0) return;
+            if (state !== 'GENERATING') return;
+            showToast(
+              "Variants ready. If the picked element isn't visible, retrace the path that revealed it — they'll appear automatically.",
+              15000,
+            );
+          }, 2000);
+          break;
+        case 'error':
+          console.error('[impeccable] Error:', msg.message);
+          showToast('Error: ' + msg.message, 5000);
+          hideBar();
+          state = 'PICKING';
+          break;
+      }
+    };
+
+    evtSource.onerror = () => {
+      sseRetries++;
+      if (sseRetries <= SSE_MAX_RETRIES) {
+        console.log('[impeccable] SSE connection lost. Retry ' + sseRetries + '/' + SSE_MAX_RETRIES + '...');
+        return; // EventSource auto-reconnects
+      }
+      // Server is gone. Clean up gracefully.
+      console.log('[impeccable] Live server unreachable. Cleaning up UI.');
+      evtSource.close();
+      evtSource = null;
+      handleServerLost();
+    };
+  }
+
+  /** Server died or became unreachable. Reset UI to a clean state. */
+  function handleServerLost() {
+    const recoveryState = currentSessionId ? state : 'IDLE';
+    if (state === 'GENERATING' || state === 'CYCLING' || state === 'SAVING') {
+      showToast('Live server disconnected. Session ended.', 5000);
+    }
+    hideBar();
+    hideHighlight();
+    hideShaderOverlay();
+    hideAnnotOverlay();
+    stopScrollTracking();
+    if (variantObserver) { variantObserver.disconnect(); variantObserver = null; }
+    stopScrollLock();
+    // Preserve local session state on server loss. The durable journal is the
+    // source of truth, but localStorage plus the variant wrapper lets the UI
+    // resume after a helper restart or page reload instead of treating a
+    // transient disconnect as an explicit discard.
+    selectedElement = null;
+    selectedAction = 'impeccable';
+    state = recoveryState;
+    if (currentSessionId) saveSession();
+  }
+
+  function sendEvent(msg, opts) {
+    msg.token = TOKEN;
+    function handleFailure(err) {
+      console.error('[impeccable] Failed to send event:', err);
+      if (opts && opts.throwOnError) throw err;
+      return null;
+    }
+    return fetch('http://localhost:' + PORT + '/events', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(msg),
+    }).then(res => {
+      if (res.ok) return res;
+      return handleFailure(new Error('HTTP ' + res.status + ' ' + res.statusText));
+    }).catch(handleFailure);
+  }
+
+  function checkpointPayload(reason) {
+    return {
+      type: 'checkpoint',
+      id: currentSessionId,
+      revision: sessionState.nextCheckpointRevision(),
+      owner: browserOwner,
+      phase: String(state || '').toLowerCase(),
+      reason,
+      pageUrl: location.pathname,
+      expectedVariants,
+      arrivedVariants,
+      visibleVariant,
+      paramValues: { ...paramsCurrentValues },
+    };
+  }
+
+  function sendCheckpoint(reason) {
+    if (!currentSessionId) return Promise.resolve(null);
+    return sendEvent(checkpointPayload(reason)).catch(() => null);
+  }
+
+  function queueCheckpoint(reason) {
+    if (!currentSessionId) return;
+    if (checkpointTimer) clearTimeout(checkpointTimer);
+    checkpointTimer = setTimeout(() => {
+      checkpointTimer = null;
+      sendCheckpoint(reason);
+    }, 120);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Event handlers
+  // ---------------------------------------------------------------------------
+
+  function handleMouseMove(e) {
+    if (state !== 'PICKING' || !pickActive) return;
+    const target = document.elementFromPoint(e.clientX, e.clientY);
+    if (!target || !pickable(target) || target === hoveredElement) return;
+    hoveredElement = target;
+    showHighlight(target);
+  }
+
+  function handleClick(e) {
+    // Close action picker on any outside click
+    if (pickerEl?.style.display !== 'none' && !own(e.target)) {
+      hideActionPicker();
+    }
+    // Close Tune popover on outside click (anything outside panel + bar)
+    if (tuneOpen && paramsPanelEl && !paramsPanelEl.contains(e.target) && barEl && !barEl.contains(e.target)) {
+      closeTunePopover();
+    }
+    // In CONFIGURING: click outside the bar and selected element returns to PICKING
+    if (state === 'CONFIGURING' && !own(e.target) && selectedElement && !selectedElement.contains(e.target)) {
+      hideBar();
+      stopScrollTracking();
+      hideAnnotOverlay();
+      clearAnnotations();
+      state = 'PICKING';
+      hoveredElement = null;
+      hideHighlight();
+      return;
+    }
+    if (state !== 'PICKING' || !pickActive) return;
+    if (own(e.target)) return;
+    if (!hoveredElement || !pickable(hoveredElement)) return;
+    e.preventDefault();
+    e.stopPropagation();
+    selectedElement = hoveredElement;
+    state = 'CONFIGURING';
+    showHighlight(selectedElement);
+    clearAnnotations();
+    showAnnotOverlay(selectedElement);
+    showBar('configure');
+    startScrollTracking();
+    maybePrefetchPage();
+    maybeWarnConditionalAncestor(selectedElement);
+  }
+
+  /**
+   * Surface a brief, non-blocking heads-up when the picked element lives
+   * inside a container whose visibility is gated by ephemeral state — modals,
+   * collapsible panels, popovers, off-screen tab panels. If HMR remounts the
+   * parent during generation (Vite Fast Refresh, SvelteKit page reload), the
+   * variants land in source but stay invisible until the user re-opens the
+   * container. Telling the user upfront is much friendlier than the silent
+   * timeout-then-toast that they'd otherwise hit.
+   *
+   * Heuristic, intentionally narrow — only fires for unambiguous cases so
+   * we don't cry wolf on every nested element.
+   */
+  function maybeWarnConditionalAncestor(el) {
+    let node = el?.parentElement;
+    let depth = 0;
+    while (node && depth < 12) {
+      // 1. Active dialog / modal
+      if (node.getAttribute && node.getAttribute('role') === 'dialog'
+          && node.getAttribute('aria-modal') === 'true') {
+        showToast('Heads up: this element lives inside a dialog. If state resets during generation, you may need to re-open it.', 6000);
+        return;
+      }
+      // 2. Common Radix / shadcn / headless-ui open-state attribute
+      if (node.dataset && node.dataset.state === 'open') {
+        showToast('Heads up: this element lives inside an open panel. If state resets during generation, you may need to re-open it.', 6000);
+        return;
+      }
+      // 3. Tab panel — only meaningful when the page also shows ANOTHER
+      // tab as selected. A single tabpanel with no tablist is just a static
+      // section in disguise and isn't conditional.
+      if (node.getAttribute && node.getAttribute('role') === 'tabpanel') {
+        const list = document.querySelector('[role="tablist"]');
+        if (list) {
+          const tabs = list.querySelectorAll('[role="tab"]');
+          if (tabs.length > 1) {
+            showToast('Heads up: this element lives in a tab panel. If state resets during generation, switch back to this tab.', 6000);
+            return;
+          }
+        }
+      }
+      // 4. Collapsible: aria-expanded sibling. Look for the trigger button.
+      if (node.id) {
+        const trigger = document.querySelector(`[aria-controls="${CSS.escape(node.id)}"][aria-expanded="true"]`);
+        if (trigger) {
+          showToast('Heads up: this element lives inside an expandable section. If state resets during generation, re-expand it.', 6000);
+          return;
+        }
+      }
+      node = node.parentElement;
+      depth++;
+    }
+  }
+
+  // Fire a lightweight prefetch event the first time the user selects an
+  // element on a given route. The agent uses this to Read the underlying file
+  // into context before Go is hit, shaving the read off the critical path.
+  // Dedupe per session by pathname — clicking around on the same page doesn't
+  // re-fire.
+  //
+  // DISABLED: quick-Go workflows pay an extra harness round trip because
+  // prefetch + generate arrive as two events instead of one. Re-enable with
+  // a browser-side debounce (~800–1000ms, cancelled on Go) if we want to
+  // resurrect this. Server validator and skill dispatch remain in place so
+  // flipping this flag is the only change needed.
+  const PREFETCH_ENABLED = false;
+  const prefetchedPaths = new Set();
+  function maybePrefetchPage() {
+    if (!PREFETCH_ENABLED) return;
+    const path = location.pathname;
+    if (prefetchedPaths.has(path)) return;
+    prefetchedPaths.add(path);
+    sendEvent({ type: 'prefetch', pageUrl: path });
+  }
+
+  function handleKeyDown(e) {
+    // When the annotation input is focused, let it handle its own keys.
+    if (annotEditing && annotEditing.input && e.target === annotEditing.input) return;
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      if (pickerEl?.style.display !== 'none') { hideActionPicker(); return; }
+      if (state === 'CONFIGURING') { hideBar(); stopScrollTracking(); hideAnnotOverlay(); clearAnnotations(); state = 'PICKING'; return; }
+      if (state === 'CYCLING') { handleDiscard(); return; }
+      if (state === 'SAVING' || state === 'CONFIRMED') return; // don't interrupt
+      if (state === 'PICKING') {
+        // Use togglePick so the "Pick" button in the global bar also flips
+        // off, otherwise the bar stays lit while nothing else is active.
+        if (pickActive) togglePick();
+        else { hideHighlight(); state = 'IDLE'; }
+        return;
+      }
+    }
+
+    // Arrow/Enter nav works in PICKING (hover) and CONFIGURING (selected, input empty)
+    var navEl = (state === 'PICKING') ? hoveredElement : (state === 'CONFIGURING') ? selectedElement : null;
+    if (navEl && (e.key === 'ArrowUp' || e.key === 'ArrowDown' || (e.key === 'Enter' && state === 'PICKING'))) {
+      let next = null;
+      if (e.key === 'ArrowDown' && !e.shiftKey) {
+        next = navEl.nextElementSibling;
+        while (next && !pickable(next)) next = next.nextElementSibling;
+      } else if (e.key === 'ArrowUp' && !e.shiftKey) {
+        next = navEl.previousElementSibling;
+        while (next && !pickable(next)) next = next.previousElementSibling;
+      } else if (e.key === 'ArrowUp' && e.shiftKey) {
+        next = navEl.parentElement;
+        if (next && !pickable(next)) next = null;
+      } else if (e.key === 'ArrowDown' && e.shiftKey) {
+        next = navEl.firstElementChild;
+        while (next && !pickable(next)) next = next.nextElementSibling;
+      } else if (e.key === 'Enter') {
+        e.preventDefault();
+        selectedElement = hoveredElement;
+        state = 'CONFIGURING';
+        showHighlight(selectedElement);
+        clearAnnotations();
+        showAnnotOverlay(selectedElement);
+        showBar('configure');
+        startScrollTracking();
+        return;
+      }
+      if (next) {
+        e.preventDefault();
+        if (state === 'PICKING') {
+          hoveredElement = next;
+        } else {
+          // CONFIGURING: re-select the new element and refresh the bar
+          selectedElement = next;
+          clearAnnotations();
+          showAnnotOverlay(next);
+          showBar('configure');
+          startScrollTracking();
+        }
+        showHighlight(next);
+        next.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
+      }
+      return;
+    }
+
+    if (state === 'CYCLING') {
+      if (e.key === 'ArrowLeft') { e.preventDefault(); cycleVariant(-1); }
+      if (e.key === 'ArrowRight') { e.preventDefault(); cycleVariant(1); }
+      if (e.key === 'Enter') { e.preventDefault(); handleAccept(); }
+    }
+  }
+
+  function handleGo() {
+    if (!selectedElement || state !== 'CONFIGURING') return;
+    const input = document.getElementById(PREFIX + '-input');
+    const prompt = input ? input.value.trim() : '';
+
+    // Commit any pending pin edit BEFORE we snapshot annotations.
+    if (annotEditing) finalizeEditingPin();
+
+    currentSessionId = id8();
+    expectedVariants = selectedCount;
+    arrivedVariants = 0;
+    visibleVariant = 0;
+
+    // Flip to GENERATING immediately so the bar morphs without waiting on
+    // capture + upload. The event is emitted from captureAndEmit() once the
+    // screenshot is uploaded (or capture fails — we still emit, just without
+    // screenshotPath).
+    const elForCapture = selectedElement;
+    const captureRect = elForCapture.getBoundingClientRect();
+    const snapshot = {
+      comments: annotState.comments.map(c => ({ x: c.x, y: c.y, text: c.text })),
+      strokes: annotState.strokes.map(s => ({ points: s.points.map(p => [p[0], p[1]]) })),
+    };
+    const basePayload = {
+      type: 'generate', id: currentSessionId,
+      action: selectedAction,
+      freeformPrompt: prompt || undefined,
+      count: selectedCount,
+      pageUrl: location.pathname,
+      element: extractContext(elForCapture),
+    };
+    if (snapshot.comments.length > 0) basePayload.comments = snapshot.comments;
+    if (snapshot.strokes.length > 0) basePayload.strokes = snapshot.strokes;
+
+    // Hide the interactive overlay so it doesn't linger during generation.
+    hideAnnotOverlay();
+    clearAnnotations();
+
+    state = 'GENERATING';
+    showBar('generating');
+    saveSession();
+    sendCheckpoint('generate_started');
+    writeScrollY(window.scrollY);
+    if (variantObserver) variantObserver.disconnect();
+    variantObserver = startVariantObserver(currentSessionId);
+    console.log('[impeccable.scroll] Go pressed', { scrollY: window.scrollY, sessionId: currentSessionId });
+    startScrollLock(currentSessionId);
+
+    captureAndEmit(elForCapture, basePayload, snapshot, captureRect);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Screenshot capture + upload
+  // ---------------------------------------------------------------------------
+
+  let msLoadPromise = null;
+  function loadModernScreenshot() {
+    if (window.modernScreenshot) return Promise.resolve(window.modernScreenshot);
+    if (msLoadPromise) return msLoadPromise;
+    msLoadPromise = new Promise((resolve, reject) => {
+      const s = document.createElement('script');
+      s.src = 'http://localhost:' + PORT + '/modern-screenshot.js';
+      s.onload = () => resolve(window.modernScreenshot);
+      s.onerror = () => { msLoadPromise = null; reject(new Error('modern-screenshot failed to load')); };
+      document.head.appendChild(s);
+    });
+    return msLoadPromise;
+  }
+
+  // Collect @font-face rules from every stylesheet on the page. Cross-origin
+  // sheets (Google Fonts, Typekit, etc.) throw SecurityError on .cssRules
+  // access, so modern-screenshot can't embed them on its own — the resulting
+  // SVG falls back to system fonts and text re-wraps + renders with different
+  // weight. We fetch the raw CSS text (CORS-permitted for these providers),
+  // extract @font-face blocks, inline the referenced font files as base64
+  // data URIs (SVGs rasterized via canvas can't fetch external resources,
+  // so URLs inside the SVG silently fail without this), and pass the result
+  // to modern-screenshot as font.cssText.
+  const FONT_EXT_RE = /\.(woff2?|ttf|otf|eot)(\?.*)?$/i;
+  const FONT_MIME = {
+    woff2: 'font/woff2', woff: 'font/woff', ttf: 'font/ttf', otf: 'font/otf', eot: 'application/vnd.ms-fontobject',
+  };
+  function bufferToBase64(buf) {
+    const bytes = new Uint8Array(buf);
+    let binary = '';
+    const CHUNK = 0x8000;
+    for (let i = 0; i < bytes.length; i += CHUNK) {
+      binary += String.fromCharCode.apply(null, bytes.subarray(i, i + CHUNK));
+    }
+    return btoa(binary);
+  }
+  async function inlineFontUrls(cssText) {
+    const urlRe = /url\((['"]?)(https?:\/\/[^'")\s]+)\1\)/g;
+    const urls = new Set();
+    let m;
+    while ((m = urlRe.exec(cssText))) {
+      if (FONT_EXT_RE.test(m[2])) urls.add(m[2]);
+    }
+    const map = new Map();
+    await Promise.all([...urls].map(async (url) => {
+      try {
+        const res = await fetch(url);
+        if (!res.ok) return;
+        const buf = await res.arrayBuffer();
+        const ext = url.toLowerCase().match(FONT_EXT_RE)?.[1] || 'woff2';
+        const mime = FONT_MIME[ext] || 'application/octet-stream';
+        map.set(url, 'data:' + mime + ';base64,' + bufferToBase64(buf));
+      } catch { /* skip; fall through to URL */ }
+    }));
+    return cssText.replace(urlRe, (orig, q, url) => {
+      const data = map.get(url);
+      return data ? 'url(' + q + data + q + ')' : orig;
+    });
+  }
+  async function collectFontCssText() {
+    const chunks = [];
+    const fontFaceRe = /@font-face\s*\{[^}]*\}/g;
+    for (const sheet of document.styleSheets) {
+      try {
+        const rules = sheet.cssRules;
+        for (const rule of rules) {
+          if (rule.constructor.name === 'CSSFontFaceRule' || rule.cssText?.startsWith('@font-face')) {
+            chunks.push(rule.cssText);
+          }
+        }
+      } catch {
+        if (!sheet.href) continue;
+        try {
+          const res = await fetch(sheet.href);
+          if (!res.ok) continue;
+          const text = await res.text();
+          let m2;
+          while ((m2 = fontFaceRe.exec(text))) chunks.push(m2[0]);
+        } catch { /* ignore; capture is best-effort */ }
+      }
+    }
+    if (chunks.length === 0) return '';
+    return inlineFontUrls(chunks.join('\n'));
+  }
+
+  // True if `s` is a computed color string that renders as nothing
+  // (explicit `transparent`, or `rgba(...)` with alpha 0).
+  function isTransparentColor(s) {
+    if (!s) return true;
+    if (s === 'transparent') return true;
+    const m = /rgba?\(([^)]+)\)/.exec(s);
+    if (!m) return false;
+    const parts = m[1].split(',').map((p) => p.trim());
+    if (parts.length === 4) return parseFloat(parts[3]) === 0;
+    return false;
+  }
+
+  // modern-screenshot force-sets `background-color: X !important` on the
+  // cloned root whenever `backgroundColor` is passed, clobbering the
+  // element's own background. So we only pass it when the element is
+  // genuinely transparent (no own color, no own image) — in that case
+  // we resolve up the DOM to the nearest opaque ancestor so the capture
+  // sits on the page's real background instead of rendering black.
+  function resolveCanvasBackground(el) {
+    const own = getComputedStyle(el);
+    if (!isTransparentColor(own.backgroundColor)) return null;
+    if (own.backgroundImage && own.backgroundImage !== 'none') return null;
+    let node = el.parentElement;
+    while (node) {
+      const cs = getComputedStyle(node);
+      if (!isTransparentColor(cs.backgroundColor)) return cs.backgroundColor;
+      node = node.parentElement;
+    }
+    // The walk already passed through <body> and <html>; if they had been
+    // opaque we would have returned. Falling through with the previous
+    // `getComputedStyle(body).backgroundColor || …` chain is a trap: that
+    // call returns the literal string `"rgba(0, 0, 0, 0)"` for a page that
+    // never set its own bg, which is truthy and short-circuits the chain to
+    // transparent-black — modern-screenshot then renders the capture on a
+    // black canvas and the shader overlay flashes solid black during load.
+    // The browser canvas defaults to white, so we do too.
+    return '#ffffff';
+  }
+
+  // Capture the element (with current annotations baked in) and return a PNG
+  // Blob. Shared between the Go flow (uploads it to the server) and the
+  // debug toggle (displays it as an overlay for side-by-side comparison).
+  async function captureElementToBlob(el, snapshot, rect) {
+    try { if (document.fonts?.ready) await document.fonts.ready; } catch {}
+    const hasAnnotations = snapshot && (snapshot.comments.length > 0 || snapshot.strokes.length > 0);
+    let annotNode = null;
+    let savedPosition = null;
+    if (hasAnnotations) {
+      const pos = getComputedStyle(el).position;
+      if (pos === 'static') {
+        savedPosition = el.style.position;
+        el.style.position = 'relative';
+      }
+      annotNode = buildAnnotationsForCapture(rect, snapshot);
+      el.appendChild(annotNode);
+    }
+    try {
+      const ms = await loadModernScreenshot();
+      const fontCssText = await collectFontCssText();
+      const backgroundColor = resolveCanvasBackground(el);
+      return await ms.domToBlob(el, {
+        scale: Math.min(window.devicePixelRatio || 1, 2),
+        font: fontCssText ? { cssText: fontCssText } : undefined,
+        ...(backgroundColor ? { backgroundColor } : {}),
+      });
+    } finally {
+      if (annotNode) annotNode.remove();
+      if (savedPosition !== null) el.style.position = savedPosition;
+    }
+  }
+
+  async function captureAndEmit(el, basePayload, snapshot, rect) {
+    let screenshotPath;
+    let blob;
+    try {
+      blob = await captureElementToBlob(el, snapshot, rect);
+    } catch (err) {
+      console.warn('[impeccable] capture failed, proceeding without screenshot:', err);
+    }
+    // Light up the shader overlay the moment capture is ready — no reason to
+    // wait for the upload to complete before the user sees something alive.
+    if (blob && state === 'GENERATING') {
+      showShaderOverlay(el, blob, rect);
+    }
+    // Only upload + forward the screenshot when annotations (comments/strokes)
+    // are present. Without annotations the image is pure visual anchoring —
+    // it biases the model toward the current rendering and works against the
+    // three-distinct-directions brief.
+    const hasAnnotations = snapshot && (snapshot.comments.length > 0 || snapshot.strokes.length > 0);
+    if (blob && hasAnnotations) {
+      try {
+        const uploadRes = await fetch(
+          'http://localhost:' + PORT + '/annotation?token=' + encodeURIComponent(TOKEN) +
+          '&eventId=' + encodeURIComponent(basePayload.id),
+          { method: 'POST', headers: { 'Content-Type': 'image/png' }, body: blob },
+        );
+        if (uploadRes.ok) {
+          const { path: p } = await uploadRes.json();
+          screenshotPath = p;
+        } else {
+          console.warn('[impeccable] annotation upload failed:', uploadRes.status);
+        }
+      } catch (err) {
+        console.warn('[impeccable] annotation upload failed:', err);
+      }
+    }
+    sendEvent(screenshotPath ? { ...basePayload, screenshotPath } : basePayload);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Shader overlay — renders the captured screenshot as a WebGL texture and
+  // runs an editorial "ink-wash" fragment shader over it during generation.
+  // A single rolling band sweeps top-to-bottom, desaturating + tinting magenta
+  // and leaving a soft trail. Makes the wait feel like a letterpress scan
+  // instead of a dead spinner.
+  // ---------------------------------------------------------------------------
+
+  const SHADER_VS = `attribute vec2 a_position;
+attribute vec2 a_uv;
+varying vec2 v_uv;
+void main() {
+  v_uv = a_uv;
+  gl_Position = vec4(a_position, 0.0, 1.0);
+}`;
+
+  const SHADER_FS = `precision highp float;
+uniform sampler2D u_texture;
+uniform float u_time;
+uniform vec2 u_resolution;
+uniform vec3 u_accent;
+varying vec2 v_uv;
+
+// Asymmetric roller band. Product of two one-sided smoothsteps — peaks at
+// d=0 with a short sharp leading ramp and a longer soft trailing tail. Clean
+// outside the [-leadW, trailW] range (no rogue "trail=1 everywhere below"
+// failure that reversed-edge smoothstep would give).
+float bandAt(float d, float leadW, float trailW) {
+  float above = smoothstep(-leadW, 0.0, d);
+  float below = 1.0 - smoothstep(0.0, trailW, d);
+  return above * below;
+}
+
+void main() {
+  vec2 uv = v_uv;
+  // Roller sweeps top-to-bottom with small overshoot so each cycle enters
+  // and exits the element cleanly.
+  float phase = fract(u_time / 3.4);
+  float y = phase * 1.25 - 0.12;
+  float band = bandAt(uv.y - y, 0.05, 0.32);
+
+  // Halftone cell grid (fixed ~10 px pitch).
+  float cellPx = 10.0;
+  vec2 gridUv = uv * u_resolution / cellPx;
+  vec2 cellId = floor(gridUv);
+  vec2 cellUv = fract(gridUv) - 0.5;
+  vec2 sampleCenter = (cellId + 0.5) * cellPx / u_resolution;
+  vec3 cellImg = texture2D(u_texture, sampleCenter).rgb;
+  float luma = dot(cellImg, vec3(0.299, 0.587, 0.114));
+  // Darker cells → bigger magenta dots (classic risograph halftone curve).
+  float radius = sqrt(clamp(1.0 - luma, 0.0, 1.0)) * 0.56;
+  float dotMask = smoothstep(radius + 0.06, radius, length(cellUv));
+  vec3 paper = vec3(0.975, 0.965, 0.955);
+  vec3 dotLayer = mix(paper, u_accent, dotMask);
+
+  // Blend the halftone layer in where the roller is passing; leave the
+  // element pristine elsewhere.
+  vec3 base = texture2D(u_texture, uv).rgb;
+  gl_FragColor = vec4(mix(base, dotLayer, band), 1.0);
+}`;
+
+  // Editorial Magenta converted to approximate sRGB 0-1 (matches oklch(60% 0.25 350))
+  const SHADER_ACCENT = [0.82, 0.16, 0.47];
+  let shaderState = null; // { canvas, gl, program, texture, rafId, startTime }
+
+  function compileShader(gl, type, source) {
+    const sh = gl.createShader(type);
+    gl.shaderSource(sh, source);
+    gl.compileShader(sh);
+    if (!gl.getShaderParameter(sh, gl.COMPILE_STATUS)) {
+      const info = gl.getShaderInfoLog(sh);
+      gl.deleteShader(sh);
+      throw new Error('shader compile failed: ' + info);
+    }
+    return sh;
+  }
+
+  function positionShaderOverlay() {
+    if (!shaderState || !selectedElement) return;
+    const r = selectedElement.getBoundingClientRect();
+    Object.assign(shaderState.canvas.style, {
+      top: r.top + 'px', left: r.left + 'px',
+      width: r.width + 'px', height: r.height + 'px',
+    });
+  }
+
+  function hideShaderOverlay() {
+    if (!shaderState) return;
+    if (shaderState.rafId) cancelAnimationFrame(shaderState.rafId);
+    if (shaderState.canvas) shaderState.canvas.remove();
+    const lose = shaderState.gl?.getExtension?.('WEBGL_lose_context');
+    try { lose?.loseContext(); } catch {}
+    shaderState = null;
+  }
+
+  async function showShaderOverlay(el, blob, rect) {
+    hideShaderOverlay();
+    if (!blob || !el) return;
+    const canvas = document.createElement('canvas');
+    canvas.id = PREFIX + '-shader';
+    const dpr = Math.min(window.devicePixelRatio || 1, 2);
+    canvas.width = Math.max(1, Math.floor(rect.width * dpr));
+    canvas.height = Math.max(1, Math.floor(rect.height * dpr));
+    Object.assign(canvas.style, {
+      position: 'fixed',
+      top: rect.top + 'px', left: rect.left + 'px',
+      width: rect.width + 'px', height: rect.height + 'px',
+      pointerEvents: 'none',
+      zIndex: Z.bar - 1,
+    });
+    document.body.appendChild(canvas);
+
+    const gl = canvas.getContext('webgl', { premultipliedAlpha: false, preserveDrawingBuffer: false })
+            || canvas.getContext('experimental-webgl');
+    if (!gl) {
+      // WebGL unavailable — fall back to a plain <img> overlay so the user
+      // still sees something meaningful during generation.
+      canvas.remove();
+      const img = document.createElement('img');
+      img.src = URL.createObjectURL(blob);
+      img.id = PREFIX + '-shader';
+      // Copy positioning via cssText. Object.assign across CSSStyleDeclaration
+      // throws in modern Chromium because the source's indexed properties
+      // (style[0], [1], ...) are read-only and the engine forbids writing
+      // them on the destination.
+      img.style.cssText = canvas.style.cssText;
+      img.style.outline = '2px dashed ' + C.brand;
+      img.style.outlineOffset = '-2px';
+      document.body.appendChild(img);
+      shaderState = { canvas: img, gl: null, program: null, texture: null, rafId: 0, startTime: 0 };
+      return;
+    }
+
+    let program, texture;
+    try {
+      const vs = compileShader(gl, gl.VERTEX_SHADER, SHADER_VS);
+      const fs = compileShader(gl, gl.FRAGMENT_SHADER, SHADER_FS);
+      program = gl.createProgram();
+      gl.attachShader(program, vs);
+      gl.attachShader(program, fs);
+      gl.linkProgram(program);
+      if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+        throw new Error('program link failed: ' + gl.getProgramInfoLog(program));
+      }
+      // Full-screen quad
+      const buf = gl.createBuffer();
+      gl.bindBuffer(gl.ARRAY_BUFFER, buf);
+      gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+        -1, -1, 0, 1,
+         1, -1, 1, 1,
+        -1,  1, 0, 0,
+        -1,  1, 0, 0,
+         1, -1, 1, 1,
+         1,  1, 1, 0,
+      ]), gl.STATIC_DRAW);
+      const posLoc = gl.getAttribLocation(program, 'a_position');
+      const uvLoc = gl.getAttribLocation(program, 'a_uv');
+      gl.enableVertexAttribArray(posLoc);
+      gl.vertexAttribPointer(posLoc, 2, gl.FLOAT, false, 16, 0);
+      gl.enableVertexAttribArray(uvLoc);
+      gl.vertexAttribPointer(uvLoc, 2, gl.FLOAT, false, 16, 8);
+    } catch (err) {
+      console.warn('[impeccable] shader setup failed:', err);
+      canvas.remove();
+      return;
+    }
+
+    // Upload the screenshot as a texture
+    let bitmap;
+    try {
+      bitmap = await createImageBitmap(blob);
+    } catch {
+      // Safari fallback: go via a regular Image
+      const imgUrl = URL.createObjectURL(blob);
+      const img = new Image();
+      img.src = imgUrl;
+      await new Promise((r, rej) => { img.onload = r; img.onerror = rej; });
+      bitmap = img;
+      URL.revokeObjectURL(imgUrl);
+    }
+    texture = gl.createTexture();
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, bitmap);
+    if (bitmap.close) bitmap.close();
+
+    const uTime = gl.getUniformLocation(program, 'u_time');
+    const uRes = gl.getUniformLocation(program, 'u_resolution');
+    const uAccent = gl.getUniformLocation(program, 'u_accent');
+    const uTex = gl.getUniformLocation(program, 'u_texture');
+    const reduced = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
+
+    shaderState = { canvas, gl, program, texture, rafId: 0, startTime: performance.now(), reduced };
+    function frame() {
+      if (!shaderState) return;
+      const elapsed = (performance.now() - shaderState.startTime) / 1000;
+      const t = shaderState.reduced ? 0.0 : elapsed;
+      gl.viewport(0, 0, canvas.width, canvas.height);
+      gl.useProgram(program);
+      gl.activeTexture(gl.TEXTURE0);
+      gl.bindTexture(gl.TEXTURE_2D, texture);
+      gl.uniform1i(uTex, 0);
+      gl.uniform1f(uTime, t);
+      gl.uniform2f(uRes, canvas.width, canvas.height);
+      gl.uniform3f(uAccent, SHADER_ACCENT[0], SHADER_ACCENT[1], SHADER_ACCENT[2]);
+      gl.drawArrays(gl.TRIANGLES, 0, 6);
+      shaderState.rafId = requestAnimationFrame(frame);
+    }
+    frame();
+  }
+
+  function handleAccept() {
+    if (!currentSessionId || arrivedVariants === 0) return;
+    const domVisibleVariant = readVisibleVariantFromDOM(currentSessionId);
+    if (domVisibleVariant > 0) visibleVariant = domVisibleVariant;
+    const acceptPayload = { type: 'accept', id: currentSessionId, variantId: String(visibleVariant) };
+    if (Object.keys(paramsCurrentValues).length > 0) {
+      acceptPayload.paramValues = { ...paramsCurrentValues };
+    }
+    // The accepted variant is already the only visible child of the wrapper
+    // (all other variants are display:none). HMR from the source rewrite will
+    // replace the wrapper imminently. Don't eagerly replaceChild here — React
+    // reconciliation races with our mutation and throws NotFoundError in Next
+    // 16 / Turbopack. Schedule a fallback that runs the manual swap only if
+    // HMR hasn't cleaned up by then (keeps static-server flows working).
+    const acceptedSessionId = currentSessionId;
+    const acceptedVariant = visibleVariant;
+
+    state = 'SAVING';
+    updateBarContent('saving');
+
+    sendEvent(acceptPayload, { throwOnError: true })
+      .then(() => {
+        markSessionHandled();
+        confirmAcceptAfterReceipt();
+      })
+      .catch(() => {
+        state = 'CYCLING';
+        updateBarContent('cycling');
+        showToast('Could not confirm accept with the live server. Session kept for recovery; try Accept again.', 5000);
+      });
+
+    function confirmAcceptAfterReceipt() {
+      state = 'CONFIRMED';
+      updateBarContent('confirmed');
+      scheduleAcceptCleanup();
+    }
+
+    function scheduleAcceptCleanup() {
+      setTimeout(function() {
+      hideBar();
+      hideHighlight();
+      stopScrollTracking();
+      if (variantObserver) { variantObserver.disconnect(); variantObserver = null; }
+      stopScrollLock();
+      clearScrollY();
+      clearSession();
+      selectedElement = null;
+      currentSessionId = null;
+      selectedAction = 'impeccable';
+      state = 'PICKING';
+    }, 1800);
+
+    // Static-server / no-HMR fallback: if the wrapper is still around 2s after
+    // the cleanup above, swap it out manually. By now React has either moved
+    // on or the app isn't React at all. Preserve the `data-impeccable-variant="N"`
+    // div (with display:contents) so @scope rules anchored to the variant
+    // attribute keep matching until reload replaces it with the carbonize block.
+    setTimeout(function() {
+      const wrapper = document.querySelector('[data-impeccable-variants="' + acceptedSessionId + '"]');
+      if (!wrapper) return;
+      const accepted = wrapper.querySelector('[data-impeccable-variant="' + acceptedVariant + '"]');
+      if (accepted && accepted.firstElementChild) {
+        const parent = wrapper.parentElement;
+        if (!parent) return;
+        accepted.style.display = 'contents';
+        parent.replaceChild(accepted, wrapper);
+      }
+      }, 2000);
+    }
+  }
+
+  function handleDiscard() {
+    if (!currentSessionId) return;
+    sendEvent({ type: 'discard', id: currentSessionId }, { throwOnError: true })
+      .then(() => {
+        markSessionHandled();
+        cleanup();
+      })
+      .catch(() => showToast('Could not confirm discard with the live server. Session kept for recovery.', 5000));
+  }
+
+  // ---------------------------------------------------------------------------
+  // Session persistence via live-browser-session.js
+  // ---------------------------------------------------------------------------
+  // Survives page reloads, browser close/reopen, HMR, and accidental refreshes.
+
+  function saveSession() {
+    if (!currentSessionId) return;
+    // NOTE: scrollY is stored under a separate key (writeScrollY). Storing
+    // it here would overwrite the Go-time value every time state changes.
+    sessionState.saveSession({
+      id: currentSessionId,
+      state,
+      action: selectedAction,
+      count: selectedCount,
+      expected: expectedVariants,
+      arrived: arrivedVariants,
+      visible: visibleVariant,
+    });
+  }
+
+  function loadSession() {
+    return sessionState.loadSession();
+  }
+
+  function clearSession() {
+    sessionState.clearSession();
+  }
+
+  /** Mark session as handled (accepted/discarded). The agent will clean up
+   *  the source, but until it does the wrapper is still in the HTML. This
+   *  prevents resumeSession from picking it up again after reload. */
+  function markSessionHandled() {
+    if (!currentSessionId) return;
+    sessionState.markHandled(currentSessionId);
+  }
+
+  function isSessionHandled(id) {
+    return sessionState.isHandled(id);
+  }
+
+  function clearHandled() {
+    sessionState.clearHandled();
+  }
+
+  function cleanup() {
+    // Hide the wrapper immediately so variants disappear. DON'T structurally
+    // mutate the DOM yet — HMR from the agent's source rewrite is on its way,
+    // and a manual replaceChild under React causes NotFoundError when the
+    // reconciler later tries to remove a wrapper we already removed.
+    // Schedule a 2s fallback that does the manual swap only if HMR hasn't
+    // replaced the wrapper by then (keeps static-server / no-HMR flows alive).
+    const cleanupSessionId = currentSessionId;
+    if (cleanupSessionId) {
+      const wrapper = document.querySelector('[data-impeccable-variants="' + cleanupSessionId + '"]');
+      if (wrapper) wrapper.style.display = 'none';
+    }
+    setTimeout(function() {
+      if (!cleanupSessionId) return;
+      const wrapper = document.querySelector('[data-impeccable-variants="' + cleanupSessionId + '"]');
+      if (!wrapper) return;
+      const orig = wrapper.querySelector('[data-impeccable-variant="original"]');
+      if (orig) {
+        const content = orig.firstElementChild;
+        if (content) {
+          wrapper.parentElement.replaceChild(content, wrapper);
+          return;
+        }
+      }
+      wrapper.remove();
+    }, 2000);
+    hideBar();
+    hideHighlight();
+    stopScrollTracking();
+    if (variantObserver) { variantObserver.disconnect(); variantObserver = null; }
+    stopScrollLock();
+    clearScrollY();
+    clearSession();
+    selectedElement = null;
+    currentSessionId = null;
+    selectedAction = 'impeccable';
+    state = 'PICKING';
+  }
+
+  // ---------------------------------------------------------------------------
+  // Toast
+  // ---------------------------------------------------------------------------
+
+  function showToast(message, duration) {
+    if (toastEl) toastEl.remove();
+    // Stack the toast above the global bar (which sits at bottom:14px) so
+    // the two never overlap. Read the bar's actual rect — its height varies
+    // with hover-expanded labels — and fall back to a sensible default
+    // when the bar isn't mounted yet.
+    const barRect = globalBarEl?.getBoundingClientRect();
+    const barTopFromBottom = barRect && barRect.height > 0
+      ? Math.max(16, window.innerHeight - barRect.top + 12)
+      : 16;
+    toastEl = el('div', {
+      position: 'fixed', bottom: barTopFromBottom + 'px', left: '50%',
+      transform: 'translateX(-50%) translateY(8px)',
+      background: C.ink, color: C.white,
+      fontFamily: FONT, fontSize: '12px',
+      padding: '8px 16px', borderRadius: '8px',
+      zIndex: Z.toast, opacity: '0',
+      transition: 'opacity 0.25s ' + EASE + ', transform 0.25s ' + EASE,
+      pointerEvents: 'none', maxWidth: '420px', textAlign: 'center',
+    });
+    toastEl.id = PREFIX + '-toast';
+    toastEl.textContent = message;
+    document.body.appendChild(toastEl);
+    requestAnimationFrame(() => {
+      toastEl.style.opacity = '1';
+      toastEl.style.transform = 'translateX(-50%) translateY(0)';
+    });
+    setTimeout(() => {
+      if (toastEl) {
+        toastEl.style.opacity = '0';
+        toastEl.style.transform = 'translateX(-50%) translateY(8px)';
+        setTimeout(() => { if (toastEl) { toastEl.remove(); toastEl = null; } }, 250);
+      }
+    }, duration);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Init
+  // ---------------------------------------------------------------------------
+
+  // Resume an active variant session after HMR/page reload.
+  // If a [data-impeccable-variants] wrapper exists in the DOM, the agent wrote
+  // variants before HMR fired. Pick up where we left off.
+  function resumeSession() {
+    const wrapper = document.querySelector('[data-impeccable-variants]');
+    if (!wrapper) { clearSession(); clearHandled(); return false; }
+
+    const sessionId = wrapper.dataset.impeccableVariants;
+
+    // Don't resume if this session was already accepted/discarded
+    if (isSessionHandled(sessionId)) return false;
+
+    currentSessionId = sessionId;
+    expectedVariants = parseInt(wrapper.dataset.impeccableVariantCount || '0');
+    const variants = wrapper.querySelectorAll('[data-impeccable-variant]:not([data-impeccable-variant="original"])');
+    arrivedVariants = variants.length;
+
+    // Restore state from localStorage if available
+    const saved = loadSession();
+    if (saved && saved.id === sessionId) {
+      visibleVariant = (saved.visible > 0 && saved.visible <= arrivedVariants) ? saved.visible : (arrivedVariants > 0 ? 1 : 0);
+      if (saved.action) selectedAction = saved.action;
+      if (saved.count) selectedCount = saved.count;
+    } else {
+      visibleVariant = arrivedVariants > 0 ? 1 : 0;
+    }
+
+    // Find the visible variant's content element for highlight positioning.
+    // Try the visible variant first, fall back to the original's content.
+    const visEl = visibleVariant > 0 ? pickVariantContent(wrapper, visibleVariant) : null;
+    const origEl = pickVariantContent(wrapper, 'original');
+    selectedElement = visEl || origEl || wrapper.parentElement;
+
+    // Set display state BEFORE starting observer (avoid triggering it)
+    if (visibleVariant > 0) showVariantInDOM(currentSessionId, visibleVariant);
+
+    state = arrivedVariants >= expectedVariants ? 'CYCLING' : 'GENERATING';
+    showBar(state === 'CYCLING' ? 'cycling' : 'generating');
+    startScrollTracking();
+    // Build the params panel for the restored visible variant. Previously
+    // this was missed on page-reload resume: showVariantInDOM above fires
+    // refreshParamsPanel, but state was still IDLE at that moment so it
+    // hid. Now that state is CYCLING, re-fire.
+    if (state === 'CYCLING') refreshParamsPanel();
+    saveSession();
+    queueCheckpoint('browser_resumed');
+
+    // Start observing for more variants AFTER initial setup
+    if (variantObserver) variantObserver.disconnect();
+    variantObserver = startVariantObserver(currentSessionId);
+
+    // Hold the target at its saved viewport top through any subsequent
+    // HMR patches, variant inserts, or cycle swaps.
+    startScrollLock(currentSessionId, readScrollY());
+
+    // If we reloaded mid-generation (Bun's HTML HMR destroys the shader
+    // canvas), re-capture the original's content and restart the shader so
+    // the wait doesn't go dead.
+    if (state === 'GENERATING' && origEl) {
+      (async () => {
+        try {
+          const rect = origEl.getBoundingClientRect();
+          if (rect.width === 0 || rect.height === 0) return;
+          const blob = await captureElementToBlob(origEl, null, rect);
+          if (blob && state === 'GENERATING') {
+            showShaderOverlay(origEl, blob, rect);
+          }
+        } catch (err) {
+          console.warn('[impeccable] shader resume failed:', err);
+        }
+      })();
+    }
+    return true;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Global bar (always visible at bottom)
+  // ---------------------------------------------------------------------------
+
+  let globalBarEl = null;
+  let detectActive = false;
+  let pickActive = true;
+  let detectCount = 0;
+  let detectScriptLoaded = false;
+
+  // Theme-aware color palette for the global bar. We detect the page's
+  // ambient background and invert — dark bar on light pages, light bar on
+  // dark pages. This keeps the bar from fighting with the host design.
+  function detectPageTheme() {
+    try {
+      // Dev override: set localStorage 'impeccable-dev-theme' to 'light' or
+      // 'dark' to preview the opposite palette without actually changing the
+      // page bg. Used for screenshots and theme QA.
+      const override = localStorage.getItem('impeccable-dev-theme');
+      if (override === 'light' || override === 'dark') return override;
+
+      // Walk body → html, taking the first opaque background. The browser's
+      // default body / html background is `rgba(0, 0, 0, 0)`, which a naive
+      // regex would read as black and mislabel a perfectly white page as
+      // dark. Honoring alpha avoids that — and falling through to <html>
+      // catches the common pattern of a bg only on <html> (or only on body).
+      function readOpaque(el) {
+        if (!el) return null;
+        const bg = getComputedStyle(el).backgroundColor;
+        const m = bg.match(/rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:\s*,\s*([\d.]+))?\s*\)/);
+        if (!m) return null;
+        const alpha = m[4] == null ? 1 : parseFloat(m[4]);
+        if (alpha < 0.5) return null; // transparent / nearly transparent → skip
+        return [+m[1], +m[2], +m[3]];
+      }
+
+      const rgb = readOpaque(document.body) || readOpaque(document.documentElement);
+      // Both transparent → fall back to the browser's effective canvas color.
+      // White is the universal default; only one in a thousand sites swaps it
+      // via `color-scheme: dark` on <html>, and `prefers-color-scheme` lets
+      // us catch that case.
+      if (!rgb) {
+        return matchMedia?.('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+      }
+      const [r, g, b] = rgb;
+      // Perceptual luminance (Rec. 709)
+      const L = (0.2126 * r + 0.7152 * g + 0.0722 * b) / 255;
+      return L > 0.55 ? 'light' : 'dark';
+    } catch { return 'light'; }
+  }
+
+  function barPaletteForTheme(theme) {
+    if (theme === 'dark') {
+      // Light bar on dark page
+      return {
+        surface: 'oklch(98% 0 0 / 0.92)',
+        surfaceDeep: 'oklch(92% 0.005 60 / 0.96)', // slightly deeper, faint warm
+        hairline: 'oklch(70% 0 0 / 0.35)',
+        text: 'oklch(15% 0 0)',
+        textDim: 'oklch(45% 0 0)',
+        accent: 'oklch(60% 0.25 350)',
+        accentSoft: 'oklch(60% 0.25 350 / 0.18)',
+        mark: 'oklch(98% 0 0)',      // logo mark fill
+        markText: 'oklch(15% 0 0)',  // logo "/" color
+        exitHover: 'oklch(85% 0 0 / 0.5)',
+      };
+    }
+    // Dark bar on light page. Bar is a warm charcoal, logo slab is much
+    // deeper so the rounded-right shape reads as a clear sculpted mark.
+    return {
+      surface: 'oklch(26% 0 0 / 0.94)',
+      surfaceDeep: 'oklch(18% 0 0 / 0.96)', // darker sand for Tune popover
+      hairline: 'oklch(42% 0 0 / 0.5)',
+      text: 'oklch(96% 0 0)',
+      textDim: 'oklch(72% 0 0)',
+      accent: 'oklch(72% 0.22 350)',
+      accentSoft: 'oklch(72% 0.22 350 / 0.22)',
+      mark: 'oklch(8% 0 0)',
+      markText: 'oklch(96% 0 0)',
+      exitHover: 'oklch(36% 0 0 / 0.6)',
+    };
+  }
+
+  // Impeccable logo mark — matches the site-header SVG (rounded square + "/").
+  function brandMarkSvg(fill, ink, size = 18) {
+    return `<svg width="${size}" height="${size}" viewBox="0 0 32 32" aria-hidden="true">
+      <rect width="32" height="32" rx="7" fill="${fill}"/>
+      <text x="16" y="24" font-family="system-ui, -apple-system, sans-serif" font-size="22" font-weight="500" fill="${ink}" text-anchor="middle">/</text>
+    </svg>`;
+  }
+
+  function initGlobalBar() {
+    const theme = detectPageTheme();
+    const P = barPaletteForTheme(theme);
+
+    // Custom focus-visible for bar buttons. Browser default is a heavy
+    // blue ring that looks jarring on the dark capsule. Replace with a
+    // soft accent-tinted inner ring that respects the bar's palette.
+    if (!document.getElementById(PREFIX + '-bar-focus-style')) {
+      const s = document.createElement('style');
+      s.id = PREFIX + '-bar-focus-style';
+      s.textContent =
+        '#' + PREFIX + '-global-bar button:focus { outline: none; }' +
+        '#' + PREFIX + '-global-bar button:focus-visible {' +
+        '  outline: none;' +
+        '  box-shadow: 0 0 0 2px ' + P.accentSoft + ', 0 0 0 3px ' + P.accent + ';' +
+        '}';
+      document.head.appendChild(s);
+    }
+
+    globalBarEl = el('div', {
+      position: 'fixed', bottom: '14px', left: '50%',
+      transform: 'translateX(-50%) translateY(20px)',
+      zIndex: Z.bar + 5,
+      display: 'flex', alignItems: 'stretch',
+      gap: '2px',
+      background: P.surface,
+      backdropFilter: 'blur(16px)', WebkitBackdropFilter: 'blur(16px)',
+      border: '1px solid ' + P.hairline,
+      borderRadius: '10px',
+      boxShadow: '0 4px 20px oklch(0% 0 0 / 0.12), 0 1px 3px oklch(0% 0 0 / 0.08)',
+      fontFamily: FONT, fontSize: '12px', lineHeight: '1',
+      opacity: '0',
+      overflow: 'hidden',          // clip the full-bleed brand mark to the bar radius
+      transition: 'opacity 0.3s ' + EASE + ', transform 0.3s ' + EASE,
+    });
+    globalBarEl.id = PREFIX + '-global-bar';
+    globalBarEl.dataset.theme = theme;
+
+    // Brand mark — fills bar height on the left. Left side inherits the bar's
+    // rounded corner via overflow:hidden; right side is a clean hard edge since
+    // the near-black/charcoal contrast does the shape-defining work.
+    const brand = el('span', {
+      display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
+      alignSelf: 'stretch',
+      padding: '0 12px 0 14px',
+      background: P.mark,
+      color: P.markText,
+      fontFamily: 'system-ui, -apple-system, sans-serif',
+      fontWeight: '500',
+      fontSize: '18px', lineHeight: '1',
+    });
+    brand.textContent = '/';
+    brand.title = 'Impeccable';
+    globalBarEl.appendChild(brand);
+
+    // Inner wrapper: holds the toggles with normal bar padding.
+    const inner = el('div', {
+      display: 'flex', alignItems: 'center',
+      padding: '4px 5px', gap: '2px',
+    });
+    inner.id = PREFIX + '-global-bar-inner';
+    globalBarEl.appendChild(inner);
+
+    // --- button factory: icon-only at rest, label slides in on hover/active ---
+    function makeIconBtn({ id, svg, label, ariaLabel, labelFont, onClick }) {
+      const b = el('button', {
+        position: 'relative',
+        display: 'inline-flex', alignItems: 'center',
+        padding: '6px 8px', borderRadius: '7px',
+        border: 'none', background: 'transparent',
+        color: P.textDim, fontFamily: FONT, fontSize: '11.5px', fontWeight: '500',
+        cursor: 'pointer',
+        transition: 'background 0.15s ease, color 0.15s ease',
+        whiteSpace: 'nowrap', overflow: 'hidden',
+      });
+      b.id = id;
+      b.title = ariaLabel || label || '';
+      b.setAttribute('aria-label', ariaLabel || label || '');
+      b.innerHTML = svg + (label
+        ? `<span class="icon-btn-label" style="display:inline-block;max-width:0;opacity:0;margin-left:0;overflow:hidden;font-family:${labelFont || FONT};transition:max-width 0.25s ${EASE}, opacity 0.2s ease, margin-left 0.25s ${EASE};">${label}</span>`
+        : '');
+      const labelEl = b.querySelector('.icon-btn-label');
+      const expand = () => {
+        if (!labelEl) return;
+        labelEl.style.maxWidth = '120px'; labelEl.style.opacity = '1'; labelEl.style.marginLeft = '6px';
+      };
+      const collapse = () => {
+        if (!labelEl || b.dataset.active === 'true') return;
+        labelEl.style.maxWidth = '0'; labelEl.style.opacity = '0'; labelEl.style.marginLeft = '0';
+      };
+      // Per-button hover only changes color (no layout). The label expand/
+      // collapse is driven by the bar-level mouseenter/mouseleave so moving
+      // the mouse between adjacent buttons doesn't trigger per-button width
+      // thrashing — the whole bar grows once and shrinks once.
+      b.addEventListener('mouseenter', () => { if (b.dataset.active !== 'true') b.style.color = P.text; });
+      b.addEventListener('mouseleave', () => { if (b.dataset.active !== 'true') b.style.color = P.textDim; });
+      b.addEventListener('click', onClick);
+      b._expandLabel = expand;
+      b._collapseLabel = collapse;
+      return b;
+    }
+
+    // Pick toggle — starts active (primary intent when entering live mode).
+    const pickBtn = makeIconBtn({
+      id: PREFIX + '-pick-toggle',
+      svg: '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="flex-shrink:0"><circle cx="12" cy="12" r="10"/><line x1="22" y1="12" x2="18" y2="12"/><line x1="6" y1="12" x2="2" y2="12"/><line x1="12" y1="6" x2="12" y2="2"/><line x1="12" y1="22" x2="12" y2="18"/></svg>',
+      label: 'Pick',
+      ariaLabel: 'Pick element',
+      onClick: () => togglePick(),
+    });
+    pickBtn.style.background = P.accentSoft;
+    pickBtn.style.color = P.accent;
+    pickBtn.dataset.active = 'true';
+    pickBtn._expandLabel();
+    inner.appendChild(pickBtn);
+
+    // Detect toggle
+    const detectBtn = makeIconBtn({
+      id: PREFIX + '-detect-toggle',
+      svg: '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="flex-shrink:0"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg>',
+      label: 'Detect',
+      ariaLabel: 'Detect anti-patterns',
+      onClick: () => toggleDetect(),
+    });
+    const detectBadge = el('span', {
+      fontSize: '10px', fontWeight: '600',
+      padding: '0px 5px', borderRadius: '7px', lineHeight: '16px',
+      background: P.accent, color: P.surface.includes('18%') ? 'oklch(18% 0 0)' : 'oklch(98% 0 0)',
+      display: 'none', fontFamily: MONO, marginLeft: '4px',
+    });
+    detectBadge.id = PREFIX + '-detect-badge';
+    detectBtn.appendChild(detectBadge);
+    inner.appendChild(detectBtn);
+
+    // DESIGN.md panel toggle — quartet of color squares as the mark.
+    const designBtn = makeIconBtn({
+      id: PREFIX + '-design-toggle',
+      svg: `<span style="display:inline-grid;grid-template-columns:1fr 1fr;grid-template-rows:1fr 1fr;width:14px;height:14px;border-radius:3px;overflow:hidden;box-shadow:inset 0 0 0 1px ${P.hairline};flex-shrink:0">
+        <span style="background:oklch(60% 0.25 350)"></span>
+        <span style="background:oklch(60% 0.15 45)"></span>
+        <span style="background:oklch(55% 0.12 250)"></span>
+        <span style="background:oklch(30% 0 0)"></span>
+      </span>`,
+      label: 'DESIGN.md',
+      ariaLabel: 'Toggle DESIGN.md panel',
+      labelFont: MONO,
+      onClick: () => toggleDesignPanel(),
+    });
+    inner.appendChild(designBtn);
+
+    // Thin divider before the exit button
+    const divider = el('span', {
+      width: '1px', height: '18px',
+      background: P.hairline,
+      margin: '0 4px 0 2px',
+    });
+    inner.appendChild(divider);
+
+    // Exit × on the right — intentionally subtle (textDim at rest, text on
+    // hover) so it sits behind the active toggles in visual hierarchy.
+    //
+    // Explicit padding + box-sizing here is load-bearing: a host page like
+    // `button { padding: 0.5rem 1rem; }` (very common in resets) would
+    // otherwise inflate this 24x24 button into 56x40 and push the SVG out
+    // of the visible bar — the X stays invisible even though the styles in
+    // DevTools look fine. Every other chrome button sets padding inline;
+    // this one needed it too.
+    const exitBtn = el('button', {
+      display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
+      padding: '0', boxSizing: 'border-box',
+      width: '24px', height: '24px', borderRadius: '6px',
+      border: 'none', background: 'transparent',
+      color: P.textDim, fontFamily: FONT, fontSize: '0', lineHeight: '0',
+      cursor: 'pointer', transition: 'color 0.12s ease, background 0.12s ease',
+    });
+    exitBtn.innerHTML = '<svg width="14" height="14" viewBox="0 0 14 14" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"><line x1="3" y1="3" x2="11" y2="11"/><line x1="11" y1="3" x2="3" y2="11"/></svg>';
+    exitBtn.title = 'Exit live mode';
+    exitBtn.addEventListener('mouseenter', () => { exitBtn.style.color = P.text; exitBtn.style.background = P.exitHover; });
+    exitBtn.addEventListener('mouseleave', () => { exitBtn.style.color = P.textDim; exitBtn.style.background = 'transparent'; });
+    exitBtn.addEventListener('click', () => { sendEvent({ type: 'exit' }); teardown(); });
+    inner.appendChild(exitBtn);
+
+    // Bar-level hover: expand every toggle's label at once; collapse on leave.
+    // Buttons with dataset.active="true" ignore collapse (their label stays).
+    const toggles = [pickBtn, detectBtn, designBtn];
+    globalBarEl.addEventListener('mouseenter', () => {
+      toggles.forEach((t) => t._expandLabel && t._expandLabel());
+    });
+    globalBarEl.addEventListener('mouseleave', () => {
+      toggles.forEach((t) => t._collapseLabel && t._collapseLabel());
+    });
+
+    document.body.appendChild(globalBarEl);
+    defangOutsideHandlers(globalBarEl);
+
+    requestAnimationFrame(() => {
+      globalBarEl.style.opacity = '1';
+      globalBarEl.style.transform = 'translateX(-50%) translateY(0)';
+    });
+
+    // Listen for detection results AND ready signal
+    window.addEventListener('message', onDetectMessage);
+  }
+
+  function updateGlobalBarState() {
+    const detectToggle = document.getElementById(PREFIX + '-detect-toggle');
+    const detectBadge = document.getElementById(PREFIX + '-detect-badge');
+    const pickToggle = document.getElementById(PREFIX + '-pick-toggle');
+    const designToggle = document.getElementById(PREFIX + '-design-toggle');
+    const theme = globalBarEl?.dataset.theme || 'light';
+    const P = barPaletteForTheme(theme);
+
+    // Sync one toggle's active state, colors, and slide-label visibility.
+    function sync(btn, active) {
+      if (!btn) return;
+      btn.style.background = active ? P.accentSoft : 'transparent';
+      btn.style.color = active ? P.accent : P.textDim;
+      btn.dataset.active = active ? 'true' : 'false';
+      if (active && btn._expandLabel) btn._expandLabel();
+      else if (!active && btn._collapseLabel) btn._collapseLabel();
+    }
+    sync(pickToggle, pickActive);
+    sync(detectToggle, detectActive);
+    sync(designToggle, designState.open);
+
+    // If the bar is currently under the cursor, keep all labels expanded —
+    // otherwise clicking a toggle that deactivates (e.g. closing DESIGN.md)
+    // would collapse its label while the user's mouse is still on the bar.
+    if (globalBarEl && globalBarEl.matches(':hover')) {
+      [pickToggle, detectToggle, designToggle].forEach((t) => t?._expandLabel?.());
+    }
+
+    if (detectBadge) {
+      detectBadge.style.display = (detectActive && detectCount > 0) ? 'inline' : 'none';
+      detectBadge.textContent = detectCount;
+    }
+
+    // When pick is active, make detect overlays click-through so the picker works
+    document.querySelectorAll('.impeccable-overlay').forEach(o => {
+      o.style.pointerEvents = pickActive ? 'none' : '';
+    });
+  }
+
+  let detectReady = false; // true once detect script posts 'impeccable-ready'
+  let detectPendingScan = false; // scan requested before script was ready
+
+  function toggleDetect() {
+    detectActive = !detectActive;
+    updateGlobalBarState();
+
+    if (detectActive) {
+      if (!detectScriptLoaded) {
+        detectPendingScan = true;
+        loadDetectScript();
+      } else if (detectReady) {
+        window.postMessage({ source: 'impeccable-command', action: 'scan' }, '*');
+      } else {
+        detectPendingScan = true;
+      }
+    } else {
+      window.postMessage({ source: 'impeccable-command', action: 'remove' }, '*');
+      detectCount = 0;
+      updateGlobalBarState();
+    }
+  }
+
+  function togglePick() {
+    pickActive = !pickActive;
+    updateGlobalBarState();
+
+    if (!pickActive) {
+      // Disabling pick clears any in-flight selection and UI: highlight,
+      // contextual bar, selectedElement. Otherwise a stale selection sits
+      // on screen with no obvious way to dismiss.
+      hideHighlight();
+      hideBar();
+      hideActionPicker();
+      selectedElement = null;
+      if (state === 'PICKING' || state === 'CONFIGURING') state = 'IDLE';
+    } else {
+      if (state === 'IDLE') state = 'PICKING';
+    }
+  }
+
+  function loadDetectScript() {
+    if (detectScriptLoaded) return;
+    detectScriptLoaded = true;
+    const s = document.createElement('script');
+    s.src = 'http://localhost:' + PORT + '/detect.js';
+    s.dataset.impeccableExtension = 'true';
+    document.head.appendChild(s);
+  }
+
+  function onDetectMessage(e) {
+    if (!e.data || typeof e.data.source !== 'string') return;
+    // Detection script is loaded and ready
+    if (e.data.source === 'impeccable-ready') {
+      detectReady = true;
+      if (detectPendingScan && detectActive) {
+        detectPendingScan = false;
+        window.postMessage({ source: 'impeccable-command', action: 'scan' }, '*');
+      }
+    }
+    // Scan results arrived
+    if (e.data.source === 'impeccable-results') {
+      detectCount = e.data.count || 0;
+      updateGlobalBarState();
+    }
+  }
+
+  /** Full teardown: remove all UI, disconnect SSE, clean up. */
+  function teardown() {
+    cleanup();
+    hideBar();
+    if (globalBarEl) {
+      globalBarEl.style.transform = 'translateY(100%)';
+      setTimeout(() => { if (globalBarEl) globalBarEl.remove(); globalBarEl = null; }, 300);
+    }
+    if (highlightEl) { highlightEl.remove(); highlightEl = null; }
+    if (tooltipEl) { tooltipEl.remove(); tooltipEl = null; }
+    if (barEl) { barEl.remove(); barEl = null; }
+    if (pickerEl) { pickerEl.remove(); pickerEl = null; }
+    if (paramsPanelEl) { paramsPanelEl.remove(); paramsPanelEl = null; paramsPanelInner = null; paramsPanelBody = null; }
+    if (evtSource) { evtSource.close(); evtSource = null; }
+    document.removeEventListener('mousemove', handleMouseMove, true);
+    document.removeEventListener('click', handleClick, true);
+    document.removeEventListener('keydown', handleKeyDown, true);
+    window.removeEventListener('message', onDetectMessage);
+    // Remove detection overlays
+    window.postMessage({ source: 'impeccable-command', action: 'remove' }, '*');
+    state = 'IDLE';
+    window.__IMPECCABLE_LIVE_INIT__ = false;
+    console.log('[impeccable] Live mode exited.');
+  }
+
+  // ---------------------------------------------------------------------------
+  // Design System Panel — visualizes the project's .impeccable/design.json sidecar
+  // ---------------------------------------------------------------------------
+
+  const DESIGN_PREFS_KEY = 'impeccable-live-design-panel';
+  const DESIGN_PANEL_WIDTH = 440;
+
+  let designHost = null;
+  let designShadow = null;
+  let designState = {
+    open: false,
+    tab: 'visual',          // 'visual' | 'raw'
+    parsed: null,           // parseDesignMd output (frontmatter + body sections)
+    sidecar: null,          // .impeccable/design.json v2 payload (extensions + components + narrative)
+    hasMd: false,
+    hasSidecar: false,
+    present: null,          // true/false once fetch resolves
+    raw: null,              // raw DESIGN.md for the raw tab
+    mdNewerThanJson: false, // stale-hint flag
+    loading: false,
+    error: null,
+    collapsed: {            // narrative-section accordion state
+      rules: true, dosdonts: true, overview: true,
+    },
+  };
+
+  function loadDesignPrefs() {
+    // `open` is intentionally NOT persisted — the panel always starts closed
+    // so live mode doesn't auto-slide a big panel over the page on startup.
+    try {
+      const raw = localStorage.getItem(DESIGN_PREFS_KEY);
+      if (!raw) return;
+      const prefs = JSON.parse(raw);
+      if (prefs.tab === 'visual' || prefs.tab === 'raw') designState.tab = prefs.tab;
+      if (prefs.collapsed && typeof prefs.collapsed === 'object') {
+        Object.assign(designState.collapsed, prefs.collapsed);
+      }
+    } catch { /* ignore */ }
+  }
+
+  function saveDesignPrefs() {
+    try {
+      localStorage.setItem(DESIGN_PREFS_KEY, JSON.stringify({
+        tab: designState.tab,
+        collapsed: designState.collapsed,
+      }));
+    } catch { /* ignore */ }
+  }
+
+  function initDesignPanel() {
+    designHost = document.createElement('div');
+    designHost.id = PREFIX + '-design-host';
+    Object.assign(designHost.style, {
+      position: 'fixed', top: '0', left: '0',
+      width: '0', height: '0',
+      zIndex: String(Z.bar + 10),
+      pointerEvents: 'none',
+    });
+    designShadow = designHost.attachShadow({ mode: 'open' });
+
+    const style = document.createElement('style');
+    // Theme-match the bar: dark chrome on light pages, light chrome on dark pages.
+    const theme = detectPageTheme();
+    style.textContent = designPanelCss(barPaletteForTheme(theme));
+    designShadow.appendChild(style);
+
+    const root = document.createElement('div');
+    root.className = 'root';
+    designShadow.appendChild(root);
+
+    document.body.appendChild(designHost);
+    // The host is pointer-events: none; the panel inside the shadow DOM
+    // manages its own auto/none. Events bubble through the shadow boundary,
+    // so attaching here silences host-page outside-interaction handlers
+    // without touching the host's click-through behavior.
+    defangOutsideHandlers(designHost, { setPointerEvents: false });
+
+    loadDesignPrefs();
+    renderDesignChrome();
+    if (designState.open) {
+      fetchDesignSystem();
+    }
+  }
+
+  // Neutral panel palette — deliberately NOT Impeccable-branded. The panel is
+  // a viewer of the project's design system, not an Impeccable surface.
+  const DP = {
+    canvas:   'oklch(94% 0 0)',            // panel background
+    tile:     'oklch(98.5% 0 0)',          // card-on-canvas
+    tileAlt:  'oklch(96% 0 0)',            // subtler tile for inner surfaces
+    ink:      'oklch(15% 0 0)',
+    ink2:     'oklch(35% 0 0)',
+    meta:     'oklch(55% 0 0)',
+    hairline: 'oklch(88% 0 0)',
+    hairlineSoft: 'oklch(92% 0 0)',
+    amber:    'oklch(70% 0.13 65)',         // stale-hint accent
+    amberBg:  'oklch(95% 0.05 80)',
+  };
+
+  function designPanelCss(BP) {
+    // BP = bar palette (theme-aware, matches the global bar).
+    // DP = internal content palette (neutral, so tiles render colors true).
+    return `
+      :host, .root { all: initial; }
+      .root {
+        font-family: ${FONT};
+        color: ${DP.ink};
+        pointer-events: none;
+      }
+      .root * { box-sizing: border-box; }
+      button { font: inherit; color: inherit; }
+
+      /* --- Panel shell: chrome matches the bar; body canvas stays neutral --- */
+      .panel {
+        position: fixed; top: 12px; bottom: 72px; right: 12px;
+        width: ${DESIGN_PANEL_WIDTH}px; max-width: calc(100vw - 24px);
+        background: ${BP.surface};
+        border: 1px solid ${BP.hairline};
+        border-radius: 14px;
+        backdrop-filter: blur(16px); -webkit-backdrop-filter: blur(16px);
+        box-shadow: 0 20px 60px oklch(0% 0 0 / 0.18), 0 4px 12px oklch(0% 0 0 / 0.08);
+        display: flex; flex-direction: column;
+        transform: translateX(calc(100% + 24px));
+        opacity: 0;
+        transition: transform 0.35s ${EASE}, opacity 0.25s ${EASE};
+        pointer-events: none;
+        overflow: hidden;
+      }
+      .panel[data-open="true"] { transform: translateX(0); opacity: 1; pointer-events: auto; }
+
+      .panel-header {
+        display: flex; align-items: center; gap: 10px;
+        padding: 10px 10px 10px 14px;
+        background: transparent;
+        border-bottom: 1px solid ${BP.hairline};
+      }
+      .panel-title {
+        flex: 1; min-width: 0;
+        font-family: ${MONO};
+        font-size: 11.5px; font-weight: 600;
+        letter-spacing: 0.02em;
+        color: ${BP.text};
+        white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+      }
+      .panel-close {
+        border: none; background: transparent; color: ${BP.textDim};
+        width: 26px; height: 26px; border-radius: 7px;
+        display: inline-flex; align-items: center; justify-content: center;
+        cursor: pointer; transition: background 0.15s ease, color 0.15s ease;
+      }
+      .panel-close:hover { background: ${BP.hairline}; color: ${BP.text}; }
+
+      .tabs {
+        display: inline-flex; padding: 2px;
+        background: ${BP.hairline};
+        border-radius: 7px;
+        gap: 2px;
+      }
+      .tab {
+        border: none; background: transparent;
+        padding: 4px 10px; border-radius: 5px;
+        font-family: ${MONO};
+        font-size: 10px; font-weight: 600; letter-spacing: 0.08em;
+        text-transform: uppercase;
+        color: ${BP.textDim}; cursor: pointer;
+        transition: background 0.15s ease, color 0.15s ease;
+      }
+      .tab[data-active="true"] { background: ${BP.surface}; color: ${BP.text}; }
+
+      .panel-body {
+        flex: 1; overflow-y: auto;
+        padding: 12px 12px 20px;
+        background: ${DP.canvas};
+        scrollbar-width: thin;
+        scrollbar-color: ${DP.hairline} transparent;
+      }
+      .panel-body::-webkit-scrollbar { width: 8px; }
+      .panel-body::-webkit-scrollbar-thumb { background: ${DP.hairline}; border-radius: 8px; border: 2px solid transparent; background-clip: padding-box; }
+
+      /* --- States --- */
+      .empty, .loading, .error {
+        margin: 16px 4px;
+        padding: 28px 20px; text-align: center;
+        background: ${DP.tile}; border-radius: 14px;
+        color: ${DP.ink2}; font-size: 13px; line-height: 1.55;
+      }
+      .empty strong { color: ${DP.ink}; display: block; margin-bottom: 6px; font-size: 14px; }
+      .empty code { font-family: ${MONO}; background: ${DP.canvas}; padding: 1px 6px; border-radius: 4px; font-size: 12px; color: ${DP.ink}; }
+      .error { color: oklch(45% 0.15 25); }
+
+      /* --- Stale hint --- */
+      .stale {
+        display: flex; align-items: center; gap: 8px;
+        margin: 8px 4px 12px;
+        padding: 8px 12px;
+        background: ${DP.amberBg};
+        border-radius: 10px;
+        font-size: 11.5px; color: ${DP.ink2};
+      }
+      .stale-dot { width: 8px; height: 8px; border-radius: 50%; background: ${DP.amber}; flex-shrink: 0; }
+      .stale-text { flex: 1; min-width: 0; }
+      .stale-text strong { color: ${DP.ink}; font-weight: 600; }
+
+      /* --- Parsed-md fallback banner --- */
+      .parsed-md-cta {
+        margin: 8px 4px 14px;
+        padding: 14px 16px;
+        background: ${DP.tile};
+        border: 1px dashed ${DP.hairline};
+        border-radius: 12px;
+        font-size: 12px; color: ${DP.ink2}; line-height: 1.55;
+      }
+      .parsed-md-cta strong { color: ${DP.ink}; display: block; margin-bottom: 4px; font-size: 13px; font-weight: 600; }
+      .parsed-md-cta code { font-family: ${MONO}; background: ${DP.canvas}; padding: 1px 5px; border-radius: 4px; font-size: 11.5px; color: ${DP.ink}; }
+
+      /* --- Tile primitives --- */
+      .tile {
+        position: relative;
+        background: ${DP.tile};
+        border-radius: 16px;
+        padding: 16px;
+        margin: 0 4px 10px;
+      }
+      .tile-row { margin: 0 4px 10px; display: grid; grid-template-columns: 1fr 1fr; gap: 10px; }
+      .tile-row .tile { margin: 0; }
+      .tile-meta {
+        display: flex; align-items: baseline; justify-content: space-between;
+        gap: 10px;
+        font-family: ${MONO};
+        font-size: 10px; font-weight: 500; letter-spacing: 0.1em; text-transform: uppercase;
+        color: ${DP.meta};
+      }
+      .tile-meta .name { color: ${DP.ink}; font-weight: 600; letter-spacing: 0.05em; text-transform: none; font-family: ${FONT}; font-size: 12.5px; }
+
+      /* --- Color tile --- */
+      .c-tile { cursor: pointer; transition: transform 0.2s ${EASE}; }
+      .c-tile:hover { transform: translateY(-1px); }
+      .c-hero {
+        height: 72px; border-radius: 10px; margin-top: 10px;
+        box-shadow: inset 0 0 0 1px oklch(0% 0 0 / 0.05);
+      }
+      .c-ramp {
+        display: flex; gap: 0; height: 14px; border-radius: 4px; overflow: hidden;
+        margin-top: 8px;
+        box-shadow: inset 0 0 0 1px oklch(0% 0 0 / 0.04);
+      }
+      .c-ramp > span { flex: 1; }
+      .c-desc { margin-top: 8px; font-size: 11.5px; line-height: 1.45; color: ${DP.ink2}; }
+
+      /* --- Type tile --- */
+      .t-tile { }
+      .t-specimen {
+        margin: 4px 0 6px;
+        color: ${DP.ink};
+        line-height: 0.9;
+      }
+      .t-family { margin-top: 4px; font-size: 12px; font-weight: 600; color: ${DP.ink}; }
+      .t-purpose { margin-top: 4px; font-size: 11px; line-height: 1.45; color: ${DP.ink2}; }
+
+      /* --- Shadow tile --- */
+      .s-tile { }
+      .s-surface {
+        height: 60px; margin: 8px 2px 10px;
+        background: ${DP.tile};
+        border-radius: 10px;
+      }
+      .s-value { font-family: ${MONO}; font-size: 10px; color: ${DP.meta}; word-break: break-all; line-height: 1.4; }
+      .s-purpose { margin-top: 4px; font-size: 11px; color: ${DP.ink2}; line-height: 1.45; }
+
+      /* --- Radii strip --- */
+      .r-strip { display: flex; gap: 10px; flex-wrap: wrap; margin-top: 10px; }
+      .r-item { display: flex; flex-direction: column; align-items: center; gap: 4px; flex: 1; min-width: 60px; }
+      .r-sample { width: 44px; height: 44px; background: ${DP.canvas}; box-shadow: inset 0 0 0 1px oklch(0% 0 0 / 0.08); }
+      .r-label { font-family: ${MONO}; font-size: 10px; color: ${DP.meta}; letter-spacing: 0.05em; text-transform: uppercase; }
+      .r-val { font-family: ${MONO}; font-size: 10px; color: ${DP.ink}; }
+
+      /* --- Component tile (hosts live primitives) --- */
+      .cmp-tile { }
+      .cmp-stage {
+        margin: 12px -4px 0;
+        padding: 18px 16px 10px;
+        border-top: 1px solid ${DP.hairlineSoft};
+        display: flex; flex-direction: column; align-items: center; justify-content: center;
+        gap: 14px;
+        min-height: 68px;
+      }
+      .cmp-stage + .cmp-stage { border-top: 1px dashed ${DP.hairlineSoft}; }
+      .cmp-sublabel { font-family: ${MONO}; font-size: 10px; color: ${DP.meta}; letter-spacing: 0.06em; }
+      .cmp-kind { font-family: ${MONO}; font-size: 10px; letter-spacing: 0.1em; text-transform: uppercase; color: ${DP.meta}; }
+
+      /* --- Collapsible --- */
+      .coll {
+        margin: 0 4px 8px;
+        background: ${DP.tile};
+        border-radius: 12px;
+        overflow: hidden;
+      }
+      .coll-head {
+        display: flex; align-items: center; gap: 10px;
+        width: 100%;
+        padding: 12px 14px;
+        background: transparent; border: none;
+        cursor: pointer; text-align: left;
+        font-family: ${FONT}; font-size: 12.5px; font-weight: 600; color: ${DP.ink};
+        transition: background 0.12s ease;
+      }
+      .coll-head:hover { background: ${DP.tileAlt}; }
+      .coll-chev {
+        width: 12px; height: 12px; flex-shrink: 0;
+        color: ${DP.meta};
+        transition: transform 0.2s ${EASE};
+      }
+      .coll[data-open="true"] .coll-chev { transform: rotate(90deg); }
+      .coll-count { margin-left: auto; font-family: ${MONO}; font-size: 10px; color: ${DP.meta}; letter-spacing: 0.05em; }
+      .coll-body { padding: 0 14px 14px; display: none; }
+      .coll[data-open="true"] .coll-body { display: block; }
+
+      .rule-card {
+        padding: 10px 0;
+        border-top: 1px solid ${DP.hairlineSoft};
+      }
+      .rule-card:first-child { border-top: none; padding-top: 2px; }
+      .rule-card .name { font-size: 11.5px; font-weight: 700; color: ${DP.ink}; margin-bottom: 3px; }
+      .rule-card .name .section { font-family: ${MONO}; font-size: 9px; font-weight: 500; letter-spacing: 0.1em; text-transform: uppercase; color: ${DP.meta}; margin-left: 8px; }
+      .rule-card .body { font-size: 11.5px; color: ${DP.ink2}; line-height: 1.5; }
+
+      .coll .dos { display: grid; gap: 0; margin-top: 2px; }
+      .coll .do, .coll .dont {
+        position: relative;
+        padding: 8px 0 8px 22px;
+        font-size: 11.5px; line-height: 1.5; color: ${DP.ink2};
+        border-top: 1px solid ${DP.hairlineSoft};
+      }
+      .coll .do:first-child, .coll .dont:first-child,
+      .coll .do:first-of-type { border-top: none; }
+      .coll .do + .dont { border-top: 1px solid ${DP.hairlineSoft}; }
+      .coll .do::before, .coll .dont::before {
+        content: ''; position: absolute; left: 4px; top: 13px;
+        width: 8px; height: 8px; border-radius: 50%;
+      }
+      .coll .do::before { background: oklch(62% 0.16 145); }
+      .coll .dont::before { background: oklch(58% 0.22 25); }
+
+      .coll .overview-body {
+        font-size: 12px; line-height: 1.55; color: ${DP.ink2};
+      }
+      .coll .overview-body .north-star {
+        display: block; font-family: ${FONT}; font-style: italic;
+        font-size: 15px; line-height: 1.3; color: ${DP.ink};
+        margin-bottom: 8px;
+      }
+      .coll .overview-body p { margin: 0 0 8px; }
+      .coll .overview-body ul { margin: 6px 0 0; padding-left: 16px; font-size: 11.5px; }
+      .coll .overview-body li { margin-bottom: 3px; }
+
+      /* --- raw tab markdown (unchanged layout, neutralized palette) --- */
+      .md { padding: 4px 10px 20px; font-size: 13px; line-height: 1.6; color: ${DP.ink}; }
+      .md h1, .md h2, .md h3, .md h4 { margin: 20px 0 8px; color: ${DP.ink}; font-weight: 600; }
+      .md h1 { font-size: 18px; }
+      .md h2 { font-size: 15px; padding-bottom: 4px; border-bottom: 1px solid ${DP.hairlineSoft}; }
+      .md h3 { font-size: 13px; }
+      .md h4 { font-size: 12px; color: ${DP.meta}; }
+      .md p { margin: 0 0 10px; }
+      .md ul, .md ol { margin: 0 0 10px; padding-left: 20px; }
+      .md li { margin-bottom: 4px; }
+      .md code { font-family: ${MONO}; font-size: 12px; background: ${DP.canvas}; padding: 1px 5px; border-radius: 4px; }
+      .md pre { font-family: ${MONO}; font-size: 12px; background: ${DP.canvas}; padding: 10px 12px; border-radius: 8px; overflow-x: auto; margin: 0 0 10px; }
+      .md pre code { background: none; padding: 0; }
+      .md strong { font-weight: 700; }
+      .md em { font-style: italic; }
+      .md a { color: ${DP.ink}; text-decoration: underline; }
+      .md hr { border: none; border-top: 1px solid ${DP.hairlineSoft}; margin: 16px 0; }
+    `;
+  }
+
+  function renderDesignChrome() {
+    const root = designShadow.querySelector('.root');
+    root.innerHTML = '';
+
+    // (Panel toggle lives in the global bar — no floating FAB.)
+    // Panel
+    const panel = document.createElement('aside');
+    panel.className = 'panel';
+    panel.setAttribute('data-open', designState.open ? 'true' : 'false');
+    panel.appendChild(buildDesignHeader());
+    const body = document.createElement('div');
+    body.className = 'panel-body';
+    body.id = 'panel-body';
+    panel.appendChild(body);
+    root.appendChild(panel);
+
+    renderDesignBody();
+  }
+
+  function buildDesignHeader() {
+    const header = document.createElement('div');
+    header.className = 'panel-header';
+
+    const title = document.createElement('div');
+    title.className = 'panel-title';
+    title.textContent = 'DESIGN.md';
+    header.appendChild(title);
+
+    const tabs = document.createElement('div');
+    tabs.className = 'tabs';
+    for (const t of [['visual', 'Visual'], ['raw', 'Raw']]) {
+      const btn = document.createElement('button');
+      btn.className = 'tab';
+      btn.textContent = t[1];
+      btn.setAttribute('data-active', designState.tab === t[0] ? 'true' : 'false');
+      btn.addEventListener('click', () => {
+        if (designState.tab === t[0]) return;
+        designState.tab = t[0];
+        saveDesignPrefs();
+        renderDesignChrome();
+        if (t[0] === 'raw' && designState.raw === null && !designState.loading) {
+          fetchDesignSystem(); // raw is part of the same fetch pair
+        }
+      });
+      tabs.appendChild(btn);
+    }
+    header.appendChild(tabs);
+
+    const close = document.createElement('button');
+    close.className = 'panel-close';
+    close.innerHTML = '&#x2715;';
+    close.setAttribute('aria-label', 'Close panel');
+    close.addEventListener('click', toggleDesignPanel);
+    header.appendChild(close);
+
+    return header;
+  }
+
+  function toggleDesignPanel() {
+    designState.open = !designState.open;
+    renderDesignChrome();
+    updateGlobalBarState();
+    if (designState.open && designState.present === null && !designState.loading) {
+      fetchDesignSystem();
+    }
+  }
+
+  async function fetchDesignSystem() {
+    designState.loading = true;
+    designState.error = null;
+    renderDesignBody();
+    try {
+      const [jsonRes, rawRes] = await Promise.all([
+        fetch(`http://localhost:${PORT}/design-system.json?token=${TOKEN}`, { cache: 'no-store' }),
+        fetch(`http://localhost:${PORT}/design-system/raw?token=${TOKEN}`, { cache: 'no-store' }),
+      ]);
+      const jsonData = await jsonRes.json();
+      designState.present = jsonData.present === true;
+      designState.parsed = jsonData.parsed || null;
+      designState.sidecar = jsonData.sidecar || null;
+      designState.hasMd = !!jsonData.hasMd;
+      designState.hasSidecar = !!jsonData.hasSidecar;
+      designState.mdNewerThanJson = !!jsonData.mdNewerThanJson;
+      designState.raw = designState.present && rawRes.ok ? await rawRes.text() : null;
+      designState.error = jsonData.parseError || jsonData.sidecarError || null;
+    } catch (err) {
+      designState.error = err?.message || 'Failed to load design system.';
+    } finally {
+      designState.loading = false;
+      renderDesignChrome(); // refresh title from data
+    }
+  }
+
+  function renderDesignBody() {
+    const body = designShadow.querySelector('#panel-body');
+    if (!body) return;
+    body.innerHTML = '';
+
+    if (designState.loading) {
+      body.appendChild(msgDiv('loading', 'Loading design system…'));
+      return;
+    }
+    if (designState.error) {
+      body.appendChild(msgDiv('error', designState.error));
+      return;
+    }
+    if (designState.present === false) {
+      const empty = document.createElement('div');
+      empty.className = 'empty';
+      empty.innerHTML = `<strong>No DESIGN.md yet</strong>Create one by running <code>/impeccable document</code> in your terminal, then re-open this panel.`;
+      body.appendChild(empty);
+      return;
+    }
+
+    if (designState.tab === 'raw') {
+      renderRawTab(body, designState.raw || '');
+      return;
+    }
+
+    // Visual tab — single unified render path.
+    if (designState.mdNewerThanJson) body.appendChild(renderStaleHint());
+    if (designState.hasMd && !designState.hasSidecar) {
+      body.appendChild(renderParsedMdCta());
+    }
+    renderDesignVisual(body, designState.parsed, designState.sidecar);
+  }
+
+  function msgDiv(cls, text) {
+    const d = document.createElement('div');
+    d.className = cls;
+    d.textContent = text;
+    return d;
+  }
+
+  function renderStaleHint() {
+    const box = document.createElement('div');
+    box.className = 'stale';
+    box.innerHTML = `
+      <span class="stale-dot"></span>
+      <span class="stale-text"><strong>DESIGN.md is newer than .impeccable/design.json.</strong> Run <code>/impeccable document</code> to refresh the sidecar.</span>
+    `;
+    return box;
+  }
+
+  function renderParsedMdCta() {
+    const box = document.createElement('div');
+    box.className = 'parsed-md-cta';
+    box.innerHTML = `<strong>Basic view</strong>This panel reads the tokens in your <code>DESIGN.md</code> frontmatter. Running <code>/impeccable document</code> also generates a <code>.impeccable/design.json</code> sidecar with your project's actual component snippets (button, input, nav) and tonal ramps, rendered live below the tokens.`;
+    return box;
+  }
+
+  // --- Unified render: merge parsed DESIGN.md frontmatter with sidecar v2 ---
+
+  function renderDesignVisual(body, parsed, sidecar) {
+    const frontmatter = parsed?.frontmatter || {};
+    const extensions = sidecar?.extensions || {};
+    const proseColors = parsed?.colors || null;
+
+    const colors = buildColorModels(frontmatter.colors, extensions.colorMeta, proseColors);
+    if (colors.length) renderColorTiles(body, colors);
+
+    const types = buildTypographyModels(frontmatter.typography, extensions.typographyMeta);
+    if (types.length) renderTypeTiles(body, types);
+
+    const radii = buildRadiiModels(frontmatter.rounded);
+    if (radii.length) renderRadiiTile(body, radii);
+
+    if (extensions.shadows?.length) renderShadowTiles(body, extensions.shadows);
+
+    const components = sidecar?.components || [];
+    if (components.length) renderComponentTiles(body, components);
+
+    // Narrative: sidecar wins if present (richer, agent-curated). Otherwise
+    // synthesize from prose sections.
+    const narrative = sidecar?.narrative || synthesizeNarrative(parsed);
+    if (narrative.rules?.length) body.appendChild(renderRulesCollapsible(narrative.rules));
+    if ((narrative.dos?.length || narrative.donts?.length)) body.appendChild(renderDosDontsCollapsible(narrative));
+    if (narrative.overview || narrative.northStar || narrative.keyCharacteristics?.length) {
+      body.appendChild(renderOverviewCollapsible(narrative));
+    }
+
+    if (body.childElementCount === 0) {
+      body.appendChild(msgDiv('empty', 'No design system data available.'));
+    }
+  }
+
+  // Frontmatter primitives + sidecar colorMeta → tile-ready color models.
+  // A matching prose bullet (when the slug sits in the bullet text) supplies
+  // description as a last-resort fallback.
+  function buildColorModels(fmColors, colorMeta, proseColors) {
+    if (!fmColors) return [];
+    const meta = colorMeta || {};
+    return Object.entries(fmColors).map(([key, value]) => {
+      const m = meta[key] || {};
+      return {
+        role: m.role || humanizeKey(key),
+        name: m.displayName || humanizeKey(key),
+        value: value,
+        canonical: m.canonical || null,
+        description: m.description || findProseDescription(proseColors, key, m.displayName),
+        tonalRamp: m.tonalRamp || null,
+      };
+    });
+  }
+
+  function buildTypographyModels(fmTypography, typographyMeta) {
+    if (!fmTypography) return [];
+    const meta = typographyMeta || {};
+    return Object.entries(fmTypography).map(([key, spec]) => {
+      const m = meta[key] || {};
+      const { family, fallback } = splitFontFamily(spec?.fontFamily);
+      return {
+        role: key,
+        name: m.displayName || humanizeKey(key),
+        family,
+        fallback,
+        weight: spec?.fontWeight ?? 400,
+        // fontStyle isn't in Stitch's frontmatter schema; the sidecar carries
+        // it when a role is rendered in italic (e.g. display italic).
+        style: m.style || 'normal',
+        sampleSize: spec?.fontSize || '1rem',
+        lineHeight: spec?.lineHeight != null ? String(spec.lineHeight) : '',
+        letterSpacing: spec?.letterSpacing,
+        purpose: m.purpose,
+      };
+    });
+  }
+
+  function buildRadiiModels(fmRounded) {
+    if (!fmRounded) return [];
+    return Object.entries(fmRounded).map(([name, value]) => ({ name, value }));
+  }
+
+  function splitFontFamily(stack) {
+    if (!stack || typeof stack !== 'string') return { family: '', fallback: '' };
+    const parts = stack.split(',').map((s) => s.trim().replace(/^['"]|['"]$/g, ''));
+    return { family: parts[0] || '', fallback: parts.slice(1).join(', ') };
+  }
+
+  function humanizeKey(k) {
+    return String(k || '').replace(/[-_]+/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
+  }
+
+  function findProseDescription(proseColors, key, displayName) {
+    if (!proseColors || !proseColors.groups) return null;
+    const needles = [key, displayName].filter(Boolean).map((s) => s.toLowerCase());
+    for (const g of proseColors.groups) {
+      for (const c of g.colors || []) {
+        const hay = String(c.name || '').toLowerCase();
+        if (hay && needles.some((n) => hay.includes(n) || n.includes(hay))) {
+          return c.description || null;
+        }
+      }
+    }
+    return null;
+  }
+
+  function synthesizeNarrative(parsed) {
+    if (!parsed) return {};
+    const md = parsed;
+    return {
+      northStar: md.overview?.creativeNorthStar,
+      overview: (md.overview?.philosophy || []).join(' '),
+      keyCharacteristics: md.overview?.keyCharacteristics || [],
+      rules: [
+        ...(md.colors?.rules || []).map((r) => ({ ...r, section: 'colors' })),
+        ...(md.typography?.rules || []).map((r) => ({ ...r, section: 'typography' })),
+        ...(md.elevation?.rules || []).map((r) => ({ ...r, section: 'elevation' })),
+      ],
+      dos: md.dosDonts?.dos || [],
+      donts: md.dosDonts?.donts || [],
+    };
+  }
+
+  function renderColorTiles(body, colors) {
+    for (const c of colors) {
+      const tile = document.createElement('div');
+      tile.className = 'tile c-tile';
+      tile.title = 'Click to copy';
+      tile.addEventListener('click', () => copyToClipboard(c.value));
+
+      const meta = document.createElement('div');
+      meta.className = 'tile-meta';
+      meta.innerHTML = `<span class="name">${escapeHtml(c.name || c.role || 'Color')}</span><span>${escapeHtml(c.value || '')}</span>`;
+      tile.appendChild(meta);
+
+      const hero = document.createElement('div');
+      hero.className = 'c-hero';
+      hero.style.background = c.value;
+      tile.appendChild(hero);
+
+      const ramp = synthesizeRamp(c);
+      if (ramp.length) {
+        const r = document.createElement('div');
+        r.className = 'c-ramp';
+        r.innerHTML = ramp.map((v) => `<span style="background:${cssSafe(v)}"></span>`).join('');
+        tile.appendChild(r);
+      }
+
+      if (c.description) {
+        const d = document.createElement('div');
+        d.className = 'c-desc';
+        d.textContent = c.description;
+        tile.appendChild(d);
+      }
+      body.appendChild(tile);
+    }
+  }
+
+  function synthesizeRamp(c) {
+    if (c.tonalRamp?.length) return c.tonalRamp;
+    // If base value is OKLCH, synthesize an 8-step ramp across lightness.
+    const m = typeof c.value === 'string' && c.value.match(/^oklch\(\s*([\d.]+)%\s+([\d.]+)\s+([\d.]+)\s*(?:\/\s*([\d.]+))?\s*\)$/i);
+    if (!m) return [];
+    const [, , chroma, hue] = m;
+    const steps = [20, 32, 44, 56, 68, 80, 90, 96];
+    return steps.map((l) => `oklch(${l}% ${chroma} ${hue})`);
+  }
+
+  function renderTypeTiles(body, types) {
+    for (const t of types) {
+      const tile = document.createElement('div');
+      tile.className = 'tile t-tile';
+
+      const meta = document.createElement('div');
+      meta.className = 'tile-meta';
+      meta.innerHTML = `<span>${escapeHtml(t.role || '')}</span><span>${escapeHtml(t.weight || '')} ${escapeHtml(t.style === 'italic' ? 'italic' : '')}</span>`;
+      tile.appendChild(meta);
+
+      const specimen = document.createElement('div');
+      specimen.className = 't-specimen';
+      specimen.textContent = 'Aa';
+      specimen.style.fontFamily = fontStack(t);
+      specimen.style.fontWeight = String(t.weight || 400);
+      specimen.style.fontStyle = t.style || 'normal';
+      specimen.style.fontSize = '56px';  // Fixed specimen size — compare faces, not scales.
+      specimen.style.letterSpacing = 'normal';
+      specimen.style.textTransform = 'none';
+      tile.appendChild(specimen);
+
+      // The system's actual sample size for this role, shown as small mono meta below.
+      if (t.sampleSize) {
+        const scale = document.createElement('div');
+        scale.style.cssText = 'font-family:' + MONO + '; font-size: 10px; color:' + DP.meta + '; margin-top: 2px;';
+        scale.textContent = t.sampleSize;
+        tile.appendChild(scale);
+      }
+
+      const family = document.createElement('div');
+      family.className = 't-family';
+      family.textContent = t.family || t.name || '';
+      tile.appendChild(family);
+
+      if (t.purpose) {
+        const p = document.createElement('div');
+        p.className = 't-purpose';
+        p.textContent = t.purpose;
+        tile.appendChild(p);
+      }
+      body.appendChild(tile);
+    }
+  }
+
+  function fontStack(t) {
+    const fam = t.family || '';
+    const fb = t.fallback || '';
+    if (fam && /[,\s]/.test(fam) && !fam.includes("'") && !fam.includes('"')) {
+      return `"${fam}", ${fb}`;
+    }
+    return fam && fb ? `"${fam}", ${fb}` : (fam || fb);
+  }
+
+  function renderRadiiTile(body, radii) {
+    const tile = document.createElement('div');
+    tile.className = 'tile';
+    const meta = document.createElement('div');
+    meta.className = 'tile-meta';
+    meta.innerHTML = `<span class="name">Corner Radii</span><span>${radii.length}</span>`;
+    tile.appendChild(meta);
+
+    const strip = document.createElement('div');
+    strip.className = 'r-strip';
+    for (const r of radii) {
+      const item = document.createElement('div');
+      item.className = 'r-item';
+      const s = document.createElement('div');
+      s.className = 'r-sample';
+      s.style.borderRadius = r.value || '0';
+      item.appendChild(s);
+      const lbl = document.createElement('div');
+      lbl.className = 'r-label';
+      lbl.textContent = r.name || '';
+      item.appendChild(lbl);
+      const val = document.createElement('div');
+      val.className = 'r-val';
+      val.textContent = r.value || '';
+      item.appendChild(val);
+      strip.appendChild(item);
+    }
+    tile.appendChild(strip);
+    body.appendChild(tile);
+  }
+
+  function renderShadowTiles(body, shadows) {
+    for (const sh of shadows) {
+      const tile = document.createElement('div');
+      tile.className = 'tile s-tile';
+
+      const meta = document.createElement('div');
+      meta.className = 'tile-meta';
+      meta.innerHTML = `<span class="name">${escapeHtml(sh.name || 'Shadow')}</span><span>Elevation</span>`;
+      tile.appendChild(meta);
+
+      const surface = document.createElement('div');
+      surface.className = 's-surface';
+      surface.style.boxShadow = sh.value || 'none';
+      tile.appendChild(surface);
+
+      const val = document.createElement('div');
+      val.className = 's-value';
+      val.textContent = sh.value || '';
+      tile.appendChild(val);
+
+      if (sh.purpose) {
+        const p = document.createElement('div');
+        p.className = 's-purpose';
+        p.textContent = sh.purpose;
+        tile.appendChild(p);
+      }
+      body.appendChild(tile);
+    }
+  }
+
+  function renderComponentTiles(body, components) {
+    // Group consecutive components that share a kind into one tile. This avoids
+    // a pile of one-component tiles (e.g., three button variants = three tiles)
+    // and reads more like a proper category.
+    const groups = groupByKind(components);
+
+    for (const group of groups) {
+      const tile = document.createElement('div');
+      tile.className = 'tile cmp-tile';
+
+      const meta = document.createElement('div');
+      meta.className = 'tile-meta';
+      const groupTitle = group.length === 1
+        ? (group[0].name || group[0].kind || 'Component')
+        : titleForKind(group[0].kind, group.length);
+      meta.innerHTML = `<span class="name">${escapeHtml(groupTitle)}</span><span class="cmp-kind">${escapeHtml(group[0].kind || '')}</span>`;
+      tile.appendChild(meta);
+
+      for (const c of group) {
+        const stage = document.createElement('div');
+        stage.className = 'cmp-stage';
+
+        // Render the component in its own shadow root so its CSS can't bleed.
+        const host = document.createElement('div');
+        const sub = host.attachShadow({ mode: 'open' });
+        const style = document.createElement('style');
+        style.textContent = c.css || '';
+        sub.appendChild(style);
+        const container = document.createElement('div');
+        container.innerHTML = c.html || '';
+        sub.appendChild(container);
+        stage.appendChild(host);
+
+        // Show component name as a sublabel only when the tile groups >1 item,
+        // or when the component's display name differs from its kind.
+        const showSublabel = group.length > 1;
+        if (showSublabel) {
+          const lbl = document.createElement('div');
+          lbl.className = 'cmp-sublabel';
+          lbl.textContent = c.name || '';
+          stage.appendChild(lbl);
+        }
+        tile.appendChild(stage);
+      }
+
+      // Single shared description if all items carry the same one; otherwise
+      // skip — per-item descriptions clutter a grouped tile.
+      if (group.length === 1 && group[0].description) {
+        const d = document.createElement('div');
+        d.className = 'c-desc';
+        d.textContent = group[0].description;
+        tile.appendChild(d);
+      }
+      body.appendChild(tile);
+    }
+  }
+
+  function groupByKind(components) {
+    const groups = [];
+    for (const c of components) {
+      const last = groups[groups.length - 1];
+      if (last && last[0].kind && c.kind === last[0].kind) {
+        last.push(c);
+      } else {
+        groups.push([c]);
+      }
+    }
+    return groups;
+  }
+
+  function titleForKind(kind, count) {
+    const labels = {
+      button: 'Buttons',
+      input: 'Inputs',
+      nav: 'Navigation',
+      chip: 'Chips',
+      card: 'Cards',
+      custom: 'Components',
+    };
+    return labels[kind] || (kind ? kind.charAt(0).toUpperCase() + kind.slice(1) + 's' : 'Components');
+  }
+
+  // --- Collapsibles ---------------------------------------------------------
+
+  function buildCollapsible(key, label, count) {
+    const wrap = document.createElement('div');
+    wrap.className = 'coll';
+    wrap.setAttribute('data-open', designState.collapsed[key] ? 'false' : 'true');
+
+    const head = document.createElement('button');
+    head.className = 'coll-head';
+    head.innerHTML = `
+      <svg class="coll-chev" viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M4 2.5L8 6 4 9.5"/></svg>
+      <span>${escapeHtml(label)}</span>
+      ${count != null ? `<span class="coll-count">${escapeHtml(String(count))}</span>` : ''}
+    `;
+    head.addEventListener('click', () => {
+      designState.collapsed[key] = !designState.collapsed[key];
+      saveDesignPrefs();
+      renderDesignBody();
+    });
+    wrap.appendChild(head);
+
+    const body = document.createElement('div');
+    body.className = 'coll-body';
+    wrap.appendChild(body);
+    return { wrap, body };
+  }
+
+  function renderRulesCollapsible(rules) {
+    const { wrap, body } = buildCollapsible('rules', 'Named Rules', rules.length);
+    for (const r of rules) {
+      const card = document.createElement('div');
+      card.className = 'rule-card';
+      const name = document.createElement('div');
+      name.className = 'name';
+      name.innerHTML = `${escapeHtml(r.name)}${r.section ? `<span class="section">${escapeHtml(r.section)}</span>` : ''}`;
+      card.appendChild(name);
+      const b = document.createElement('div');
+      b.className = 'body';
+      b.textContent = r.body || '';
+      card.appendChild(b);
+      body.appendChild(card);
+    }
+    return wrap;
+  }
+
+  function renderDosDontsCollapsible(n) {
+    const total = (n.dos?.length || 0) + (n.donts?.length || 0);
+    const { wrap, body } = buildCollapsible('dosdonts', "Do's and Don'ts", total);
+    const grid = document.createElement('div');
+    grid.className = 'dos';
+    for (const d of n.dos || []) {
+      const el = document.createElement('div');
+      el.className = 'do';
+      el.innerHTML = inlineMd(d);
+      grid.appendChild(el);
+    }
+    for (const d of n.donts || []) {
+      const el = document.createElement('div');
+      el.className = 'dont';
+      el.innerHTML = inlineMd(d);
+      grid.appendChild(el);
+    }
+    body.appendChild(grid);
+    return wrap;
+  }
+
+  function renderOverviewCollapsible(n) {
+    const { wrap, body } = buildCollapsible('overview', 'Overview', null);
+    const ov = document.createElement('div');
+    ov.className = 'overview-body';
+    if (n.northStar) {
+      const star = document.createElement('span');
+      star.className = 'north-star';
+      star.textContent = '“' + n.northStar + '”';
+      ov.appendChild(star);
+    }
+    if (n.overview) {
+      const p = document.createElement('p');
+      p.innerHTML = inlineMd(n.overview);
+      ov.appendChild(p);
+    }
+    if (n.keyCharacteristics?.length) {
+      const ul = document.createElement('ul');
+      ul.innerHTML = n.keyCharacteristics.map((k) => `<li>${inlineMd(k)}</li>`).join('');
+      ov.appendChild(ul);
+    }
+    body.appendChild(ov);
+    return wrap;
+  }
+
+  function cssSafe(v) {
+    // Strip anything outside valid CSS value chars to prevent injection via
+    // .impeccable/design.json values rendered into inline style strings.
+    return String(v).replace(/[<>"'`\n]/g, '');
+  }
+
+  // --- Raw tab: minimal markdown renderer (subset) --------------------------
+
+  function renderRawTab(body, md) {
+    const wrap = document.createElement('div');
+    wrap.className = 'md';
+    wrap.innerHTML = renderMarkdown(md);
+    body.appendChild(wrap);
+  }
+
+  function renderMarkdown(md) {
+    const lines = md.split(/\r?\n/);
+    const out = [];
+    let i = 0;
+    let inCode = false;
+    let codeBuf = [];
+    let paraBuf = [];
+    let listBuf = [];  // array of { indent, html }
+    let listType = null; // 'ul' | 'ol'
+
+    const flushPara = () => {
+      if (paraBuf.length) {
+        out.push(`<p>${inlineMd(paraBuf.join(' '))}</p>`);
+        paraBuf = [];
+      }
+    };
+    const flushList = () => {
+      if (listBuf.length) {
+        out.push(buildListHtml(listBuf, listType));
+        listBuf = [];
+        listType = null;
+      }
+    };
+    const flushAll = () => { flushPara(); flushList(); };
+
+    for (; i < lines.length; i++) {
+      const line = lines[i];
+
+      // Code fence
+      const fence = line.match(/^```(\w*)\s*$/);
+      if (fence) {
+        if (!inCode) { flushAll(); inCode = true; codeBuf = []; }
+        else {
+          out.push(`<pre><code>${escapeHtml(codeBuf.join('\n'))}</code></pre>`);
+          inCode = false;
+        }
+        continue;
+      }
+      if (inCode) { codeBuf.push(line); continue; }
+
+      if (line.trim() === '') { flushAll(); continue; }
+
+      const hr = line.match(/^\s*(?:---+|\*\*\*+)\s*$/);
+      if (hr) { flushAll(); out.push('<hr />'); continue; }
+
+      const heading = line.match(/^(#{1,4})\s+(.+)$/);
+      if (heading) {
+        flushAll();
+        const lvl = heading[1].length;
+        out.push(`<h${lvl}>${inlineMd(heading[2])}</h${lvl}>`);
+        continue;
+      }
+
+      const bullet = line.match(/^(\s*)([-*])\s+(.+)$/);
+      const ordered = line.match(/^(\s*)(\d+)\.\s+(.+)$/);
+      if (bullet || ordered) {
+        flushPara();
+        const m = bullet || ordered;
+        const indent = Math.floor(m[1].length / 2);
+        const t = bullet ? 'ul' : 'ol';
+        if (listType && listType !== t) flushList();
+        listType = t;
+        listBuf.push({ indent, html: inlineMd(m[3]) });
+        continue;
+      }
+
+      paraBuf.push(line);
+    }
+    flushAll();
+    if (inCode && codeBuf.length) {
+      out.push(`<pre><code>${escapeHtml(codeBuf.join('\n'))}</code></pre>`);
+    }
+    return out.join('\n');
+  }
+
+  function buildListHtml(items, type) {
+    // Nest by indent (one level deep is plenty for DESIGN.md).
+    let html = `<${type}>`;
+    let lastIndent = 0;
+    for (const it of items) {
+      if (it.indent > lastIndent) html += `<${type}>`;
+      else if (it.indent < lastIndent) html += `</${type}>`.repeat(lastIndent - it.indent);
+      html += `<li>${it.html}</li>`;
+      lastIndent = it.indent;
+    }
+    html += `</${type}>`.repeat(lastIndent + 1);
+    return html;
+  }
+
+  function inlineMd(text) {
+    // Order matters: escape first, then re-inject tags.
+    let s = escapeHtml(text);
+    // Code spans
+    s = s.replace(/`([^`]+)`/g, (_, code) => `<code>${code}</code>`);
+    // Links [text](url)
+    s = s.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, t, u) => `<a href="${u}" target="_blank" rel="noopener noreferrer">${t}</a>`);
+    // Bold
+    s = s.replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>');
+    // Italic (only single *…*, skip if inside bold already handled)
+    s = s.replace(/(^|[^*])\*([^*\n]+)\*(?!\*)/g, '$1<em>$2</em>');
+    return s;
+  }
+
+  function highlightBold(text) {
+    return inlineMd(text);
+  }
+
+  function escapeHtml(s) {
+    return String(s)
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
+  }
+
+  function copyToClipboard(text) {
+    if (!text) return;
+    try {
+      navigator.clipboard.writeText(text);
+      showToast('Copied: ' + text);
+    } catch { /* ignore */ }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Init
+  // ---------------------------------------------------------------------------
+
+  function init() {
+    try { history.scrollRestoration = 'manual'; } catch {}
+    initHighlight();
+    initAnnotOverlay();
+    initBar();
+    initActionPicker();
+    initParamsPanel();
+    initGlobalBar();
+    initDesignPanel();
+    document.addEventListener('mousemove', handleMouseMove, true);
+    document.addEventListener('click', handleClick, true);
+    document.addEventListener('keydown', handleKeyDown, true);
+    connectSSE();
+
+    // Check for an active session to resume (variant wrapper already in DOM after HMR)
+    if (!resumeSession()) {
+      console.log('[impeccable] Live variant mode ready. Hover over elements to pick one.');
+      // SvelteKit (and any framework that hydrates after HTML parse) may add
+      // the variant wrapper AFTER init runs. Watch for it and retry resume
+      // once it appears. Disconnect on first hit.
+      const scout = new MutationObserver(() => {
+        const wrapper = document.querySelector('[data-impeccable-variants]');
+        if (!wrapper) return;
+        scout.disconnect();
+        if (resumeSession()) {
+          console.log('[impeccable] Resumed deferred session ' + currentSessionId + ' (post-hydration).');
+        }
+      });
+      scout.observe(document.body, { childList: true, subtree: true });
+    } else {
+      console.log('[impeccable] Resumed active variant session ' + currentSessionId + ' (' + arrivedVariants + '/' + expectedVariants + ' variants).');
+    }
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', init);
+  } else {
+    init();
+  }
+})();
diff --git a/.agents/skills/impeccable/scripts/live-complete.mjs b/.agents/skills/impeccable/scripts/live-complete.mjs
new file mode 100644
index 00000000..78155af8
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-complete.mjs
@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+/**
+ * Canonical durable completion acknowledgement for Impeccable live sessions.
+ */
+
+import { createLiveSessionStore } from './live-session-store.mjs';
+import { readLiveServerInfo } from './impeccable-paths.mjs';
+
+function parseArgs(argv) {
+  const out = { status: 'complete' };
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === '--id') out.id = argv[++i];
+    else if (arg.startsWith('--id=')) out.id = arg.slice('--id='.length);
+    else if (arg === '--discarded' || arg === '--discard') out.status = 'discarded';
+    else if (arg === '--error') { out.status = 'agent_error'; out.message = argv[++i] || 'unknown error'; }
+    else if (arg.startsWith('--error=')) { out.status = 'agent_error'; out.message = arg.slice('--error='.length); }
+    else if (arg === '--help' || arg === '-h') out.help = true;
+  }
+  return out;
+}
+
+export async function completeCli() {
+  const args = parseArgs(process.argv.slice(2));
+  if (args.help || !args.id) {
+    console.log(`Usage: node live-complete.mjs --id SESSION_ID [--discarded|--error MESSAGE]\n\nAppend the final durable session acknowledgement. Use after accept/discard cleanup is verified.`);
+    process.exit(args.help ? 0 : 1);
+  }
+
+  const serverInfo = readServerInfo();
+  const serverResult = serverInfo ? await completeThroughServer(serverInfo, args) : null;
+  if (serverResult?.ok) {
+    const store = createLiveSessionStore({ cwd: process.cwd(), sessionId: args.id });
+    const snapshot = store.getSnapshot(args.id, { includeCompleted: true });
+    console.log(JSON.stringify({ ok: true, id: args.id, phase: snapshot?.phase || args.status, snapshot }, null, 2));
+    return;
+  }
+
+  const store = createLiveSessionStore({ cwd: process.cwd(), sessionId: args.id });
+  const event = args.status === 'discarded'
+    ? { type: 'discarded', id: args.id }
+    : args.status === 'agent_error'
+      ? { type: 'agent_error', id: args.id, message: args.message || 'unknown error' }
+      : { type: 'complete', id: args.id };
+  const snapshot = store.appendEvent(event);
+  console.log(JSON.stringify({ ok: true, id: args.id, phase: snapshot.phase, snapshot }, null, 2));
+}
+
+function readServerInfo() {
+  return readLiveServerInfo(process.cwd())?.info || null;
+}
+
+async function completeThroughServer(info, args) {
+  const type = args.status === 'discarded'
+    ? 'discarded'
+    : args.status === 'agent_error'
+      ? 'error'
+      : 'complete';
+  try {
+    const res = await fetch(`http://localhost:${info.port}/poll`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ token: info.token, id: args.id, type, message: args.message }),
+    });
+    if (!res.ok) return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
+const _running = process.argv[1];
+if (_running?.endsWith('live-complete.mjs') || _running?.endsWith('live-complete.mjs/')) {
+  completeCli();
+}
diff --git a/.agents/skills/impeccable/scripts/live-completion.mjs b/.agents/skills/impeccable/scripts/live-completion.mjs
new file mode 100644
index 00000000..86b637ff
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-completion.mjs
@@ -0,0 +1,18 @@
+export function completionTypeForAcceptResult(eventType, acceptResult) {
+  if (eventType === 'discard') return acceptResult?.handled === true ? 'discarded' : 'error';
+  if (acceptResult?.handled === true && acceptResult?.carbonize === true) return 'agent_done';
+  if (acceptResult?.handled === true) return 'complete';
+  if (acceptResult?.mode === 'error') return 'error';
+  return 'agent_done';
+}
+
+export function completionAckForAcceptResult(eventId, completionType, acceptResult) {
+  const ack = { ok: true, type: completionType };
+  if (acceptResult?.handled === true && acceptResult?.carbonize === true) {
+    ack.final = false;
+    ack.requiresComplete = true;
+    ack.nextCommand = `live-complete.mjs --id ${eventId}`;
+    ack.message = 'Carbonize cleanup must be verified, then the session must be completed explicitly before polling again.';
+  }
+  return ack;
+}
diff --git a/.agents/skills/impeccable/scripts/live-inject.mjs b/.agents/skills/impeccable/scripts/live-inject.mjs
new file mode 100644
index 00000000..555c3a36
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-inject.mjs
@@ -0,0 +1,446 @@
+/**
+ * CLI helper: insert/remove the live variant mode script tag in the project's
+ * main HTML entry point.
+ *
+ * On first live run, the agent generates `.impeccable/live/config.json`
+ * with the project's insertion target (framework-specific). On
+ * every subsequent run, this script handles insert/remove deterministically
+ * with zero LLM involvement.
+ *
+ * Usage:
+ *   node live-inject.mjs --port PORT   # Insert the live script tag
+ *   node live-inject.mjs --remove      # Remove the live script tag
+ *   node live-inject.mjs --check       # Check whether live config exists
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { resolveLiveConfigPath } from './impeccable-paths.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const CONFIG_PATH = resolveLiveConfigPath({ cwd: process.cwd(), scriptsDir: __dirname });
+const MARKER_OPEN_TEXT = 'impeccable-live-start';
+const MARKER_CLOSE_TEXT = 'impeccable-live-end';
+
+/**
+ * Hard-excluded directory patterns. These are NEVER user-facing pages and
+ * matching them would silently inject tracking scripts into third-party
+ * code. The user cannot turn these off via config — they are the floor.
+ */
+const HARD_EXCLUDES = [
+  '**/node_modules/**',
+  '**/.git/**',
+];
+
+export async function injectCli() {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`Usage: node live-inject.mjs [options]
+
+Insert or remove the live mode script tag in the project's HTML entry point.
+Reads configuration from .impeccable/live/config.json.
+
+Modes:
+  --port PORT   Insert script tag pointing at http://localhost:PORT/live.js
+  --remove      Remove the script tag (if present)
+  --check       Print whether .impeccable/live/config.json exists and its content
+
+Output (JSON):
+  { ok, file, inserted|removed, config? }`);
+    process.exit(0);
+  }
+
+  if (args.includes('--check')) {
+    if (!fs.existsSync(CONFIG_PATH)) {
+      console.log(JSON.stringify({ ok: false, error: 'config_missing', path: CONFIG_PATH }));
+      process.exit(0);
+    }
+    let cfg;
+    try {
+      cfg = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
+    } catch (err) {
+      console.log(JSON.stringify({ ok: false, error: 'config_invalid', message: err.message, path: CONFIG_PATH }));
+      return;
+    }
+    try {
+      validateConfig(cfg);
+    } catch (err) {
+      console.log(JSON.stringify({ ok: false, error: 'config_invalid', message: err.message, path: CONFIG_PATH }));
+      return;
+    }
+    console.log(JSON.stringify({ ok: true, config: cfg, path: CONFIG_PATH }));
+    return;
+  }
+
+  // Load config
+  if (!fs.existsSync(CONFIG_PATH)) {
+    console.error(JSON.stringify({ ok: false, error: 'config_missing', path: CONFIG_PATH }));
+    process.exit(1);
+  }
+  const config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
+  validateConfig(config);
+
+  const resolvedFiles = resolveFiles(process.cwd(), config);
+
+  if (args.includes('--remove')) {
+    const results = resolvedFiles.map((relFile) => {
+      const absFile = path.resolve(process.cwd(), relFile);
+      if (!fs.existsSync(absFile)) return { file: relFile, error: 'file_not_found' };
+      const content = fs.readFileSync(absFile, 'utf-8');
+      const detagged = removeTag(content, config.commentSyntax);
+      const updated = revertCspMeta(detagged);
+      if (updated === content) return { file: relFile, removed: false, note: 'no tag present' };
+      fs.writeFileSync(absFile, updated, 'utf-8');
+      return {
+        file: relFile,
+        removed: detagged !== content,
+        cspReverted: updated !== detagged,
+      };
+    });
+    console.log(JSON.stringify({ ok: true, results }));
+    return;
+  }
+
+  // Insert mode — need --port
+  const portIdx = args.indexOf('--port');
+  const port = portIdx !== -1 ? parseInt(args[portIdx + 1], 10) : NaN;
+  if (!Number.isFinite(port)) {
+    console.error(JSON.stringify({ ok: false, error: 'missing_port' }));
+    process.exit(1);
+  }
+
+  const results = resolvedFiles.map((relFile) => {
+    const absFile = path.resolve(process.cwd(), relFile);
+    if (!fs.existsSync(absFile)) return { file: relFile, error: 'file_not_found' };
+    const content = fs.readFileSync(absFile, 'utf-8');
+    const withoutOld = revertCspMeta(removeTag(content, config.commentSyntax));
+    const withTag = insertTag(withoutOld, config, port);
+    if (withTag === withoutOld) {
+      return { file: relFile, error: 'insertion_point_not_found', anchor: config.insertBefore || config.insertAfter };
+    }
+    const updated = patchCspMeta(withTag, port);
+    fs.writeFileSync(absFile, updated, 'utf-8');
+    return {
+      file: relFile,
+      inserted: true,
+      cspPatched: updated !== withTag,
+    };
+  });
+  const anyInserted = results.some((r) => r.inserted);
+  console.log(JSON.stringify({ ok: anyInserted, port, results }));
+  if (!anyInserted) process.exit(1);
+}
+
+/**
+ * Expand config.files (which may contain glob patterns) into a literal list
+ * of existing file paths relative to rootDir. Literal entries pass through;
+ * glob patterns are expanded via fs.globSync. HARD_EXCLUDES and config.exclude
+ * are applied as filters. Duplicates are removed. Order is preserved by
+ * first appearance.
+ */
+export function resolveFiles(rootDir, config) {
+  const patterns = config.files;
+  const userExcludes = Array.isArray(config.exclude) ? config.exclude : [];
+  const allExcludes = [...HARD_EXCLUDES, ...userExcludes];
+  const excludeRegexes = allExcludes.map(globToRegex);
+
+  const isExcluded = (relPath) => excludeRegexes.some((re) => re.test(relPath));
+  const isGlob = (s) => /[*?[]/.test(s);
+
+  const seen = new Set();
+  const out = [];
+  for (const pat of patterns) {
+    if (!isGlob(pat)) {
+      // Literal path — include even if it doesn't exist yet; the caller
+      // reports file_not_found per-entry. Exclude list doesn't apply to
+      // explicit literal entries (user named it on purpose).
+      if (!seen.has(pat)) {
+        seen.add(pat);
+        out.push(pat);
+      }
+      continue;
+    }
+    let matches;
+    try {
+      matches = fs.globSync(pat, { cwd: rootDir, withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const ent of matches) {
+      if (!ent.isFile || !ent.isFile()) continue;
+      const abs = path.join(ent.parentPath || ent.path || rootDir, ent.name);
+      const rel = path.relative(rootDir, abs).split(path.sep).join('/');
+      if (isExcluded(rel)) continue;
+      if (seen.has(rel)) continue;
+      seen.add(rel);
+      out.push(rel);
+    }
+  }
+  return out;
+}
+
+/**
+ * Convert a glob pattern to a RegExp. Supports:
+ *   **  → any number of path segments (including zero)
+ *   *   → any chars except `/`
+ *   ?   → any single char except `/`
+ * Paths are normalized to forward slashes before matching.
+ */
+function globToRegex(pattern) {
+  let re = '';
+  let i = 0;
+  while (i < pattern.length) {
+    const c = pattern[i];
+    if (c === '*') {
+      if (pattern[i + 1] === '*') {
+        // ** — any number of segments, including zero. Handle the common
+        // **/ and /** forms so `a/**/b` matches `a/b` as well as `a/x/y/b`.
+        if (pattern[i + 2] === '/') {
+          re += '(?:.*/)?';
+          i += 3;
+        } else {
+          re += '.*';
+          i += 2;
+        }
+      } else {
+        re += '[^/]*';
+        i += 1;
+      }
+    } else if (c === '?') {
+      re += '[^/]';
+      i += 1;
+    } else if (/[.+^${}()|[\]\\]/.test(c)) {
+      re += '\\' + c;
+      i += 1;
+    } else {
+      re += c;
+      i += 1;
+    }
+  }
+  return new RegExp('^' + re + '$');
+}
+
+// ---------------------------------------------------------------------------
+// Core operations
+// ---------------------------------------------------------------------------
+
+function validateConfig(cfg) {
+  if (!cfg || typeof cfg !== 'object') throw new Error('config.json must be an object');
+  if (!Array.isArray(cfg.files) || cfg.files.length === 0) {
+    throw new Error('config.files (non-empty string array) required');
+  }
+  if (!cfg.files.every((f) => typeof f === 'string' && f.length > 0)) {
+    throw new Error('config.files must contain only non-empty strings');
+  }
+  if (cfg.exclude !== undefined) {
+    if (!Array.isArray(cfg.exclude)) {
+      throw new Error('config.exclude, if present, must be a string array');
+    }
+    if (!cfg.exclude.every((f) => typeof f === 'string' && f.length > 0)) {
+      throw new Error('config.exclude must contain only non-empty strings');
+    }
+  }
+  if (typeof cfg.insertBefore !== 'string' && typeof cfg.insertAfter !== 'string') {
+    throw new Error('config.insertBefore or config.insertAfter (string) required');
+  }
+  if (cfg.commentSyntax !== 'html' && cfg.commentSyntax !== 'jsx') {
+    throw new Error("config.commentSyntax must be 'html' or 'jsx'");
+  }
+  if (cfg.cspChecked !== undefined && typeof cfg.cspChecked !== 'boolean') {
+    throw new Error("config.cspChecked, if present, must be a boolean");
+  }
+}
+
+function commentOpen(syntax) { return syntax === 'jsx' ? '{/*' : '<!--'; }
+function commentClose(syntax) { return syntax === 'jsx' ? '*/}' : '-->'; }
+
+function buildTagBlock(syntax, port) {
+  const open = commentOpen(syntax);
+  const close = commentClose(syntax);
+  return (
+    open + ' ' + MARKER_OPEN_TEXT + ' ' + close + '\n' +
+    '<script src="http://localhost:' + port + '/live.js"></script>\n' +
+    open + ' ' + MARKER_CLOSE_TEXT + ' ' + close + '\n'
+  );
+}
+
+function insertTag(content, config, port) {
+  const block = buildTagBlock(config.commentSyntax, port);
+  // insertBefore: match the LAST occurrence. Anchors like `</body>` naturally
+  // belong at the end, and the same literal can appear earlier in code blocks
+  // within rendered documentation pages.
+  if (config.insertBefore) {
+    const idx = content.lastIndexOf(config.insertBefore);
+    if (idx === -1) return content;
+    return content.slice(0, idx) + block + content.slice(idx);
+  }
+  // insertAfter: match the FIRST occurrence — typical anchors like `<head>` or
+  // `<body>` open near the top of the document.
+  const idx = content.indexOf(config.insertAfter);
+  if (idx === -1) return content;
+  const after = idx + config.insertAfter.length;
+  // Preserve a single trailing newline if the anchor didn't end with one
+  const prefix = content[after] === '\n' ? content.slice(0, after + 1) : content.slice(0, after) + '\n';
+  return prefix + block + content.slice(prefix.length);
+}
+
+/**
+ * Remove the live script block. Matches either HTML or JSX comment markers
+ * regardless of config (so stale tags from a wrong config can still be cleaned).
+ *
+ * Indent-preserving: captures any whitespace immediately preceding the opener
+ * marker and re-emits it in place of the removed block. `insertTag` inserted
+ * the block *after* the original line's indent and *before* the anchor (e.g.
+ * `</body>`), which moved the indent onto the opener line and left the anchor
+ * unindented. Replacing the whole block (plus its trailing newline) with just
+ * the captured indent hands the indent back to the anchor that follows.
+ */
+function removeTag(content, _syntax) {
+  const patterns = [
+    /([ \t]*)<!--\s*impeccable-live-start\s*-->[\s\S]*?<!--\s*impeccable-live-end\s*-->[ \t]*\n/,
+    /([ \t]*)\{\/\*\s*impeccable-live-start\s*\*\/\}[\s\S]*?\{\/\*\s*impeccable-live-end\s*\*\/\}[ \t]*\n/,
+  ];
+  for (const pat of patterns) {
+    const next = content.replace(pat, '$1');
+    if (next !== content) return next;
+  }
+  return content;
+}
+
+// ---------------------------------------------------------------------------
+// Content-Security-Policy meta-tag patcher
+//
+// When the user's HTML carries `<meta http-equiv="Content-Security-Policy">`,
+// the cross-origin load of /live.js (and the SSE/POST connection back to
+// localhost:PORT) is blocked unless the CSP explicitly allows that origin.
+//
+// On insert: append `http://localhost:PORT` to `script-src` and `connect-src`,
+// and stash the original `content` value in a `data-impeccable-csp-original`
+// attribute (base64) so revert is exact.
+//
+// On remove: detect the marker attribute, decode it, restore the original
+// content value verbatim, drop the marker.
+//
+// Header-based CSP (Next.js headers, Nuxt routeRules, SvelteKit kit.csp,
+// shared helpers) is NOT patched here — those need framework-specific config
+// edits and are handled via the existing detect-csp.mjs reference output.
+// Only the in-source meta-tag form gets the auto-patch.
+// ---------------------------------------------------------------------------
+
+const CSP_MARKER_ATTR = 'data-impeccable-csp-original';
+
+function findCspMetaTags(content) {
+  const out = [];
+  const tagRe = /<meta\s+([^>]*?)\/?>/gis;
+  let m;
+  while ((m = tagRe.exec(content)) !== null) {
+    const attrs = m[1];
+    if (!/(http-equiv|httpEquiv)\s*=\s*(['"])Content-Security-Policy\2/i.test(attrs)) continue;
+    out.push({ start: m.index, end: m.index + m[0].length, full: m[0], attrs });
+  }
+  return out;
+}
+
+function getAttr(attrs, name) {
+  const re = new RegExp(`\\b${name}\\s*=\\s*(['"])([\\s\\S]*?)\\1`, 'i');
+  const m = attrs.match(re);
+  return m ? { quote: m[1], value: m[2], full: m[0] } : null;
+}
+
+function appendOriginToDirective(csp, directive, origin) {
+  const re = new RegExp(`(^|;)(\\s*)(${directive})\\s+([^;]*)`, 'i');
+  const m = csp.match(re);
+  if (m) {
+    const tokens = m[4].trim().split(/\s+/);
+    if (tokens.includes(origin)) return csp;
+    return csp.replace(re, `${m[1]}${m[2]}${m[3]} ${[...tokens, origin].join(' ')}`);
+  }
+  // Directive missing — add it. Use 'self' + origin so we don't inadvertently
+  // narrow the policy compared to the default-src fallback (most users with
+  // an explicit CSP have 'self' there).
+  return csp.trim().replace(/;?\s*$/, '') + `; ${directive} 'self' ${origin}`;
+}
+
+export function patchCspMeta(content, port) {
+  const tags = findCspMetaTags(content);
+  if (tags.length === 0) return content;
+  const origin = `http://localhost:${port}`;
+
+  // Walk last-to-first so prior splices don't invalidate later indices.
+  let result = content;
+  for (let i = tags.length - 1; i >= 0; i--) {
+    const tag = tags[i];
+    const attrs = tag.attrs;
+    if (getAttr(attrs, CSP_MARKER_ATTR)) continue; // already patched
+    const contentAttr = getAttr(attrs, 'content');
+    if (!contentAttr) continue;
+
+    const original = contentAttr.value;
+    let patched = original;
+    patched = appendOriginToDirective(patched, 'script-src', origin);
+    patched = appendOriginToDirective(patched, 'connect-src', origin);
+    // The shader overlay during 'generating' creates a screenshot via
+    // URL.createObjectURL, producing a `blob:` URL — img-src 'self' rejects
+    // those. Add `blob:` so the overlay doesn't throw a CSP violation.
+    patched = appendOriginToDirective(patched, 'img-src', 'blob:');
+    if (patched === original) continue;
+
+    const newContentAttr = `content=${contentAttr.quote}${patched}${contentAttr.quote}`;
+    const marker = `${CSP_MARKER_ATTR}="${Buffer.from(original, 'utf-8').toString('base64')}"`;
+    // The tagRe captures any whitespace between the last attribute and the
+    // closing `/>` as part of `attrs`. Naively appending ` ${marker}` after
+    // a replace would land it BEFORE that trailing space, leaving a double
+    // space inside attrs and clobbering the space before `/>`. Split off
+    // the trailing whitespace, splice the marker into the attribute body,
+    // and re-append the original trailing whitespace so a self-closing
+    // `<meta … />` round-trips byte-for-byte.
+    const trailingWs = (attrs.match(/[ \t]*$/) || [''])[0];
+    const attrsBody = attrs.slice(0, attrs.length - trailingWs.length);
+    const newAttrs = attrsBody.replace(contentAttr.full, newContentAttr) + ' ' + marker + trailingWs;
+    const newTag = tag.full.replace(attrs, newAttrs);
+
+    result = result.slice(0, tag.start) + newTag + result.slice(tag.end);
+  }
+  return result;
+}
+
+export function revertCspMeta(content) {
+  const tags = findCspMetaTags(content);
+  if (tags.length === 0) return content;
+
+  let result = content;
+  for (let i = tags.length - 1; i >= 0; i--) {
+    const tag = tags[i];
+    const origAttr = getAttr(tag.attrs, CSP_MARKER_ATTR);
+    if (!origAttr) continue;
+    const contentAttr = getAttr(tag.attrs, 'content');
+    if (!contentAttr) continue;
+
+    let originalValue;
+    try { originalValue = Buffer.from(origAttr.value, 'base64').toString('utf-8'); }
+    catch { continue; }
+
+    const newContentAttr = `content=${contentAttr.quote}${originalValue}${contentAttr.quote}`;
+    let newAttrs = tag.attrs.replace(contentAttr.full, newContentAttr);
+    // Drop the marker attribute and any single space immediately preceding it.
+    newAttrs = newAttrs.replace(new RegExp(`\\s*${origAttr.full}`), '');
+    const newTag = tag.full.replace(tag.attrs, newAttrs);
+
+    result = result.slice(0, tag.start) + newTag + result.slice(tag.end);
+  }
+  return result;
+}
+
+// ---------------------------------------------------------------------------
+// Auto-execute
+// ---------------------------------------------------------------------------
+
+const _running = process.argv[1];
+if (_running?.endsWith('live-inject.mjs') || _running?.endsWith('live-inject.mjs/')) {
+  injectCli();
+}
+
+export { insertTag, removeTag, validateConfig, buildTagBlock };
+// patchCspMeta + revertCspMeta are exported above where they're defined.
diff --git a/.agents/skills/impeccable/scripts/live-poll.mjs b/.agents/skills/impeccable/scripts/live-poll.mjs
new file mode 100644
index 00000000..10d45249
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-poll.mjs
@@ -0,0 +1,200 @@
+/**
+ * CLI client for the live variant mode poll/reply protocol.
+ *
+ * Usage:
+ *   npx impeccable poll                         # Block until browser event, print JSON
+ *   npx impeccable poll --timeout=600000        # Custom timeout (ms); default is long-poll friendly
+ *   npx impeccable poll --reply <id> done       # Reply "done" to event <id>
+ *   npx impeccable poll --reply <id> error "msg" # Reply with error
+ */
+
+import { execFileSync } from 'node:child_process';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { completionAckForAcceptResult, completionTypeForAcceptResult } from './live-completion.mjs';
+import { readLiveServerInfo } from './impeccable-paths.mjs';
+
+// Node's built-in fetch (undici under the hood) enforces a 300s headers
+// timeout that can't be lowered per-request. We cap each request below
+// that ceiling and loop in `pollOnce` to synthesize a long poll without
+// depending on the standalone undici package.
+const PER_REQUEST_TIMEOUT_MS = 270_000;
+
+function readServerInfo() {
+  const record = readLiveServerInfo(process.cwd());
+  if (!record) {
+    console.error('No running live server found. Start one with: npx impeccable live');
+    process.exit(1);
+  }
+  return record.info;
+}
+
+export function buildPollReplyPayload(token, { id, type, message, file, data }) {
+  return { token, id, type, message, file, data };
+}
+
+async function postReply(base, token, reply) {
+  const res = await fetch(`${base}/poll`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(buildPollReplyPayload(token, reply)),
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({}));
+    throw new Error(body.error || res.statusText);
+  }
+}
+
+export async function pollCli() {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`Usage: impeccable poll [options]
+
+Wait for a browser event from the live variant server, or reply to one.
+
+Modes:
+  poll                             Block until a browser event arrives, print JSON
+  poll --reply <id> done           Reply "done" to event <id>
+  poll --reply <id> error "msg"    Reply with an error message
+
+Options:
+  --timeout=MS   Long-poll timeout in ms (default: 600000). Use the default unless the user asked to pause live; never use a short timeout to end the chat turn
+  --help         Show this help message`);
+    process.exit(0);
+  }
+
+  const info = readServerInfo();
+  const base = `http://localhost:${info.port}`;
+
+  // Reply mode: npx impeccable poll --reply <id> <status> [--file path] [message]
+  const replyIdx = args.indexOf('--reply');
+  if (replyIdx !== -1) {
+    const id = args[replyIdx + 1];
+    const status = args[replyIdx + 2] || 'done';
+    const fileIdx = args.indexOf('--file');
+    const filePath = fileIdx !== -1 && fileIdx + 1 < args.length ? args[fileIdx + 1] : undefined;
+    // Message is any remaining positional arg that isn't a flag
+    const message = args.find((a, i) => i > replyIdx + 2 && !a.startsWith('--') && i !== fileIdx + 1) || undefined;
+
+    if (!id) {
+      console.error('Usage: npx impeccable poll --reply <id> <status> [--file path] [message]');
+      process.exit(1);
+    }
+
+    try {
+      await postReply(base, info.token, { id, type: status, message, file: filePath });
+
+      // Success — silent exit (agent doesn't need output for replies)
+    } catch (err) {
+      if (err.cause?.code === 'ECONNREFUSED') {
+        console.error('Live server not running. Start one with: npx impeccable live');
+      } else {
+        console.error('Reply failed:', err.message);
+      }
+      process.exit(1);
+    }
+    return;
+  }
+
+  // Poll mode: block until browser event. Default 10 min. Node's built-in
+  // fetch enforces a 300s headers timeout, so we loop in slices under that
+  // ceiling and keep re-polling until we get a real event or the user's
+  // total timeout runs out.
+  const timeoutArg = args.find(a => a.startsWith('--timeout='));
+  const totalTimeout = timeoutArg ? parseInt(timeoutArg.split('=')[1], 10) : 600000;
+
+  const deadline = Date.now() + totalTimeout;
+  let event;
+  try {
+    while (true) {
+      const remaining = deadline - Date.now();
+      if (remaining <= 0) {
+        event = { type: 'timeout' };
+        break;
+      }
+      const slice = Math.min(remaining, PER_REQUEST_TIMEOUT_MS);
+      const res = await fetch(`${base}/poll?token=${info.token}&timeout=${slice}`);
+
+      if (res.status === 401) {
+        console.error('Authentication failed. The server token may have changed.');
+        console.error('Try restarting: npx impeccable live stop && npx impeccable live');
+        process.exit(1);
+      }
+
+      if (!res.ok) {
+        console.error(`Poll failed: ${res.status} ${res.statusText}`);
+        process.exit(1);
+      }
+
+      const next = await res.json();
+      // Server-side timeout means no browser event arrived in this slice.
+      // Loop and re-poll until we get a real event or we hit the user's
+      // total deadline.
+      if (next?.type === 'timeout' && Date.now() < deadline) continue;
+      event = next;
+      break;
+    }
+
+    // Auto-handle accept/discard via deterministic script
+    if (event.type === 'accept' || event.type === 'discard') {
+      const __dirname = path.dirname(fileURLToPath(import.meta.url));
+      const acceptScript = path.join(__dirname, 'live-accept.mjs');
+      const scriptArgs = event.type === 'discard'
+        ? ['--id', event.id, '--discard']
+        : ['--id', event.id, '--variant', event.variantId];
+      if (event.type === 'accept' && event.paramValues && Object.keys(event.paramValues).length > 0) {
+        scriptArgs.push('--param-values', JSON.stringify(event.paramValues));
+      }
+      try {
+        const out = execFileSync(
+          'node',
+          [acceptScript, ...scriptArgs],
+          { encoding: 'utf-8', cwd: process.cwd(), timeout: 30_000 }
+        );
+        event._acceptResult = JSON.parse(out.trim());
+      } catch (err) {
+        event._acceptResult = { handled: false, mode: 'error', error: err.message };
+      }
+
+      const completionType = completionTypeForAcceptResult(event.type, event._acceptResult);
+      try {
+        await postReply(base, info.token, {
+          id: event.id,
+          type: completionType,
+          message: event._acceptResult?.error,
+          file: event._acceptResult?.file,
+          data: event._acceptResult?.carbonize === true ? { carbonize: true } : undefined,
+        });
+      } catch (err) {
+        event._completionAck = { ok: false, error: err.message };
+      }
+      if (!event._completionAck) {
+        event._completionAck = completionAckForAcceptResult(event.id, completionType, event._acceptResult);
+      }
+    }
+
+    // Second signal path: stderr banner in case the agent parses stdout
+    // JSON but skips nested fields. One line is enough — the full checklist
+    // is in reference/live.md.
+    if (event._acceptResult?.carbonize === true) {
+      process.stderr.write('\n⚠ Carbonize cleanup REQUIRED before next poll. After cleanup, run live-complete.mjs --id ' + event.id + '. See reference/live.md "Required after accept".\n\n');
+    }
+
+    // Print the event as JSON — the agent reads this from stdout
+    console.log(JSON.stringify(event));
+  } catch (err) {
+    if (err.cause?.code === 'ECONNREFUSED') {
+      console.error('Live server not running. Start one with: npx impeccable live');
+    } else {
+      console.error('Poll failed:', err.message);
+    }
+    process.exit(1);
+  }
+}
+
+// Auto-execute when run directly
+const _running = process.argv[1];
+if (_running?.endsWith('live-poll.mjs') || _running?.endsWith('live-poll.mjs/')) {
+  pollCli();
+}
diff --git a/.agents/skills/impeccable/scripts/live-resume.mjs b/.agents/skills/impeccable/scripts/live-resume.mjs
new file mode 100644
index 00000000..a3465c9b
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-resume.mjs
@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+/**
+ * Recover the next agent action from the durable live-session journal.
+ */
+
+import { createLiveSessionStore } from './live-session-store.mjs';
+
+function parseArgs(argv) {
+  const out = { id: null };
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === '--id') out.id = argv[++i];
+    else if (arg.startsWith('--id=')) out.id = arg.slice('--id='.length);
+    else if (arg === '--help' || arg === '-h') out.help = true;
+  }
+  return out;
+}
+
+export async function resumeCli() {
+  const args = parseArgs(process.argv.slice(2));
+  if (args.help) {
+    console.log(`Usage: node live-resume.mjs [--id SESSION_ID]\n\nPrint the active durable session checkpoint and the next safe agent action.`);
+    return;
+  }
+
+  const store = createLiveSessionStore({ cwd: process.cwd(), sessionId: args.id || undefined });
+  const snapshot = args.id ? store.getSnapshot(args.id) : store.listActiveSessions()[0] || null;
+  if (!snapshot) {
+    console.log(JSON.stringify({ active: false, nextAction: 'No active durable live session found.' }, null, 2));
+    return;
+  }
+
+  const pending = snapshot.pendingEvent || null;
+  const nextAction = pending
+    ? `Run live-poll.mjs, handle ${pending.type} ${pending.id}, then acknowledge with live-poll.mjs --reply ${pending.id} done.`
+    : snapshot.phase === 'carbonize_required'
+      ? `Finish carbonize cleanup${snapshot.sourceFile ? ` in ${snapshot.sourceFile}` : ''}, then run live-complete.mjs --id ${snapshot.id}.`
+      : snapshot.phase === 'accept_requested'
+        ? `Run live-complete.mjs --id ${snapshot.id} after verifying the accepted variant is written.`
+        : `Inspect ${snapshot.id}; no pending agent event is currently queued.`;
+
+  console.log(JSON.stringify({ active: true, snapshot, pendingEvent: pending, nextAction }, null, 2));
+}
+
+const _running = process.argv[1];
+if (_running?.endsWith('live-resume.mjs') || _running?.endsWith('live-resume.mjs/')) {
+  resumeCli();
+}
diff --git a/.agents/skills/impeccable/scripts/live-server.mjs b/.agents/skills/impeccable/scripts/live-server.mjs
new file mode 100644
index 00000000..53d8f21c
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-server.mjs
@@ -0,0 +1,836 @@
+#!/usr/bin/env node
+/**
+ * Live variant mode server (self-contained, zero dependencies).
+ *
+ * Serves the browser script (/live.js), the detection overlay (/detect.js),
+ * uses Server-Sent Events (SSE) for server→browser push, and HTTP POST for
+ * browser→server events. Agent communicates via HTTP long-poll (/poll).
+ *
+ * Usage:
+ *   node <scripts_path>/live-server.mjs              # start
+ *   node <scripts_path>/live-server.mjs stop         # stop + remove injected live.js tag
+ *   node <scripts_path>/live-server.mjs stop --keep-inject   # stop only
+ *   node <scripts_path>/live-server.mjs --help
+ */
+
+import http from 'node:http';
+import { randomUUID } from 'node:crypto';
+import { spawn, execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import net from 'node:net';
+import { fileURLToPath } from 'node:url';
+import { parseDesignMd } from './design-parser.mjs';
+import { resolveContextDir } from './load-context.mjs';
+import { createLiveSessionStore } from './live-session-store.mjs';
+import {
+  getDesignSidecarPath,
+  getLiveAnnotationsDir,
+  readLiveServerInfo,
+  removeLiveServerInfo,
+  resolveDesignSidecarPath,
+  writeLiveServerInfo,
+} from './impeccable-paths.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// PRODUCT.md / DESIGN.md live wherever load-context.mjs resolves. The generated
+// DESIGN sidecar is project-local at .impeccable/design.json, with legacy
+// DESIGN.json fallback for existing projects.
+const CONTEXT_DIR = resolveContextDir(process.cwd());
+const DEFAULT_POLL_TIMEOUT = 600_000;   // 10 min — agent re-polls on timeout anyway
+const SSE_HEARTBEAT_INTERVAL = 30_000;  // keepalive ping every 30s
+
+// ---------------------------------------------------------------------------
+// Port detection
+// ---------------------------------------------------------------------------
+
+async function findOpenPort(start = 8400) {
+  return new Promise((resolve) => {
+    const srv = net.createServer();
+    srv.listen(start, '127.0.0.1', () => {
+      const port = srv.address().port;
+      srv.close(() => resolve(port));
+    });
+    srv.on('error', () => resolve(findOpenPort(start + 1)));
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Session state
+// ---------------------------------------------------------------------------
+
+const state = {
+  token: null,
+  port: null,
+  sseClients: new Set(),   // SSE response objects (server→browser push)
+  pendingEvents: [],        // browser events waiting for agent ack ({ event, leaseUntil })
+  pendingPolls: [],         // agent poll callbacks waiting for browser events
+  exitTimer: null,
+  sessionDir: null,         // per-session tmp dir for annotation screenshots
+  sessionStore: null,
+  leaseTimer: null,
+};
+
+// Cap per-annotation upload size. A full 1920×1080 PNG is typically <1 MB;
+// cap at 10 MB to guard against runaway writes from a misbehaving client.
+const MAX_ANNOTATION_BYTES = 10 * 1024 * 1024;
+
+function enqueueEvent(event) {
+  if (!event || (event.id && state.pendingEvents.some((entry) => entry.event?.id === event.id && entry.event?.type === event.type))) return;
+  state.pendingEvents.push({ event, leaseUntil: 0 });
+  flushPendingPolls();
+}
+
+function restorePendingEventsFromStore() {
+  if (!state.sessionStore) return;
+  for (const snapshot of state.sessionStore.listActiveSessions()) {
+    if (snapshot.pendingEvent) enqueueEvent(snapshot.pendingEvent);
+  }
+}
+
+function findAvailablePendingEvent(now = Date.now()) {
+  return state.pendingEvents.find((entry) => !entry.leaseUntil || entry.leaseUntil <= now);
+}
+
+function leaseEvent(entry, leaseMs) {
+  if (!entry.event?.id) {
+    const idx = state.pendingEvents.indexOf(entry);
+    if (idx !== -1) state.pendingEvents.splice(idx, 1);
+    return entry.event;
+  }
+  entry.leaseUntil = Date.now() + leaseMs;
+  return entry.event;
+}
+
+function acknowledgePendingEvent(id) {
+  if (!id) return false;
+  const idx = state.pendingEvents.findIndex((entry) => entry.event?.id === id);
+  if (idx === -1) return false;
+  state.pendingEvents.splice(idx, 1);
+  scheduleLeaseFlush();
+  return true;
+}
+
+function scheduleLeaseFlush() {
+  if (state.leaseTimer) {
+    clearTimeout(state.leaseTimer);
+    state.leaseTimer = null;
+  }
+  if (state.pendingPolls.length === 0) return;
+  const now = Date.now();
+  const nextLeaseUntil = state.pendingEvents
+    .map((entry) => entry.leaseUntil || 0)
+    .filter((leaseUntil) => leaseUntil > now)
+    .sort((a, b) => a - b)[0];
+  if (!nextLeaseUntil) return;
+  state.leaseTimer = setTimeout(() => {
+    state.leaseTimer = null;
+    flushPendingPolls();
+  }, Math.max(0, nextLeaseUntil - now));
+}
+
+function flushPendingPolls() {
+  while (state.pendingPolls.length > 0) {
+    const entry = findAvailablePendingEvent();
+    if (!entry) {
+      scheduleLeaseFlush();
+      return;
+    }
+    const poll = state.pendingPolls.shift();
+    poll.resolve(leaseEvent(entry, poll.leaseMs));
+  }
+  scheduleLeaseFlush();
+}
+
+/** Push a message to all connected SSE clients. */
+function broadcast(msg) {
+  const data = 'data: ' + JSON.stringify(msg) + '\n\n';
+  for (const res of state.sseClients) {
+    try { res.write(data); } catch { /* client gone */ }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Load scripts
+// ---------------------------------------------------------------------------
+
+function loadBrowserScripts() {
+  // Detection script: look relative to the skill scripts dir, then fall back
+  // to the npm package location (src/detect-antipatterns-browser.js).
+  // This one IS cached — detect.js rarely changes during a session.
+  const detectPaths = [
+    path.join(__dirname, '..', '..', '..', '..', 'src', 'detect-antipatterns-browser.js'),
+    path.join(process.cwd(), 'node_modules', 'impeccable', 'src', 'detect-antipatterns-browser.js'),
+  ];
+  let detectScript = '';
+  for (const p of detectPaths) {
+    try { detectScript = fs.readFileSync(p, 'utf-8'); break; } catch { /* try next */ }
+  }
+
+  // live-browser.js: DO NOT cache. Return the path so the /live.js handler
+  // can re-read on every request. Editing the browser script during iteration
+  // should land on the next tab reload, not require a server restart.
+  const sessionPath = path.join(__dirname, 'live-browser-session.js');
+  const livePath = path.join(__dirname, 'live-browser.js');
+  for (const p of [sessionPath, livePath]) {
+    if (!fs.existsSync(p)) {
+      process.stderr.write('Error: live browser script not found at ' + p + '\n');
+      process.exit(1);
+    }
+  }
+
+  return { detectScript, sessionPath, livePath };
+}
+
+function hasProjectContext() {
+  // PRODUCT.md carries brand voice / anti-references — that's what determines
+  // whether variants are brand-aware. DESIGN.md (visual tokens) is a separate
+  // concern, surfaced by the design panel's own empty state. Legacy
+  // .impeccable.md is auto-migrated to PRODUCT.md by load-context.mjs.
+  try {
+    fs.accessSync(path.join(CONTEXT_DIR, 'PRODUCT.md'), fs.constants.R_OK);
+    return true;
+  } catch { return false; }
+}
+
+function statOrNull(filePath) {
+  try { return fs.statSync(filePath); } catch { return null; }
+}
+
+// ---------------------------------------------------------------------------
+// Validation (inline — no external import needed for self-contained script)
+// ---------------------------------------------------------------------------
+
+const VISUAL_ACTIONS = [
+  'impeccable', 'bolder', 'quieter', 'distill', 'polish', 'typeset',
+  'colorize', 'layout', 'adapt', 'animate', 'delight', 'overdrive',
+];
+
+// Browser generates ids via crypto.randomUUID().slice(0, 8) (8 hex chars)
+// and variantIds via String(small integer). Restrict to those shapes so
+// any value that reaches a downstream child_process or DOM selector is
+// inert by construction.
+const ID_PATTERN = /^[0-9a-f]{8}$/;
+const VARIANT_ID_PATTERN = /^[0-9]{1,3}$/;
+
+function isValidId(v) { return typeof v === 'string' && ID_PATTERN.test(v); }
+function isValidVariantId(v) { return typeof v === 'string' && VARIANT_ID_PATTERN.test(v); }
+
+function validateEvent(msg) {
+  if (!msg || typeof msg !== 'object' || !msg.type) return 'Missing or invalid message';
+  switch (msg.type) {
+    case 'generate':
+      if (!isValidId(msg.id)) return 'generate: missing or malformed id';
+      if (!msg.action || !VISUAL_ACTIONS.includes(msg.action)) return 'generate: invalid action';
+      if (!Number.isInteger(msg.count) || msg.count < 1 || msg.count > 8) return 'generate: count must be 1-8';
+      if (!msg.element || !msg.element.outerHTML) return 'generate: missing element context';
+      // Optional annotation fields (all-or-nothing: if any present, all must be well-formed).
+      if (msg.screenshotPath !== undefined && typeof msg.screenshotPath !== 'string') return 'generate: screenshotPath must be string';
+      if (msg.comments !== undefined && !Array.isArray(msg.comments)) return 'generate: comments must be array';
+      if (msg.strokes !== undefined && !Array.isArray(msg.strokes)) return 'generate: strokes must be array';
+      return null;
+    case 'accept':
+      if (!isValidId(msg.id)) return 'accept: missing or malformed id';
+      if (!isValidVariantId(msg.variantId)) return 'accept: missing or malformed variantId';
+      if (msg.paramValues !== undefined) {
+        if (typeof msg.paramValues !== 'object' || msg.paramValues === null || Array.isArray(msg.paramValues)) {
+          return 'accept: paramValues must be an object';
+        }
+      }
+      return null;
+    case 'discard':
+      return isValidId(msg.id) ? null : 'discard: missing or malformed id';
+    case 'checkpoint':
+      if (!isValidId(msg.id)) return 'checkpoint: missing or malformed id';
+      if (!Number.isInteger(msg.revision) || msg.revision < 0) return 'checkpoint: revision must be a non-negative integer';
+      if (msg.paramValues !== undefined && (typeof msg.paramValues !== 'object' || msg.paramValues === null || Array.isArray(msg.paramValues))) {
+        return 'checkpoint: paramValues must be an object';
+      }
+      return null;
+    case 'exit':
+      return null;
+    case 'prefetch':
+      if (!msg.pageUrl || typeof msg.pageUrl !== 'string') return 'prefetch: missing pageUrl';
+      return null;
+    default:
+      return 'Unknown event type: ' + msg.type;
+  }
+}
+
+// ---------------------------------------------------------------------------
+// HTTP request handler
+// ---------------------------------------------------------------------------
+
+function createRequestHandler({ detectScript, sessionPath, livePath }) {
+  return (req, res) => {
+    const url = new URL(req.url, `http://localhost:${state.port}`);
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+    if (req.method === 'OPTIONS') { res.writeHead(204); res.end(); return; }
+
+    const p = url.pathname;
+
+    // --- Scripts ---
+    if (p === '/live.js') {
+      // Re-read from disk each request so edits to live-browser.js land on
+      // the next tab reload. No-store headers prevent browser caching across
+      // sessions — during iteration, a cached old script silently breaks
+      // every subsequent session.
+      let sessionScript;
+      let liveScript;
+      try {
+        sessionScript = fs.readFileSync(sessionPath, 'utf-8');
+        liveScript = fs.readFileSync(livePath, 'utf-8');
+      } catch (err) {
+        res.writeHead(500, { 'Content-Type': 'text/plain' });
+        res.end('Error reading live browser scripts: ' + err.message);
+        return;
+      }
+      const body =
+        `window.__IMPECCABLE_TOKEN__ = '${state.token}';\n` +
+        `window.__IMPECCABLE_PORT__ = ${state.port};\n` +
+        sessionScript + '\n' +
+        liveScript;
+      res.writeHead(200, {
+        'Content-Type': 'application/javascript',
+        'Cache-Control': 'no-store, no-cache, must-revalidate, max-age=0',
+        'Pragma': 'no-cache',
+      });
+      res.end(body);
+      return;
+    }
+    if (p === '/detect.js' || p === '/') {
+      if (!detectScript) { res.writeHead(404); res.end('Not available'); return; }
+      res.writeHead(200, { 'Content-Type': 'application/javascript' });
+      res.end(detectScript);
+      return;
+    }
+
+    // --- Vendored modern-screenshot (UMD build) ---
+    // Lazy-loaded by live.js when the user clicks Go; exposes
+    // window.modernScreenshot.domToBlob(...) for capture.
+    if (p === '/modern-screenshot.js') {
+      const vendorPath = path.join(__dirname, 'modern-screenshot.umd.js');
+      try {
+        res.writeHead(200, {
+          'Content-Type': 'application/javascript',
+          'Cache-Control': 'public, max-age=31536000, immutable',
+        });
+        res.end(fs.readFileSync(vendorPath));
+      } catch {
+        res.writeHead(404); res.end('Vendor script not found');
+      }
+      return;
+    }
+
+    // --- Annotation upload (browser → server, raw PNG body) ---
+    // Client generates the eventId, POSTs the PNG, then POSTs the generate
+    // event with screenshotPath already set. Keeps bytes out of the SSE/poll
+    // bridge and preserves the "one shot from the user's POV" UX.
+    if (p === '/annotation' && req.method === 'POST') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401); res.end('Unauthorized'); return; }
+      const eventId = url.searchParams.get('eventId');
+      if (!eventId || !/^[A-Za-z0-9_-]{1,64}$/.test(eventId)) {
+        res.writeHead(400, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Invalid eventId' }));
+        return;
+      }
+      if ((req.headers['content-type'] || '').toLowerCase() !== 'image/png') {
+        res.writeHead(415, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Content-Type must be image/png' }));
+        return;
+      }
+      if (!state.sessionDir) {
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Session dir unavailable' }));
+        return;
+      }
+      const chunks = [];
+      let total = 0;
+      let aborted = false;
+      req.on('data', (c) => {
+        if (aborted) return;
+        total += c.length;
+        if (total > MAX_ANNOTATION_BYTES) {
+          aborted = true;
+          res.writeHead(413, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Payload too large' }));
+          req.destroy();
+          return;
+        }
+        chunks.push(c);
+      });
+      req.on('end', () => {
+        if (aborted) return;
+        const absPath = path.join(state.sessionDir, eventId + '.png');
+        try {
+          fs.writeFileSync(absPath, Buffer.concat(chunks));
+        } catch (err) {
+          res.writeHead(500, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Write failed: ' + err.message }));
+          return;
+        }
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: true, path: absPath }));
+      });
+      req.on('error', () => {
+        if (!aborted) {
+          res.writeHead(500, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Upload failed' }));
+        }
+      });
+      return;
+    }
+
+    // --- Health ---
+    if (p === '/status') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401, { 'Content-Type': 'application/json' }); res.end(JSON.stringify({ error: 'Unauthorized' })); return; }
+      const sessions = state.sessionStore ? state.sessionStore.listActiveSessions() : [];
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({
+        status: 'ok',
+        port: state.port,
+        connectedClients: state.sseClients.size,
+        pendingEvents: state.pendingEvents.map((entry) => ({
+          id: entry.event?.id,
+          type: entry.event?.type,
+          leased: !!(entry.leaseUntil && entry.leaseUntil > Date.now()),
+          leaseUntil: entry.leaseUntil || null,
+        })),
+        activeSessions: sessions,
+      }));
+      return;
+    }
+
+    if (p === '/health') {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({
+        status: 'ok', port: state.port, mode: 'variant',
+        hasProjectContext: hasProjectContext(),
+        connectedClients: state.sseClients.size,
+      }));
+      return;
+    }
+
+    // --- Design system (unified v2 response) + raw ---
+    //   /design-system.json    returns both parsed DESIGN.md and .impeccable/design.json
+    //                          sidecar when present. Panel merges them:
+    //                            { present, parsed, sidecar, hasMd, hasSidecar,
+    //                              mdNewerThanJson, parseError?, sidecarError? }
+    //                          - parsed: output of parseDesignMd (frontmatter
+    //                            + six canonical sections) when DESIGN.md exists.
+    //                          - sidecar: .impeccable/design.json contents when present.
+    //                            Expected shape: schemaVersion 2, carrying
+    //                            extensions + components + narrative.
+    //   /design-system/raw     returns DESIGN.md markdown verbatim
+    if (p === '/design-system.json' || p === '/design-system/raw') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401); res.end('Unauthorized'); return; }
+
+      const mdPath = path.join(CONTEXT_DIR, 'DESIGN.md');
+      const jsonPath = resolveDesignSidecarPath(process.cwd(), CONTEXT_DIR) || getDesignSidecarPath(process.cwd());
+      const mdStat = statOrNull(mdPath);
+      const jsonStat = statOrNull(jsonPath);
+
+      if (p === '/design-system/raw') {
+        if (!mdStat) { res.writeHead(404); res.end('Not found'); return; }
+        res.writeHead(200, { 'Content-Type': 'text/markdown; charset=utf-8' });
+        res.end(fs.readFileSync(mdPath, 'utf-8'));
+        return;
+      }
+
+      if (!mdStat && !jsonStat) {
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ present: false }));
+        return;
+      }
+
+      const response = {
+        present: true,
+        hasMd: !!mdStat,
+        hasSidecar: !!jsonStat,
+        mdNewerThanJson: !!(mdStat && jsonStat && mdStat.mtimeMs > jsonStat.mtimeMs + 1000),
+      };
+
+      if (mdStat) {
+        try {
+          response.parsed = parseDesignMd(fs.readFileSync(mdPath, 'utf-8'));
+        } catch (err) {
+          response.parseError = err.message;
+        }
+      }
+
+      if (jsonStat) {
+        try {
+          response.sidecar = JSON.parse(fs.readFileSync(jsonPath, 'utf-8'));
+        } catch (err) {
+          response.sidecarError = 'Failed to parse .impeccable/design.json: ' + err.message;
+        }
+      }
+
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify(response));
+      return;
+    }
+
+    // --- Source file (no-HMR fallback) ---
+    if (p === '/source') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401); res.end('Unauthorized'); return; }
+      const filePath = url.searchParams.get('path');
+      if (!filePath || filePath.includes('..')) { res.writeHead(400); res.end('Bad path'); return; }
+      const absPath = path.resolve(process.cwd(), filePath);
+      if (!absPath.startsWith(process.cwd())) { res.writeHead(403); res.end('Forbidden'); return; }
+      let content;
+      try { content = fs.readFileSync(absPath, 'utf-8'); }
+      catch { res.writeHead(404); res.end('File not found'); return; }
+      res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+      res.end(content);
+      return;
+    }
+
+    // --- SSE: server→browser push (replaces WebSocket) ---
+    if (p === '/events' && req.method === 'GET') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401); res.end('Unauthorized'); return; }
+      res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive',
+      });
+      res.write('data: ' + JSON.stringify({
+        type: 'connected',
+        hasProjectContext: hasProjectContext(),
+      }) + '\n\n');
+
+      state.sseClients.add(res);
+      clearTimeout(state.exitTimer);
+
+      // Keepalive: SSE comment every 30s prevents silent connection drops.
+      const heartbeat = setInterval(() => {
+        try { res.write(': keepalive\n\n'); } catch { clearInterval(heartbeat); }
+      }, SSE_HEARTBEAT_INTERVAL);
+
+      req.on('close', () => {
+        clearInterval(heartbeat);
+        state.sseClients.delete(res);
+        if (state.sseClients.size === 0) {
+          clearTimeout(state.exitTimer);
+          state.exitTimer = setTimeout(() => {
+            if (state.sseClients.size === 0) enqueueEvent({ type: 'exit' });
+          }, 8000);
+        }
+      });
+      return;
+    }
+
+    // --- Browser→server events (replaces WebSocket messages) ---
+    if (p === '/events' && req.method === 'POST') {
+      let body = '';
+      req.on('data', (c) => { body += c; });
+      req.on('end', () => {
+        let msg;
+        try { msg = JSON.parse(body); } catch {
+          res.writeHead(400, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Invalid JSON' }));
+          return;
+        }
+        if (msg.token !== state.token) {
+          res.writeHead(401, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: 'Unauthorized' }));
+          return;
+        }
+        const error = validateEvent(msg);
+        if (error) {
+          res.writeHead(400, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error }));
+          return;
+        }
+        if (state.sessionStore && msg.id) {
+          try {
+            state.sessionStore.appendEvent(msg);
+          } catch (err) {
+            res.writeHead(500, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: 'session_store_append_failed', message: err.message }));
+            return;
+          }
+        }
+        if (msg.type !== 'checkpoint') enqueueEvent(msg);
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: true }));
+      });
+      return;
+    }
+
+    // --- Stop ---
+    if (p === '/stop') {
+      const token = url.searchParams.get('token');
+      if (token !== state.token) { res.writeHead(401); res.end('Unauthorized'); return; }
+      res.writeHead(200, { 'Content-Type': 'text/plain' });
+      res.end('stopping');
+      shutdown();
+      return;
+    }
+
+    // --- Agent poll ---
+    if (p === '/poll' && req.method === 'GET') {
+      handlePollGet(req, res, url);
+      return;
+    }
+    if (p === '/poll' && req.method === 'POST') {
+      handlePollPost(req, res);
+      return;
+    }
+
+    res.writeHead(404); res.end('Not found');
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Agent poll endpoints (unchanged from WS version)
+// ---------------------------------------------------------------------------
+
+function handlePollGet(req, res, url) {
+  const token = url.searchParams.get('token');
+  if (token !== state.token) {
+    res.writeHead(401, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Unauthorized' }));
+    return;
+  }
+  const timeout = parseInt(url.searchParams.get('timeout') || DEFAULT_POLL_TIMEOUT, 10);
+  const leaseMs = parseInt(url.searchParams.get('leaseMs') || '30000', 10);
+  const available = findAvailablePendingEvent();
+  if (available) {
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify(leaseEvent(available, leaseMs)));
+    return;
+  }
+  const poll = { resolve, leaseMs };
+  const timer = setTimeout(() => {
+    const idx = state.pendingPolls.indexOf(poll);
+    if (idx !== -1) state.pendingPolls.splice(idx, 1);
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ type: 'timeout' }));
+  }, timeout);
+  function resolve(event) {
+    clearTimeout(timer);
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify(event));
+  }
+  state.pendingPolls.push(poll);
+  scheduleLeaseFlush();
+  req.on('close', () => {
+    clearTimeout(timer);
+    const idx = state.pendingPolls.indexOf(poll);
+    if (idx !== -1) state.pendingPolls.splice(idx, 1);
+  });
+}
+
+function handlePollPost(req, res) {
+  let body = '';
+  req.on('data', (c) => { body += c; });
+  req.on('end', () => {
+    let msg;
+    try { msg = JSON.parse(body); } catch {
+      res.writeHead(400, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Invalid JSON' }));
+      return;
+    }
+    if (msg.token !== state.token) {
+      res.writeHead(401, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Unauthorized' }));
+      return;
+    }
+    acknowledgePendingEvent(msg.id);
+    if (state.sessionStore && msg.id) {
+      try {
+        const eventType = msg.type === 'discard' || msg.type === 'discarded'
+          ? 'discarded'
+          : msg.type === 'complete'
+            ? 'complete'
+            : msg.type === 'error'
+              ? 'agent_error'
+              : 'agent_done';
+        state.sessionStore.appendEvent({
+          type: eventType,
+          id: msg.id,
+          file: msg.file,
+          message: msg.message,
+          carbonize: msg.data?.carbonize === true,
+        });
+      } catch { /* keep reply path best-effort; browser still needs SSE */ }
+    }
+    flushPendingPolls();
+    // Forward the reply to the browser via SSE
+    broadcast({ type: msg.type || 'done', id: msg.id, message: msg.message, file: msg.file, data: msg.data });
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ ok: true }));
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Lifecycle
+// ---------------------------------------------------------------------------
+
+let httpServer = null;
+
+function shutdown() {
+  removeLiveServerInfo(process.cwd());
+  if (state.leaseTimer) clearTimeout(state.leaseTimer);
+  state.leaseTimer = null;
+  if (state.sessionDir) {
+    try { fs.rmSync(state.sessionDir, { recursive: true, force: true }); } catch {}
+  }
+  for (const res of state.sseClients) { try { res.end(); } catch {} }
+  state.sseClients.clear();
+  for (const poll of state.pendingPolls) poll.resolve({ type: 'exit' });
+  state.pendingPolls.length = 0;
+  if (httpServer) httpServer.close();
+  process.exit(0);
+}
+
+// ---------------------------------------------------------------------------
+// Main
+// ---------------------------------------------------------------------------
+
+const args = process.argv.slice(2);
+
+if (args.includes('--help') || args.includes('-h')) {
+  console.log(`Usage: node live-server.mjs [options]
+
+Start the live variant mode server (zero dependencies).
+
+Commands:
+  (default)     Start the server (foreground)
+  stop          Stop the server and remove the injected live.js script tag
+  stop --keep-inject   Stop the server only (leave the script tag in the HTML entry)
+
+Options:
+  --background  Start detached, print connection JSON to stdout, then exit
+  --port=PORT   Use a specific port (default: auto-detect starting at 8400)
+  --keep-inject Only with stop: skip live-inject.mjs --remove
+  --help        Show this help
+
+Endpoints:
+  /live.js             Browser script (element picker + variant cycling)
+  /detect.js           Detection overlay (backwards compatible)
+  /modern-screenshot.js Vendored modern-screenshot UMD build (lazy-loaded by live.js)
+  /annotation          POST raw image/png to stage a variant screenshot
+  /events              SSE stream (server→browser) + POST (browser→server)
+  /poll                Long-poll for agent CLI
+  /source              Raw source file reader (no-HMR fallback)
+  /status              Durable recovery status (token-protected)
+  /health              Health check`);
+  process.exit(0);
+}
+
+if (args.includes('stop')) {
+  const keepInject = args.includes('--keep-inject');
+  try {
+    const { info } = readLiveServerInfo(process.cwd()) || {};
+    const res = await fetch(`http://localhost:${info.port}/stop?token=${info.token}`);
+    if (res.ok) console.log(`Stopped live server on port ${info.port}.`);
+  } catch {
+    console.log('No running live server found.');
+  }
+  if (!keepInject) {
+    const injectPath = path.join(__dirname, 'live-inject.mjs');
+    try {
+      const out = execFileSync(process.execPath, [injectPath, '--remove'], {
+        encoding: 'utf-8',
+        cwd: process.cwd(),
+      });
+      const line = out.trim().split('\n').filter(Boolean).pop();
+      if (line) {
+        try {
+          const j = JSON.parse(line);
+          if (j.removed === true) {
+            console.log(`Removed live script tag from ${j.file}.`);
+          }
+        } catch {
+          /* ignore non-JSON lines */
+        }
+      }
+    } catch (err) {
+      const detail = err.stderr?.toString?.().trim?.()
+        || err.stdout?.toString?.().trim?.()
+        || err.message
+        || String(err);
+      console.warn(`Note: could not remove live script tag (${detail.split('\n')[0]})`);
+    }
+  }
+  process.exit(0);
+}
+
+// --background: spawn a detached child server, wait for it to be ready,
+// print the connection JSON, then exit.  This keeps the startup command
+// simple (no shell backgrounding or chained commands).
+if (args.includes('--background')) {
+  const childArgs = args.filter(a => a !== '--background');
+  const child = spawn(process.execPath, [fileURLToPath(import.meta.url), ...childArgs], {
+    detached: true,
+    stdio: 'ignore',
+    cwd: process.cwd(),
+  });
+  child.unref();
+
+  // Poll for the PID file (the child writes it once the HTTP server is listening).
+  const deadline = Date.now() + 10_000;
+  while (Date.now() < deadline) {
+    try {
+      const { info } = readLiveServerInfo(process.cwd()) || {};
+      if (info.pid !== process.pid) {
+        // Output JSON so the agent can read port + token from stdout.
+        console.log(JSON.stringify(info));
+        process.exit(0);
+      }
+    } catch { /* not ready yet */ }
+    await new Promise(r => setTimeout(r, 200));
+  }
+  console.error('Timed out waiting for live server to start.');
+  process.exit(1);
+}
+
+// Check for existing session
+const existingRecord = readLiveServerInfo(process.cwd());
+if (existingRecord?.info) {
+  const existing = existingRecord.info;
+  try {
+    process.kill(existing.pid, 0);
+    console.error(`Live server already running on port ${existing.port} (pid ${existing.pid}).`);
+    console.error('Stop it first with: node ' + path.basename(fileURLToPath(import.meta.url)) + ' stop');
+    process.exit(1);
+  } catch {
+    try { fs.unlinkSync(existingRecord.path); } catch {}
+  }
+}
+
+state.token = randomUUID();
+state.sessionStore = createLiveSessionStore({ cwd: process.cwd() });
+restorePendingEventsFromStore();
+const portArg = args.find(a => a.startsWith('--port='));
+state.port = portArg ? parseInt(portArg.split('=')[1], 10) : await findOpenPort();
+// Annotation screenshots live in the project root so the agent's Read tool
+// doesn't trip a per-file permission prompt. Sessioned by token so concurrent
+// projects (or quick restarts) don't collide.
+const annotRoot = getLiveAnnotationsDir(process.cwd());
+fs.mkdirSync(annotRoot, { recursive: true });
+state.sessionDir = fs.mkdtempSync(path.join(annotRoot, 'session-'));
+
+const { detectScript, sessionPath, livePath } = loadBrowserScripts();
+httpServer = http.createServer(createRequestHandler({ detectScript, sessionPath, livePath }));
+
+httpServer.listen(state.port, '127.0.0.1', () => {
+  writeLiveServerInfo(process.cwd(), { pid: process.pid, port: state.port, token: state.token });
+  const url = `http://localhost:${state.port}`;
+  console.log(`\nImpeccable live server running on ${url}`);
+  console.log(`Token: ${state.token}\n`);
+  console.log(`Inject: <script src="${url}/live.js"><\/script>`);
+  console.log(`Stop:   node ${path.basename(fileURLToPath(import.meta.url))} stop`);
+});
+
+process.on('SIGINT', shutdown);
+process.on('SIGTERM', shutdown);
diff --git a/.agents/skills/impeccable/scripts/live-session-store.mjs b/.agents/skills/impeccable/scripts/live-session-store.mjs
new file mode 100644
index 00000000..d55ed2d3
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-session-store.mjs
@@ -0,0 +1,254 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { getLegacyLiveSessionsDir, getLiveSessionsDir } from './impeccable-paths.mjs';
+
+const COMPLETED_PHASES = new Set(['completed', 'discarded']);
+
+export function createLiveSessionStore({ cwd = process.cwd(), sessionId } = {}) {
+  const rootDir = getLiveSessionsDir(cwd);
+  const legacyRootDir = getLegacyLiveSessionsDir(cwd);
+  fs.mkdirSync(rootDir, { recursive: true });
+  const snapshotCache = new Map();
+
+  function loadCachedOrRebuild(id) {
+    const cached = snapshotCache.get(id);
+    if (cached) return cached;
+    const journalPath = getReadableJournalPath(id);
+    const rebuilt = rebuildSnapshotFromJournal(journalPath, id);
+    snapshotCache.set(id, rebuilt);
+    return rebuilt;
+  }
+
+  function getReadableJournalPath(id) {
+    const primary = getJournalPath(rootDir, id);
+    if (fs.existsSync(primary)) return primary;
+    const legacy = getJournalPath(legacyRootDir, id);
+    if (fs.existsSync(legacy)) return legacy;
+    return primary;
+  }
+
+  return {
+    rootDir,
+    legacyRootDir,
+    appendEvent(event) {
+      const normalized = normalizeEvent(event, sessionId);
+      const journalPath = getJournalPath(rootDir, normalized.id);
+      const snapshotPath = getSnapshotPath(rootDir, normalized.id);
+      const legacyJournalPath = getJournalPath(legacyRootDir, normalized.id);
+      if (!fs.existsSync(journalPath) && fs.existsSync(legacyJournalPath)) {
+        fs.copyFileSync(legacyJournalPath, journalPath);
+      }
+      const prior = loadCachedOrRebuild(normalized.id);
+      const seq = prior.nextSeq;
+      const entry = {
+        seq,
+        id: normalized.id,
+        type: normalized.type,
+        ts: new Date().toISOString(),
+        event: normalized,
+      };
+      fs.appendFileSync(journalPath, JSON.stringify(entry) + '\n');
+      const next = applyEvent(prior.snapshot, entry, prior.diagnostics);
+      snapshotCache.set(normalized.id, { snapshot: next, diagnostics: next.diagnostics || [], nextSeq: seq + 1 });
+      writeSnapshot(snapshotPath, next);
+      return next;
+    },
+    getSnapshot(id = sessionId, opts = {}) {
+      if (!id) throw new Error('session id required');
+      const journalPath = getReadableJournalPath(id);
+      const snapshotPath = getSnapshotPath(rootDir, id);
+      const rebuilt = rebuildSnapshotFromJournal(journalPath, id);
+      snapshotCache.set(id, rebuilt);
+      writeSnapshot(snapshotPath, rebuilt.snapshot);
+      if (!opts.includeCompleted && COMPLETED_PHASES.has(rebuilt.snapshot.phase)) return null;
+      return rebuilt.snapshot;
+    },
+    listActiveSessions() {
+      const ids = new Set();
+      for (const dir of [legacyRootDir, rootDir]) {
+        if (!fs.existsSync(dir)) continue;
+        for (const name of fs.readdirSync(dir)) {
+          if (name.endsWith('.jsonl')) ids.add(name.slice(0, -'.jsonl'.length));
+        }
+      }
+      return [...ids]
+        .sort()
+        .map((id) => this.getSnapshot(id))
+        .filter(Boolean);
+    },
+  };
+}
+
+function normalizeEvent(event, fallbackId) {
+  if (!event || typeof event !== 'object') throw new Error('event object required');
+  const id = event.id || fallbackId;
+  if (!id || typeof id !== 'string') throw new Error('event id required');
+  if (!event.type || typeof event.type !== 'string') throw new Error('event type required');
+  return { ...event, id };
+}
+
+function getJournalPath(rootDir, id) {
+  return path.join(rootDir, safeSessionId(id) + '.jsonl');
+}
+
+function getSnapshotPath(rootDir, id) {
+  return path.join(rootDir, safeSessionId(id) + '.snapshot.json');
+}
+
+function safeSessionId(id) {
+  if (!/^[A-Za-z0-9_-]{1,128}$/.test(id)) throw new Error('invalid session id: ' + id);
+  return id;
+}
+
+function baseSnapshot(id) {
+  return {
+    id,
+    phase: 'new',
+    pageUrl: null,
+    sourceFile: null,
+    expectedVariants: 0,
+    arrivedVariants: 0,
+    visibleVariant: null,
+    paramValues: {},
+    pendingEventSeq: null,
+    pendingEvent: null,
+    deliveryLease: null,
+    checkpointRevision: 0,
+    activeOwner: null,
+    sourceMarkers: {},
+    fallbackMode: null,
+    annotationArtifacts: [],
+    diagnostics: [],
+    updatedAt: null,
+  };
+}
+
+function rebuildSnapshotFromJournal(journalPath, id) {
+  let snapshot = baseSnapshot(id);
+  const diagnostics = [];
+  let nextSeq = 1;
+  if (!fs.existsSync(journalPath)) return { snapshot, diagnostics, nextSeq };
+
+  const lines = fs.readFileSync(journalPath, 'utf-8').split('\n');
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (!line.trim()) continue;
+    try {
+      const entry = JSON.parse(line);
+      if (!entry || typeof entry !== 'object') throw new Error('entry is not object');
+      if (Number.isInteger(entry.seq)) nextSeq = Math.max(nextSeq, entry.seq + 1);
+      snapshot = applyEvent(snapshot, entry);
+    } catch (err) {
+      diagnostics.push({
+        error: 'journal_parse_failed',
+        line: i + 1,
+        message: err.message,
+      });
+    }
+  }
+  snapshot.diagnostics = [...snapshot.diagnostics, ...diagnostics];
+  return { snapshot, diagnostics, nextSeq };
+}
+
+function applyEvent(snapshot, entry, inheritedDiagnostics = []) {
+  const event = entry.event || entry;
+  const next = {
+    ...snapshot,
+    paramValues: { ...(snapshot.paramValues || {}) },
+    sourceMarkers: { ...(snapshot.sourceMarkers || {}) },
+    annotationArtifacts: [...(snapshot.annotationArtifacts || [])],
+    diagnostics: [...(snapshot.diagnostics || [])],
+    updatedAt: entry.ts || new Date().toISOString(),
+  };
+
+  if (inheritedDiagnostics.length && next.diagnostics.length === 0) {
+    next.diagnostics = [...inheritedDiagnostics];
+  }
+
+  switch (event.type) {
+    case 'generate':
+      next.phase = 'generate_requested';
+      next.pageUrl = event.pageUrl ?? next.pageUrl;
+      next.expectedVariants = event.count ?? next.expectedVariants;
+      next.pendingEventSeq = entry.seq ?? next.pendingEventSeq;
+      next.pendingEvent = toPendingEvent(event);
+      if (event.screenshotPath) upsertArtifact(next.annotationArtifacts, { type: 'screenshot', path: event.screenshotPath });
+      break;
+    case 'variants_ready':
+    case 'agent_done':
+      next.phase = event.carbonize === true ? 'carbonize_required' : 'variants_ready';
+      next.sourceFile = event.file ?? next.sourceFile;
+      next.arrivedVariants = event.arrivedVariants ?? (next.arrivedVariants ?? next.expectedVariants);
+      next.pendingEventSeq = null;
+      next.pendingEvent = null;
+      if (event.carbonize === true) {
+        next.diagnostics.push({
+          error: 'carbonize_cleanup_required',
+          file: event.file || null,
+          message: 'Accepted variant still has carbonize markers that must be folded into source CSS.',
+        });
+      }
+      break;
+    case 'checkpoint':
+      if ((event.revision ?? 0) >= (next.checkpointRevision ?? 0)) {
+        next.phase = event.phase ?? next.phase;
+        next.checkpointRevision = event.revision ?? next.checkpointRevision;
+        next.activeOwner = event.owner ?? next.activeOwner;
+        next.arrivedVariants = event.arrivedVariants ?? next.arrivedVariants;
+        next.visibleVariant = event.visibleVariant ?? next.visibleVariant;
+        if (event.paramValues) next.paramValues = { ...event.paramValues };
+      } else {
+        next.diagnostics.push({ error: 'stale_checkpoint_ignored', revision: event.revision });
+      }
+      break;
+    case 'accept':
+    case 'accept_intent':
+      next.phase = 'accept_requested';
+      next.visibleVariant = Number(event.variantId ?? next.visibleVariant);
+      if (event.paramValues) next.paramValues = { ...event.paramValues };
+      next.pendingEventSeq = entry.seq ?? next.pendingEventSeq;
+      next.pendingEvent = toPendingEvent(event);
+      break;
+    case 'discard':
+      next.phase = 'discard_requested';
+      next.pendingEventSeq = entry.seq ?? next.pendingEventSeq;
+      next.pendingEvent = toPendingEvent(event);
+      break;
+    case 'discarded':
+      next.phase = 'discarded';
+      next.pendingEventSeq = null;
+      next.pendingEvent = null;
+      break;
+    case 'complete':
+      next.phase = 'completed';
+      next.pendingEventSeq = null;
+      next.pendingEvent = null;
+      break;
+    case 'agent_error':
+      next.phase = 'agent_error';
+      next.pendingEventSeq = null;
+      next.pendingEvent = null;
+      next.diagnostics.push({ error: 'agent_error', message: event.message || 'unknown agent error' });
+      break;
+    default:
+      next.diagnostics.push({ error: 'unknown_event_type', type: event.type });
+      break;
+  }
+  return next;
+}
+
+function toPendingEvent(event) {
+  const pending = { ...event };
+  delete pending.token;
+  return pending;
+}
+
+function upsertArtifact(artifacts, artifact) {
+  if (!artifacts.some((existing) => existing.path === artifact.path && existing.type === artifact.type)) {
+    artifacts.push(artifact);
+  }
+}
+
+function writeSnapshot(snapshotPath, snapshot) {
+  fs.writeFileSync(snapshotPath, JSON.stringify(snapshot, null, 2) + '\n');
+}
diff --git a/.agents/skills/impeccable/scripts/live-status.mjs b/.agents/skills/impeccable/scripts/live-status.mjs
new file mode 100644
index 00000000..dce1fbca
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-status.mjs
@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+/**
+ * Print durable recovery status for Impeccable live sessions.
+ */
+
+import { createLiveSessionStore } from './live-session-store.mjs';
+import { readLiveServerInfo } from './impeccable-paths.mjs';
+
+function readServerInfo() {
+  return readLiveServerInfo(process.cwd())?.info || null;
+}
+
+async function fetchServerStatus(info) {
+  if (!info) return null;
+  try {
+    const res = await fetch(`http://localhost:${info.port}/status?token=${info.token}`);
+    if (!res.ok) return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
+export async function statusCli() {
+  const info = readServerInfo();
+  const server = await fetchServerStatus(info);
+  const store = createLiveSessionStore({ cwd: process.cwd() });
+  const activeSessions = store.listActiveSessions();
+  const payload = {
+    liveServer: server ? {
+      status: server.status,
+      port: server.port,
+      connectedClients: server.connectedClients,
+      pendingEvents: server.pendingEvents,
+    } : null,
+    activeSessions: server?.activeSessions || activeSessions,
+    recoveryHint: server
+      ? 'Run live-poll.mjs to continue pending work, or live-complete.mjs --id <session> after manual cleanup.'
+      : 'Start live-server.mjs to requeue pending durable events, then run live-poll.mjs.',
+  };
+  console.log(JSON.stringify(payload, null, 2));
+}
+
+const _running = process.argv[1];
+if (_running?.endsWith('live-status.mjs') || _running?.endsWith('live-status.mjs/')) {
+  statusCli();
+}
diff --git a/.agents/skills/impeccable/scripts/live-wrap.mjs b/.agents/skills/impeccable/scripts/live-wrap.mjs
new file mode 100644
index 00000000..d46328b9
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live-wrap.mjs
@@ -0,0 +1,632 @@
+/**
+ * CLI helper: find an element in source and wrap it in a variant container.
+ *
+ * Usage:
+ *   npx impeccable wrap --id SESSION_ID --count N --query "hero-combined-left" [--file path]
+ *
+ * Searches project files for the element matching the query (class name, ID, or
+ * text snippet), wraps it with the variant scaffolding, and prints the file path
+ * + line range where the agent should insert variant HTML.
+ *
+ * This replaces 3-4 agent tool calls (grep + read + edit) with a single CLI call.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { isGeneratedFile } from './is-generated.mjs';
+
+const EXTENSIONS = ['.html', '.jsx', '.tsx', '.vue', '.svelte', '.astro'];
+
+export async function wrapCli() {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`Usage: impeccable wrap [options]
+
+Find an element in source and wrap it in a variant container.
+
+Required:
+  --id ID            Session ID for the variant wrapper
+  --count N          Number of expected variants (1-8)
+
+Element identification (at least one required):
+  --element-id ID    HTML id attribute of the element
+  --classes A,B,C    Comma-separated CSS class names
+  --tag TAG          Tag name (div, section, etc.)
+  --query TEXT       Fallback: raw text to search for
+
+Optional:
+  --file PATH        Source file to search in (skips auto-detection)
+  --text TEXT        Picked element's textContent. Used to disambiguate when
+                     classes/tag match multiple sibling elements (e.g. a list
+                     of <Card>s with the same className). Pass the first ~80
+                     chars of event.element.textContent.
+  --help             Show this help message
+
+Output (JSON):
+  { file, startLine, endLine, insertLine, commentSyntax }
+
+The agent should insert variant HTML at insertLine.`);
+    process.exit(0);
+  }
+
+  const id = argVal(args, '--id');
+  const count = parseInt(argVal(args, '--count') || '3');
+  const elementId = argVal(args, '--element-id');
+  const classes = argVal(args, '--classes');
+  const tag = argVal(args, '--tag');
+  const query = argVal(args, '--query');
+  const filePath = argVal(args, '--file');
+  const text = argVal(args, '--text');
+
+  if (!id) { console.error('Missing --id'); process.exit(1); }
+  if (!elementId && !classes && !query) {
+    console.error('Need at least one of: --element-id, --classes, --query');
+    process.exit(1);
+  }
+
+  // Build search queries in priority order (most specific first)
+  const queries = buildSearchQueries(elementId, classes, tag, query);
+
+  const genOpts = { cwd: process.cwd() };
+
+  // Find the source file. Generated files are excluded from auto-search so we
+  // don't silently write variants into a file the next build will wipe.
+  let targetFile = filePath;
+  let matchedQuery = null;
+  if (!targetFile) {
+    for (const q of queries) {
+      targetFile = findFileWithQuery(q, process.cwd(), genOpts);
+      if (targetFile) { matchedQuery = q; break; }
+    }
+    if (!targetFile) {
+      // Nothing in source. Did the element show up in a generated file? That
+      // tells the agent "fall back to the agent-driven flow" vs "element just
+      // doesn't exist in this project."
+      let generatedHit = null;
+      for (const q of queries) {
+        generatedHit = findFileWithQuery(q, process.cwd(), { ...genOpts, includeGenerated: true });
+        if (generatedHit) break;
+      }
+      if (generatedHit) {
+        console.error(JSON.stringify({
+          error: 'element_not_in_source',
+          fallback: 'agent-driven',
+          generatedMatch: path.relative(process.cwd(), generatedHit),
+          hint: 'Element found only in a generated file. See "Handle fallback" in live.md.',
+        }));
+      } else {
+        console.error(JSON.stringify({
+          error: 'element_not_found',
+          fallback: 'agent-driven',
+          hint: 'Element not found in any project file. It may be runtime-injected (JS component, etc.). See "Handle fallback" in live.md.',
+        }));
+      }
+      process.exit(1);
+    }
+  } else {
+    if (isGeneratedFile(targetFile, genOpts)) {
+      console.error(JSON.stringify({
+        error: 'file_is_generated',
+        fallback: 'agent-driven',
+        file: path.relative(process.cwd(), path.resolve(process.cwd(), targetFile)),
+        hint: 'Explicit --file points at a generated file. Writing here gets wiped by the next build. See "Handle fallback" in live.md.',
+      }));
+      process.exit(1);
+    }
+    matchedQuery = queries[0];
+  }
+
+  const content = fs.readFileSync(targetFile, 'utf-8');
+  const lines = content.split('\n');
+
+  // Find the element, trying each query in priority order. When `--text` is
+  // supplied, collect every candidate the queries surface and disambiguate
+  // by the picked element's textContent. Without `--text`, fall back to the
+  // legacy first-match behavior so unmodified callers keep working.
+  let match = null;
+  if (text) {
+    const candidates = [];
+    for (const q of queries) {
+      const all = findAllElements(lines, q, tag);
+      for (const c of all) {
+        if (!candidates.some((x) => x.startLine === c.startLine)) {
+          candidates.push(c);
+        }
+      }
+      // Once a more-specific query (ID, full className combo) yielded a unique
+      // result, stop — falling through to the loose tag+single-class query
+      // would readmit the siblings we just disambiguated past.
+      if (candidates.length === 1) break;
+    }
+    if (candidates.length === 0) {
+      console.error(JSON.stringify({ error: 'Found file but could not locate element in ' + targetFile + '. Searched for: ' + queries.join(', ') }));
+      process.exit(1);
+    }
+    if (candidates.length === 1) {
+      match = candidates[0];
+    } else {
+      const filtered = filterByText(candidates, lines, text);
+      if (filtered.length === 1) {
+        match = filtered[0];
+      } else if (filtered.length === 0) {
+        // Source uses dynamic content (`<h1>{title}</h1>` etc.) so the
+        // browser-side textContent doesn't appear literally in source. Fall
+        // back to first-match rather than refusing — this is the same
+        // behavior unmodified callers see, just preserved.
+        match = candidates[0];
+      } else {
+        // Multiple candidates ALSO match the text. Truly ambiguous — refuse
+        // rather than pick wrong, and hand the agent the candidate locations
+        // so it can disambiguate by reading the file.
+        console.error(JSON.stringify({
+          error: 'element_ambiguous',
+          fallback: 'agent-driven',
+          file: path.relative(process.cwd(), targetFile),
+          candidates: filtered.map((c) => ({
+            startLine: c.startLine + 1,
+            endLine: c.endLine + 1,
+          })),
+          hint: 'Multiple source elements match both classes/tag and textContent. Pass --element-id, a more specific --text, or write the wrapper manually. See "Handle fallback" in live.md.',
+        }));
+        process.exit(1);
+      }
+    }
+  } else {
+    for (const q of queries) {
+      match = findElement(lines, q, tag);
+      if (match) break;
+    }
+    if (!match) {
+      console.error(JSON.stringify({ error: 'Found file but could not locate element in ' + targetFile + '. Searched for: ' + queries.join(', ') }));
+      process.exit(1);
+    }
+  }
+
+  const { startLine, endLine } = match;
+  const commentSyntax = detectCommentSyntax(targetFile);
+  const styleMode = detectStyleMode(targetFile);
+  const isJsx = commentSyntax.open === '{/*';
+  const indent = lines[startLine].match(/^(\s*)/)[1];
+
+  // Extract the original element. Reindent under the wrapper while preserving
+  // the relative depth between lines — `l.trimStart()` would strip ALL leading
+  // whitespace and collapse e.g. `<aside>`/`  <h1>`/`</aside>` (6/8/6 spaces)
+  // to a single uniform indent, so on accept/discard the round-trip restores
+  // the inner element at its parent's depth instead of nested inside it.
+  // Strip only the COMMON minimum leading whitespace across the picked lines;
+  // `deindentContent` on the accept side already mirrors this convention.
+  const originalLines = lines.slice(startLine, endLine + 1);
+  const originalBaseIndent = minLeadingSpaces(originalLines);
+  const reindentOriginal = (extra) => originalLines
+    .map((l) => (l.trim() === '' ? '' : indent + extra + l.slice(originalBaseIndent)))
+    .join('\n');
+  const originalIndented = reindentOriginal('    ');
+
+  // Wrapper attributes differ by syntax. HTML allows plain string attrs;
+  // JSX requires object-literal style and parses string attrs as HTML (which
+  // either type-errors or renders a literal CSS string).
+  const styleContents = isJsx ? 'style={{ display: "contents" }}' : 'style="display: contents"';
+
+  // JSX/TSX guard: the picked element occupies a single JSX child slot
+  // (inside `return (...)`, an array `.map(...)`, an `asChild` branch, or
+  // any other expression position). Replacing it with `comment + <div> +
+  // comment` yields three adjacent siblings — invalid JSX. We can't use a
+  // Fragment `<></>` either: parents that clone children (Radix `asChild`,
+  // Headless UI, etc.) hit "Invalid prop supplied to React.Fragment" when
+  // they try to pass an `id` through.
+  //
+  // Solution: keep the wrapper `<div>` as the single JSX-slot child and
+  // tuck both marker comments INSIDE it. accept/discard then expands its
+  // replacement range to include the wrapper's `<div>` open / close lines
+  // so the entire scaffold gets removed cleanly.
+  const wrapperLines = isJsx ? [
+    indent + '<div data-impeccable-variants="' + id + '" data-impeccable-variant-count="' + count + '" ' + styleContents + '>',
+    indent + '  ' + commentSyntax.open + ' impeccable-variants-start ' + id + ' ' + commentSyntax.close,
+    indent + '  ' + commentSyntax.open + ' Original ' + commentSyntax.close,
+    indent + '  <div data-impeccable-variant="original">',
+    reindentOriginal('    '),
+    indent + '  </div>',
+    indent + '  ' + commentSyntax.open + ' Variants: insert below this line ' + commentSyntax.close,
+    indent + '  ' + commentSyntax.open + ' impeccable-variants-end ' + id + ' ' + commentSyntax.close,
+    indent + '</div>',
+  ] : [
+    indent + commentSyntax.open + ' impeccable-variants-start ' + id + ' ' + commentSyntax.close,
+    indent + '<div data-impeccable-variants="' + id + '" data-impeccable-variant-count="' + count + '" ' + styleContents + '>',
+    indent + '  ' + commentSyntax.open + ' Original ' + commentSyntax.close,
+    indent + '  <div data-impeccable-variant="original">',
+    originalIndented,
+    indent + '  </div>',
+    indent + '  ' + commentSyntax.open + ' Variants: insert below this line ' + commentSyntax.close,
+    indent + '</div>',
+    indent + commentSyntax.open + ' impeccable-variants-end ' + id + ' ' + commentSyntax.close,
+  ];
+
+  // Replace the original element with the wrapper
+  const newLines = [
+    ...lines.slice(0, startLine),
+    ...wrapperLines,
+    ...lines.slice(endLine + 1),
+  ];
+  fs.writeFileSync(targetFile, newLines.join('\n'), 'utf-8');
+
+  // Calculate insert line (the "insert below this line" comment).
+  // 0-indexed file position. Both HTML and JSX wrappers have 6 lines above
+  // the insert marker (HTML: start-comment + outer-div + Original-comment +
+  // original-div + content + close-original-div; JSX: outer-div +
+  // start-comment + Original-comment + original-div + content +
+  // close-original-div). Multi-line originals push the marker by their
+  // extra line count.
+  const insertLine = startLine + 6 + (originalLines.length - 1);
+
+  console.log(JSON.stringify({
+    file: path.relative(process.cwd(), targetFile),
+    startLine: startLine + 1,       // 1-indexed for the agent
+    // wrapperLines is an array but one element (the original-content slot)
+    // is a `\n`-joined multi-line string, so the actual file-row count is
+    // wrapperLines.length + (originalLines.length - 1). Without the offset,
+    // endLine pointed inside the wrapper for any picked element that
+    // spanned more than one source line.
+    endLine: startLine + wrapperLines.length + (originalLines.length - 1), // 1-indexed
+    insertLine: insertLine + 1,     // 1-indexed: where variants go
+    commentSyntax: commentSyntax,
+    styleMode: styleMode.mode,
+    styleTag: styleMode.styleTag,
+    cssSelectorPrefixExamples: buildCssSelectorPrefixExamples(styleMode.mode, count),
+    cssAuthoring: buildCssAuthoring(styleMode, count),
+    originalLineCount: originalLines.length,
+  }));
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function argVal(args, flag) {
+  const idx = args.indexOf(flag);
+  return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : null;
+}
+
+/**
+ * Build search query strings in priority order (most specific first).
+ * ID is most reliable, then specific class combos, then single classes, then raw query.
+ */
+function buildSearchQueries(elementId, classes, tag, query) {
+  const queries = [];
+
+  // 1. ID is the most specific
+  if (elementId) {
+    queries.push('id="' + elementId + '"');
+  }
+
+  // 2. Full class attribute match (for elements with distinctive multi-class combos).
+  // Emit both class="..." (HTML) and className="..." (React/JSX) so whichever
+  // convention the file uses will match.
+  if (classes) {
+    const classList = classes.split(',').map(c => c.trim()).filter(Boolean);
+    if (classList.length > 1) {
+      const joined = classList.join(' ');
+      const sorted = [...classList].sort((a, b) => b.length - a.length);
+      queries.push('class="' + joined + '"');
+      queries.push('className="' + joined + '"');
+      queries.push(sorted[0]); // most distinctive single class, fallback
+    } else if (classList.length === 1) {
+      queries.push(classList[0]);
+    }
+  }
+
+  // 3. Tag + class combo (e.g., <section class="hero">).
+  // Same dual-emit for JSX compatibility.
+  if (tag && classes) {
+    const firstClass = classes.split(',')[0].trim();
+    queries.push('<' + tag + ' class="' + firstClass);
+    queries.push('<' + tag + ' className="' + firstClass);
+  }
+
+  // 4. Raw fallback query
+  if (query) {
+    queries.push(query);
+  }
+
+  return queries;
+}
+
+function detectCommentSyntax(filePath) {
+  const ext = path.extname(filePath).toLowerCase();
+  if (ext === '.jsx' || ext === '.tsx') {
+    return { open: '{/*', close: '*/}' };
+  }
+  // HTML, Vue, Svelte, Astro all use HTML comments
+  return { open: '<!--', close: '-->' };
+}
+
+function detectStyleMode(filePath) {
+  const ext = path.extname(filePath).toLowerCase();
+  if (ext === '.astro') {
+    return {
+      mode: 'astro-global-prefixed',
+      styleTag: '<style is:inline data-impeccable-css="SESSION_ID">',
+    };
+  }
+  return {
+    mode: 'scoped',
+    styleTag: '<style data-impeccable-css="SESSION_ID">',
+  };
+}
+
+function buildCssSelectorPrefixExamples(styleMode, count) {
+  if (styleMode !== 'astro-global-prefixed') return [];
+  return Array.from({ length: count }, (_, i) => `[data-impeccable-variant="${i + 1}"]`);
+}
+
+function buildCssAuthoring(styleMode, count) {
+  const variantNumbers = Array.from({ length: count }, (_, i) => i + 1);
+  if (styleMode.mode === 'astro-global-prefixed') {
+    return {
+      mode: styleMode.mode,
+      styleTag: styleMode.styleTag,
+      strategy: 'global-prefixed',
+      rulePattern: '[data-impeccable-variant="N"] > .variant-class { ... }',
+      selectorExamples: variantNumbers.map((n) => `[data-impeccable-variant="${n}"] > .variant-class`),
+      requirements: [
+        'Use the styleTag exactly; the is:inline attribute is required for this file.',
+        'Prefix every preview selector with the matching [data-impeccable-variant="N"] selector.',
+        'Keep selectors anchored to the generated variant wrapper; do not rely on component CSS scoping for preview rules.',
+      ],
+      forbidden: [
+        'Do not use @scope for this styleMode.',
+      ],
+    };
+  }
+  return {
+    mode: styleMode.mode,
+    styleTag: styleMode.styleTag,
+    strategy: 'scope-rule',
+    rulePattern: '@scope ([data-impeccable-variant="N"]) { :scope > .variant-class { ... } }',
+    selectorExamples: variantNumbers.map((n) => `@scope ([data-impeccable-variant="${n}"]) { :scope > .variant-class { ... } }`),
+    requirements: [
+      'Use @scope blocks keyed to each [data-impeccable-variant="N"] wrapper.',
+      'Inside each @scope block, make :scope rules step into the replacement element with a descendant combinator.',
+      'Use the styleTag exactly; do not add framework-specific style attributes unless this object says to.',
+    ],
+    forbidden: [
+      'Do not use global [data-impeccable-variant="N"] selector prefixes for this styleMode.',
+      'Do not add is:inline to the style tag for this styleMode.',
+    ],
+  };
+}
+
+/**
+ * Search project files for the query string (class name, ID, etc.)
+ * Returns the first matching file path, or null.
+ */
+function findFileWithQuery(query, cwd, genOpts = {}) {
+  const searchDirs = ['src', 'app', 'pages', 'components', 'public', 'views', 'templates', '.'];
+  const seen = new Set();
+
+  for (const dir of searchDirs) {
+    const absDir = path.join(cwd, dir);
+    if (!fs.existsSync(absDir)) continue;
+    const result = searchDir(absDir, query, seen, 0, genOpts);
+    if (result) return result;
+  }
+  return null;
+}
+
+function searchDir(dir, query, seen, depth, genOpts) {
+  if (depth > 5) return null; // don't go too deep
+  const realDir = fs.realpathSync(dir);
+  if (seen.has(realDir)) return null;
+  seen.add(realDir);
+
+  let entries;
+  try { entries = fs.readdirSync(dir, { withFileTypes: true }); }
+  catch { return null; }
+
+  // Check files first
+  for (const entry of entries) {
+    if (!entry.isFile()) continue;
+    const ext = path.extname(entry.name).toLowerCase();
+    if (!EXTENSIONS.includes(ext)) continue;
+
+    const filePath = path.join(dir, entry.name);
+    if (!genOpts.includeGenerated && isGeneratedFile(filePath, genOpts)) continue;
+    try {
+      const content = fs.readFileSync(filePath, 'utf-8');
+      if (content.includes(query)) return filePath;
+    } catch { /* skip unreadable files */ }
+  }
+
+  // Then recurse into directories. Always skip node_modules and .git (never
+  // project content). dist/build/out are left to the isGeneratedFile guard so
+  // the includeGenerated second-pass can still find the element there and
+  // report `generatedMatch`.
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    if (entry.name === 'node_modules' || entry.name === '.git') continue;
+    const result = searchDir(path.join(dir, entry.name), query, seen, depth + 1, genOpts);
+    if (result) return result;
+  }
+
+  return null;
+}
+
+/**
+ * Regex that matches a tag opener on a line. Allows the tag name to be
+ * followed by whitespace, `>`, `/`, or end-of-line so that multi-line JSX
+ * openers (e.g. `<section\n  className="..."\n>`) are recognised.
+ */
+const OPENER_RE = /<([A-Za-z][A-Za-z0-9]*)(?=[\s/>]|$)/;
+
+/**
+ * Find the element's start and end line in the file.
+ *
+ * `query` is a class name, attribute fragment (`class="..."`, `className="..."`,
+ * `id="..."`), or a raw text snippet. Because a query can appear on a
+ * continuation line of a multi-line tag (e.g. the `className="..."` row of a
+ * `<section\n  className="..."\n>` JSX tag), we walk backward from the match
+ * line to find the actual tag opener. When `tag` is provided, opener candidates
+ * must match that tag name.
+ */
+/**
+ * Return the smallest leading-whitespace count across a set of lines,
+ * ignoring blank lines (whose indent isn't load-bearing). Used to compute
+ * the common base indent of a multi-line picked element so reindenting
+ * under the wrapper preserves the relative depth between lines.
+ */
+function minLeadingSpaces(lines) {
+  let min = Infinity;
+  for (const l of lines) {
+    if (l.trim() === '') continue;
+    const m = l.match(/^(\s*)/);
+    if (m && m[1].length < min) min = m[1].length;
+  }
+  return min === Infinity ? 0 : min;
+}
+
+function findElement(lines, query, tag = null) {
+  // Iterate all matches — the first substring hit isn't always the right one.
+  for (let i = 0; i < lines.length; i++) {
+    if (!lines[i].includes(query)) continue;
+
+    const stripped = lines[i].trim();
+    if (stripped.startsWith('<!--') || stripped.startsWith('{/*') || stripped.startsWith('//')) continue;
+    // Skip lines already inside a variant wrapper
+    if (lines[i].includes('data-impeccable-variant')) continue;
+
+    const openerLine = findOpenerLine(lines, i, tag);
+    if (openerLine === -1) continue;
+
+    const endLine = findClosingLine(lines, openerLine);
+    return { startLine: openerLine, endLine };
+  }
+
+  return null;
+}
+
+/**
+ * Like findElement, but returns every match. Used for ambiguity detection
+ * when the agent passes --text: when the same className appears on multiple
+ * sibling elements (a list of cards, repeated section variants, etc.),
+ * first-match silently lands on the wrong branch. Returning all matches lets
+ * the caller narrow by textContent or fail with a structured ambiguity error.
+ */
+function findAllElements(lines, query, tag = null) {
+  const out = [];
+  const seen = new Set();
+  for (let i = 0; i < lines.length; i++) {
+    if (!lines[i].includes(query)) continue;
+    const stripped = lines[i].trim();
+    if (stripped.startsWith('<!--') || stripped.startsWith('{/*') || stripped.startsWith('//')) continue;
+    if (lines[i].includes('data-impeccable-variant')) continue;
+    const openerLine = findOpenerLine(lines, i, tag);
+    if (openerLine === -1) continue;
+    if (seen.has(openerLine)) continue; // multiple matches inside the same element
+    seen.add(openerLine);
+    const endLine = findClosingLine(lines, openerLine);
+    out.push({ startLine: openerLine, endLine });
+  }
+  return out;
+}
+
+/**
+ * Narrow a candidate set to those whose source body matches a meaningful
+ * prefix of the picked element's textContent. The compare strips tags and
+ * JSX expressions, then checks two whitespace normalizations side-by-side:
+ *
+ *   - single-space ("hero two second card body")
+ *   - no-whitespace ("herotwosecondcardbody")
+ *
+ * Both are needed because `el.textContent` concatenates sibling text without
+ * inserting whitespace (e.g. `<h1>Hero Two</h1><p>Second…</p>` reads as
+ * `"Hero TwoSecond…"`), while the source has whitespace between tags. If
+ * EITHER normalization matches, the candidate keeps. A snippet shorter than
+ * 8 chars after stripping is too weak to disambiguate — the caller falls
+ * back to first-match.
+ */
+function filterByText(candidates, lines, text) {
+  const trimmed = text.replace(/\s+/g, ' ').trim().toLowerCase().slice(0, 80);
+  // Too short to disambiguate. Return [] so the caller's `filtered.length
+  // === 0` branch fires (fall back to first-match) — the previous
+  // `candidates.slice()` return forced `filtered.length > 1` and surfaced
+  // a spurious `element_ambiguous` error on every short-text picker event
+  // with multiple candidates.
+  if (trimmed.length < 8) return [];
+  const targetSpaced = trimmed;
+  const targetCompact = trimmed.replace(/\s+/g, '');
+
+  return candidates.filter((c) => {
+    const body = lines.slice(c.startLine, c.endLine + 1).join(' ');
+    const inner = body
+      .replace(/<[^>]*>/g, ' ')   // strip HTML/JSX tags
+      .replace(/\{[^}]*\}/g, ' ')  // strip JSX expressions
+      .toLowerCase();
+    const sourceSpaced = inner.replace(/\s+/g, ' ').trim();
+    const sourceCompact = inner.replace(/\s+/g, '');
+    return sourceSpaced.includes(targetSpaced) || sourceCompact.includes(targetCompact);
+  });
+}
+
+/**
+ * Resolve a match line to the real tag opener. If the match line itself opens
+ * a tag, return it. Otherwise walk up to 10 lines backward looking for the
+ * first tag opener. If `tag` is specified, the opener must match that tag
+ * name; an opener with a different tag name aborts the backward walk for this
+ * match (we don't jump across element boundaries).
+ *
+ * Returns the line index of the opener, or -1 if none can be resolved.
+ */
+function findOpenerLine(lines, matchLine, tag) {
+  const self = lines[matchLine].match(OPENER_RE);
+  if (self) {
+    if (!tag || self[1] === tag) return matchLine;
+    return -1;
+  }
+  const MAX_BACKWALK = 10;
+  for (let i = matchLine - 1; i >= Math.max(0, matchLine - MAX_BACKWALK); i--) {
+    const opener = lines[i].match(OPENER_RE);
+    if (!opener) continue;
+    if (!tag || opener[1] === tag) return i;
+    // Different tag name than requested — abort; we're inside a non-target opener.
+    return -1;
+  }
+  return -1;
+}
+
+/**
+ * Starting from a line with an opening tag, find the line with the matching
+ * closing tag by counting tag nesting depth.
+ */
+function findClosingLine(lines, start) {
+  const openMatch = lines[start].match(OPENER_RE);
+  if (!openMatch) return start; // caller passed a non-opener; nothing to span
+
+  const tagName = openMatch[1];
+  let depth = 0;
+  const openRe = new RegExp('<' + tagName + '(?=[\\s/>]|$)', 'g');
+  const selfCloseRe = new RegExp('<' + tagName + '[^>]*/>', 'g');
+  const closeRe = new RegExp('</' + tagName + '\\s*>', 'g');
+
+  for (let i = start; i < lines.length; i++) {
+    const line = lines[i];
+    const opens = (line.match(openRe) || []).length;
+    const selfCloses = (line.match(selfCloseRe) || []).length;
+    const closes = (line.match(closeRe) || []).length;
+
+    depth += opens - selfCloses - closes;
+
+    if (depth <= 0) return i;
+  }
+
+  // If we can't find the close, return a reasonable guess
+  return Math.min(start + 50, lines.length - 1);
+}
+
+// Auto-execute when run directly (node live-wrap.mjs ...)
+const _running = process.argv[1];
+if (_running?.endsWith('live-wrap.mjs') || _running?.endsWith('live-wrap.mjs/')) {
+  wrapCli();
+}
+
+// Test exports (used by tests/live-wrap.test.mjs)
+export { buildSearchQueries, findElement, findClosingLine, detectCommentSyntax };
diff --git a/.agents/skills/impeccable/scripts/live.mjs b/.agents/skills/impeccable/scripts/live.mjs
new file mode 100644
index 00000000..cafb0eca
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/live.mjs
@@ -0,0 +1,247 @@
+/**
+ * CLI entry point: prepare everything needed to enter the live variant poll loop.
+ *
+ * Does (all in one command):
+ *   1. Check .impeccable/live/config.json (returns config_missing if first-ever run)
+ *   2. Start the live server in the background (or reuse a running one)
+ *   3. Inject the browser script tag into the project's entry file
+ *   4. Read PRODUCT.md / DESIGN.md for project context
+ *   5. Print a single JSON blob with everything the agent needs
+ *
+ * After this, the agent's only remaining steps are:
+ *   - Open the project's live dev/preview URL in the browser (optional, if browser automation exists)—not `serverPort`; that port is the Impeccable helper for /live.js and /poll
+ *   - Enter the poll loop: `node live-poll.mjs`
+ *
+ * Usage:
+ *   node live.mjs                   # Prepare everything, print JSON, exit
+ *   node live.mjs --help
+ */
+
+import { execSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { loadContext } from './load-context.mjs';
+import { resolveFiles } from './live-inject.mjs';
+import { readLiveServerInfo } from './impeccable-paths.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function liveCli() {
+  const args = process.argv.slice(2);
+
+  if (args.includes('--help') || args.includes('-h')) {
+    console.log(`Usage: node live.mjs
+
+Prepare everything for live variant mode in a single command:
+  - Checks .impeccable/live/config.json (required, created once per project)
+  - Starts (or reuses) the live server in the background
+  - Injects the browser script tag
+  - Reads PRODUCT.md / DESIGN.md for project context
+
+On success, prints a JSON blob with:
+  { ok, serverPort, serverToken, pageFile, hasContext, context }
+
+On config_missing, prints:
+  { ok: false, error: "config_missing", configPath, hint }
+
+The agent should then:
+  1. If config_missing, create the config and re-run this script
+  2. Optionally open the project's dev/preview URL in the browser (see reference/live.md—not serverPort)
+  3. Enter the poll loop: node live-poll.mjs`);
+    process.exit(0);
+  }
+
+  // 1. Check config (fail fast if missing — no point starting anything else)
+  const checkOut = runScript('live-inject.mjs', ['--check']);
+  const checkResult = safeParse(checkOut);
+  if (!checkResult || !checkResult.ok) {
+    console.log(JSON.stringify(checkResult || { ok: false, error: 'check_failed', raw: checkOut }));
+    process.exit(0);
+  }
+
+  // 2. Start server (or reuse existing)
+  const serverInfo = ensureServerRunning();
+  if (!serverInfo) {
+    console.log(JSON.stringify({ ok: false, error: 'server_start_failed' }));
+    process.exit(1);
+  }
+
+  // 3. Inject the script tag at the current port
+  const injectOut = runScript('live-inject.mjs', ['--port', String(serverInfo.port)]);
+  const injectResult = safeParse(injectOut);
+  if (!injectResult || !injectResult.ok) {
+    console.log(JSON.stringify({
+      ok: false,
+      error: 'inject_failed',
+      detail: injectResult || injectOut,
+      serverPort: serverInfo.port,
+    }));
+    process.exit(1);
+  }
+
+  // 4. Load PRODUCT.md + DESIGN.md context (auto-migrates legacy .impeccable.md)
+  const ctx = loadContext(process.cwd());
+
+  // 5. Compute drift-heal: compare resolved inject targets against the
+  //    project's HTML files. Orphans are HTML files not covered by config.
+  //    Warning only — the agent decides whether to act.
+  const resolvedFiles = resolveFiles(process.cwd(), checkResult.config);
+  const drift = scanForDrift(process.cwd(), resolvedFiles, checkResult.config);
+
+  // 6. Emit everything the agent needs
+  console.log(JSON.stringify({
+    ok: true,
+    serverPort: serverInfo.port,
+    serverToken: serverInfo.token,
+    pageFiles: resolvedFiles,
+    configDrift: drift,
+    hasProduct: ctx.hasProduct,
+    product: ctx.product,
+    productPath: ctx.productPath,
+    hasDesign: ctx.hasDesign,
+    design: ctx.design,
+    designPath: ctx.designPath,
+    migrated: ctx.migrated,
+  }, null, 2));
+}
+
+/**
+ * Drift-heal scan. Walks the project for HTML files under common
+ * page-source directories (public/, src/, app/, pages/) and reports any
+ * that aren't covered by the resolved inject targets. This is purely
+ * advisory — the agent can ignore it, or suggest the user add the
+ * orphans to config.files.
+ *
+ * Skipped if config.files already contains at least one glob pattern
+ * covering everything in practice (signaled by the orphan count being 0).
+ */
+function scanForDrift(rootDir, resolvedFiles, config) {
+  const SCAN_ROOTS = ['public', 'src', 'app', 'pages'];
+  const IGNORE_DIRS = new Set([
+    'node_modules', '.git', '.next', '.nuxt', '.svelte-kit', '.astro',
+    '.turbo', '.vercel', '.cache', 'coverage', 'dist', 'build',
+  ]);
+
+  const resolvedSet = new Set(resolvedFiles.map((f) => f.split(path.sep).join('/')));
+
+  // Files matching the user's `exclude` globs are intentional omissions,
+  // not drift. Compile them to regexes so the orphan list stays signal.
+  const userExcludeRegexes = (Array.isArray(config.exclude) ? config.exclude : [])
+    .map((p) => globToRegex(p));
+  const isUserExcluded = (rel) => userExcludeRegexes.some((re) => re.test(rel));
+
+  const orphans = [];
+
+  const walk = (dir, relBase) => {
+    let entries;
+    try { entries = fs.readdirSync(dir, { withFileTypes: true }); }
+    catch { return; }
+    for (const e of entries) {
+      const rel = relBase ? `${relBase}/${e.name}` : e.name;
+      if (e.isDirectory()) {
+        if (IGNORE_DIRS.has(e.name) || e.name.startsWith('.')) continue;
+        walk(path.join(dir, e.name), rel);
+      } else if (e.isFile() && e.name.endsWith('.html')) {
+        if (resolvedSet.has(rel)) continue;
+        if (isUserExcluded(rel)) continue;
+        orphans.push(rel);
+      }
+    }
+  };
+
+  for (const root of SCAN_ROOTS) {
+    const abs = path.join(rootDir, root);
+    if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
+      walk(abs, root);
+    }
+  }
+
+  if (orphans.length === 0) return null;
+  const capped = orphans.slice(0, 20);
+  return {
+    orphans: capped,
+    orphanCount: orphans.length,
+    hint: `${orphans.length} HTML file(s) exist but aren't in config.files. Consider adding them, or use a glob pattern like "public/**/*.html".`,
+  };
+}
+
+/**
+ * Same glob-to-regex mapping used by live-inject.mjs. Kept inline here
+ * to avoid a circular import (live-inject.mjs already imports nothing
+ * from live.mjs). The two must stay in sync.
+ */
+function globToRegex(pattern) {
+  let re = '';
+  let i = 0;
+  while (i < pattern.length) {
+    const c = pattern[i];
+    if (c === '*') {
+      if (pattern[i + 1] === '*') {
+        if (pattern[i + 2] === '/') { re += '(?:.*/)?'; i += 3; }
+        else { re += '.*'; i += 2; }
+      } else {
+        re += '[^/]*';
+        i += 1;
+      }
+    } else if (c === '?') {
+      re += '[^/]';
+      i += 1;
+    } else if (/[.+^${}()|[\]\\]/.test(c)) {
+      re += '\\' + c;
+      i += 1;
+    } else {
+      re += c;
+      i += 1;
+    }
+  }
+  return new RegExp('^' + re + '$');
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function runScript(name, args) {
+  const scriptPath = path.join(__dirname, name);
+  const cmd = `node "${scriptPath}" ${args.map(a => `"${a}"`).join(' ')}`;
+  try {
+    return execSync(cmd, { encoding: 'utf-8', cwd: process.cwd(), timeout: 15_000 });
+  } catch (err) {
+    // execSync throws on non-zero exit; return stdout if any
+    return err.stdout || err.message || '';
+  }
+}
+
+function safeParse(out) {
+  try { return JSON.parse(String(out).trim()); } catch { return null; }
+}
+
+/**
+ * Return { pid, port, token } for the running live server, starting one if needed.
+ */
+function ensureServerRunning() {
+  // Try to reuse an existing server
+  try {
+    const existing = readLiveServerInfo(process.cwd())?.info;
+    if (existing && existing.pid) {
+      try {
+        process.kill(existing.pid, 0); // throws if dead
+        return existing;
+      } catch { /* stale PID file — the server script will clean it up */ }
+    }
+  } catch { /* no PID file */ }
+
+  // Start a new server
+  const out = runScript('live-server.mjs', ['--background']);
+  return safeParse(out);
+}
+
+// ---------------------------------------------------------------------------
+// Auto-execute
+// ---------------------------------------------------------------------------
+
+const _running = process.argv[1];
+if (_running?.endsWith('live.mjs') || _running?.endsWith('live.mjs/')) {
+  liveCli();
+}
diff --git a/.agents/skills/impeccable/scripts/load-context.mjs b/.agents/skills/impeccable/scripts/load-context.mjs
new file mode 100644
index 00000000..dc340bf1
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/load-context.mjs
@@ -0,0 +1,141 @@
+/**
+ * Shared context loader for every impeccable command that needs to know
+ * "who is this for" and "what does this look like".
+ *
+ * Input: project root (process.cwd()).
+ *
+ * Output (JSON to stdout):
+ *   {
+ *     hasProduct: boolean,        // PRODUCT.md found (or auto-migrated)
+ *     product: string | null,     // PRODUCT.md contents
+ *     productPath: string | null, // relative path
+ *     hasDesign: boolean,         // DESIGN.md found
+ *     design: string | null,      // DESIGN.md contents
+ *     designPath: string | null,
+ *     migrated: boolean,          // true if we auto-renamed .impeccable.md -> PRODUCT.md
+ *     contextDir: string,         // absolute path of the directory the files were found in
+ *   }
+ *
+ * Filename matching is case-insensitive for PRODUCT.md and DESIGN.md. The
+ * Google DESIGN.md convention is uppercase at repo root; Kiro-style and
+ * lowercase variants are also matched so users don't get punished for case.
+ *
+ * Lookup directory resolution (first match wins):
+ *   1. process.env.IMPECCABLE_CONTEXT_DIR (absolute or relative to cwd)
+ *   2. cwd, if PRODUCT.md / DESIGN.md / .impeccable.md is there (back-compat)
+ *   3. Auto-fallback subdirectories of cwd: .agents/context/, then docs/
+ *   4. cwd as a default "no context found" location
+ *
+ * Legacy `.impeccable.md` -> PRODUCT.md migration only fires at cwd root;
+ * fallback directories are read-only as far as auto-rename is concerned.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+
+const PRODUCT_NAMES = ['PRODUCT.md', 'Product.md', 'product.md'];
+const DESIGN_NAMES = ['DESIGN.md', 'Design.md', 'design.md'];
+const LEGACY_NAMES = ['.impeccable.md'];
+const FALLBACK_DIRS = ['.agents/context', 'docs'];
+
+/**
+ * Resolve the directory that holds PRODUCT.md / DESIGN.md for
+ * this project. Exported so other scripts (e.g. live-server.mjs) can read the
+ * design files from the same location the loader uses.
+ */
+export function resolveContextDir(cwd = process.cwd()) {
+  // 1. Explicit override
+  const envDir = process.env.IMPECCABLE_CONTEXT_DIR;
+  if (envDir && envDir.trim()) {
+    const trimmed = envDir.trim();
+    return path.isAbsolute(trimmed) ? trimmed : path.resolve(cwd, trimmed);
+  }
+
+  // 2. cwd wins if any canonical or legacy file is there. We check legacy too
+  //    so the auto-migration path in loadContext stays predictable.
+  if (firstExisting(cwd, [...PRODUCT_NAMES, ...DESIGN_NAMES, ...LEGACY_NAMES])) {
+    return cwd;
+  }
+
+  // 3. Auto-fallback subdirs. Match if PRODUCT.md or DESIGN.md is present;
+  //    legacy `.impeccable.md` does not pull the lookup into a fallback dir.
+  for (const rel of FALLBACK_DIRS) {
+    const candidate = path.resolve(cwd, rel);
+    if (firstExisting(candidate, [...PRODUCT_NAMES, ...DESIGN_NAMES])) {
+      return candidate;
+    }
+  }
+
+  // 4. Nothing found — keep the historical "default to cwd" behaviour so the
+  //    caller's `hasProduct === false` branch still fires the same way.
+  return cwd;
+}
+
+export function loadContext(cwd = process.cwd()) {
+  let migrated = false;
+  const contextDir = resolveContextDir(cwd);
+
+  // 1. Look for PRODUCT.md (case-insensitive) in the resolved dir
+  let productPath = firstExisting(contextDir, PRODUCT_NAMES);
+
+  // 2. Legacy: if no PRODUCT.md but .impeccable.md exists at cwd root, rename
+  //    it in place. We only migrate at the root — fallback dirs are read-only
+  //    so we don't surprise users by mutating files under docs/ or .agents/.
+  if (!productPath && contextDir === cwd) {
+    const legacyPath = firstExisting(cwd, LEGACY_NAMES);
+    if (legacyPath) {
+      const newPath = path.join(cwd, 'PRODUCT.md');
+      try {
+        fs.renameSync(legacyPath, newPath);
+        productPath = newPath;
+        migrated = true;
+      } catch {
+        // Rename failed (permissions, etc.) — fall back to reading legacy in place
+        productPath = legacyPath;
+      }
+    }
+  }
+
+  // 3. DESIGN.md (case-insensitive)
+  const designPath = firstExisting(contextDir, DESIGN_NAMES);
+
+  const product = productPath ? safeRead(productPath) : null;
+  const design = designPath ? safeRead(designPath) : null;
+
+  return {
+    hasProduct: !!product,
+    product,
+    productPath: productPath ? path.relative(cwd, productPath) : null,
+    hasDesign: !!design,
+    design,
+    designPath: designPath ? path.relative(cwd, designPath) : null,
+    migrated,
+    contextDir,
+  };
+}
+
+function firstExisting(dir, names) {
+  for (const name of names) {
+    const abs = path.join(dir, name);
+    if (fs.existsSync(abs)) return abs;
+  }
+  return null;
+}
+
+function safeRead(p) {
+  try { return fs.readFileSync(p, 'utf-8'); } catch { return null; }
+}
+
+// ---------------------------------------------------------------------------
+// CLI mode — print the context as JSON
+// ---------------------------------------------------------------------------
+
+function cli() {
+  const result = loadContext(process.cwd());
+  console.log(JSON.stringify(result, null, 2));
+}
+
+const _running = process.argv[1];
+if (_running?.endsWith('load-context.mjs') || _running?.endsWith('load-context.mjs/')) {
+  cli();
+}
diff --git a/.agents/skills/impeccable/scripts/modern-screenshot.umd.js b/.agents/skills/impeccable/scripts/modern-screenshot.umd.js
new file mode 100644
index 00000000..a9c5208f
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/modern-screenshot.umd.js
@@ -0,0 +1,14 @@
+(function(y,v){typeof exports=="object"&&typeof module!="undefined"?v(exports):typeof define=="function"&&define.amd?define(["exports"],v):(y=typeof globalThis!="undefined"?globalThis:y||self,v(y.modernScreenshot={}))})(this,function(y){"use strict";var rr=Object.defineProperty,nr=Object.defineProperties;var or=Object.getOwnPropertyDescriptors;var Z=Object.getOwnPropertySymbols;var xe=Object.prototype.hasOwnProperty,Me=Object.prototype.propertyIsEnumerable;var Oe=Math.pow,Le=(y,v,N)=>v in y?rr(y,v,{enumerable:!0,configurable:!0,writable:!0,value:N}):y[v]=N,D=(y,v)=>{for(var N in v||(v={}))xe.call(v,N)&&Le(y,N,v[N]);if(Z)for(var N of Z(v))Me.call(v,N)&&Le(y,N,v[N]);return y},M=(y,v)=>nr(y,or(v));var je=(y,v)=>{var N={};for(var R in y)xe.call(y,R)&&v.indexOf(R)<0&&(N[R]=y[R]);if(y!=null&&Z)for(var R of Z(y))v.indexOf(R)<0&&Me.call(y,R)&&(N[R]=y[R]);return N};var C=(y,v,N)=>new Promise((R,O)=>{var X=P=>{try{q(N.next(P))}catch(W){O(W)}},j=P=>{try{q(N.throw(P))}catch(W){O(W)}},q=P=>P.done?R(P.value):Promise.resolve(P.value).then(X,j);q((N=N.apply(y,v)).next())});var Be;function v(e,t){return e[13]=1,e[14]=t>>8,e[15]=t&255,e[16]=t>>8,e[17]=t&255,e}const N=112,R=72,O=89,X=115;let j;function q(){const e=new Int32Array(256);for(let t=0;t<256;t++){let r=t;for(let n=0;n<8;n++)r=r&1?3988292384^r>>>1:r>>>1;e[t]=r}return e}function P(e){let t=-1;j||(j=q());for(let r=0;r<e.length;r++)t=j[(t^e[r])&255]^t>>>8;return t^-1}function W(e){const t=e.length-1;for(let r=t;r>=4;r--)if(e[r-4]===9&&e[r-3]===N&&e[r-2]===R&&e[r-1]===O&&e[r]===X)return r-3;return 0}function ae(e,t,r=!1){const n=new Uint8Array(13);t*=39.3701,n[0]=N,n[1]=R,n[2]=O,n[3]=X,n[4]=t>>>24,n[5]=t>>>16,n[6]=t>>>8,n[7]=t&255,n[8]=n[4],n[9]=n[5],n[10]=n[6],n[11]=n[7],n[12]=1;const i=P(n),a=new Uint8Array(4);if(a[0]=i>>>24,a[1]=i>>>16,a[2]=i>>>8,a[3]=i&255,r){const s=W(e);return e.set(n,s),e.set(a,s+13),e}else{const s=new Uint8Array(4);s[0]=0,s[1]=0,s[2]=0,s[3]=9;const o=new Uint8Array(54);return o.set(e,0),o.set(s,33),o.set(n,37),o.set(a,50),o}}const qe="AAlwSFlz",We="AAAJcEhZ",He="AAAACXBI";function Ve(e){let t=e.indexOf(qe);return t===-1&&(t=e.indexOf(We)),t===-1&&(t=e.indexOf(He)),t}const se="[modern-screenshot]",U=typeof window!="undefined",ze=U&&"Worker"in window,ie=U&&"atob"in window,Xe=U&&"btoa"in window,ee=U?(Be=window.navigator)==null?void 0:Be.userAgent:"",le=ee.includes("Chrome"),G=ee.includes("AppleWebKit")&&!le,te=ee.includes("Firefox"),Ge=e=>e&&"__CONTEXT__"in e,Ye=e=>e.constructor.name==="CSSFontFaceRule",Je=e=>e.constructor.name==="CSSImportRule",Ke=e=>e.constructor.name==="CSSLayerBlockRule",I=e=>e.nodeType===1,H=e=>typeof e.className=="object",ce=e=>e.tagName==="image",Qe=e=>e.tagName==="use",V=e=>I(e)&&typeof e.style!="undefined"&&!H(e),Ze=e=>e.nodeType===8,et=e=>e.nodeType===3,$=e=>e.tagName==="IMG",Y=e=>e.tagName==="VIDEO",tt=e=>e.tagName==="CANVAS",rt=e=>e.tagName==="TEXTAREA",nt=e=>e.tagName==="INPUT",ot=e=>e.tagName==="STYLE",at=e=>e.tagName==="SCRIPT",st=e=>e.tagName==="SELECT",it=e=>e.tagName==="SLOT",lt=e=>e.tagName==="IFRAME",ct=(...e)=>console.warn(se,...e);function ut(e){var r;const t=(r=e==null?void 0:e.createElement)==null?void 0:r.call(e,"canvas");return t&&(t.height=t.width=1),!!t&&"toDataURL"in t&&!!t.toDataURL("image/webp").includes("image/webp")}const re=e=>e.startsWith("data:");function ue(e,t){if(e.match(/^[a-z]+:\/\//i))return e;if(U&&e.match(/^\/\//))return window.location.protocol+e;if(e.match(/^[a-z]+:/i)||!U)return e;const r=J().implementation.createHTMLDocument(),n=r.createElement("base"),i=r.createElement("a");return r.head.appendChild(n),r.body.appendChild(i),t&&(n.href=t),i.href=e,i.href}function J(e){var t;return(t=e&&I(e)?e==null?void 0:e.ownerDocument:e)!=null?t:window.document}const K="http://www.w3.org/2000/svg";function fe(e,t,r){const n=J(r).createElementNS(K,"svg");return n.setAttributeNS(null,"width",e.toString()),n.setAttributeNS(null,"height",t.toString()),n.setAttributeNS(null,"viewBox",`0 0 ${e} ${t}`),n}function de(e,t){let r=new XMLSerializer().serializeToString(e);return t&&(r=r.replace(/[\u0000-\u0008\v\f\u000E-\u001F\uD800-\uDFFF\uFFFE\uFFFF]/gu,"")),`data:image/svg+xml;charset=utf-8,${encodeURIComponent(r)}`}function ft(e,t="image/png",r=1){return C(this,null,function*(){try{return yield new Promise((n,i)=>{e.toBlob(a=>{a?n(a):i(new Error("Blob is null"))},t,r)})}catch(n){if(ie)return dt(e.toDataURL(t,r));throw n}})}function dt(e){var o,c;const[t,r]=e.split(","),n=(c=(o=t.match(/data:(.+);/))==null?void 0:o[1])!=null?c:void 0,i=window.atob(r),a=i.length,s=new Uint8Array(a);for(let u=0;u<a;u+=1)s[u]=i.charCodeAt(u);return new Blob([s],{type:n})}function ge(e,t){return new Promise((r,n)=>{const i=new FileReader;i.onload=()=>r(i.result),i.onerror=()=>n(i.error),i.onabort=()=>n(new Error(`Failed read blob to ${t}`)),t==="dataUrl"?i.readAsDataURL(e):t==="arrayBuffer"&&i.readAsArrayBuffer(e)})}const gt=e=>ge(e,"dataUrl"),mt=e=>ge(e,"arrayBuffer");function _(e,t){const r=J(t).createElement("img");return r.decoding="sync",r.loading="eager",r.src=e,r}function L(e,t){return new Promise(r=>{const{timeout:n,ownerDocument:i,onError:a,onWarn:s}=t!=null?t:{},o=typeof e=="string"?_(e,J(i)):e;let c=null,u=null;function l(){r(o),c&&clearTimeout(c),u==null||u()}if(n&&(c=setTimeout(l,n)),Y(o)){const d=o.currentSrc||o.src;if(!d)return o.poster?L(o.poster,t).then(r):l();if(o.readyState>=2)return l();const m=l,f=h=>{s==null||s("Failed video load",d,h),a==null||a(h),l()};u=()=>{o.removeEventListener("loadeddata",m),o.removeEventListener("error",f)},o.addEventListener("loadeddata",m,{once:!0}),o.addEventListener("error",f,{once:!0})}else{const d=ce(o)?o.href.baseVal:o.currentSrc||o.src;if(!d)return l();const m=()=>C(this,null,function*(){if($(o)&&"decode"in o)try{yield o.decode()}catch(h){s==null||s("Failed to decode image, trying to render anyway",o.dataset.originalSrc||d,h)}l()}),f=h=>{s==null||s("Failed image load",o.dataset.originalSrc||d,h),l()};if($(o)&&o.complete)return m();u=()=>{o.removeEventListener("load",m),o.removeEventListener("error",f)},o.addEventListener("load",m,{once:!0}),o.addEventListener("error",f,{once:!0})}})}function me(e,t){return C(this,null,function*(){V(e)&&($(e)||Y(e)?yield L(e,t):yield Promise.all(["img","video"].flatMap(r=>Array.from(e.querySelectorAll(r)).map(n=>L(n,t)))))})}const he=function(){let t=0;const r=()=>`0000${(Math.random()*Oe(36,4)<<0).toString(36)}`.slice(-4);return()=>(t+=1,`u${r()}${t}`)}();function we(e){return e==null?void 0:e.split(",").map(t=>t.trim().replace(/"|'/g,"").toLowerCase()).filter(Boolean)}let pe=0;function ht(e){const t=`${se}[#${pe}]`;return pe++,{time:r=>e&&console.time(`${t} ${r}`),timeEnd:r=>e&&console.timeEnd(`${t} ${r}`),warn:(...r)=>e&&ct(...r)}}function wt(e){return{cache:e?"no-cache":"force-cache"}}function k(e,t){return C(this,null,function*(){return Ge(e)?e:ye(e,M(D({},t),{autoDestruct:!0}))})}function ye(e,t){return C(this,null,function*(){var f,h,g,p,E;const{scale:r=1,workerUrl:n,workerNumber:i=1}=t||{},a=!!(t!=null&&t.debug),s=(f=t==null?void 0:t.features)!=null?f:!0,o=(h=e.ownerDocument)!=null?h:U?window.document:void 0,c=(p=(g=e.ownerDocument)==null?void 0:g.defaultView)!=null?p:U?window:void 0,u=new Map,l=M(D({width:0,height:0,quality:1,type:"image/png",scale:r,backgroundColor:null,style:null,filter:null,maximumCanvasSize:0,timeout:3e4,progress:null,debug:a,fetch:D({requestInit:wt((E=t==null?void 0:t.fetch)==null?void 0:E.bypassingCache),placeholderImage:"data:image/png;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",bypassingCache:!1},t==null?void 0:t.fetch),fetchFn:null,font:{},drawImageInterval:100,workerUrl:null,workerNumber:i,onCloneEachNode:null,onCloneNode:null,onEmbedNode:null,onCreateForeignObjectSvg:null,includeStyleProperties:null,autoDestruct:!1},t),{__CONTEXT__:!0,log:ht(a),node:e,ownerDocument:o,ownerWindow:c,dpi:r===1?null:96*r,svgStyleElement:be(o),svgDefsElement:o==null?void 0:o.createElementNS(K,"defs"),svgStyles:new Map,defaultComputedStyles:new Map,workers:[...Array.from({length:ze&&n&&i?i:0})].map(()=>{try{const b=new Worker(n);return b.onmessage=w=>C(this,null,function*(){var A,F,B,$e;const{url:S,result:T}=w.data;T?(F=(A=u.get(S))==null?void 0:A.resolve)==null||F.call(A,T):($e=(B=u.get(S))==null?void 0:B.reject)==null||$e.call(B,new Error(`Error receiving message from worker: ${S}`))}),b.onmessageerror=w=>{var T,A;const{url:S}=w.data;(A=(T=u.get(S))==null?void 0:T.reject)==null||A.call(T,new Error(`Error receiving message from worker: ${S}`))},b}catch(b){return l.log.warn("Failed to new Worker",b),null}}).filter(Boolean),fontFamilies:new Map,fontCssTexts:new Map,acceptOfImage:`${[ut(o)&&"image/webp","image/svg+xml","image/*","*/*"].filter(Boolean).join(",")};q=0.8`,requests:u,drawImageCount:0,tasks:[],features:s,isEnable:b=>{var w,S;return b==="restoreScrollPosition"?typeof s=="boolean"?!1:(w=s[b])!=null?w:!1:typeof s=="boolean"?s:(S=s[b])!=null?S:!0},shadowRoots:[]});l.log.time("wait until load"),yield me(e,{timeout:l.timeout,onWarn:l.log.warn}),l.log.timeEnd("wait until load");const{width:d,height:m}=pt(e,l);return l.width=d,l.height=m,l})}function be(e){if(!e)return;const t=e.createElement("style"),r=t.ownerDocument.createTextNode(`
+.______background-clip--text {
+  background-clip: text;
+  -webkit-background-clip: text;
+}
+`);return t.appendChild(r),t}function pt(e,t){let{width:r,height:n}=t;if(I(e)&&(!r||!n)){const i=e.getBoundingClientRect();r=r||i.width||Number(e.getAttribute("width"))||0,n=n||i.height||Number(e.getAttribute("height"))||0}return{width:r,height:n}}function yt(e,t){return C(this,null,function*(){const{log:r,timeout:n,drawImageCount:i,drawImageInterval:a}=t;r.time("image to canvas");const s=yield L(e,{timeout:n,onWarn:t.log.warn}),{canvas:o,context2d:c}=bt(e.ownerDocument,t),u=()=>{try{c==null||c.drawImage(s,0,0,o.width,o.height)}catch(l){t.log.warn("Failed to drawImage",l)}};if(u(),t.isEnable("fixSvgXmlDecode"))for(let l=0;l<i;l++)yield new Promise(d=>{setTimeout(()=>{c==null||c.clearRect(0,0,o.width,o.height),u(),d()},l+a)});return t.drawImageCount=0,r.timeEnd("image to canvas"),o})}function bt(e,t){const{width:r,height:n,scale:i,backgroundColor:a,maximumCanvasSize:s}=t,o=e.createElement("canvas");o.width=Math.floor(r*i),o.height=Math.floor(n*i),o.style.width=`${r}px`,o.style.height=`${n}px`,s&&(o.width>s||o.height>s)&&(o.width>s&&o.height>s?o.width>o.height?(o.height*=s/o.width,o.width=s):(o.width*=s/o.height,o.height=s):o.width>s?(o.height*=s/o.width,o.width=s):(o.width*=s/o.height,o.height=s));const c=o.getContext("2d");return c&&a&&(c.fillStyle=a,c.fillRect(0,0,o.width,o.height)),{canvas:o,context2d:c}}function Se(e,t){if(e.ownerDocument)try{const a=e.toDataURL();if(a!=="data:,")return _(a,e.ownerDocument)}catch(a){t.log.warn("Failed to clone canvas",a)}const r=e.cloneNode(!1),n=e.getContext("2d"),i=r.getContext("2d");try{return n&&i&&i.putImageData(n.getImageData(0,0,e.width,e.height),0,0),r}catch(a){t.log.warn("Failed to clone canvas",a)}return r}function St(e,t){var r;try{if((r=e==null?void 0:e.contentDocument)!=null&&r.documentElement)return ne(e.contentDocument.documentElement,t)}catch(n){t.log.warn("Failed to clone iframe",n)}return e.cloneNode(!1)}function Et(e){const t=e.cloneNode(!1);return e.currentSrc&&e.currentSrc!==e.src&&(t.src=e.currentSrc,t.srcset=""),t.loading==="lazy"&&(t.loading="eager"),t}function Ct(e,t){return C(this,null,function*(){if(e.ownerDocument&&!e.currentSrc&&e.poster)return _(e.poster,e.ownerDocument);const r=e.cloneNode(!1);r.crossOrigin="anonymous",e.currentSrc&&e.currentSrc!==e.src&&(r.src=e.currentSrc);const n=r.ownerDocument;if(n){let i=!0;if(yield L(r,{onError:()=>i=!1,onWarn:t.log.warn}),!i)return e.poster?_(e.poster,e.ownerDocument):r;r.currentTime=e.currentTime,yield new Promise(s=>{r.addEventListener("seeked",s,{once:!0})});const a=n.createElement("canvas");a.width=e.offsetWidth,a.height=e.offsetHeight;try{const s=a.getContext("2d");s&&s.drawImage(r,0,0,a.width,a.height)}catch(s){return t.log.warn("Failed to clone video",s),e.poster?_(e.poster,e.ownerDocument):r}return Se(a,t)}return r})}function Tt(e,t){return tt(e)?Se(e,t):lt(e)?St(e,t):$(e)?Et(e):Y(e)?Ct(e,t):e.cloneNode(!1)}function vt(e){let t=e.sandbox;if(!t){const{ownerDocument:r}=e;try{r&&(t=r.createElement("iframe"),t.id=`__SANDBOX__${he()}`,t.width="0",t.height="0",t.style.visibility="hidden",t.style.position="fixed",r.body.appendChild(t),t.srcdoc='<!DOCTYPE html><meta charset="UTF-8"><title></title><body>',e.sandbox=t)}catch(n){e.log.warn("Failed to getSandBox",n)}}return t}const At=["width","height","-webkit-text-fill-color"],Nt=["stroke","fill"];function Ee(e,t,r){const{defaultComputedStyles:n}=r,i=e.nodeName.toLowerCase(),a=H(e)&&i!=="svg",s=a?Nt.map(g=>[g,e.getAttribute(g)]).filter(([,g])=>g!==null):[],o=[a&&"svg",i,s.map((g,p)=>`${g}=${p}`).join(","),t].filter(Boolean).join(":");if(n.has(o))return n.get(o);const c=vt(r),u=c==null?void 0:c.contentWindow;if(!u)return new Map;const l=u==null?void 0:u.document;let d,m;a?(d=l.createElementNS(K,"svg"),m=d.ownerDocument.createElementNS(d.namespaceURI,i),s.forEach(([g,p])=>{m.setAttributeNS(null,g,p)}),d.appendChild(m)):d=m=l.createElement(i),m.textContent=" ",l.body.appendChild(d);const f=u.getComputedStyle(m,t),h=new Map;for(let g=f.length,p=0;p<g;p++){const E=f.item(p);At.includes(E)||h.set(E,f.getPropertyValue(E))}return l.body.removeChild(d),n.set(o,h),h}function Ce(e,t,r){var o;const n=new Map,i=[],a=new Map;if(r)for(const c of r)s(c);else for(let c=e.length,u=0;u<c;u++){const l=e.item(u);s(l)}for(let c=i.length,u=0;u<c;u++)(o=a.get(i[u]))==null||o.forEach((l,d)=>n.set(d,l));function s(c){const u=e.getPropertyValue(c),l=e.getPropertyPriority(c),d=c.lastIndexOf("-"),m=d>-1?c.substring(0,d):void 0;if(m){let f=a.get(m);f||(f=new Map,a.set(m,f)),f.set(c,[u,l])}t.get(c)===u&&!l||(m?i.push(m):n.set(c,[u,l]))}return n}function Rt(e,t,r,n){var d,m,f,h;const{ownerWindow:i,includeStyleProperties:a,currentParentNodeStyle:s}=n,o=t.style,c=i.getComputedStyle(e),u=Ee(e,null,n);s==null||s.forEach((g,p)=>{u.delete(p)});const l=Ce(c,u,a);l.delete("transition-property"),l.delete("all"),l.delete("d"),l.delete("content"),r&&(l.delete("position"),l.delete("margin-top"),l.delete("margin-right"),l.delete("margin-bottom"),l.delete("margin-left"),l.delete("margin-block-start"),l.delete("margin-block-end"),l.delete("margin-inline-start"),l.delete("margin-inline-end"),l.set("box-sizing",["border-box",""])),((d=l.get("background-clip"))==null?void 0:d[0])==="text"&&t.classList.add("______background-clip--text"),le&&(l.has("font-kerning")||l.set("font-kerning",["normal",""]),(((m=l.get("overflow-x"))==null?void 0:m[0])==="hidden"||((f=l.get("overflow-y"))==null?void 0:f[0])==="hidden")&&((h=l.get("text-overflow"))==null?void 0:h[0])==="ellipsis"&&e.scrollWidth===e.clientWidth&&l.set("text-overflow",["clip",""]));for(let g=o.length,p=0;p<g;p++)o.removeProperty(o.item(p));return l.forEach(([g,p],E)=>{o.setProperty(E,g,p)}),l}function It(e,t){(rt(e)||nt(e)||st(e))&&t.setAttribute("value",e.value)}const kt=["::before","::after"],Dt=["::-webkit-scrollbar","::-webkit-scrollbar-button","::-webkit-scrollbar-thumb","::-webkit-scrollbar-track","::-webkit-scrollbar-track-piece","::-webkit-scrollbar-corner","::-webkit-resizer"];function Pt(e,t,r,n,i){const{ownerWindow:a,svgStyleElement:s,svgStyles:o,currentNodeStyle:c}=n;if(!s||!a)return;function u(l){var w;const d=a.getComputedStyle(e,l);let m=d.getPropertyValue("content");if(!m||m==="none")return;i==null||i(m),m=m.replace(/(')|(")|(counter\(.+\))/g,"");const f=[he()],h=Ee(e,l,n);c==null||c.forEach((S,T)=>{h.delete(T)});const g=Ce(d,h,n.includeStyleProperties);g.delete("content"),g.delete("-webkit-locale"),((w=g.get("background-clip"))==null?void 0:w[0])==="text"&&t.classList.add("______background-clip--text");const p=[`content: '${m}';`];if(g.forEach(([S,T],A)=>{p.push(`${A}: ${S}${T?" !important":""};`)}),p.length===1)return;try{t.className=[t.className,...f].join(" ")}catch(S){n.log.warn("Failed to copyPseudoClass",S);return}const E=p.join(`
+  `);let b=o.get(E);b||(b=[],o.set(E,b)),b.push(`.${f[0]}${l}`)}kt.forEach(u),r&&Dt.forEach(u)}const Te=new Set(["symbol"]);function ve(e,t,r,n,i){return C(this,null,function*(){if(I(r)&&(ot(r)||at(r))||n.filter&&!n.filter(r))return;Te.has(t.nodeName)||Te.has(r.nodeName)?n.currentParentNodeStyle=void 0:n.currentParentNodeStyle=n.currentNodeStyle;const a=yield ne(r,n,!1,i);n.isEnable("restoreScrollPosition")&&Ut(e,a),t.appendChild(a)})}function Ae(e,t,r,n){return C(this,null,function*(){var a;let i=e.firstChild;I(e)&&e.shadowRoot&&(i=(a=e.shadowRoot)==null?void 0:a.firstChild,r.shadowRoots.push(e.shadowRoot));for(let s=i;s;s=s.nextSibling)if(!Ze(s))if(I(s)&&it(s)&&typeof s.assignedNodes=="function"){const o=s.assignedNodes();for(let c=0;c<o.length;c++)yield ve(e,t,o[c],r,n)}else yield ve(e,t,s,r,n)})}function Ut(e,t){if(!V(e)||!V(t))return;const{scrollTop:r,scrollLeft:n}=e;if(!r&&!n)return;const{transform:i}=t.style,a=new DOMMatrix(i),{a:s,b:o,c,d:u}=a;a.a=1,a.b=0,a.c=0,a.d=1,a.translateSelf(-n,-r),a.a=s,a.b=o,a.c=c,a.d=u,t.style.transform=a.toString()}function _t(e,t){const{backgroundColor:r,width:n,height:i,style:a}=t,s=e.style;if(r&&s.setProperty("background-color",r,"important"),n&&s.setProperty("width",`${n}px`,"important"),i&&s.setProperty("height",`${i}px`,"important"),a)for(const o in a)s[o]=a[o]}const Ft=/^[\w-:]+$/;function ne(e,t,r=!1,n){return C(this,null,function*(){var u,l,d,m;const{ownerDocument:i,ownerWindow:a,fontFamilies:s,onCloneEachNode:o}=t;if(i&&et(e))return n&&/\S/.test(e.data)&&n(e.data),i.createTextNode(e.data);if(i&&a&&I(e)&&(V(e)||H(e))){const f=yield Tt(e,t);if(t.isEnable("removeAbnormalAttributes")){const w=f.getAttributeNames();for(let S=w.length,T=0;T<S;T++){const A=w[T];Ft.test(A)||f.removeAttribute(A)}}const h=t.currentNodeStyle=Rt(e,f,r,t);r&&_t(f,t);let g=!1;if(t.isEnable("copyScrollbar")){const w=[(u=h.get("overflow-x"))==null?void 0:u[0],(l=h.get("overflow-y"))==null?void 0:l[0]];g=w.includes("scroll")||(w.includes("auto")||w.includes("overlay"))&&(e.scrollHeight>e.clientHeight||e.scrollWidth>e.clientWidth)}const p=(d=h.get("text-transform"))==null?void 0:d[0],E=we((m=h.get("font-family"))==null?void 0:m[0]),b=E?w=>{p==="uppercase"?w=w.toUpperCase():p==="lowercase"?w=w.toLowerCase():p==="capitalize"&&(w=w[0].toUpperCase()+w.substring(1)),E.forEach(S=>{let T=s.get(S);T||s.set(S,T=new Set),w.split("").forEach(A=>T.add(A))})}:void 0;return Pt(e,f,g,t,b),It(e,f),Y(e)||(yield Ae(e,f,t,b)),yield o==null?void 0:o(f),f}const c=e.cloneNode(!1);return yield Ae(e,c,t),yield o==null?void 0:o(c),c})}function Ne(e){if(e.ownerDocument=void 0,e.ownerWindow=void 0,e.svgStyleElement=void 0,e.svgDefsElement=void 0,e.svgStyles.clear(),e.defaultComputedStyles.clear(),e.sandbox){try{e.sandbox.remove()}catch(t){e.log.warn("Failed to destroyContext",t)}e.sandbox=void 0}e.workers=[],e.fontFamilies.clear(),e.fontCssTexts.clear(),e.requests.clear(),e.tasks=[],e.shadowRoots=[]}function Bt(e){const o=e,{url:t,timeout:r,responseType:n}=o,i=je(o,["url","timeout","responseType"]),a=new AbortController,s=r?setTimeout(()=>a.abort(),r):void 0;return fetch(t,D({signal:a.signal},i)).then(c=>{if(!c.ok)throw new Error("Failed fetch, not 2xx response",{cause:c});switch(n){case"arrayBuffer":return c.arrayBuffer();case"dataUrl":return c.blob().then(gt);case"text":default:return c.text()}}).finally(()=>clearTimeout(s))}function z(e,t){const{url:r,requestType:n="text",responseType:i="text",imageDom:a}=t;let s=r;const{timeout:o,acceptOfImage:c,requests:u,fetchFn:l,fetch:{requestInit:d,bypassingCache:m,placeholderImage:f},font:h,workers:g,fontFamilies:p}=e;n==="image"&&(G||te)&&e.drawImageCount++;let E=u.get(r);if(!E){m&&m instanceof RegExp&&m.test(s)&&(s+=(/\?/.test(s)?"&":"?")+new Date().getTime());const b=n.startsWith("font")&&h&&h.minify,w=new Set;b&&n.split(";")[1].split(",").forEach(F=>{p.has(F)&&p.get(F).forEach(B=>w.add(B))});const S=b&&w.size,T=D({url:s,timeout:o,responseType:S?"arrayBuffer":i,headers:n==="image"?{accept:c}:void 0},d);E={type:n,resolve:void 0,reject:void 0,response:null},E.response=C(this,null,function*(){if(l&&n==="image"){const A=yield l(r);if(A)return A}return!G&&r.startsWith("http")&&g.length?new Promise((A,F)=>{g[u.size&g.length-1].postMessage(D({rawUrl:r},T)),E.resolve=A,E.reject=F}):Bt(T)}).catch(A=>{if(u.delete(r),n==="image"&&f)return e.log.warn("Failed to fetch image base64, trying to use placeholder image",s),typeof f=="string"?f:f(a);throw A}),u.set(r,E)}return E.response}function Re(e,t,r,n){return C(this,null,function*(){if(!Ie(e))return e;for(const[i,a]of $t(e,t))try{const s=yield z(r,{url:a,requestType:n?"image":"text",responseType:"dataUrl"});e=e.replace(Lt(i),`$1${s}$3`)}catch(s){r.log.warn("Failed to fetch css data url",i,s)}return e})}function Ie(e){return/url\((['"]?)([^'"]+?)\1\)/.test(e)}const ke=/url\((['"]?)([^'"]+?)\1\)/g;function $t(e,t){const r=[];return e.replace(ke,(n,i,a)=>(r.push([a,ue(a,t)]),n)),r.filter(([n])=>!re(n))}function Lt(e){const t=e.replace(/([.*+?^${}()|\[\]\/\\])/g,"\\$1");return new RegExp(`(url\\(['"]?)(${t})(['"]?\\))`,"g")}const xt=["background-image","border-image-source","-webkit-border-image","-webkit-mask-image","list-style-image"];function Mt(e,t){return xt.map(r=>{const n=e.getPropertyValue(r);return!n||n==="none"?null:((G||te)&&t.drawImageCount++,Re(n,null,t,!0).then(i=>{!i||n===i||e.setProperty(r,i,e.getPropertyPriority(r))}))}).filter(Boolean)}function Ot(e,t){if($(e)){const r=e.currentSrc||e.src;if(!re(r))return[z(t,{url:r,imageDom:e,requestType:"image",responseType:"dataUrl"}).then(n=>{n&&(e.srcset="",e.dataset.originalSrc=r,e.src=n||"")})];(G||te)&&t.drawImageCount++}else if(H(e)&&!re(e.href.baseVal)){const r=e.href.baseVal;return[z(t,{url:r,imageDom:e,requestType:"image",responseType:"dataUrl"}).then(n=>{n&&(e.dataset.originalSrc=r,e.href.baseVal=n||"")})]}return[]}function jt(e,t){var o;const{ownerDocument:r,svgDefsElement:n}=t,i=(o=e.getAttribute("href"))!=null?o:e.getAttribute("xlink:href");if(!i)return[];const[a,s]=i.split("#");if(s){const c=`#${s}`,u=t.shadowRoots.reduce((l,d)=>l!=null?l:d.querySelector(`svg ${c}`),r==null?void 0:r.querySelector(`svg ${c}`));if(a&&e.setAttribute("href",c),n!=null&&n.querySelector(c))return[];if(u)return n==null||n.appendChild(u.cloneNode(!0)),[];if(a)return[z(t,{url:a,responseType:"text"}).then(l=>{n==null||n.insertAdjacentHTML("beforeend",l)})]}return[]}function De(e,t){const{tasks:r}=t;I(e)&&(($(e)||ce(e))&&r.push(...Ot(e,t)),Qe(e)&&r.push(...jt(e,t))),V(e)&&r.push(...Mt(e.style,t)),e.childNodes.forEach(n=>{De(n,t)})}function qt(e,t){return C(this,null,function*(){const{ownerDocument:r,svgStyleElement:n,fontFamilies:i,fontCssTexts:a,tasks:s,font:o}=t;if(!(!r||!n||!i.size))if(o&&o.cssText){const c=Ue(o.cssText,t);n.appendChild(r.createTextNode(`${c}
+`))}else{const c=Array.from(r.styleSheets).filter(f=>{try{return"cssRules"in f&&!!f.cssRules.length}catch(h){return t.log.warn(`Error while reading CSS rules from ${f.href}`,h),!1}}),u=r.implementation.createHTMLDocument(""),l=u.createElement("style");u.head.appendChild(l);const d=l.sheet;yield Promise.all(c.flatMap(f=>Array.from(f.cssRules).map(h=>C(this,null,function*(){if(Je(h)){const g=h.href;let p="";try{p=yield z(t,{url:g,requestType:"text",responseType:"text"})}catch(b){t.log.warn(`Error fetch remote css import from ${g}`,b)}const E=p.replace(ke,(b,w,S)=>b.replace(S,ue(S,g)));for(const b of Ht(E))try{d.insertRule(b,d.cssRules.length)}catch(w){t.log.warn("Error inserting rule from remote css import",{rule:b,error:w})}}})))),d.cssRules.length&&c.push(d);const m=[];c.forEach(f=>{oe(f.cssRules,m)}),m.filter(f=>{var h;return Ye(f)&&Ie(f.style.getPropertyValue("src"))&&((h=we(f.style.getPropertyValue("font-family")))==null?void 0:h.some(g=>i.has(g)))}).forEach(f=>{const h=f,g=a.get(h.cssText);g?n.appendChild(r.createTextNode(`${g}
+`)):s.push(Re(h.cssText,h.parentStyleSheet?h.parentStyleSheet.href:null,t).then(p=>{p=Ue(p,t),a.set(h.cssText,p),n.appendChild(r.createTextNode(`${p}
+`))}))})}})}const Wt=/(\/\*[\s\S]*?\*\/)/g,Pe=/((@.*?keyframes [\s\S]*?){([\s\S]*?}\s*?)})/gi;function Ht(e){if(e==null)return[];const t=[];let r=e.replace(Wt,"");for(;;){const a=Pe.exec(r);if(!a)break;t.push(a[0])}r=r.replace(Pe,"");const n=/@import[\s\S]*?url\([^)]*\)[\s\S]*?;/gi,i=new RegExp("((\\s*?(?:\\/\\*[\\s\\S]*?\\*\\/)?\\s*?@media[\\s\\S]*?){([\\s\\S]*?)}\\s*?})|(([\\s\\S]*?){([\\s\\S]*?)})","gi");for(;;){let a=n.exec(r);if(a)i.lastIndex=n.lastIndex;else if(a=i.exec(r),a)n.lastIndex=i.lastIndex;else break;t.push(a[0])}return t}const Vt=/url\([^)]+\)\s*format\((["']?)([^"']+)\1\)/g,zt=/src:\s*(?:url\([^)]+\)\s*format\([^)]+\)[,;]\s*)+/g;function Ue(e,t){const{font:r}=t,n=r?r==null?void 0:r.preferredFormat:void 0;return n?e.replace(zt,i=>{for(;;){const[a,,s]=Vt.exec(i)||[];if(!s)return"";if(s===n)return`src: ${a};`}}):e}function oe(e,t=[]){for(const r of Array.from(e))Ke(r)?t.push(...oe(r.cssRules)):"cssRules"in r?oe(r.cssRules,t):t.push(r);return t}const Xt=/\bx?link:?href\s*=\s*["'](?!data:)[^"']+["']/i;function Gt(e){return Xt.test(e.innerHTML)}function _e(e,t){return C(this,null,function*(){const r=yield k(e,t);if(I(r.node)&&H(r.node)&&!Gt(r.node))return r.node;const{ownerDocument:n,log:i,tasks:a,svgStyleElement:s,svgDefsElement:o,svgStyles:c,font:u,progress:l,autoDestruct:d,onCloneNode:m,onEmbedNode:f,onCreateForeignObjectSvg:h}=r;i.time("clone node");const g=yield ne(r.node,r,!0);if(s&&n){let S="";c.forEach((T,A)=>{S+=`${T.join(`,
+`)} {
+  ${A}
+}
+`}),s.appendChild(n.createTextNode(S))}i.timeEnd("clone node"),yield m==null?void 0:m(g),u!==!1&&I(g)&&(i.time("embed web font"),yield qt(g,r),i.timeEnd("embed web font")),i.time("embed node"),De(g,r);const p=a.length;let E=0;const b=()=>C(this,null,function*(){for(;;){const S=a.pop();if(!S)break;try{yield S}catch(T){r.log.warn("Failed to run task",T)}l==null||l(++E,p)}});l==null||l(E,p),yield Promise.all([...Array.from({length:4})].map(b)),i.timeEnd("embed node"),yield f==null?void 0:f(g);const w=Yt(g,r);return o&&w.insertBefore(o,w.children[0]),s&&w.insertBefore(s,w.children[0]),d&&Ne(r),yield h==null?void 0:h(w),w})}function Yt(e,t){const{width:r,height:n}=t,i=fe(r,n,e.ownerDocument),a=i.ownerDocument.createElementNS(i.namespaceURI,"foreignObject");return a.setAttributeNS(null,"x","0%"),a.setAttributeNS(null,"y","0%"),a.setAttributeNS(null,"width","100%"),a.setAttributeNS(null,"height","100%"),a.append(e),i.appendChild(a),i}function Q(e,t){return C(this,null,function*(){var s;const r=yield k(e,t),n=yield _e(r),i=de(n,r.isEnable("removeControlCharacter"));r.autoDestruct||(r.svgStyleElement=be(r.ownerDocument),r.svgDefsElement=(s=r.ownerDocument)==null?void 0:s.createElementNS(K,"defs"),r.svgStyles.clear());const a=_(i,n.ownerDocument);return yield yt(a,r)})}function Jt(e,t){return C(this,null,function*(){const r=yield k(e,t),{log:n,type:i,quality:a,dpi:s}=r,o=yield Q(r);n.time("canvas to blob");const c=yield ft(o,i,a);if(["image/png","image/jpeg"].includes(i)&&s){const u=yield mt(c.slice(0,33));let l=new Uint8Array(u);return i==="image/png"?l=ae(l,s):i==="image/jpeg"&&(l=v(l,s)),n.timeEnd("canvas to blob"),new Blob([l,c.slice(33)],{type:i})}return n.timeEnd("canvas to blob"),c})}function x(e,t){return C(this,null,function*(){const r=yield k(e,t),{log:n,quality:i,type:a,dpi:s}=r,o=yield Q(r);n.time("canvas to data url");let c=o.toDataURL(a,i);if(["image/png","image/jpeg"].includes(a)&&s&&ie&&Xe){const[u,l]=c.split(",");let d=0,m=!1;if(a==="image/png"){const w=Ve(l);w>=0?(d=Math.ceil((w+28)/3)*4,m=!0):d=33/3*4}else a==="image/jpeg"&&(d=18/3*4);const f=l.substring(0,d),h=l.substring(d),g=window.atob(f),p=new Uint8Array(g.length);for(let w=0;w<p.length;w++)p[w]=g.charCodeAt(w);const E=a==="image/png"?ae(p,s,m):v(p,s),b=window.btoa(String.fromCharCode(...E));c=[u,",",b,h].join("")}return n.timeEnd("canvas to data url"),c})}function Fe(e,t){return C(this,null,function*(){const r=yield k(e,t),{width:n,height:i,ownerDocument:a}=r,s=yield x(r),o=fe(n,i,a),c=o.ownerDocument.createElementNS(o.namespaceURI,"image");return c.setAttributeNS(null,"href",s),c.setAttributeNS(null,"height","100%"),c.setAttributeNS(null,"width","100%"),o.appendChild(c),de(o,r.isEnable("removeControlCharacter"))})}function Kt(e,t){return C(this,null,function*(){const r=yield k(e,t),{ownerDocument:n,width:i,height:a,scale:s,type:o}=r,c=o==="image/svg+xml"?yield Fe(r):yield x(r),u=_(c,n);return u.width=Math.floor(i*s),u.height=Math.floor(a*s),u.style.width=`${i}px`,u.style.height=`${a}px`,u})}function Qt(e,t){return C(this,null,function*(){return x(yield k(e,M(D({},t),{type:"image/jpeg"})))})}function Zt(e,t){return C(this,null,function*(){const r=yield k(e,t),n=yield Q(r);return n.getContext("2d").getImageData(0,0,n.width,n.height).data})}function er(e,t){return C(this,null,function*(){return x(yield k(e,M(D({},t),{type:"image/png"})))})}function tr(e,t){return C(this,null,function*(){return x(yield k(e,M(D({},t),{type:"image/webp"})))})}y.createContext=ye,y.destroyContext=Ne,y.domToBlob=Jt,y.domToCanvas=Q,y.domToDataUrl=x,y.domToForeignObjectSvg=_e,y.domToImage=Kt,y.domToJpeg=Qt,y.domToPixel=Zt,y.domToPng=er,y.domToSvg=Fe,y.domToWebp=tr,y.loadMedia=L,y.waitUntilLoad=me,Object.defineProperty(y,Symbol.toStringTag,{value:"Module"})});
diff --git a/.agents/skills/impeccable/scripts/pin.mjs b/.agents/skills/impeccable/scripts/pin.mjs
new file mode 100644
index 00000000..ba02783f
--- /dev/null
+++ b/.agents/skills/impeccable/scripts/pin.mjs
@@ -0,0 +1,214 @@
+#!/usr/bin/env node
+/**
+ * Pin/unpin sub-commands as standalone skill shortcuts.
+ *
+ * Usage:
+ *   node <scripts_path>/pin.mjs pin <command>
+ *   node <scripts_path>/pin.mjs unpin <command>
+ *
+ * `pin audit` creates a lightweight /audit skill that redirects to /impeccable audit.
+ * `unpin audit` removes that shortcut.
+ *
+ * The script discovers harness directories (.claude/skills, .cursor/skills, etc.)
+ * in the project root and creates/removes the pin in all of them.
+ */
+
+import { existsSync, readFileSync, writeFileSync, mkdirSync, rmSync, readdirSync } from 'node:fs';
+import { join, resolve, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// All known harness directories
+const HARNESS_DIRS = [
+  '.claude', '.cursor', '.gemini', '.codex', '.agents',
+  '.trae', '.trae-cn', '.pi', '.opencode', '.kiro', '.rovodev',
+];
+
+// Valid sub-command names
+const VALID_COMMANDS = [
+  'craft', 'teach', 'extract', 'document', 'shape',
+  'critique', 'audit',
+  'polish', 'bolder', 'quieter', 'distill', 'harden', 'onboard', 'live',
+  'animate', 'colorize', 'typeset', 'layout', 'delight', 'overdrive',
+  'clarify', 'adapt', 'optimize',
+];
+
+// Marker to identify pinned skills (so unpin doesn't delete user skills)
+const PIN_MARKER = '<!-- impeccable-pinned-skill -->';
+
+/**
+ * Walk up from startDir to find a project root.
+ */
+function findProjectRoot(startDir = process.cwd()) {
+  let dir = resolve(startDir);
+  while (dir !== '/') {
+    if (
+      existsSync(join(dir, 'package.json')) ||
+      existsSync(join(dir, '.git')) ||
+      existsSync(join(dir, 'skills-lock.json'))
+    ) {
+      return dir;
+    }
+    const parent = resolve(dir, '..');
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return resolve(startDir);
+}
+
+/**
+ * Find harness skill directories that have an impeccable skill installed.
+ */
+function findHarnessDirs(projectRoot) {
+  const dirs = [];
+  for (const harness of HARNESS_DIRS) {
+    const skillsDir = join(projectRoot, harness, 'skills');
+    // Only pin in harness dirs that already have impeccable installed
+    const impeccableDir = join(skillsDir, 'impeccable');
+    if (existsSync(impeccableDir) || existsSync(join(skillsDir, 'i-impeccable'))) {
+      dirs.push(skillsDir);
+    }
+  }
+  return dirs;
+}
+
+/**
+ * Load command metadata (descriptions for pinned skills).
+ */
+function loadCommandMetadata() {
+  const metadataPath = join(__dirname, 'command-metadata.json');
+  if (existsSync(metadataPath)) {
+    return JSON.parse(readFileSync(metadataPath, 'utf-8'));
+  }
+  return {};
+}
+
+/**
+ * Generate a pinned skill's SKILL.md content.
+ */
+function generatePinnedSkill(command, metadata) {
+  const desc = metadata[command]?.description || `Shortcut for /impeccable ${command}.`;
+  const hint = metadata[command]?.argumentHint || '[target]';
+
+  return `---
+name: ${command}
+description: "${desc}"
+argument-hint: "${hint}"
+user-invocable: true
+---
+
+${PIN_MARKER}
+
+This is a pinned shortcut for \`{{command_prefix}}impeccable ${command}\`.
+
+Invoke {{command_prefix}}impeccable ${command}, passing along any arguments provided here, and follow its instructions.
+`;
+}
+
+/**
+ * Pin a command: create shortcut skill in all harness dirs.
+ */
+function pin(command, projectRoot) {
+  const metadata = loadCommandMetadata();
+  const harnessDirs = findHarnessDirs(projectRoot);
+
+  if (harnessDirs.length === 0) {
+    console.log('No harness directories with impeccable installed found.');
+    return false;
+  }
+
+  const content = generatePinnedSkill(command, metadata);
+  let created = 0;
+
+  for (const skillsDir of harnessDirs) {
+    // Check if skill already exists (and isn't a pin)
+    const skillDir = join(skillsDir, command);
+    if (existsSync(skillDir)) {
+      const existingMd = join(skillDir, 'SKILL.md');
+      if (existsSync(existingMd)) {
+        const existing = readFileSync(existingMd, 'utf-8');
+        if (!existing.includes(PIN_MARKER)) {
+          console.log(`  SKIP: ${skillDir} (non-pinned skill already exists)`);
+          continue;
+        }
+      }
+    }
+
+    mkdirSync(skillDir, { recursive: true });
+    writeFileSync(join(skillDir, 'SKILL.md'), content, 'utf-8');
+    console.log(`  + ${skillDir}`);
+    created++;
+  }
+
+  if (created > 0) {
+    console.log(`\nPinned '${command}' as a standalone shortcut in ${created} location(s).`);
+    console.log(`You can now use /${command} directly.`);
+  }
+
+  return created > 0;
+}
+
+/**
+ * Unpin a command: remove shortcut skill from all harness dirs.
+ */
+function unpin(command, projectRoot) {
+  const harnessDirs = findHarnessDirs(projectRoot);
+  let removed = 0;
+
+  for (const skillsDir of harnessDirs) {
+    const skillDir = join(skillsDir, command);
+    if (!existsSync(skillDir)) continue;
+
+    const skillMd = join(skillDir, 'SKILL.md');
+    if (!existsSync(skillMd)) continue;
+
+    // Safety: only remove if it's a pinned skill
+    const content = readFileSync(skillMd, 'utf-8');
+    if (!content.includes(PIN_MARKER)) {
+      console.log(`  SKIP: ${skillDir} (not a pinned skill)`);
+      continue;
+    }
+
+    rmSync(skillDir, { recursive: true, force: true });
+    console.log(`  - ${skillDir}`);
+    removed++;
+  }
+
+  if (removed > 0) {
+    console.log(`\nUnpinned '${command}' from ${removed} location(s).`);
+    console.log(`Use /impeccable ${command} to access it.`);
+  } else {
+    console.log(`No pinned '${command}' shortcut found.`);
+  }
+
+  return removed > 0;
+}
+
+// --- CLI ---
+const [,, action, command] = process.argv;
+
+if (!action || !command) {
+  console.log('Usage: node pin.mjs <pin|unpin> <command>');
+  console.log(`\nAvailable commands: ${VALID_COMMANDS.join(', ')}`);
+  process.exit(1);
+}
+
+if (action !== 'pin' && action !== 'unpin') {
+  console.error(`Unknown action: ${action}. Use 'pin' or 'unpin'.`);
+  process.exit(1);
+}
+
+if (!VALID_COMMANDS.includes(command)) {
+  console.error(`Unknown command: ${command}`);
+  console.error(`Available commands: ${VALID_COMMANDS.join(', ')}`);
+  process.exit(1);
+}
+
+const root = findProjectRoot();
+
+if (action === 'pin') {
+  pin(command, root);
+} else {
+  unpin(command, root);
+}
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 8f875d1e..fd12d582 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -71,6 +71,8 @@ jobs:
 
       - name: Run Desktop Release Script
         shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           $args = @(
             "-ExecutionPolicy", "Bypass",
diff --git a/.impeccable/design.json b/.impeccable/design.json
new file mode 100644
index 00000000..ca6898c7
--- /dev/null
+++ b/.impeccable/design.json
@@ -0,0 +1,245 @@
+{
+  "schemaVersion": 2,
+  "generatedAt": "2026-05-04T21:15:40Z",
+  "title": "Design System: Icarus",
+  "extensions": {
+    "colorMeta": {
+      "tactical-background": {
+        "role": "neutral",
+        "displayName": "Workbench Black",
+        "canonical": "#09090b",
+        "tonalRamp": ["oklch(15% 0.008 285)", "oklch(24% 0.008 285)", "oklch(34% 0.008 285)", "oklch(45% 0.008 285)", "oklch(56% 0.008 285)", "oklch(68% 0.008 285)", "oklch(82% 0.008 285)", "oklch(95% 0.008 285)"]
+      },
+      "tactical-card": {
+        "role": "neutral",
+        "displayName": "Panel Zinc",
+        "canonical": "#18181b",
+        "tonalRamp": ["oklch(15% 0.008 285)", "oklch(24% 0.008 285)", "oklch(34% 0.008 285)", "oklch(45% 0.008 285)", "oklch(56% 0.008 285)", "oklch(68% 0.008 285)", "oklch(82% 0.008 285)", "oklch(95% 0.008 285)"]
+      },
+      "tactical-raised": {
+        "role": "neutral",
+        "displayName": "Raised Zinc",
+        "canonical": "#27272a",
+        "tonalRamp": ["oklch(15% 0.008 285)", "oklch(24% 0.008 285)", "oklch(34% 0.008 285)", "oklch(45% 0.008 285)", "oklch(56% 0.008 285)", "oklch(68% 0.008 285)", "oklch(82% 0.008 285)", "oklch(95% 0.008 285)"]
+      },
+      "tactical-primary": {
+        "role": "primary",
+        "displayName": "Command Violet",
+        "canonical": "#7c3aed",
+        "tonalRamp": ["oklch(15% 0.14 295)", "oklch(24% 0.16 295)", "oklch(34% 0.18 295)", "oklch(45% 0.2 295)", "oklch(56% 0.22 295)", "oklch(68% 0.18 295)", "oklch(82% 0.1 295)", "oklch(95% 0.035 295)"]
+      },
+      "tactical-danger": {
+        "role": "secondary",
+        "displayName": "Destructive Red",
+        "canonical": "#ef4444",
+        "tonalRamp": ["oklch(15% 0.11 25)", "oklch(24% 0.13 25)", "oklch(34% 0.16 25)", "oklch(45% 0.19 25)", "oklch(56% 0.21 25)", "oklch(68% 0.16 25)", "oklch(82% 0.08 25)", "oklch(95% 0.025 25)"]
+      },
+      "tactical-favorite": {
+        "role": "secondary",
+        "displayName": "Favorite Amber",
+        "canonical": "#ff9800",
+        "tonalRamp": ["oklch(15% 0.09 70)", "oklch(24% 0.11 70)", "oklch(34% 0.13 70)", "oklch(45% 0.15 70)", "oklch(56% 0.17 70)", "oklch(68% 0.15 70)", "oklch(82% 0.09 70)", "oklch(95% 0.03 70)"]
+      },
+      "tactical-ally": {
+        "role": "secondary",
+        "displayName": "Ally Green",
+        "canonical": "#3a7e5d",
+        "tonalRamp": ["oklch(15% 0.07 155)", "oklch(24% 0.08 155)", "oklch(34% 0.09 155)", "oklch(45% 0.1 155)", "oklch(56% 0.11 155)", "oklch(68% 0.09 155)", "oklch(82% 0.055 155)", "oklch(95% 0.02 155)"]
+      },
+      "tactical-enemy": {
+        "role": "secondary",
+        "displayName": "Enemy Red",
+        "canonical": "#772727",
+        "tonalRamp": ["oklch(15% 0.08 25)", "oklch(24% 0.09 25)", "oklch(34% 0.1 25)", "oklch(45% 0.11 25)", "oklch(56% 0.12 25)", "oklch(68% 0.09 25)", "oklch(82% 0.05 25)", "oklch(95% 0.02 25)"]
+      }
+    },
+    "typographyMeta": {
+      "headline": {
+        "displayName": "Headline",
+        "purpose": "Section headings such as Tools and Agents."
+      },
+      "title": {
+        "displayName": "Title",
+        "purpose": "Dialog titles, settings group titles, card titles, and primary row labels."
+      },
+      "body": {
+        "displayName": "Body",
+        "purpose": "Normal controls, option labels, strategy metadata, and helper text."
+      },
+      "label": {
+        "displayName": "Label",
+        "purpose": "Section labels, filter state text, compact state descriptions, and setting captions."
+      },
+      "micro": {
+        "displayName": "Micro",
+        "purpose": "Badges such as DEFAULT and CUSTOM OVERRIDE."
+      }
+    },
+    "shadows": [
+      {
+        "name": "card-foreground-backdrop",
+        "value": "0 4px 12px rgba(0, 0, 0, 0.54)",
+        "purpose": "Separate foreground card details and select controls from the dark tactical surface."
+      },
+      {
+        "name": "folder-pill-glow",
+        "value": "0 2px 4px color-matched at 30% opacity; hover increases blur to 8px",
+        "purpose": "Give draggable folder pills a clear hover and drag affordance."
+      },
+      {
+        "name": "delete-menu-lift",
+        "value": "0 8px 24px rgba(0, 0, 0, 0.28)",
+        "purpose": "Lift floating destructive controls above the canvas."
+      }
+    ],
+    "motion": [
+      {
+        "name": "state-fast",
+        "value": "150ms ease-out",
+        "purpose": "Small hover and text-state transitions."
+      },
+      {
+        "name": "state-standard",
+        "value": "200ms ease-out-cubic",
+        "purpose": "Route transitions, panel reveals, menu reveals, and state fades."
+      },
+      {
+        "name": "state-deliberate",
+        "value": "240-250ms ease-in-out-cubic",
+        "purpose": "Segmented tab indicator motion and expanding search fields."
+      }
+    ],
+    "breakpoints": [
+      {
+        "name": "desktop-workspace",
+        "value": "fixed desktop app shell"
+      },
+      {
+        "name": "strategy-grid-min-tile",
+        "value": "250px"
+      }
+    ]
+  },
+  "components": [
+    {
+      "name": "Primary Button",
+      "kind": "button",
+      "refersTo": "button-primary",
+      "description": "Primary command button for decisive strategy or settings actions.",
+      "html": "<button class=\"ds-btn-primary\"><span class=\"ds-btn-icon\">+</span>Create Strategy</button>",
+      "css": ".ds-btn-primary { background: #7c3aed; color: #f9fafb; border: 1px solid #7c3aed; border-radius: 8px; padding: 8px 14px; font: 600 14px system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif; display: inline-flex; align-items: center; gap: 8px; transition: background 180ms ease-out, border-color 180ms ease-out, transform 120ms ease-out; } .ds-btn-primary:hover { background: #8b5cf6; border-color: #8b5cf6; } .ds-btn-primary:focus-visible { outline: 2px solid #7c3aed; outline-offset: 2px; } .ds-btn-primary:active { transform: translateY(1px); } .ds-btn-icon { font-size: 16px; line-height: 1; }"
+    },
+    {
+      "name": "Secondary Button",
+      "kind": "button",
+      "refersTo": "button-secondary",
+      "description": "Utility button for import, export, folders, resets, and non-primary commands.",
+      "html": "<button class=\"ds-btn-secondary\">Import / Export</button>",
+      "css": ".ds-btn-secondary { background: #27272a; color: #fafafa; border: 1px solid #27272a; border-radius: 8px; padding: 8px 14px; font: 500 14px system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif; transition: background 180ms ease-out, border-color 180ms ease-out; } .ds-btn-secondary:hover { background: #323236; border-color: #3f3f46; } .ds-btn-secondary:focus-visible { outline: 2px solid #7c3aed; outline-offset: 2px; }"
+    },
+    {
+      "name": "Tool Icon Button",
+      "kind": "button",
+      "refersTo": "tool-button-selected",
+      "description": "Square icon control used in the sidebar tool grid, with shortcut label support.",
+      "html": "<button class=\"ds-tool-button ds-tool-button-selected\"><span class=\"ds-tool-icon\">✎</span><span class=\"ds-tool-shortcut\">Q</span></button>",
+      "css": ".ds-tool-button { position: relative; width: 57.8px; height: 57.8px; background: #27272a; color: #fafafa; border: 1px solid #27272a; border-radius: 8px; display: inline-grid; place-items: center; transition: background 180ms ease-out, border-color 180ms ease-out; } .ds-tool-button:hover { background: #323236; border-color: #3f3f46; } .ds-tool-button:focus-visible { outline: 2px solid #7c3aed; outline-offset: 2px; } .ds-tool-button-selected { background: #7c3aed; border-color: #7c3aed; } .ds-tool-icon { font-size: 20px; } .ds-tool-shortcut { position: absolute; right: 4px; bottom: 4px; color: #a1a1aa; font: 700 9px system-ui, sans-serif; }"
+    },
+    {
+      "name": "Search Field",
+      "kind": "input",
+      "refersTo": "search-field",
+      "description": "Collapsible search input that expands when active.",
+      "html": "<label class=\"ds-search\"><span class=\"ds-search-icon\">⌕</span><input placeholder=\"Search\" /></label>",
+      "css": ".ds-search { width: 250px; height: 40px; background: #18181b; color: #fafafa; border: 1px solid #27272a; border-radius: 8px; padding: 0 8px; display: inline-flex; align-items: center; gap: 8px; transition: width 250ms cubic-bezier(0.215, 0.61, 0.355, 1), border-color 180ms ease-out; } .ds-search:hover { border-color: #3f3f46; } .ds-search:focus-within { border-color: #7c3aed; box-shadow: 0 0 0 1px #7c3aed; } .ds-search input { min-width: 0; flex: 1; background: transparent; border: 0; color: #fafafa; font: 14px system-ui, sans-serif; outline: 0; } .ds-search input::placeholder { color: rgba(255,255,255,0.54); } .ds-search-icon { color: #fafafa; font-size: 18px; }"
+    },
+    {
+      "name": "Segmented Tabs",
+      "kind": "chip",
+      "refersTo": "segmented-tabs",
+      "description": "Compact segmented mode switcher with a sliding violet selected pill.",
+      "html": "<div class=\"ds-tabs\"><button class=\"ds-tab ds-tab-active\">Strategy</button><button class=\"ds-tab\">Global</button></div>",
+      "css": ".ds-tabs { display: inline-flex; gap: 2px; background: #27272a; border: 1px solid #27272a; border-radius: 6px; padding: 2px; } .ds-tab { border: 0; background: transparent; color: #a1a1aa; border-radius: 5px; padding: 4px 8px; font: 600 13px system-ui, sans-serif; transition: background 240ms cubic-bezier(0.65, 0, 0.35, 1), color 180ms ease-out; } .ds-tab:hover { color: #fafafa; } .ds-tab:focus-visible { outline: 2px solid #7c3aed; outline-offset: 2px; } .ds-tab-active { background: #7c3aed; color: #f9fafb; }"
+    },
+    {
+      "name": "Strategy Card",
+      "kind": "card",
+      "refersTo": "strategy-card",
+      "description": "Library tile for a saved strategy with map thumbnail, metadata, role icons, and context menu.",
+      "html": "<article class=\"ds-strategy-card\"><div class=\"ds-strategy-thumb\"></div><div class=\"ds-strategy-detail\"><strong>Ascent A Split</strong><span>Ascent</span><span class=\"ds-strategy-side\">Attack</span></div></article>",
+      "css": ".ds-strategy-card { width: 250px; height: 250px; background: #18181b; border: 2px solid #27272a; border-radius: 16px; padding: 8px; display: grid; grid-template-rows: 1fr 1fr; gap: 10px; color: #fafafa; transition: border-color 100ms ease-out; } .ds-strategy-card:hover { border-color: #7c3aed; } .ds-strategy-card:focus-within { outline: 2px solid #7c3aed; outline-offset: 2px; } .ds-strategy-thumb { border-radius: 16px; background: linear-gradient(135deg, #271406, #b27c40 70%, #f08234); } .ds-strategy-detail { background: #18181b; border: 1px solid #27272a; border-radius: 16px; padding: 10px 16px; box-shadow: 0 4px 12px rgba(0,0,0,0.54); display: grid; gap: 5px; font: 14px system-ui, sans-serif; } .ds-strategy-detail strong { font-weight: 500; } .ds-strategy-side { color: #ff5252; justify-self: end; }"
+    },
+    {
+      "name": "Sidebar Panel",
+      "kind": "nav",
+      "refersTo": "sidebar-panel",
+      "description": "Right-side tactical tool panel that groups tools, filters, agents, and contextual controls.",
+      "html": "<aside class=\"ds-sidebar\"><h2>Tools</h2><div class=\"ds-tool-grid\"><span></span><span></span><span></span><span></span><span></span></div><h2>Agents</h2></aside>",
+      "css": ".ds-sidebar { width: 345px; background: #18181b; color: #fafafa; border: 2px solid rgba(210,214,219,0.1); border-radius: 12px; padding: 16px; } .ds-sidebar h2 { margin: 0 0 16px; font: 500 20px system-ui, sans-serif; } .ds-tool-grid { display: grid; grid-template-columns: repeat(5, 1fr); gap: 5px; margin-bottom: 24px; } .ds-tool-grid span { aspect-ratio: 1; background: #27272a; border-radius: 8px; border: 1px solid #27272a; }"
+    },
+    {
+      "name": "Folder Pill",
+      "kind": "chip",
+      "refersTo": "folder-pill",
+      "description": "User-colored draggable organization chip for folders.",
+      "html": "<button class=\"ds-folder-pill\"><span>▣</span>Execs</button>",
+      "css": ".ds-folder-pill { height: 44px; background: #3a7e5d; color: #fafafa; border: 1px solid rgba(255,255,255,0.15); border-radius: 22px; padding: 0 12px 0 14px; display: inline-flex; align-items: center; gap: 10px; font: 600 14px system-ui, sans-serif; box-shadow: 0 2px 4px rgba(58,126,93,0.3); transition: transform 150ms ease-out, border-color 150ms ease-out, box-shadow 150ms ease-out; } .ds-folder-pill:hover { transform: scale(1.03); border-color: rgba(255,255,255,0.5); box-shadow: 0 2px 8px rgba(58,126,93,0.3); } .ds-folder-pill:focus-visible { outline: 2px solid #7c3aed; outline-offset: 2px; }"
+    }
+  ],
+  "narrative": {
+    "northStar": "The Tactical Workbench",
+    "overview": "Icarus should feel like a disciplined workbench for planning Valorant rounds: dark, compact, map-first, and deliberate. The UI is allowed to be dense because the work is dense, but every cluster needs an obvious job and a stable place. Panels, toolbars, filter controls, and strategy cards should support tactical thinking without asking for attention.\n\nThe current system is a dark Shad UI foundation with a restrained violet accent, cool zinc surfaces, image-rich map and agent assets, and small, fast transitions. The product direction is minimal, intuitive, tasteful, and fast; polish comes from order, not ornament.\n\nThis system explicitly rejects disorganized layouts, flashy color, novelty effects, cluttered panels, and features that look shoehorned into the interface. If a control cannot explain why it sits where it sits, it is not refined enough.",
+    "keyCharacteristics": [
+      "Canvas-first: map, agents, abilities, drawings, and lineups stay visually dominant.",
+      "Restrained tactical color: violet marks primary action and selection only.",
+      "Dense but calm: tool surfaces are compact, predictable, and grouped by task.",
+      "Native product typography: system sans, practical weights, no decorative type.",
+      "Fast state feedback: transitions are short and communicate hover, selection, reveal, or loading."
+    ],
+    "rules": [
+      {
+        "name": "The One Command Color Rule",
+        "body": "Violet is for current action, selection, focus, and primary commands. It is not decoration.",
+        "section": "colors"
+      },
+      {
+        "name": "The Tactical Semantics Rule",
+        "body": "Ally, enemy, favorite, and map colors carry game meaning. Do not reuse them for unrelated UI emphasis.",
+        "section": "colors"
+      },
+      {
+        "name": "The Native Tool Rule",
+        "body": "Use the system sans stack for all product UI. Display fonts, novelty fonts, and over-styled labels are forbidden.",
+        "section": "typography"
+      },
+      {
+        "name": "The Compact Legibility Rule",
+        "body": "Dense panels may use small text, but labels must keep enough weight, contrast, and spacing to scan at desktop distance.",
+        "section": "typography"
+      },
+      {
+        "name": "The Tonal First Rule",
+        "body": "Prefer surface changes and borders before shadows. If a shadow does not explain stacking, remove it.",
+        "section": "elevation"
+      }
+    ],
+    "dos": [
+      "Do keep the map and tactical objects visually dominant; supporting UI should feel like workbench hardware around the canvas.",
+      "Do use Command Violet for selected tools, primary actions, focus rings, and current assignments.",
+      "Do group tools by task and reveal contextual controls only when the current interaction mode needs them.",
+      "Do keep dense panels orderly with consistent 8px, 10px, 12px, 16px, and 24px spacing steps.",
+      "Do use icons for familiar tool actions, with tooltips for compact controls.",
+      "Do preserve tactical color meaning for ally, enemy, favorite, destructive, and map states.",
+      "Do keep transitions short: 150-250ms for hover, reveal, route, and state changes."
+    ],
+    "donts": [
+      "Don't make Icarus look disorganized, noisy, or arbitrary.",
+      "Don't add flashy colors, loud gradients, glow-heavy treatments, glassmorphism, or decorative effects.",
+      "Don't shoehorn features into spare space; every control needs a clear reason for its position.",
+      "Don't reuse ally, enemy, favorite, or map colors for unrelated UI decoration.",
+      "Don't introduce marketing-page composition, hero typography, decorative dashboards, or generic gamer overlay styling.",
+      "Don't use colored side-stripe borders, gradient text, nested cards, or identical decorative card grids.",
+      "Don't invent custom affordances where standard Shad, Flutter, or desktop patterns already communicate the action clearly."
+    ]
+  }
+}
diff --git a/AGENTS.md b/AGENTS.md
index 0c8ff483..cccc495c 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,6 +16,7 @@ A Flutter desktop app for creating interactive Valorant game strategies. See `RE
 - **`xdg-user-dirs` must be initialized.** The `path_provider` plugin needs XDG user directories. Run `sudo apt-get install -y xdg-user-dirs && xdg-user-dirs-update` if the app crashes with `MissingPlatformDirectoryException`.
 - **Linux build deps.** `clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-14-dev` must be installed for Linux desktop builds.
 - **Code generation.** After changing Hive models, Riverpod providers, or JSON-serializable classes, regenerate with: `fvm flutter pub run build_runner build --delete-conflicting-outputs`.
+- **Generated files are outputs, not edit targets.** Never manually edit generated files like `*.g.dart`, `*.g.yaml`, or registrar outputs. Make changes in the source files that drive generation, or replace generated behavior with explicit source-owned code such as a custom adapter, then regenerate.
 - **No automated tests exist** in this codebase. `flutter test` will find nothing.
 - **Lint.** `fvm flutter analyze` — expect ~70 pre-existing warnings/infos (unused imports, deprecated APIs). No errors.
 - **Build.** `fvm flutter build linux --debug` produces the binary at `build/linux/x64/debug/bundle/icarus`.
diff --git a/DESIGN.md b/DESIGN.md
new file mode 100644
index 00000000..1d3b4d5f
--- /dev/null
+++ b/DESIGN.md
@@ -0,0 +1,278 @@
+---
+name: Icarus
+description: A refined tactical desktop workspace for Valorant strategy planning.
+colors:
+  tactical-background: "#09090b"
+  tactical-sidebar: "#141114"
+  tactical-card: "#18181b"
+  tactical-panel: "#1b1b1b"
+  tactical-raised: "#27272a"
+  tactical-border: "#27272a"
+  tactical-scrollbar: "#353435"
+  tactical-foreground: "#fafafa"
+  tactical-muted: "#a1a1aa"
+  tactical-primary: "#7c3aed"
+  tactical-primary-deep: "#4c1d95"
+  tactical-primary-foreground: "#f9fafb"
+  tactical-danger: "#ef4444"
+  tactical-favorite: "#ff9800"
+  tactical-favorite-danger: "#e53935"
+  tactical-ally: "#3a7e5d"
+  tactical-ally-outline: "#69f0af6a"
+  tactical-enemy: "#772727"
+  tactical-enemy-outline: "#ff52528b"
+  map-base: "#271406"
+  map-detail: "#b27c40"
+  map-highlight: "#f08234"
+typography:
+  headline:
+    fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif"
+    fontSize: "20px"
+    fontWeight: 500
+    lineHeight: 1.2
+    letterSpacing: "normal"
+  title:
+    fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif"
+    fontSize: "16px"
+    fontWeight: 600
+    lineHeight: 1.25
+    letterSpacing: "normal"
+  body:
+    fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif"
+    fontSize: "14px"
+    fontWeight: 400
+    lineHeight: 1.35
+    letterSpacing: "normal"
+  label:
+    fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif"
+    fontSize: "12px"
+    fontWeight: 600
+    lineHeight: 1.2
+    letterSpacing: "0.3px"
+  micro:
+    fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif"
+    fontSize: "10px"
+    fontWeight: 600
+    lineHeight: 1.2
+    letterSpacing: "0.5px"
+rounded:
+  xs: "3px"
+  sm: "4px"
+  md: "6px"
+  lg: "8px"
+  xl: "10px"
+  panel: "12px"
+  card: "16px"
+  dialog: "22px"
+  pill: "22px"
+spacing:
+  xxs: "2px"
+  xs: "4px"
+  sm: "6px"
+  md: "8px"
+  lg: "10px"
+  xl: "12px"
+  section: "16px"
+  panel: "24px"
+  grid-gap: "20px"
+components:
+  button-primary:
+    backgroundColor: "{colors.tactical-primary}"
+    textColor: "{colors.tactical-primary-foreground}"
+    rounded: "{rounded.lg}"
+    padding: "8px 14px"
+  button-secondary:
+    backgroundColor: "{colors.tactical-raised}"
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.lg}"
+    padding: "8px 14px"
+  icon-button:
+    backgroundColor: "{colors.tactical-raised}"
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.lg}"
+    size: "40px"
+  tool-button-selected:
+    backgroundColor: "{colors.tactical-primary}"
+    textColor: "{colors.tactical-primary-foreground}"
+    rounded: "{rounded.lg}"
+    size: "57.8px"
+  search-field:
+    backgroundColor: "{colors.tactical-card}"
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.lg}"
+    height: "40px"
+  segmented-tabs:
+    backgroundColor: "{colors.tactical-raised}"
+    textColor: "{colors.tactical-muted}"
+    rounded: "{rounded.md}"
+    padding: "2px"
+  strategy-card:
+    backgroundColor: "{colors.tactical-card}"
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.card}"
+    padding: "8px"
+  sidebar-panel:
+    backgroundColor: "{colors.tactical-card}"
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.panel}"
+    width: "345px"
+  folder-pill:
+    textColor: "{colors.tactical-foreground}"
+    rounded: "{rounded.pill}"
+    height: "44px"
+---
+
+# Design System: Icarus
+
+## 1. Overview
+
+**Creative North Star: "The Tactical Workbench"**
+
+Icarus should feel like a disciplined workbench for planning Valorant rounds: dark, compact, map-first, and deliberate. The UI is allowed to be dense because the work is dense, but every cluster needs an obvious job and a stable place. Panels, toolbars, filter controls, and strategy cards should support tactical thinking without asking for attention.
+
+The current system is a dark Shad UI foundation with a restrained violet accent, cool zinc surfaces, image-rich map and agent assets, and small, fast transitions. The product direction is minimal, intuitive, tasteful, and fast; polish comes from order, not ornament.
+
+This system explicitly rejects disorganized layouts, flashy color, novelty effects, cluttered panels, and features that look shoehorned into the interface. If a control cannot explain why it sits where it sits, it is not refined enough.
+
+**Key Characteristics:**
+- Canvas-first: map, agents, abilities, drawings, and lineups stay visually dominant.
+- Restrained tactical color: violet marks primary action and selection only.
+- Dense but calm: tool surfaces are compact, predictable, and grouped by task.
+- Native product typography: system sans, practical weights, no decorative type.
+- Fast state feedback: transitions are short and communicate hover, selection, reveal, or loading.
+
+## 2. Colors
+
+The palette is a restrained tactical dark system: near-black workspace surfaces, zinc panels, one violet action accent, and semantic colors reserved for tactical meaning.
+
+### Primary
+- **Command Violet**: The primary action and selection color. Use it for current tool state, primary buttons, active segmented tabs, focus rings, and success toasts. It should remain rare enough that it keeps command value.
+- **Deep Selection Violet**: The deeper selected-region color. Use it for selection backgrounds or lower-emphasis active areas, never as a decorative gradient.
+
+### Secondary
+- **Ally Green**: Tactical ally marker color. Use for player-side identity and team state, not general positive UI.
+- **Enemy Red**: Tactical enemy marker color. Use for opponent identity and destructive warnings only when context makes the distinction clear.
+- **Favorite Amber**: Favorite state and favorites-only filter indicator. Use sparingly; it is a utility state, not a brand accent.
+
+### Tertiary
+- **Map Ember Base**: The warm base hue used by map recoloring.
+- **Map Callout Bronze**: The warm detail hue used for map geometry and callout texture.
+- **Map Highlight Orange**: The map highlight hue used for tactically relevant map contrast.
+
+### Neutral
+- **Workbench Black**: App background and deepest canvas environment.
+- **Sidebar Charcoal**: Legacy sidebar, menu, and dialog foundation.
+- **Panel Zinc**: Primary card, popover, and sidebar panel surface.
+- **Raised Zinc**: Secondary, muted, input, border, and hover surface.
+- **Muted Text Zinc**: Secondary labels, helper text, inactive controls, and compact metadata.
+- **Tactical White**: Foreground and high-contrast text.
+
+### Named Rules
+
+**The One Command Color Rule.** Violet is for current action, selection, focus, and primary commands. It is not decoration.
+
+**The Tactical Semantics Rule.** Ally, enemy, favorite, and map colors carry game meaning. Do not reuse them for unrelated UI emphasis.
+
+## 3. Typography
+
+**Display Font:** System UI sans stack.
+**Body Font:** System UI sans stack.
+**Label/Mono Font:** System UI sans stack.
+
+**Character:** Typography should feel native, quiet, and utilitarian. Scale and weight do the hierarchy work; the app does not need a decorative display face.
+
+### Hierarchy
+- **Display**: Not a standard Icarus role. Avoid hero-scale type inside the product.
+- **Headline** (500, 20px, 1.2): Section headings such as Tools and Agents.
+- **Title** (600, 16px, 1.25): Dialog titles, settings group titles, compact card titles, and primary row labels.
+- **Body** (400, 14px, 1.35): Normal controls, option labels, strategy metadata, and helper text.
+- **Label** (600, 12px, 0.3px letter spacing): Section labels, filter state text, compact state descriptions, and setting captions.
+- **Micro** (600, 9-10px, 0.5-0.8px letter spacing): Badges such as DEFAULT and CUSTOM OVERRIDE.
+
+### Named Rules
+
+**The Native Tool Rule.** Use the system sans stack for all product UI. Display fonts, novelty fonts, and over-styled labels are forbidden.
+
+**The Compact Legibility Rule.** Dense panels may use small text, but labels must keep enough weight, contrast, and spacing to scan at desktop distance.
+
+## 4. Elevation
+
+Icarus is flat by default and uses tonal layering first: background, panel, raised control, border, and selected state. Shadows are reserved for foregrounded content like strategy tile detail panels, drag previews, folder pills, delete menus, and popover-like controls. Depth should clarify stacking or interaction, never decorate an otherwise flat surface.
+
+### Shadow Vocabulary
+- **Card Foreground Backdrop** (`0 4px 12px rgba(0,0,0,0.54)`): Used on card foreground details and select controls to separate them from dark textured surroundings.
+- **Folder Pill Glow** (`0 2px 4-8px current folder color at 30% opacity`): Used only on draggable folder pills as hover and drag affordance.
+- **Delete Menu Lift** (`0 8px 24px rgba(0,0,0,0.28)`): Used on floating destructive-control panels.
+
+### Named Rules
+
+**The Tonal First Rule.** Prefer surface changes and borders before shadows. If a shadow does not explain stacking, remove it.
+
+## 5. Components
+
+### Buttons
+
+Buttons are compact, icon-led, and stateful. Primary buttons use Command Violet for decisive actions such as Create Strategy or Save, secondary buttons use Raised Zinc for utility actions, and ghost icon buttons stay transparent over the canvas.
+
+- **Shape:** Soft product corners (8px) for standard buttons; compact icon buttons inherit the same control language.
+- **Primary:** Command Violet background, Tactical White text, icon-leading when the action has a familiar symbol.
+- **Hover / Focus:** Hover uses the Shad state layer; focus uses the violet ring. Keep transitions around 150-250ms.
+- **Secondary / Ghost:** Secondary buttons sit on Raised Zinc. Ghost buttons are reserved for canvas chrome and toolbar actions where a filled button would compete with the map.
+
+### Chips
+
+Chips are functional state markers, not decoration. Folder pills may be colorful because folder color is user-authored organization; state badges use tinted violet surfaces and small uppercase type.
+
+- **Style:** Folder pills are 44px tall, 22px radius, white text, a subtle border, and a small color-matched shadow.
+- **State:** Hover scales folder pills to 1.03 and brightens the border. Drop-target state uses a clear white border.
+
+### Cards / Containers
+
+Cards and panels are used for actual grouped tools or repeated objects, not as generic section wrappers.
+
+- **Corner Style:** Sidebar panels use 12px radius. Strategy tiles and thumbnails use 16px radius. Dialogs use 22px radius.
+- **Background:** Panel Zinc for cards and sidebars; Raised Zinc for controls within panels.
+- **Shadow Strategy:** Flat at rest except foreground card detail blocks and floating controls.
+- **Border:** 1-2px zinc borders define edges in dark space. Avoid colored side-stripe borders.
+- **Internal Padding:** Tool panels use 16px grouping; settings sheets use 24px outer padding; cards use 8-16px.
+
+### Inputs / Fields
+
+Inputs are dark, bordered, and compact. Search is a signature interaction: it collapses to an icon at rest and expands on hover, focus, or text entry.
+
+- **Style:** Panel Zinc fill, 8px radius, 1px zinc border.
+- **Focus:** Command Violet cursor and 2px ring/border.
+- **Error / Disabled:** Use destructive red for true errors only; disabled controls stay muted rather than saturated.
+
+### Navigation
+
+Navigation is practical and spatial. The library uses a top app bar with breadcrumbs and action buttons; the strategy editor uses a compact top strip plus canvas overlays for map selection, settings, save, export, screenshots, pages, and the right-side tool panel.
+
+- **Style:** Keep navigation predictable: top row for global context, right panel for creation tools, left/overlay controls for strategy-level actions.
+- **Motion:** Route changes use 200ms fade/scale transitions. Reveals use 150-250ms easing and must communicate state.
+
+### Signature Component
+
+The strategy editor right sidebar is the signature product component. It combines a tool grid, contextual tool bar, filters, team selection, role filters, draggable agent tiles, and an ability rail. Its job is to keep strategy creation fast without cluttering the map.
+
+## 6. Do's and Don'ts
+
+### Do:
+
+- **Do** keep the map and tactical objects visually dominant; supporting UI should feel like workbench hardware around the canvas.
+- **Do** use Command Violet for selected tools, primary actions, focus rings, and current assignments.
+- **Do** group tools by task and reveal contextual controls only when the current interaction mode needs them.
+- **Do** keep dense panels orderly with consistent 8px, 10px, 12px, 16px, and 24px spacing steps.
+- **Do** use icons for familiar tool actions, with tooltips for compact controls.
+- **Do** preserve tactical color meaning for ally, enemy, favorite, destructive, and map states.
+- **Do** keep transitions short: 150-250ms for hover, reveal, route, and state changes.
+
+### Don't:
+
+- **Don't** make Icarus look disorganized, noisy, or arbitrary.
+- **Don't** add flashy colors, loud gradients, glow-heavy treatments, glassmorphism, or decorative effects.
+- **Don't** shoehorn features into spare space; every control needs a clear reason for its position.
+- **Don't** reuse ally, enemy, favorite, or map colors for unrelated UI decoration.
+- **Don't** introduce marketing-page composition, hero typography, decorative dashboards, or generic gamer overlay styling.
+- **Don't** use colored side-stripe borders, gradient text, nested cards, or identical decorative card grids.
+- **Don't** invent custom affordances where standard Shad, Flutter, or desktop patterns already communicate the action clearly.
diff --git a/PRODUCT.md b/PRODUCT.md
new file mode 100644
index 00000000..e4d4e01f
--- /dev/null
+++ b/PRODUCT.md
@@ -0,0 +1,41 @@
+# Product
+
+## Register
+
+product
+
+## Users
+
+Icarus is for Valorant players, in-game leaders, coaches, and small teams who need a focused desktop workspace for planning rounds. They are usually reviewing maps, building strategies, marking utility, saving reusable setups, or preparing material to share with teammates.
+
+The user context is practical and time-sensitive: they need to place agents, abilities, drawings, notes, images, and lineups quickly without the interface getting in the way of tactical thinking.
+
+## Product Purpose
+
+Icarus is an interactive Valorant strategy and lineup tool. It exists to make strategy creation feel fast, local, organized, and easy to revisit. Success means a user can move from an idea to a usable tactical map with minimal friction, then save, organize, import, export, and refine that work over time.
+
+The app should make complex strategy work feel manageable. The map and placed tactical objects are the main artifact; surrounding UI should support scanning, editing, and control without competing with the canvas.
+
+## Brand Personality
+
+Minimal, intuitive, tasteful, and fast.
+
+The product should feel refined and deliberate. Controls should look like they belong where they are placed, workflows should feel obvious after a short glance, and dense tools should remain calm enough for repeated use during planning sessions.
+
+## Anti-references
+
+Icarus should not look disorganized, noisy, or arbitrary. Nothing should feel placed only because there was space for it. Avoid flashy color, novelty effects, cluttered panels, inconsistent spacing, and features that look shoehorned into the interface.
+
+The app should not feel like a generic gamer overlay, a marketing page, or a decorative dashboard. It should not rely on loud gradients, excessive glow, glass effects, or visual noise to create excitement.
+
+## Design Principles
+
+1. Canvas first: the strategy map is the work surface, and every surrounding control should preserve focus on that surface.
+2. Every control earns its position: placement, grouping, and hierarchy should reveal why something is available at that moment.
+3. Fast beats ornate: common actions should be quick to find, quick to trigger, and visually stable.
+4. Refined density: the app can be tool-rich, but it should stay orderly, scannable, and calm.
+5. Tactical clarity: markings, agents, abilities, and annotations should be legible before they are decorative.
+
+## Accessibility & Inclusion
+
+No formal accessibility target is currently defined. Use sensible product defaults: clear focus states, keyboard-friendly controls where practical, readable contrast in the dark interface, reduced-motion respect for nonessential transitions, and color choices that do not make tactical meaning depend on hue alone.
diff --git a/lib/const/agents.dart b/lib/const/agents.dart
index 4e7e86f7..f9d55d80 100644
--- a/lib/const/agents.dart
+++ b/lib/const/agents.dart
@@ -108,6 +108,16 @@ class AbilityInfo extends HiveObject implements DraggableData {
   }
 }
 
+class DraggedAbilityData implements DraggableData {
+  const DraggedAbilityData({
+    required this.ability,
+    required this.isAlly,
+  });
+
+  final AbilityInfo ability;
+  final bool isAlly;
+}
+
 // This is the custom Hive adapter for AbilityInfo.
 // It only stores the AgentType and index.
 class AbilityInfoAdapter extends TypeAdapter<AbilityInfo> {
@@ -985,5 +995,3 @@ class AgentData implements DraggableData {
     })(),
   };
 }
-
-
diff --git a/lib/const/drawing_element.dart b/lib/const/drawing_element.dart
index 84b171da..4509d5f5 100644
--- a/lib/const/drawing_element.dart
+++ b/lib/const/drawing_element.dart
@@ -10,8 +10,12 @@ import 'package:json_annotation/json_annotation.dart';
 part "drawing_element.g.dart";
 
 abstract class DrawingElement {
-  @ColorConverter()
-  final Color color;
+  @JsonKey(
+    readValue: _readDrawingColorJsonValue,
+    fromJson: _drawingColorValueFromJson,
+    toJson: _drawingColorValueToJson,
+  )
+  final int colorValue;
   @JsonKey(defaultValue: Settings.defaultStrokeThickness)
   final double thickness;
   final bool isDotted;
@@ -19,8 +23,11 @@ abstract class DrawingElement {
   final String id;
   BoundingBox? boundingBox;
 
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  Color get color => Color(colorValue);
+
   DrawingElement({
-    required this.color,
+    required this.colorValue,
     this.thickness = Settings.defaultStrokeThickness,
     this.boundingBox,
     required this.isDotted,
@@ -35,6 +42,21 @@ abstract class DrawingElement {
   }
 }
 
+Object? _readDrawingColorJsonValue(Map<dynamic, dynamic> json, String key) {
+  return json[key] ?? json['color'];
+}
+
+int _drawingColorValueFromJson(Object? json) {
+  if (json is int) return json;
+  if (json is num) return json.toInt();
+  if (json is String) {
+    return const ColorConverter().fromJson(json).toARGB32();
+  }
+  return 0xFFFFFFFF;
+}
+
+int _drawingColorValueToJson(int colorValue) => colorValue;
+
 class Line extends DrawingElement with HiveObjectMixin {
   final Offset lineStart;
   Offset lineEnd;
@@ -44,7 +66,8 @@ class Line extends DrawingElement with HiveObjectMixin {
   Line({
     required this.lineStart,
     required this.lineEnd,
-    required super.color,
+    Color? color,
+    int? colorValue,
     super.thickness = Settings.defaultStrokeThickness,
     super.boundingBox,
     required super.isDotted,
@@ -52,7 +75,11 @@ class Line extends DrawingElement with HiveObjectMixin {
     required super.id,
     this.showTraversalTime = false,
     this.traversalSpeedProfile = TraversalSpeed.defaultProfile,
-  });
+  })  : assert(
+          color != null || colorValue != null,
+          'Either color or colorValue is required.',
+        ),
+        super(colorValue: colorValue ?? color!.toARGB32());
 
   void updateEndPoint(Offset endPoint) {
     lineEnd = endPoint;
@@ -62,6 +89,7 @@ class Line extends DrawingElement with HiveObjectMixin {
     Offset? lineStart,
     Offset? lineEnd,
     Color? color,
+    int? colorValue,
     double? thickness,
     BoundingBox? boundingBox,
     bool? isDotted,
@@ -73,7 +101,7 @@ class Line extends DrawingElement with HiveObjectMixin {
     return Line(
       lineStart: lineStart ?? this.lineStart,
       lineEnd: lineEnd ?? this.lineEnd,
-      color: color ?? this.color,
+      colorValue: colorValue ?? color?.toARGB32() ?? this.colorValue,
       thickness: thickness ?? this.thickness,
       boundingBox: boundingBox ?? this.boundingBox,
       isDotted: isDotted ?? this.isDotted,
@@ -93,13 +121,18 @@ class RectangleDrawing extends DrawingElement with HiveObjectMixin {
   RectangleDrawing({
     required this.start,
     required this.end,
-    required super.color,
+    Color? color,
+    int? colorValue,
     super.thickness = Settings.defaultStrokeThickness,
     super.boundingBox,
     required super.isDotted,
     required super.hasArrow,
     required super.id,
-  });
+  })  : assert(
+          color != null || colorValue != null,
+          'Either color or colorValue is required.',
+        ),
+        super(colorValue: colorValue ?? color!.toARGB32());
 
   void updateEndPoint(Offset endPoint) {
     end = endPoint;
@@ -120,13 +153,18 @@ class EllipseDrawing extends DrawingElement with HiveObjectMixin {
   EllipseDrawing({
     required this.start,
     required this.end,
-    required super.color,
+    Color? color,
+    int? colorValue,
     super.thickness = Settings.defaultStrokeThickness,
     super.boundingBox,
     required super.isDotted,
     required super.hasArrow,
     required super.id,
-  });
+  })  : assert(
+          color != null || colorValue != null,
+          'Either color or colorValue is required.',
+        ),
+        super(colorValue: colorValue ?? color!.toARGB32());
 
   void updateEndPoint(Offset endPoint) {
     end = endPoint;
@@ -145,7 +183,8 @@ class FreeDrawing extends DrawingElement with HiveObjectMixin {
   FreeDrawing({
     List<Offset>? listOfPoints,
     Path? path,
-    required super.color,
+    Color? color,
+    int? colorValue,
     super.thickness = Settings.defaultStrokeThickness,
     super.boundingBox,
     required super.isDotted,
@@ -155,9 +194,14 @@ class FreeDrawing extends DrawingElement with HiveObjectMixin {
     this.traversalSpeedProfile = TraversalSpeed.defaultProfile,
     double? cachedPolylineLengthUnits,
   })  : listOfPoints = listOfPoints ?? [],
+        assert(
+          color != null || colorValue != null,
+          'Either color or colorValue is required.',
+        ),
         _path = path ?? Path(),
         cachedPolylineLengthUnits = cachedPolylineLengthUnits ??
-            _computePolylineLength(listOfPoints ?? []);
+            _computePolylineLength(listOfPoints ?? []),
+        super(colorValue: colorValue ?? color!.toARGB32());
 
   @OffsetListConverter()
   List<Offset> listOfPoints = [];
@@ -263,6 +307,7 @@ class FreeDrawing extends DrawingElement with HiveObjectMixin {
     List<Offset>? listOfPoints,
     Path? path,
     Color? color,
+    int? colorValue,
     double? thickness,
     BoundingBox? boundingBox,
     bool? isDotted,
@@ -273,7 +318,7 @@ class FreeDrawing extends DrawingElement with HiveObjectMixin {
     double? cachedPolylineLengthUnits,
   }) {
     return FreeDrawing(
-      color: color ?? this.color,
+      colorValue: colorValue ?? color?.toARGB32() ?? this.colorValue,
       thickness: thickness ?? this.thickness,
       listOfPoints: listOfPoints ?? this.listOfPoints,
       path: path ?? _path,
diff --git a/lib/const/drawing_element.g.dart b/lib/const/drawing_element.g.dart
index c2bfba0d..c2046ac9 100644
--- a/lib/const/drawing_element.g.dart
+++ b/lib/const/drawing_element.g.dart
@@ -9,7 +9,8 @@ part of 'drawing_element.dart';
 FreeDrawing _$FreeDrawingFromJson(Map<String, dynamic> json) => FreeDrawing(
       listOfPoints: _$JsonConverterFromJson<List<dynamic>, List<Offset>>(
           json['listOfPoints'], const OffsetListConverter().fromJson),
-      color: const ColorConverter().fromJson(json['color'] as String),
+      colorValue: _drawingColorValueFromJson(
+          _readDrawingColorJsonValue(json, 'colorValue')),
       thickness: (json['thickness'] as num?)?.toDouble() ?? 5.0,
       boundingBox: json['boundingBox'] == null
           ? null
@@ -25,7 +26,7 @@ FreeDrawing _$FreeDrawingFromJson(Map<String, dynamic> json) => FreeDrawing(
 
 Map<String, dynamic> _$FreeDrawingToJson(FreeDrawing instance) =>
     <String, dynamic>{
-      'color': const ColorConverter().toJson(instance.color),
+      'colorValue': _drawingColorValueToJson(instance.colorValue),
       'thickness': instance.thickness,
       'isDotted': instance.isDotted,
       'hasArrow': instance.hasArrow,
diff --git a/lib/const/settings.dart b/lib/const/settings.dart
index 5c3ddf9d..31c672e2 100644
--- a/lib/const/settings.dart
+++ b/lib/const/settings.dart
@@ -79,6 +79,10 @@ class Settings {
   static const Color enemyOutlineColor = Color.fromARGB(139, 255, 82, 82);
   static const Color allyOutlineColor = Color.fromARGB(106, 105, 240, 175);
 
+  static Color neutralTeamShade(Color color) {
+    return HSLColor.fromColor(color).withSaturation(0).toColor();
+  }
+
   static final Uri dicordLink = Uri.parse("https://discord.gg/PN2uKwCqYB");
 
   static const Duration autoSaveOffset = Duration(seconds: 15);
diff --git a/lib/const/shortcut_info.dart b/lib/const/shortcut_info.dart
index 133410be..c5d009e4 100644
--- a/lib/const/shortcut_info.dart
+++ b/lib/const/shortcut_info.dart
@@ -1,77 +1,464 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+enum IcarusShortcutAction {
+  undo,
+  redo,
+  draw,
+  erase,
+  addText,
+  navigation,
+  toggleAgentFilter,
+  forwardPage,
+  backwardPage,
+  addPage,
+  addLineup,
+  openDeleteMenu,
+  saveStrategy,
+  pasteImage,
+  openInAppDebug,
+}
+
+class IcarusKeyBinding {
+  const IcarusKeyBinding({
+    required this.trigger,
+    this.primary = false,
+    this.shift = false,
+    this.alt = false,
+  });
+
+  final LogicalKeyboardKey trigger;
+  final bool primary;
+  final bool shift;
+  final bool alt;
+  static const LogicalKeyboardKey emptyTrigger = LogicalKeyboardKey(0);
+
+  static IcarusKeyBinding? tryParse(String value) {
+    final parts = value.split('+');
+    if (parts.isEmpty) return null;
+
+    var primary = false;
+    var shift = false;
+    var alt = false;
+    int? triggerKeyId;
+
+    for (final rawPart in parts) {
+      final part = rawPart.trim();
+      if (part.isEmpty) continue;
+      switch (part) {
+        case 'primary':
+          primary = true;
+        case 'shift':
+          shift = true;
+        case 'alt':
+          alt = true;
+        default:
+          triggerKeyId = int.tryParse(part);
+      }
+    }
+
+    if (triggerKeyId == null) return null;
+    return IcarusKeyBinding(
+      trigger: LogicalKeyboardKey(triggerKeyId),
+      primary: primary,
+      shift: shift,
+      alt: alt,
+    );
+  }
+
+  static IcarusKeyBinding fromPressedKeys(Set<LogicalKeyboardKey> keys) {
+    final primary = keys.contains(LogicalKeyboardKey.controlLeft) ||
+        keys.contains(LogicalKeyboardKey.controlRight) ||
+        keys.contains(LogicalKeyboardKey.control) ||
+        keys.contains(LogicalKeyboardKey.metaLeft) ||
+        keys.contains(LogicalKeyboardKey.metaRight) ||
+        keys.contains(LogicalKeyboardKey.meta);
+    final shift = keys.contains(LogicalKeyboardKey.shiftLeft) ||
+        keys.contains(LogicalKeyboardKey.shiftRight) ||
+        keys.contains(LogicalKeyboardKey.shift);
+    final alt = keys.contains(LogicalKeyboardKey.altLeft) ||
+        keys.contains(LogicalKeyboardKey.altRight) ||
+        keys.contains(LogicalKeyboardKey.alt);
+
+    final trigger = keys.lastWhere(
+      (key) => !_modifierKeys.contains(key),
+      orElse: () => emptyTrigger,
+    );
+
+    return IcarusKeyBinding(
+      trigger: trigger,
+      primary: primary,
+      shift: shift,
+      alt: alt,
+    );
+  }
+
+  bool get isComplete => trigger != emptyTrigger;
+
+  String serialize() {
+    final parts = <String>[
+      if (primary) 'primary',
+      if (shift) 'shift',
+      if (alt) 'alt',
+      trigger.keyId.toString(),
+    ];
+    return parts.join('+');
+  }
+
+  String displayLabel({TargetPlatform? platform}) {
+    final resolvedPlatform = platform ?? defaultTargetPlatform;
+    final primaryLabel =
+        resolvedPlatform == TargetPlatform.macOS ? 'Cmd' : 'Ctrl';
+    final parts = <String>[
+      if (primary) primaryLabel,
+      if (shift) 'Shift',
+      if (alt) 'Alt',
+      _displayTriggerLabel(trigger),
+    ];
+    return parts.join(' ');
+  }
+
+  ShortcutActivator toActivator({TargetPlatform? platform}) {
+    final resolvedPlatform = platform ?? defaultTargetPlatform;
+    final keys = <LogicalKeyboardKey>[
+      if (primary)
+        resolvedPlatform == TargetPlatform.macOS
+            ? LogicalKeyboardKey.meta
+            : LogicalKeyboardKey.control,
+      if (shift) LogicalKeyboardKey.shift,
+      if (alt) LogicalKeyboardKey.alt,
+      trigger,
+    ];
+    return LogicalKeySet.fromSet(keys.toSet());
+  }
+
+  bool matchesSearch(String query, {TargetPlatform? platform}) {
+    final normalizedQuery = ShortcutInfo.normalizeSearch(query);
+    return ShortcutInfo.normalizeSearch(displayLabel(platform: platform))
+        .contains(normalizedQuery);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is IcarusKeyBinding &&
+        other.trigger == trigger &&
+        other.primary == primary &&
+        other.shift == shift &&
+        other.alt == alt;
+  }
+
+  @override
+  int get hashCode => Object.hash(trigger, primary, shift, alt);
+
+  static final Set<LogicalKeyboardKey> _modifierKeys = {
+    LogicalKeyboardKey.control,
+    LogicalKeyboardKey.controlLeft,
+    LogicalKeyboardKey.controlRight,
+    LogicalKeyboardKey.meta,
+    LogicalKeyboardKey.metaLeft,
+    LogicalKeyboardKey.metaRight,
+    LogicalKeyboardKey.shift,
+    LogicalKeyboardKey.shiftLeft,
+    LogicalKeyboardKey.shiftRight,
+    LogicalKeyboardKey.alt,
+    LogicalKeyboardKey.altLeft,
+    LogicalKeyboardKey.altRight,
+  };
+}
+
+class IcarusShortcutDefinition {
+  const IcarusShortcutDefinition({
+    required this.action,
+    required this.title,
+    required this.defaultBinding,
+    required this.intent,
+    this.searchAliases = const [],
+  });
+
+  final IcarusShortcutAction action;
+  final String title;
+  final IcarusKeyBinding defaultBinding;
+  final Intent intent;
+  final List<String> searchAliases;
+
+  String get id => action.name;
+}
+
 class ShortcutInfo {
   static const LogicalKeyboardKey openDeleteMenuKey = LogicalKeyboardKey.keyE;
 
-  static final Map<ShortcutActivator, Intent> globalShortcuts = {
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyZ):
-        const UndoActionIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.keyZ):
-        const UndoActionIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyS):
-        const SaveStrategyIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.keyS):
-        const SaveStrategyIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.keyZ,
-        LogicalKeyboardKey.shift): const RedoActionIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyZ,
-        LogicalKeyboardKey.shift): const RedoActionIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyQ): const ToggleDrawingIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyW): const ToggleErasingIntent(),
-    LogicalKeySet(openDeleteMenuKey): const ContextualDeleteIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyT): const AddedTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyS): const NavigationActionIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyR): const ToggleAgentFilterIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyD): const ForwardPageIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyA): const BackwardPageIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyC): const AddPageIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyG): const ToggleLineupIntent(),
-    LogicalKeySet(LogicalKeyboardKey.f12): const OpenInAppDebugIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyV, LogicalKeyboardKey.control):
-        const PasteImageIntent(),
+  static const reservedShortcuts = [
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.undo,
+      title: 'Undo',
+      defaultBinding: IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyZ,
+        primary: true,
+      ),
+      intent: UndoActionIntent(),
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.redo,
+      title: 'Redo',
+      defaultBinding: IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyZ,
+        primary: true,
+        shift: true,
+      ),
+      intent: RedoActionIntent(),
+    ),
+  ];
+
+  static final _reservedBindings = {
+    for (final definition in reservedShortcuts) definition.defaultBinding,
   };
 
-  // New map to disable global shortcuts when typing
-  static final Map<ShortcutActivator, Intent> textEditingOverrides = {
-    // Override Ctrl+Z/Cmd+Z (let the TextField handle these)
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyZ):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.keyZ):
-        const DoNothingAndStopPropagationIntent(),
-
-    LogicalKeySet(LogicalKeyboardKey.keyT):
-        const DoNothingAndStopPropagationIntent(),
-    // Override Ctrl+Shift+Z/Cmd+Shift+Z
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyZ,
-        LogicalKeyboardKey.shift): const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.keyZ,
-        LogicalKeyboardKey.shift): const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyA):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyD):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyC):
-        const DoNothingAndStopPropagationIntent(),
-    // Override Q and W shortcuts
-    LogicalKeySet(LogicalKeyboardKey.keyQ):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyW):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyE):
-        const DoNothingAndStopPropagationIntent(),
-
-    LogicalKeySet(LogicalKeyboardKey.keyS):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyR):
-        const DoNothingAndStopPropagationIntent(),
-    LogicalKeySet(LogicalKeyboardKey.keyG):
-        const DoNothingAndStopPropagationIntent(),
-
-    LogicalKeySet(LogicalKeyboardKey.enter): const EnterTextIntent(),
-    // LogicalKeySet(LogicalKeyboardKey.keyV, LogicalKeyboardKey.control):
-    //     const DoNothingAndStopPropagationIntent(),
+  static const editableShortcuts = [
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.draw,
+      title: 'Draw',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyQ),
+      intent: ToggleDrawingIntent(),
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.erase,
+      title: 'Eraser',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyW),
+      intent: ToggleErasingIntent(),
+      searchAliases: ['erase'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.addText,
+      title: 'Add Text',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyT),
+      intent: AddedTextIntent(),
+      searchAliases: ['text'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.navigation,
+      title: 'Navigation',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyS),
+      intent: NavigationActionIntent(),
+      searchAliases: ['select', 'pointer'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.toggleAgentFilter,
+      title: 'Toggle Agent Filter',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyR),
+      intent: ToggleAgentFilterIntent(),
+      searchAliases: ['agents', 'filter'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.forwardPage,
+      title: 'Next Page',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyD),
+      intent: ForwardPageIntent(),
+      searchAliases: ['forward'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.backwardPage,
+      title: 'Previous Page',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyA),
+      intent: BackwardPageIntent(),
+      searchAliases: ['backward', 'back'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.addPage,
+      title: 'Add Page',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyC),
+      intent: AddPageIntent(),
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.addLineup,
+      title: 'Add Lineup',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.keyG),
+      intent: ToggleLineupIntent(),
+      searchAliases: ['lineup'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.openDeleteMenu,
+      title: 'Open Delete Menu',
+      defaultBinding: IcarusKeyBinding(trigger: openDeleteMenuKey),
+      intent: ContextualDeleteIntent(),
+      searchAliases: ['delete'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.saveStrategy,
+      title: 'Save Strategy',
+      defaultBinding: IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyS,
+        primary: true,
+      ),
+      intent: SaveStrategyIntent(),
+      searchAliases: ['save'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.pasteImage,
+      title: 'Paste Image',
+      defaultBinding: IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyV,
+        primary: true,
+      ),
+      intent: PasteImageIntent(),
+      searchAliases: ['paste'],
+    ),
+    IcarusShortcutDefinition(
+      action: IcarusShortcutAction.openInAppDebug,
+      title: 'Open Debug Log',
+      defaultBinding: IcarusKeyBinding(trigger: LogicalKeyboardKey.f12),
+      intent: OpenInAppDebugIntent(),
+      searchAliases: ['debug', 'log'],
+    ),
+  ];
+
+  static final Map<String, IcarusShortcutDefinition> definitionsById = {
+    for (final definition in editableShortcuts) definition.id: definition,
   };
+
+  static Map<ShortcutActivator, Intent> globalShortcutsFor(
+    Map<String, String> customBindings, {
+    TargetPlatform? platform,
+  }) {
+    return {
+      _primaryActivator(LogicalKeyboardKey.keyZ, platform: platform):
+          const UndoActionIntent(),
+      _primaryActivator(
+        LogicalKeyboardKey.keyZ,
+        shift: true,
+        platform: platform,
+      ): const RedoActionIntent(),
+      for (final definition in editableShortcuts)
+        effectiveBindingFor(definition.id, customBindings)
+            .toActivator(platform: platform): definition.intent,
+    };
+  }
+
+  static final Map<ShortcutActivator, Intent> globalShortcuts =
+      globalShortcutsFor(const {});
+
+  // New map to disable global shortcuts when typing
+  static Map<ShortcutActivator, Intent> textEditingOverridesFor(
+    Map<String, String> customBindings, {
+    TargetPlatform? platform,
+  }) {
+    return {
+      _primaryActivator(LogicalKeyboardKey.keyZ, platform: platform):
+          const DoNothingAndStopPropagationIntent(),
+      _primaryActivator(
+        LogicalKeyboardKey.keyZ,
+        shift: true,
+        platform: platform,
+      ): const DoNothingAndStopPropagationIntent(),
+      for (final definition in editableShortcuts)
+        effectiveBindingFor(definition.id, customBindings).toActivator(
+            platform: platform): const DoNothingAndStopPropagationIntent(),
+      LogicalKeySet(LogicalKeyboardKey.enter): const EnterTextIntent(),
+    };
+  }
+
+  static final Map<ShortcutActivator, Intent> textEditingOverrides =
+      textEditingOverridesFor(const {});
+
+  static IcarusKeyBinding effectiveBindingFor(
+    String shortcutId,
+    Map<String, String> customBindings,
+  ) {
+    final definition = definitionsById[shortcutId];
+    final custom = customBindings[shortcutId];
+    if (definition == null) {
+      return const IcarusKeyBinding(trigger: IcarusKeyBinding.emptyTrigger);
+    }
+    if (custom == null) return definition.defaultBinding;
+    final parsed = IcarusKeyBinding.tryParse(custom);
+    if (parsed == null || _reservedBindings.contains(parsed)) {
+      return definition.defaultBinding;
+    }
+    return parsed;
+  }
+
+  static String displayLabelFor(
+    String shortcutId,
+    Map<String, String> customBindings, {
+    TargetPlatform? platform,
+  }) {
+    return effectiveBindingFor(shortcutId, customBindings)
+        .displayLabel(platform: platform);
+  }
+
+  static IcarusShortcutDefinition? findDuplicateBinding({
+    required String editingShortcutId,
+    required IcarusKeyBinding binding,
+    required Map<String, String> customBindings,
+  }) {
+    for (final definition in reservedShortcuts) {
+      if (definition.defaultBinding == binding) return definition;
+    }
+    for (final definition in editableShortcuts) {
+      if (definition.id == editingShortcutId) continue;
+      final existing = effectiveBindingFor(definition.id, customBindings);
+      if (existing == binding) return definition;
+    }
+    return null;
+  }
+
+  static bool isDefaultBinding(
+    String shortcutId,
+    Map<String, String> customBindings,
+  ) {
+    final definition = definitionsById[shortcutId];
+    if (definition == null) return true;
+    return effectiveBindingFor(shortcutId, customBindings) ==
+        definition.defaultBinding;
+  }
+
+  static bool matchesSearch(
+    IcarusShortcutDefinition definition,
+    String query,
+    Map<String, String> customBindings, {
+    TargetPlatform? platform,
+  }) {
+    final normalizedQuery = normalizeSearch(query);
+    if (normalizedQuery.isEmpty) return true;
+    final title = normalizeSearch(definition.title);
+    final aliases = definition.searchAliases.map(normalizeSearch).join(' ');
+    final binding = effectiveBindingFor(definition.id, customBindings);
+    return title.contains(normalizedQuery) ||
+        aliases.contains(normalizedQuery) ||
+        binding.matchesSearch(query, platform: platform);
+  }
+
+  static String normalizeSearch(String value) {
+    return value
+        .toLowerCase()
+        .replaceAll(RegExp(r'[\s+\-_/]'), '')
+        .replaceAll('command', 'cmd')
+        .replaceAll('control', 'ctrl');
+  }
+
+  static ShortcutActivator _primaryActivator(
+    LogicalKeyboardKey trigger, {
+    bool shift = false,
+    TargetPlatform? platform,
+  }) {
+    return IcarusKeyBinding(
+      trigger: trigger,
+      primary: true,
+      shift: shift,
+    ).toActivator(platform: platform);
+  }
+}
+
+String _displayTriggerLabel(LogicalKeyboardKey key) {
+  if (key.keyLabel.isNotEmpty) return key.keyLabel.toUpperCase();
+  if (key == LogicalKeyboardKey.f12) return 'F12';
+  if (key == LogicalKeyboardKey.escape) return 'Esc';
+  if (key == LogicalKeyboardKey.enter) return 'Enter';
+  if (key == LogicalKeyboardKey.space) return 'Space';
+  if (key == LogicalKeyboardKey.tab) return 'Tab';
+  if (key == LogicalKeyboardKey.backspace) return 'Backspace';
+  if (key == LogicalKeyboardKey.delete) return 'Delete';
+  return key.debugName ?? 'Key';
 }
 
 class PasteImageIntent extends Intent {
diff --git a/lib/hive/hive_adapters.dart b/lib/hive/hive_adapters.dart
index 5f45e44c..11a4876c 100644
--- a/lib/hive/hive_adapters.dart
+++ b/lib/hive/hive_adapters.dart
@@ -15,7 +15,7 @@ import 'package:icarus/const/settings.dart';
 import 'package:icarus/const/traversal_speed.dart';
 import 'package:icarus/const/utilities.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
@@ -31,8 +31,6 @@ import 'package:icarus/providers/strategy_settings_provider.dart';
   AdapterSpec<MapValue>(),
   AdapterSpec<AgentType>(),
   AdapterSpec<Offset>(),
-  AdapterSpec<FreeDrawing>(),
-  AdapterSpec<Line>(),
   AdapterSpec<BoundingBox>(),
   AdapterSpec<StrategySettings>(),
   AdapterSpec<PlacedUtility>(),
@@ -45,8 +43,6 @@ import 'package:icarus/providers/strategy_settings_provider.dart';
   AdapterSpec<LineUpItem>(),
   AdapterSpec<SimpleImageData>(),
   AdapterSpec<AgentState>(),
-  AdapterSpec<RectangleDrawing>(),
-  AdapterSpec<EllipseDrawing>(),
   AdapterSpec<TraversalSpeedProfile>(),
   AdapterSpec<MapThemePalette>(),
   AdapterSpec<MapThemeProfile>(),
@@ -56,6 +52,252 @@ import 'package:icarus/providers/strategy_settings_provider.dart';
 ])
 part 'hive_adapters.g.dart';
 
+const int freeDrawingAdapterTypeId = 11;
+const int lineAdapterTypeId = 12;
+const int rectangleDrawingAdapterTypeId = 24;
+const int ellipseDrawingAdapterTypeId = 31;
+
+int _readDrawingHiveColorValue(
+  Map<int, dynamic> fields, {
+  required int colorFieldIndex,
+  int? legacyColorValueFieldIndex,
+}) {
+  final value = legacyColorValueFieldIndex == null
+      ? fields[colorFieldIndex]
+      : fields[legacyColorValueFieldIndex] ?? fields[colorFieldIndex];
+
+  return switch (value) {
+    final int colorValue => colorValue,
+    final num colorValue => colorValue.toInt(),
+    final Color color => color.toARGB32(),
+    _ => 0xFFFFFFFF,
+  };
+}
+
+class FreeDrawingAdapter extends TypeAdapter<FreeDrawing> {
+  @override
+  final typeId = freeDrawingAdapterTypeId;
+
+  @override
+  FreeDrawing read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+
+    return FreeDrawing(
+      listOfPoints: (fields[0] as List?)?.cast<Offset>(),
+      colorValue: _readDrawingHiveColorValue(
+        fields,
+        colorFieldIndex: 2,
+        legacyColorValueFieldIndex: 12,
+      ),
+      thickness: fields[11] == null
+          ? Settings.defaultStrokeThickness
+          : (fields[11] as num).toDouble(),
+      boundingBox: fields[6] as BoundingBox?,
+      isDotted: fields[3] as bool,
+      hasArrow: fields[4] as bool,
+      id: fields[5] as String,
+      showTraversalTime: fields[8] == null ? false : fields[8] as bool,
+      traversalSpeedProfile: fields[9] == null
+          ? TraversalSpeed.defaultProfile
+          : fields[9] as TraversalSpeedProfile,
+      cachedPolylineLengthUnits: (fields[10] as num?)?.toDouble(),
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, FreeDrawing obj) {
+    writer
+      ..writeByte(10)
+      ..writeByte(0)
+      ..write(obj.listOfPoints)
+      ..writeByte(2)
+      ..write(obj.colorValue)
+      ..writeByte(3)
+      ..write(obj.isDotted)
+      ..writeByte(4)
+      ..write(obj.hasArrow)
+      ..writeByte(5)
+      ..write(obj.id)
+      ..writeByte(6)
+      ..write(obj.boundingBox)
+      ..writeByte(8)
+      ..write(obj.showTraversalTime)
+      ..writeByte(9)
+      ..write(obj.traversalSpeedProfile)
+      ..writeByte(10)
+      ..write(obj.cachedPolylineLengthUnits)
+      ..writeByte(11)
+      ..write(obj.thickness);
+  }
+}
+
+class LineAdapter extends TypeAdapter<Line> {
+  @override
+  final typeId = lineAdapterTypeId;
+
+  @override
+  Line read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+
+    return Line(
+      lineStart: fields[0] as Offset,
+      lineEnd: fields[1] as Offset,
+      colorValue: _readDrawingHiveColorValue(
+        fields,
+        colorFieldIndex: 2,
+        legacyColorValueFieldIndex: 10,
+      ),
+      thickness: fields[9] == null
+          ? Settings.defaultStrokeThickness
+          : (fields[9] as num).toDouble(),
+      boundingBox: fields[6] as BoundingBox?,
+      isDotted: fields[3] as bool,
+      hasArrow: fields[4] as bool,
+      id: fields[5] as String,
+      showTraversalTime: fields[7] == null ? false : fields[7] as bool,
+      traversalSpeedProfile: fields[8] == null
+          ? TraversalSpeed.defaultProfile
+          : fields[8] as TraversalSpeedProfile,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, Line obj) {
+    writer
+      ..writeByte(10)
+      ..writeByte(0)
+      ..write(obj.lineStart)
+      ..writeByte(1)
+      ..write(obj.lineEnd)
+      ..writeByte(2)
+      ..write(obj.colorValue)
+      ..writeByte(3)
+      ..write(obj.isDotted)
+      ..writeByte(4)
+      ..write(obj.hasArrow)
+      ..writeByte(5)
+      ..write(obj.id)
+      ..writeByte(6)
+      ..write(obj.boundingBox)
+      ..writeByte(7)
+      ..write(obj.showTraversalTime)
+      ..writeByte(8)
+      ..write(obj.traversalSpeedProfile)
+      ..writeByte(9)
+      ..write(obj.thickness);
+  }
+}
+
+class RectangleDrawingAdapter extends TypeAdapter<RectangleDrawing> {
+  @override
+  final typeId = rectangleDrawingAdapterTypeId;
+
+  @override
+  RectangleDrawing read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+
+    return RectangleDrawing(
+      start: fields[0] as Offset,
+      end: fields[1] as Offset,
+      colorValue: _readDrawingHiveColorValue(
+        fields,
+        colorFieldIndex: 2,
+        legacyColorValueFieldIndex: 8,
+      ),
+      thickness: fields[7] == null
+          ? Settings.defaultStrokeThickness
+          : (fields[7] as num).toDouble(),
+      boundingBox: fields[6] as BoundingBox?,
+      isDotted: fields[3] as bool,
+      hasArrow: fields[4] as bool,
+      id: fields[5] as String,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, RectangleDrawing obj) {
+    writer
+      ..writeByte(8)
+      ..writeByte(0)
+      ..write(obj.start)
+      ..writeByte(1)
+      ..write(obj.end)
+      ..writeByte(2)
+      ..write(obj.colorValue)
+      ..writeByte(3)
+      ..write(obj.isDotted)
+      ..writeByte(4)
+      ..write(obj.hasArrow)
+      ..writeByte(5)
+      ..write(obj.id)
+      ..writeByte(6)
+      ..write(obj.boundingBox)
+      ..writeByte(7)
+      ..write(obj.thickness);
+  }
+}
+
+class EllipseDrawingAdapter extends TypeAdapter<EllipseDrawing> {
+  @override
+  final typeId = ellipseDrawingAdapterTypeId;
+
+  @override
+  EllipseDrawing read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+
+    return EllipseDrawing(
+      start: fields[0] as Offset,
+      end: fields[1] as Offset,
+      colorValue: _readDrawingHiveColorValue(
+        fields,
+        colorFieldIndex: 2,
+        legacyColorValueFieldIndex: 8,
+      ),
+      thickness: fields[3] == null
+          ? Settings.defaultStrokeThickness
+          : (fields[3] as num).toDouble(),
+      boundingBox: fields[7] as BoundingBox?,
+      isDotted: fields[4] as bool,
+      hasArrow: fields[5] as bool,
+      id: fields[6] as String,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, EllipseDrawing obj) {
+    writer
+      ..writeByte(8)
+      ..writeByte(0)
+      ..write(obj.start)
+      ..writeByte(1)
+      ..write(obj.end)
+      ..writeByte(2)
+      ..write(obj.colorValue)
+      ..writeByte(3)
+      ..write(obj.thickness)
+      ..writeByte(4)
+      ..write(obj.isDotted)
+      ..writeByte(5)
+      ..write(obj.hasArrow)
+      ..writeByte(6)
+      ..write(obj.id)
+      ..writeByte(7)
+      ..write(obj.boundingBox);
+  }
+}
+
 class FolderAdapter extends TypeAdapter<Folder> {
   @override
   final typeId = 17;
diff --git a/lib/hive/hive_adapters.g.dart b/lib/hive/hive_adapters.g.dart
index 1f0c3b8b..a0083fd8 100644
--- a/lib/hive/hive_adapters.g.dart
+++ b/lib/hive/hive_adapters.g.dart
@@ -629,136 +629,6 @@ class OffsetAdapter extends TypeAdapter<Offset> {
           typeId == other.typeId;
 }
 
-class FreeDrawingAdapter extends TypeAdapter<FreeDrawing> {
-  @override
-  final typeId = 11;
-
-  @override
-  FreeDrawing read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return FreeDrawing(
-      listOfPoints: (fields[0] as List?)?.cast<Offset>(),
-      color: fields[2] as Color,
-      thickness: fields[11] == null
-          ? Settings.defaultStrokeThickness
-          : (fields[11] as num).toDouble(),
-      boundingBox: fields[6] as BoundingBox?,
-      isDotted: fields[3] as bool,
-      hasArrow: fields[4] as bool,
-      id: fields[5] as String,
-      showTraversalTime: fields[8] == null ? false : fields[8] as bool,
-      traversalSpeedProfile: fields[9] == null
-          ? TraversalSpeed.defaultProfile
-          : fields[9] as TraversalSpeedProfile,
-      cachedPolylineLengthUnits: (fields[10] as num?)?.toDouble(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, FreeDrawing obj) {
-    writer
-      ..writeByte(10)
-      ..writeByte(0)
-      ..write(obj.listOfPoints)
-      ..writeByte(2)
-      ..write(obj.color)
-      ..writeByte(3)
-      ..write(obj.isDotted)
-      ..writeByte(4)
-      ..write(obj.hasArrow)
-      ..writeByte(5)
-      ..write(obj.id)
-      ..writeByte(6)
-      ..write(obj.boundingBox)
-      ..writeByte(8)
-      ..write(obj.showTraversalTime)
-      ..writeByte(9)
-      ..write(obj.traversalSpeedProfile)
-      ..writeByte(10)
-      ..write(obj.cachedPolylineLengthUnits)
-      ..writeByte(11)
-      ..write(obj.thickness);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is FreeDrawingAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class LineAdapter extends TypeAdapter<Line> {
-  @override
-  final typeId = 12;
-
-  @override
-  Line read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Line(
-      lineStart: fields[0] as Offset,
-      lineEnd: fields[1] as Offset,
-      color: fields[2] as Color,
-      thickness: fields[9] == null
-          ? Settings.defaultStrokeThickness
-          : (fields[9] as num).toDouble(),
-      boundingBox: fields[6] as BoundingBox?,
-      isDotted: fields[3] as bool,
-      hasArrow: fields[4] as bool,
-      id: fields[5] as String,
-      showTraversalTime: fields[7] == null ? false : fields[7] as bool,
-      traversalSpeedProfile: fields[8] == null
-          ? TraversalSpeed.defaultProfile
-          : fields[8] as TraversalSpeedProfile,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Line obj) {
-    writer
-      ..writeByte(10)
-      ..writeByte(0)
-      ..write(obj.lineStart)
-      ..writeByte(1)
-      ..write(obj.lineEnd)
-      ..writeByte(2)
-      ..write(obj.color)
-      ..writeByte(3)
-      ..write(obj.isDotted)
-      ..writeByte(4)
-      ..write(obj.hasArrow)
-      ..writeByte(5)
-      ..write(obj.id)
-      ..writeByte(6)
-      ..write(obj.boundingBox)
-      ..writeByte(7)
-      ..write(obj.showTraversalTime)
-      ..writeByte(8)
-      ..write(obj.traversalSpeedProfile)
-      ..writeByte(9)
-      ..write(obj.thickness);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is LineAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 class BoundingBoxAdapter extends TypeAdapter<BoundingBox> {
   @override
   final typeId = 13;
@@ -813,17 +683,20 @@ class StrategySettingsAdapter extends TypeAdapter<StrategySettings> {
       abilitySize: fields[1] == null
           ? Settings.abilitySize
           : (fields[1] as num).toDouble(),
+      useNeutralTeamColors: fields[2] == null ? false : fields[2] as bool,
     );
   }
 
   @override
   void write(BinaryWriter writer, StrategySettings obj) {
     writer
-      ..writeByte(2)
+      ..writeByte(3)
       ..writeByte(0)
       ..write(obj.agentSize)
       ..writeByte(1)
-      ..write(obj.abilitySize);
+      ..write(obj.abilitySize)
+      ..writeByte(2)
+      ..write(obj.useNeutralTeamColors);
   }
 
   @override
@@ -1275,63 +1148,6 @@ class AgentStateAdapter extends TypeAdapter<AgentState> {
           typeId == other.typeId;
 }
 
-class RectangleDrawingAdapter extends TypeAdapter<RectangleDrawing> {
-  @override
-  final typeId = 24;
-
-  @override
-  RectangleDrawing read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RectangleDrawing(
-      start: fields[0] as Offset,
-      end: fields[1] as Offset,
-      color: fields[2] as Color,
-      thickness: fields[7] == null
-          ? Settings.defaultStrokeThickness
-          : (fields[7] as num).toDouble(),
-      boundingBox: fields[6] as BoundingBox?,
-      isDotted: fields[3] as bool,
-      hasArrow: fields[4] as bool,
-      id: fields[5] as String,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RectangleDrawing obj) {
-    writer
-      ..writeByte(8)
-      ..writeByte(0)
-      ..write(obj.start)
-      ..writeByte(1)
-      ..write(obj.end)
-      ..writeByte(2)
-      ..write(obj.color)
-      ..writeByte(3)
-      ..write(obj.isDotted)
-      ..writeByte(4)
-      ..write(obj.hasArrow)
-      ..writeByte(5)
-      ..write(obj.id)
-      ..writeByte(6)
-      ..write(obj.boundingBox)
-      ..writeByte(7)
-      ..write(obj.thickness);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RectangleDrawingAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 class TraversalSpeedProfileAdapter extends TypeAdapter<TraversalSpeedProfile> {
   @override
   final typeId = 25;
@@ -1476,21 +1292,53 @@ class AppPreferencesAdapter extends TypeAdapter<AppPreferences> {
     return AppPreferences(
       defaultThemeProfileIdForNewStrategies: fields[0] as String,
       autosaveEnabled: fields[1] == null ? true : fields[1] as bool,
+      defaultAgentSizeForNewStrategies: fields[5] == null
+          ? Settings.agentSize
+          : (fields[5] as num).toDouble(),
+      defaultAbilitySizeForNewStrategies: fields[6] == null
+          ? Settings.abilitySize
+          : (fields[6] as num).toDouble(),
+      defaultNeutralTeamColorsForNewStrategies:
+          fields[4] == null ? false : fields[4] as bool,
+      showSpawnBarrier: fields[9] == null ? false : fields[9] as bool,
+      showUltOrbs: fields[10] == null ? false : fields[10] as bool,
+      showRegionNames: fields[11] == null ? false : fields[11] as bool,
       pagesBarExpandedHeight:
           fields[2] == null ? 310.0 : (fields[2] as num).toDouble(),
+      pagesBarWidth: fields[7] == null ? 224.0 : (fields[7] as num).toDouble(),
+      customColorValues: (fields[3] as List?)?.cast<int>(),
+      customShortcutBindings: (fields[8] as Map?)?.cast<String, String>(),
     );
   }
 
   @override
   void write(BinaryWriter writer, AppPreferences obj) {
     writer
-      ..writeByte(3)
+      ..writeByte(12)
       ..writeByte(0)
       ..write(obj.defaultThemeProfileIdForNewStrategies)
       ..writeByte(1)
       ..write(obj.autosaveEnabled)
       ..writeByte(2)
-      ..write(obj.pagesBarExpandedHeight);
+      ..write(obj.pagesBarExpandedHeight)
+      ..writeByte(3)
+      ..write(obj.customColorValues)
+      ..writeByte(4)
+      ..write(obj.defaultNeutralTeamColorsForNewStrategies)
+      ..writeByte(5)
+      ..write(obj.defaultAgentSizeForNewStrategies)
+      ..writeByte(6)
+      ..write(obj.defaultAbilitySizeForNewStrategies)
+      ..writeByte(7)
+      ..write(obj.pagesBarWidth)
+      ..writeByte(8)
+      ..write(obj.customShortcutBindings)
+      ..writeByte(9)
+      ..write(obj.showSpawnBarrier)
+      ..writeByte(10)
+      ..write(obj.showUltOrbs)
+      ..writeByte(11)
+      ..write(obj.showRegionNames);
   }
 
   @override
@@ -1618,63 +1466,6 @@ class PlacedCircleAgentAdapter extends TypeAdapter<PlacedCircleAgent> {
           typeId == other.typeId;
 }
 
-class EllipseDrawingAdapter extends TypeAdapter<EllipseDrawing> {
-  @override
-  final typeId = 31;
-
-  @override
-  EllipseDrawing read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return EllipseDrawing(
-      start: fields[0] as Offset,
-      end: fields[1] as Offset,
-      color: fields[2] as Color,
-      thickness: fields[3] == null
-          ? Settings.defaultStrokeThickness
-          : (fields[3] as num).toDouble(),
-      boundingBox: fields[7] as BoundingBox?,
-      isDotted: fields[4] as bool,
-      hasArrow: fields[5] as bool,
-      id: fields[6] as String,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, EllipseDrawing obj) {
-    writer
-      ..writeByte(8)
-      ..writeByte(0)
-      ..write(obj.start)
-      ..writeByte(1)
-      ..write(obj.end)
-      ..writeByte(2)
-      ..write(obj.color)
-      ..writeByte(3)
-      ..write(obj.thickness)
-      ..writeByte(4)
-      ..write(obj.isDotted)
-      ..writeByte(5)
-      ..write(obj.hasArrow)
-      ..writeByte(6)
-      ..write(obj.id)
-      ..writeByte(7)
-      ..write(obj.boundingBox);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is EllipseDrawingAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
 class AbilityVisualStateAdapter extends TypeAdapter<AbilityVisualState> {
   @override
   final typeId = 32;
diff --git a/lib/hive/hive_adapters.g.yaml b/lib/hive/hive_adapters.g.yaml
index ad40594a..b3c2d5d8 100644
--- a/lib/hive/hive_adapters.g.yaml
+++ b/lib/hive/hive_adapters.g.yaml
@@ -235,54 +235,6 @@ types:
         index: 0
       dy:
         index: 1
-  FreeDrawing:
-    typeId: 11
-    nextIndex: 12
-    fields:
-      listOfPoints:
-        index: 0
-      color:
-        index: 2
-      isDotted:
-        index: 3
-      hasArrow:
-        index: 4
-      id:
-        index: 5
-      boundingBox:
-        index: 6
-      showTraversalTime:
-        index: 8
-      traversalSpeedProfile:
-        index: 9
-      cachedPolylineLengthUnits:
-        index: 10
-      thickness:
-        index: 11
-  Line:
-    typeId: 12
-    nextIndex: 10
-    fields:
-      lineStart:
-        index: 0
-      lineEnd:
-        index: 1
-      color:
-        index: 2
-      isDotted:
-        index: 3
-      hasArrow:
-        index: 4
-      id:
-        index: 5
-      boundingBox:
-        index: 6
-      showTraversalTime:
-        index: 7
-      traversalSpeedProfile:
-        index: 8
-      thickness:
-        index: 9
   BoundingBox:
     typeId: 13
     nextIndex: 2
@@ -293,12 +245,14 @@ types:
         index: 1
   StrategySettings:
     typeId: 14
-    nextIndex: 2
+    nextIndex: 3
     fields:
       agentSize:
         index: 0
       abilitySize:
         index: 1
+      useNeutralTeamColors:
+        index: 2
   PlacedUtility:
     typeId: 15
     nextIndex: 15
@@ -447,26 +401,6 @@ types:
         index: 0
       none:
         index: 1
-  RectangleDrawing:
-    typeId: 24
-    nextIndex: 8
-    fields:
-      start:
-        index: 0
-      end:
-        index: 1
-      color:
-        index: 2
-      isDotted:
-        index: 3
-      hasArrow:
-        index: 4
-      id:
-        index: 5
-      boundingBox:
-        index: 6
-      thickness:
-        index: 7
   TraversalSpeedProfile:
     typeId: 25
     nextIndex: 4
@@ -505,7 +439,7 @@ types:
         index: 4
   AppPreferences:
     typeId: 28
-    nextIndex: 3
+    nextIndex: 12
     fields:
       defaultThemeProfileIdForNewStrategies:
         index: 0
@@ -513,6 +447,24 @@ types:
         index: 1
       pagesBarExpandedHeight:
         index: 2
+      customColorValues:
+        index: 3
+      defaultNeutralTeamColorsForNewStrategies:
+        index: 4
+      defaultAgentSizeForNewStrategies:
+        index: 5
+      defaultAbilitySizeForNewStrategies:
+        index: 6
+      pagesBarWidth:
+        index: 7
+      customShortcutBindings:
+        index: 8
+      showSpawnBarrier:
+        index: 9
+      showUltOrbs:
+        index: 10
+      showRegionNames:
+        index: 11
   PlacedViewConeAgent:
     typeId: 29
     nextIndex: 9
@@ -557,26 +509,6 @@ types:
         index: 7
       position:
         index: 8
-  EllipseDrawing:
-    typeId: 31
-    nextIndex: 8
-    fields:
-      start:
-        index: 0
-      end:
-        index: 1
-      color:
-        index: 2
-      thickness:
-        index: 3
-      isDotted:
-        index: 4
-      hasArrow:
-        index: 5
-      id:
-        index: 6
-      boundingBox:
-        index: 7
   AbilityVisualState:
     typeId: 32
     nextIndex: 6
diff --git a/lib/hive/hive_registrar.g.dart b/lib/hive/hive_registrar.g.dart
index a09987f5..bb55d7f4 100644
--- a/lib/hive/hive_registrar.g.dart
+++ b/lib/hive/hive_registrar.g.dart
@@ -14,11 +14,8 @@ extension HiveRegistrar on HiveInterface {
     registerAdapter(AgentTypeAdapter());
     registerAdapter(AppPreferencesAdapter());
     registerAdapter(BoundingBoxAdapter());
-    registerAdapter(EllipseDrawingAdapter());
     registerAdapter(FolderColorAdapter());
-    registerAdapter(FreeDrawingAdapter());
     registerAdapter(IconDataAdapter());
-    registerAdapter(LineAdapter());
     registerAdapter(LineUpAdapter());
     registerAdapter(LineUpGroupAdapter());
     registerAdapter(LineUpItemAdapter());
@@ -34,7 +31,6 @@ extension HiveRegistrar on HiveInterface {
     registerAdapter(PlacedUtilityAdapter());
     registerAdapter(PlacedViewConeAgentAdapter());
     registerAdapter(PlacedWidgetAdapter());
-    registerAdapter(RectangleDrawingAdapter());
     registerAdapter(SimpleImageDataAdapter());
     registerAdapter(StrategyDataAdapter());
     registerAdapter(StrategyPageAdapter());
@@ -52,11 +48,8 @@ extension IsolatedHiveRegistrar on IsolatedHiveInterface {
     registerAdapter(AgentTypeAdapter());
     registerAdapter(AppPreferencesAdapter());
     registerAdapter(BoundingBoxAdapter());
-    registerAdapter(EllipseDrawingAdapter());
     registerAdapter(FolderColorAdapter());
-    registerAdapter(FreeDrawingAdapter());
     registerAdapter(IconDataAdapter());
-    registerAdapter(LineAdapter());
     registerAdapter(LineUpAdapter());
     registerAdapter(LineUpGroupAdapter());
     registerAdapter(LineUpItemAdapter());
@@ -72,7 +65,6 @@ extension IsolatedHiveRegistrar on IsolatedHiveInterface {
     registerAdapter(PlacedUtilityAdapter());
     registerAdapter(PlacedViewConeAgentAdapter());
     registerAdapter(PlacedWidgetAdapter());
-    registerAdapter(RectangleDrawingAdapter());
     registerAdapter(SimpleImageDataAdapter());
     registerAdapter(StrategyDataAdapter());
     registerAdapter(StrategyPageAdapter());
diff --git a/lib/hive/hive_registration.dart b/lib/hive/hive_registration.dart
index ec038957..9e9348b9 100644
--- a/lib/hive/hive_registration.dart
+++ b/lib/hive/hive_registration.dart
@@ -6,6 +6,18 @@ const int _folderAdapterTypeId = 17;
 
 void registerIcarusAdapters(HiveInterface hive) {
   hive.registerAdapters();
+  if (!hive.isAdapterRegistered(freeDrawingAdapterTypeId)) {
+    hive.registerAdapter(FreeDrawingAdapter());
+  }
+  if (!hive.isAdapterRegistered(lineAdapterTypeId)) {
+    hive.registerAdapter(LineAdapter());
+  }
+  if (!hive.isAdapterRegistered(rectangleDrawingAdapterTypeId)) {
+    hive.registerAdapter(RectangleDrawingAdapter());
+  }
+  if (!hive.isAdapterRegistered(ellipseDrawingAdapterTypeId)) {
+    hive.registerAdapter(EllipseDrawingAdapter());
+  }
   if (!hive.isAdapterRegistered(_folderAdapterTypeId)) {
     hive.registerAdapter(FolderAdapter());
   }
@@ -13,6 +25,18 @@ void registerIcarusAdapters(HiveInterface hive) {
 
 void registerIcarusIsolatedAdapters(IsolatedHiveInterface hive) {
   hive.registerAdapters();
+  if (!hive.isAdapterRegistered(freeDrawingAdapterTypeId)) {
+    hive.registerAdapter(FreeDrawingAdapter());
+  }
+  if (!hive.isAdapterRegistered(lineAdapterTypeId)) {
+    hive.registerAdapter(LineAdapter());
+  }
+  if (!hive.isAdapterRegistered(rectangleDrawingAdapterTypeId)) {
+    hive.registerAdapter(RectangleDrawingAdapter());
+  }
+  if (!hive.isAdapterRegistered(ellipseDrawingAdapterTypeId)) {
+    hive.registerAdapter(EllipseDrawingAdapter());
+  }
   if (!hive.isAdapterRegistered(_folderAdapterTypeId)) {
     hive.registerAdapter(FolderAdapter());
   }
diff --git a/lib/interactive_map.dart b/lib/interactive_map.dart
index bd6bf9cc..ce642758 100644
--- a/lib/interactive_map.dart
+++ b/lib/interactive_map.dart
@@ -9,7 +9,7 @@ import 'package:icarus/providers/ability_bar_provider.dart';
 import 'package:icarus/providers/canvas_resize_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/placement_center_provider.dart';
 import 'package:icarus/providers/screen_zoom_provider.dart';
 import 'package:icarus/providers/transition_provider.dart';
@@ -169,7 +169,8 @@ class _InteractiveMapState extends ConsumerState<InteractiveMap> {
             (constraints.maxWidth - Settings.sideBarReservedWidth)
                 .clamp(0.0, constraints.maxWidth);
         final viewportSize = Size(viewportWidth, height);
-        if (_lastViewportSize != viewportSize || _lastPlayAreaSize != playAreaSize) {
+        if (_lastViewportSize != viewportSize ||
+            _lastPlayAreaSize != playAreaSize) {
           final double currentScale = controller.value.getMaxScaleOnAxis();
           final double safeScale = currentScale == 0 ? 1.0 : currentScale;
           final double centeredOffsetX =
@@ -339,6 +340,13 @@ class _InteractiveMapState extends ConsumerState<InteractiveMap> {
                                           child: PlacedWidgetBuilder(),
                                         ),
                                 ),
+                                Positioned.fill(
+                                  child: ref.watch(transitionProvider).hideView
+                                      ? IgnorePointer(
+                                          child: LineUpOverlay(),
+                                        )
+                                      : SizedBox.shrink(),
+                                ),
                                 Positioned.fill(
                                   child: ref.watch(transitionProvider).active
                                       ? PageTransitionOverlay()
diff --git a/lib/main.dart b/lib/main.dart
index b3d92e13..b0461de5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -20,7 +20,7 @@ import 'package:icarus/const/second_instance_args.dart';
 import 'package:icarus/const/settings.dart' show Settings;
 import 'package:icarus/hive/hive_registration.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/services/app_error_reporter.dart';
 import 'package:icarus/strategy_view.dart';
diff --git a/lib/providers/ability_provider.dart b/lib/providers/ability_provider.dart
index 824875ad..a863aa64 100644
--- a/lib/providers/ability_provider.dart
+++ b/lib/providers/ability_provider.dart
@@ -9,6 +9,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/providers/action_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
+import 'package:uuid/uuid.dart';
 
 final abilityProvider =
     NotifierProvider<AbilityProvider, List<PlacedAbility>>(AbilityProvider.new);
@@ -33,6 +34,8 @@ class AbilitySnapshot {
 class AbilityProvider extends Notifier<List<PlacedAbility>> {
   List<PlacedAbility> poppedAbility = [];
   List<AbilitySnapshot> snapshots = [];
+  static const _uuid = Uuid();
+
   @override
   List<PlacedAbility> build() {
     return [];
@@ -98,6 +101,33 @@ class AbilityProvider extends Notifier<List<PlacedAbility>> {
     state = [...newState, temp];
   }
 
+  String? duplicateAbilityAt({
+    required String sourceId,
+    required Offset position,
+  }) {
+    final sourceIndex = PlacedWidget.getIndexByID(sourceId, state);
+    if (sourceIndex < 0) return null;
+
+    final sourceAbility = state[sourceIndex];
+    final coordinateSystem = CoordinateSystem.instance;
+    final mapState = ref.read(mapProvider);
+    final mapScale = Maps.mapScale[mapState.currentMap] ?? 1.0;
+    final abilitySize = ref.read(strategySettingsProvider).abilitySize;
+    final centerOffset = sourceAbility.data.abilityData!
+        .getAnchorPoint(mapScale: mapScale, abilitySize: abilitySize);
+    final centerPosition =
+        Offset(position.dx + centerOffset.dx, position.dy + centerOffset.dy);
+
+    if (coordinateSystem.isOutOfBounds(centerPosition)) return null;
+
+    final duplicatedAbility = sourceAbility.copyWith(
+      id: _uuid.v4(),
+      position: position,
+    );
+    addAbility(duplicatedAbility);
+    return duplicatedAbility.id;
+  }
+
   void switchSides() {
     if (state.isEmpty && poppedAbility.isEmpty) return;
 
diff --git a/lib/providers/color_library_provider.dart b/lib/providers/color_library_provider.dart
new file mode 100644
index 00000000..d2a256e8
--- /dev/null
+++ b/lib/providers/color_library_provider.dart
@@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
+
+class ColorLibraryEntry {
+  const ColorLibraryEntry({
+    required this.color,
+    required this.isCustom,
+    this.customIndex,
+  });
+
+  final Color color;
+  final bool isCustom;
+  final int? customIndex;
+}
+
+final defaultColorLibraryProvider = Provider<List<Color>>((ref) {
+  return const [
+    Colors.white,
+    Colors.red,
+    Colors.blue,
+    Colors.yellow,
+    Colors.green,
+  ];
+});
+
+final customColorLibraryProvider = Provider<List<Color>>((ref) {
+  final colorValues = ref.watch(colorLibraryControllerProvider);
+  return colorValues.map(Color.new).toList(growable: false);
+});
+
+final colorLibraryProvider = Provider<List<ColorLibraryEntry>>((ref) {
+  final defaults = ref.watch(defaultColorLibraryProvider);
+  final customColors = ref.watch(customColorLibraryProvider);
+  return [
+    for (final color in defaults)
+      ColorLibraryEntry(color: color, isCustom: false),
+    for (final (index, color) in customColors.indexed)
+      ColorLibraryEntry(color: color, isCustom: true, customIndex: index),
+  ];
+});
+
+class ColorLibraryController extends Notifier<List<int>> {
+  static const int customColorLimit = 15;
+
+  @override
+  List<int> build() {
+    return ref.read(appPreferencesProvider).customColorValues;
+  }
+
+  bool get canAddColor => state.length < customColorLimit;
+
+  Future<void> addColor(Color color) async {
+    if (!canAddColor) return;
+    await _save([...state, color.toARGB32()]);
+  }
+
+  Future<void> updateColor(int customIndex, Color color) async {
+    if (customIndex < 0 || customIndex >= state.length) return;
+    final next = [...state];
+    next[customIndex] = color.toARGB32();
+    await _save(next);
+  }
+
+  Future<void> deleteColor(int customIndex) async {
+    if (customIndex < 0 || customIndex >= state.length) return;
+    final next = [...state]..removeAt(customIndex);
+    await _save(next);
+  }
+
+  Future<void> _save(List<int> colorValues) async {
+    state = colorValues;
+    await ref
+        .read(appPreferencesProvider.notifier)
+        .setCustomColorValues(colorValues);
+  }
+}
+
+final colorLibraryControllerProvider =
+    NotifierProvider<ColorLibraryController, List<int>>(
+  ColorLibraryController.new,
+);
diff --git a/lib/providers/drawing_provider.dart b/lib/providers/drawing_provider.dart
index 93e0b90b..73523e0b 100644
--- a/lib/providers/drawing_provider.dart
+++ b/lib/providers/drawing_provider.dart
@@ -178,11 +178,10 @@ class DrawingProvider extends Notifier<DrawingState> {
     }
 
     if (element is Line) {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
       return {
         'type': 'lineDrawing',
-        'color': colorConverter.toJson(element.color),
+        'colorValue': element.colorValue,
         'thickness': element.thickness,
         'isDotted': element.isDotted,
         'hasArrow': element.hasArrow,
@@ -196,11 +195,10 @@ class DrawingProvider extends Notifier<DrawingState> {
     }
 
     if (element is RectangleDrawing) {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
       return {
         'type': 'rectangleDrawing',
-        'color': colorConverter.toJson(element.color),
+        'colorValue': element.colorValue,
         'thickness': element.thickness,
         'isDotted': element.isDotted,
         'hasArrow': element.hasArrow,
@@ -212,11 +210,10 @@ class DrawingProvider extends Notifier<DrawingState> {
     }
 
     if (element is EllipseDrawing) {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
       return {
         'type': 'ellipseDrawing',
-        'color': colorConverter.toJson(element.color),
+        'colorValue': element.colorValue,
         'thickness': element.thickness,
         'isDotted': element.isDotted,
         'hasArrow': element.hasArrow,
@@ -249,7 +246,6 @@ class DrawingProvider extends Notifier<DrawingState> {
         (type == null &&
             json.containsKey('lineStart') &&
             json.containsKey('lineEnd'))) {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
 
       final lineStart = offsetConverter
@@ -269,7 +265,7 @@ class DrawingProvider extends Notifier<DrawingState> {
       return Line(
         lineStart: lineStart,
         lineEnd: lineEnd,
-        color: colorConverter.fromJson(json['color'] as String),
+        colorValue: _readDrawingColorValue(json),
         thickness: (json['thickness'] as num?)?.toDouble() ??
             Settings.defaultStrokeThickness,
         isDotted: json['isDotted'] as bool? ?? false,
@@ -289,7 +285,6 @@ class DrawingProvider extends Notifier<DrawingState> {
         (type == null &&
             json.containsKey('start') &&
             json.containsKey('end'))) {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
 
       final start = offsetConverter
@@ -312,7 +307,7 @@ class DrawingProvider extends Notifier<DrawingState> {
       return RectangleDrawing(
         start: start,
         end: end,
-        color: colorConverter.fromJson(json['color'] as String),
+        colorValue: _readDrawingColorValue(json),
         thickness: (json['thickness'] as num?)?.toDouble() ??
             Settings.defaultStrokeThickness,
         isDotted: json['isDotted'] as bool? ?? false,
@@ -323,7 +318,6 @@ class DrawingProvider extends Notifier<DrawingState> {
     }
 
     if (type == 'ellipseDrawing') {
-      const colorConverter = ColorConverter();
       const offsetConverter = OffsetConverter();
 
       final start = offsetConverter
@@ -347,7 +341,7 @@ class DrawingProvider extends Notifier<DrawingState> {
       return EllipseDrawing(
         start: start,
         end: end,
-        color: colorConverter.fromJson(json['color'] as String),
+        colorValue: _readDrawingColorValue(json),
         thickness: (json['thickness'] as num?)?.toDouble() ??
             Settings.defaultStrokeThickness,
         isDotted: json['isDotted'] as bool? ?? false,
@@ -572,7 +566,7 @@ class DrawingProvider extends Notifier<DrawingState> {
     FreeDrawing freeDrawing = FreeDrawing(
       hasArrow: hasArrow,
       isDotted: isDotted,
-      color: activeColor,
+      colorValue: activeColor.toARGB32(),
       thickness: thickness,
       boundingBox: BoundingBox(min: normalizedStart, max: normalizedStart),
       id: id,
@@ -664,7 +658,7 @@ class DrawingProvider extends Notifier<DrawingState> {
     final rectangle = RectangleDrawing(
       start: normalizedStart,
       end: normalizedStart,
-      color: activeColor,
+      colorValue: activeColor.toARGB32(),
       thickness: thickness,
       isDotted: isDotted,
       hasArrow: false,
@@ -742,7 +736,7 @@ class DrawingProvider extends Notifier<DrawingState> {
     final ellipse = EllipseDrawing(
       start: normalizedStart,
       end: normalizedStart,
-      color: activeColor,
+      colorValue: activeColor.toARGB32(),
       thickness: thickness,
       isDotted: isDotted,
       hasArrow: false,
@@ -831,7 +825,7 @@ class DrawingProvider extends Notifier<DrawingState> {
     final line = Line(
       lineStart: normalizedStart,
       lineEnd: normalizedStart,
-      color: activeColor,
+      colorValue: activeColor.toARGB32(),
       thickness: thickness,
       boundingBox: BoundingBox(min: normalizedStart, max: normalizedStart),
       isDotted: isDotted,
@@ -921,6 +915,16 @@ class DrawingProvider extends Notifier<DrawingState> {
   }
 }
 
+int _readDrawingColorValue(Map<String, dynamic> json) {
+  final value = json['colorValue'] ?? json['color'];
+  if (value is int) return value;
+  if (value is num) return value.toInt();
+  if (value is String) {
+    return const ColorConverter().fromJson(value).toARGB32();
+  }
+  return 0xFFFFFFFF;
+}
+
 BoundingBox _boundingBoxForPoints(Offset a, Offset b) {
   return BoundingBox(
     min: Offset(min(a.dx, b.dx), min(a.dy, b.dy)),
diff --git a/lib/providers/map_provider.dart b/lib/providers/map_provider.dart
index b33c170b..2984bfba 100644
--- a/lib/providers/map_provider.dart
+++ b/lib/providers/map_provider.dart
@@ -8,6 +8,7 @@ import 'package:icarus/providers/agent_provider.dart';
 import 'package:icarus/providers/image_provider.dart';
 import 'package:icarus/providers/text_provider.dart';
 import 'package:icarus/providers/utility_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 
 final mapProvider = NotifierProvider<MapProvider, MapState>(MapProvider.new);
 
@@ -46,7 +47,14 @@ class MapState {
 class MapProvider extends Notifier<MapState> {
   @override
   MapState build() {
-    return MapState(currentMap: MapValue.ascent, isAttack: true);
+    final preferences = ref.read(appPreferencesProvider);
+    return MapState(
+      currentMap: MapValue.ascent,
+      isAttack: true,
+      showSpawnBarrier: preferences.showSpawnBarrier,
+      showUltOrbs: preferences.showUltOrbs,
+      showRegionNames: preferences.showRegionNames,
+    );
   }
 
   void updateMap(MapValue map) => state = state.copyWith(currentMap: map);
@@ -55,16 +63,27 @@ class MapProvider extends Notifier<MapState> {
     state = state.copyWith(currentMap: map, isAttack: isAttack);
   }
 
-  void updateSpawnBarrier(bool value) {
+  void syncVisibilityFromPreferences(AppPreferences preferences) {
+    state = state.copyWith(
+      showSpawnBarrier: preferences.showSpawnBarrier,
+      showUltOrbs: preferences.showUltOrbs,
+      showRegionNames: preferences.showRegionNames,
+    );
+  }
+
+  Future<void> updateSpawnBarrier(bool value) async {
     state = state.copyWith(showSpawnBarrier: value);
+    await ref.read(appPreferencesProvider.notifier).setShowSpawnBarrier(value);
   }
 
-  void updateUltOrbs(bool value) {
+  Future<void> updateUltOrbs(bool value) async {
     state = state.copyWith(showUltOrbs: value);
+    await ref.read(appPreferencesProvider.notifier).setShowUltOrbs(value);
   }
 
-  void updateRegionNames(bool value) {
+  Future<void> updateRegionNames(bool value) async {
     state = state.copyWith(showRegionNames: value);
+    await ref.read(appPreferencesProvider.notifier).setShowRegionNames(value);
   }
 
   void switchSide() {
diff --git a/lib/providers/strategy_provider.dart b/lib/providers/strategy_provider.dart
index b397548e..d88881a4 100644
--- a/lib/providers/strategy_provider.dart
+++ b/lib/providers/strategy_provider.dart
@@ -29,7 +29,7 @@ import 'package:icarus/providers/drawing_provider.dart';
 import 'package:icarus/providers/folder_provider.dart';
 import 'package:icarus/providers/favorite_agents_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
 import 'package:icarus/providers/text_provider.dart';
@@ -800,7 +800,7 @@ class StrategyProvider extends Notifier<StrategyState> {
               return Line(
                 lineStart: shift(element.lineStart),
                 lineEnd: shift(element.lineEnd),
-                color: element.color,
+                colorValue: element.colorValue,
                 thickness: element.thickness,
                 boundingBox: shiftBoundingBox(element.boundingBox),
                 isDotted: element.isDotted,
@@ -816,7 +816,7 @@ class StrategyProvider extends Notifier<StrategyState> {
 
               return FreeDrawing(
                 listOfPoints: shiftedPoints,
-                color: element.color,
+                colorValue: element.colorValue,
                 thickness: element.thickness,
                 boundingBox: shiftBoundingBox(element.boundingBox),
                 isDotted: element.isDotted,
@@ -830,7 +830,7 @@ class StrategyProvider extends Notifier<StrategyState> {
               return RectangleDrawing(
                 start: shift(element.start),
                 end: shift(element.end),
-                color: element.color,
+                colorValue: element.colorValue,
                 thickness: element.thickness,
                 boundingBox: shiftBoundingBox(element.boundingBox),
                 isDotted: element.isDotted,
@@ -1045,13 +1045,17 @@ class StrategyProvider extends Notifier<StrategyState> {
       ..sort((a, b) => a.sortIndex.compareTo(b.sortIndex));
     final resolvedDirection =
         direction ?? _resolveDirectionForPage(pageID, orderedPages);
+    final sourcePageId = activePageID;
+    final targetPageId = pageID;
     final startSettings = ref.read(strategySettingsProvider);
 
     final prev = _snapshotAllPlaced();
     transitionNotifier.prepare(prev.values.toList(),
         direction: resolvedDirection,
         startAgentSize: startSettings.agentSize,
-        startAbilitySize: startSettings.abilitySize);
+        startAbilitySize: startSettings.abilitySize,
+        sourcePageId: sourcePageId,
+        targetPageId: targetPageId);
 
     // Load target page (hydrates providers)
     await setActivePage(pageID);
@@ -1070,6 +1074,8 @@ class StrategyProvider extends Notifier<StrategyState> {
           endAgentSize: endSettings.agentSize,
           startAbilitySize: startSettings.abilitySize,
           endAbilitySize: endSettings.abilitySize,
+          sourcePageId: sourcePageId,
+          targetPageId: targetPageId,
         );
       } else {
         transitionNotifier.complete();
@@ -2804,6 +2810,10 @@ class StrategyProvider extends Notifier<StrategyState> {
               ))
           .copyWith(
         defaultThemeProfileIdForNewStrategies: resolvedDefaultProfileId,
+        showSpawnBarrier: globals.showSpawnBarrier,
+        showUltOrbs: globals.showUltOrbs,
+        showRegionNames: globals.showRegionNames,
+        customColorValues: globals.customColorValues,
       ),
     );
 
@@ -2814,6 +2824,9 @@ class StrategyProvider extends Notifier<StrategyState> {
 
     await ref.read(mapThemeProfilesProvider.notifier).refreshFromHive();
     await ref.read(appPreferencesProvider.notifier).refreshFromHive();
+    ref
+        .read(mapProvider.notifier)
+        .syncVisibilityFromPreferences(ref.read(appPreferencesProvider));
     ref.invalidate(favoriteAgentsProvider);
 
     return _GlobalImportResult(
@@ -3025,6 +3038,13 @@ class StrategyProvider extends Notifier<StrategyState> {
     final pageID = const Uuid().v4();
     final defaultThemeProfileId =
         ref.read(mapThemeProfilesProvider).defaultProfileIdForNewStrategies;
+    final appPreferences = ref.read(appPreferencesProvider);
+    final defaultSettings = StrategySettings(
+      agentSize: appPreferences.defaultAgentSizeForNewStrategies,
+      abilitySize: appPreferences.defaultAbilitySizeForNewStrategies,
+      useNeutralTeamColors:
+          appPreferences.defaultNeutralTeamColorsForNewStrategies,
+    );
     final newStrategy = StrategyData(
       mapData: MapValue.ascent,
       versionNumber: Settings.versionNumber,
@@ -3043,13 +3063,13 @@ class StrategyProvider extends Notifier<StrategyState> {
           lineUpGroups: [],
           sortIndex: 0,
           isAttack: true,
-          settings: StrategySettings(),
+          settings: defaultSettings,
         )
       ],
       lastEdited: DateTime.now(),
 
       // ignore: deprecated_member_use_from_same_package
-      strategySettings: StrategySettings(),
+      strategySettings: defaultSettings,
       folderID: ref.read(folderProvider),
       themeProfileId: defaultThemeProfileId,
     );
@@ -3371,6 +3391,10 @@ class StrategyProvider extends Notifier<StrategyState> {
       themeProfiles: profiles,
       defaultThemeProfileIdForNewStrategies:
           appPreferences?.defaultThemeProfileIdForNewStrategies,
+      showSpawnBarrier: appPreferences?.showSpawnBarrier,
+      showUltOrbs: appPreferences?.showUltOrbs,
+      showRegionNames: appPreferences?.showRegionNames,
+      customColorValues: appPreferences?.customColorValues ?? const [],
       favoriteAgents: favoriteAgents,
     );
   }
@@ -3665,6 +3689,36 @@ class StrategyProvider extends Notifier<StrategyState> {
     setUnsaved();
   }
 
+  Future<void> applyNeutralTeamColorsToAllPages(bool value) async {
+    if (state.stratName == null) return;
+
+    await _syncCurrentPageToHive();
+
+    final box = Hive.box<StrategyData>(HiveBoxNames.strategiesBox);
+    final strat = box.get(state.id);
+    if (strat == null || strat.pages.isEmpty) return;
+
+    final newPages = [
+      for (final page in strat.pages)
+        page.copyWith(
+          settings: page.settings.copyWith(useNeutralTeamColors: value),
+        ),
+    ];
+
+    final strategyTheme = ref.read(strategyThemeProvider);
+    final updated = strat.copyWith(
+      pages: newPages,
+      mapData: ref.read(mapProvider).currentMap,
+      themeProfileId: strategyTheme.profileId,
+      clearThemeProfileId: strategyTheme.profileId == null,
+      themeOverridePalette: strategyTheme.overridePalette,
+      clearThemeOverridePalette: strategyTheme.overridePalette == null,
+      lastEdited: DateTime.now(),
+    );
+    await box.put(updated.id, updated);
+    setUnsaved();
+  }
+
   void moveToFolder({required String strategyID, required String? parentID}) {
     final strategyBox = Hive.box<StrategyData>(HiveBoxNames.strategiesBox);
     final strategy = strategyBox.get(strategyID);
diff --git a/lib/providers/strategy_settings_provider.dart b/lib/providers/strategy_settings_provider.dart
index f06e2710..89ac5910 100644
--- a/lib/providers/strategy_settings_provider.dart
+++ b/lib/providers/strategy_settings_provider.dart
@@ -10,20 +10,24 @@ part "strategy_settings_provider.g.dart";
 class StrategySettings extends HiveObject {
   final double agentSize;
   final double abilitySize;
+  final bool useNeutralTeamColors;
 
   StrategySettings({
     this.agentSize = Settings.agentSize,
     this.abilitySize = Settings.abilitySize,
+    this.useNeutralTeamColors = false,
   });
 
   StrategySettings copyWith({
     double? agentSize,
     double? abilitySize,
+    bool? useNeutralTeamColors,
     bool? isOpen,
   }) {
     return StrategySettings(
       agentSize: agentSize ?? this.agentSize,
       abilitySize: abilitySize ?? this.abilitySize,
+      useNeutralTeamColors: useNeutralTeamColors ?? this.useNeutralTeamColors,
     );
   }
 
@@ -76,4 +80,8 @@ class StrategySettingsProvider extends Notifier<StrategySettings> {
   void updateAbilitySize(double size) {
     state = state.copyWith(abilitySize: size);
   }
+
+  void updateNeutralTeamColors(bool value) {
+    state = state.copyWith(useNeutralTeamColors: value);
+  }
 }
diff --git a/lib/providers/strategy_settings_provider.g.dart b/lib/providers/strategy_settings_provider.g.dart
index 5745091a..0fd36553 100644
--- a/lib/providers/strategy_settings_provider.g.dart
+++ b/lib/providers/strategy_settings_provider.g.dart
@@ -11,10 +11,12 @@ StrategySettings _$StrategySettingsFromJson(Map<String, dynamic> json) =>
       agentSize: (json['agentSize'] as num?)?.toDouble() ?? Settings.agentSize,
       abilitySize:
           (json['abilitySize'] as num?)?.toDouble() ?? Settings.abilitySize,
+      useNeutralTeamColors: json['useNeutralTeamColors'] as bool? ?? false,
     );
 
 Map<String, dynamic> _$StrategySettingsToJson(StrategySettings instance) =>
     <String, dynamic>{
       'agentSize': instance.agentSize,
       'abilitySize': instance.abilitySize,
+      'useNeutralTeamColors': instance.useNeutralTeamColors,
     };
diff --git a/lib/providers/transition_provider.dart b/lib/providers/transition_provider.dart
index a7d2c07b..9bbf1df3 100644
--- a/lib/providers/transition_provider.dart
+++ b/lib/providers/transition_provider.dart
@@ -21,6 +21,8 @@ class PageTransitionState {
     required this.endAgentSize,
     required this.startAbilitySize,
     required this.endAbilitySize,
+    this.sourcePageId,
+    this.targetPageId,
   });
   final bool hideView;
   final bool active;
@@ -35,6 +37,8 @@ class PageTransitionState {
   final double endAgentSize;
   final double startAbilitySize;
   final double endAbilitySize;
+  final String? sourcePageId;
+  final String? targetPageId;
 
   PageTransitionState copyWith({
     bool? active,
@@ -50,6 +54,9 @@ class PageTransitionState {
     double? endAgentSize,
     double? startAbilitySize,
     double? endAbilitySize,
+    String? sourcePageId,
+    String? targetPageId,
+    bool clearPageIds = false,
   }) =>
       PageTransitionState(
         hideView: hideView ?? this.hideView,
@@ -65,6 +72,8 @@ class PageTransitionState {
         endAgentSize: endAgentSize ?? this.endAgentSize,
         startAbilitySize: startAbilitySize ?? this.startAbilitySize,
         endAbilitySize: endAbilitySize ?? this.endAbilitySize,
+        sourcePageId: clearPageIds ? null : (sourcePageId ?? this.sourcePageId),
+        targetPageId: clearPageIds ? null : (targetPageId ?? this.targetPageId),
       );
 
   static const idle = PageTransitionState(
@@ -80,7 +89,9 @@ class PageTransitionState {
       startAgentSize: 0,
       endAgentSize: 0,
       startAbilitySize: 0,
-      endAbilitySize: 0);
+      endAbilitySize: 0,
+      sourcePageId: null,
+      targetPageId: null);
 }
 
 final transitionProvider =
@@ -103,7 +114,9 @@ class TransitionProvider extends Notifier<PageTransitionState> {
   void prepare(List<PlacedWidget> widgets,
       {PageTransitionDirection direction = PageTransitionDirection.forward,
       required double startAgentSize,
-      required double startAbilitySize}) {
+      required double startAbilitySize,
+      String? sourcePageId,
+      String? targetPageId}) {
     state = state.copyWith(
       allWidgets: widgets,
       hideView: true,
@@ -116,6 +129,8 @@ class TransitionProvider extends Notifier<PageTransitionState> {
       endAgentSize: startAgentSize,
       startAbilitySize: startAbilitySize,
       endAbilitySize: startAbilitySize,
+      sourcePageId: sourcePageId,
+      targetPageId: targetPageId,
     );
   }
 
@@ -125,7 +140,9 @@ class TransitionProvider extends Notifier<PageTransitionState> {
       required double startAgentSize,
       required double endAgentSize,
       required double startAbilitySize,
-      required double endAbilitySize}) {
+      required double endAbilitySize,
+      String? sourcePageId,
+      String? targetPageId}) {
     state = state.copyWith(
       hideView: true,
       active: true,
@@ -139,6 +156,8 @@ class TransitionProvider extends Notifier<PageTransitionState> {
       endAgentSize: endAgentSize,
       startAbilitySize: startAbilitySize,
       endAbilitySize: endAbilitySize,
+      sourcePageId: sourcePageId,
+      targetPageId: targetPageId,
     );
   }
 
@@ -158,6 +177,7 @@ class TransitionProvider extends Notifier<PageTransitionState> {
       entries: const [],
       allWidgets: const [],
       phase: PageTransitionPhase.idle,
+      clearPageIds: true,
     );
   }
 }
diff --git a/lib/providers/map_theme_provider.dart b/lib/providers/user_preferences_provider.dart
similarity index 72%
rename from lib/providers/map_theme_provider.dart
rename to lib/providers/user_preferences_provider.dart
index 4fb80928..ede9972d 100644
--- a/lib/providers/map_theme_provider.dart
+++ b/lib/providers/user_preferences_provider.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive_ce_flutter/hive_flutter.dart';
 import 'package:icarus/const/hive_boxes.dart';
+import 'package:icarus/const/settings.dart';
 import 'package:uuid/uuid.dart';
 
 class MapThemePalette extends HiveObject {
@@ -111,26 +112,69 @@ class MapThemeProfile extends HiveObject {
 class AppPreferences extends HiveObject {
   final String defaultThemeProfileIdForNewStrategies;
   final bool autosaveEnabled;
+  final double defaultAgentSizeForNewStrategies;
+  final double defaultAbilitySizeForNewStrategies;
+  final bool defaultNeutralTeamColorsForNewStrategies;
+  final bool showSpawnBarrier;
+  final bool showUltOrbs;
+  final bool showRegionNames;
   final double pagesBarExpandedHeight;
+  final double pagesBarWidth;
+  final List<int> customColorValues;
+  final Map<String, String> customShortcutBindings;
 
   AppPreferences({
     required this.defaultThemeProfileIdForNewStrategies,
     this.autosaveEnabled = true,
+    this.defaultAgentSizeForNewStrategies = Settings.agentSize,
+    this.defaultAbilitySizeForNewStrategies = Settings.abilitySize,
+    this.defaultNeutralTeamColorsForNewStrategies = false,
+    this.showSpawnBarrier = false,
+    this.showUltOrbs = false,
+    this.showRegionNames = false,
     this.pagesBarExpandedHeight = 310.0,
-  });
+    this.pagesBarWidth = 224.0,
+    List<int>? customColorValues,
+    Map<String, String>? customShortcutBindings,
+  })  : customColorValues = List.unmodifiable(customColorValues ?? const []),
+        customShortcutBindings =
+            Map.unmodifiable(customShortcutBindings ?? const {});
 
   AppPreferences copyWith({
     String? defaultThemeProfileIdForNewStrategies,
     bool? autosaveEnabled,
+    double? defaultAgentSizeForNewStrategies,
+    double? defaultAbilitySizeForNewStrategies,
+    bool? defaultNeutralTeamColorsForNewStrategies,
+    bool? showSpawnBarrier,
+    bool? showUltOrbs,
+    bool? showRegionNames,
     double? pagesBarExpandedHeight,
+    double? pagesBarWidth,
+    List<int>? customColorValues,
+    Map<String, String>? customShortcutBindings,
   }) {
     return AppPreferences(
       defaultThemeProfileIdForNewStrategies:
           defaultThemeProfileIdForNewStrategies ??
               this.defaultThemeProfileIdForNewStrategies,
       autosaveEnabled: autosaveEnabled ?? this.autosaveEnabled,
+      defaultAgentSizeForNewStrategies: defaultAgentSizeForNewStrategies ??
+          this.defaultAgentSizeForNewStrategies,
+      defaultAbilitySizeForNewStrategies: defaultAbilitySizeForNewStrategies ??
+          this.defaultAbilitySizeForNewStrategies,
+      defaultNeutralTeamColorsForNewStrategies:
+          defaultNeutralTeamColorsForNewStrategies ??
+              this.defaultNeutralTeamColorsForNewStrategies,
+      showSpawnBarrier: showSpawnBarrier ?? this.showSpawnBarrier,
+      showUltOrbs: showUltOrbs ?? this.showUltOrbs,
+      showRegionNames: showRegionNames ?? this.showRegionNames,
       pagesBarExpandedHeight:
           pagesBarExpandedHeight ?? this.pagesBarExpandedHeight,
+      pagesBarWidth: pagesBarWidth ?? this.pagesBarWidth,
+      customColorValues: customColorValues ?? this.customColorValues,
+      customShortcutBindings:
+          customShortcutBindings ?? this.customShortcutBindings,
     );
   }
 }
@@ -297,16 +341,16 @@ class MapThemeProfilesProvider extends Notifier<MapThemeProfilesState> {
     state = build();
   }
 
-  Future<bool> createProfile({
+  Future<MapThemeProfile?> createProfile({
     required String name,
     required MapThemePalette palette,
   }) async {
     if (customProfilesAtCap) {
-      return false;
+      return null;
     }
     final trimmedName = name.trim();
     if (trimmedName.isEmpty) {
-      return false;
+      return null;
     }
     final profile = MapThemeProfile(
       id: const Uuid().v4(),
@@ -317,7 +361,7 @@ class MapThemeProfilesProvider extends Notifier<MapThemeProfilesState> {
     await Hive.box<MapThemeProfile>(HiveBoxNames.mapThemeProfilesBox)
         .put(profile.id, profile);
     await refreshFromHive();
-    return true;
+    return profile;
   }
 
   Future<void> renameProfile({
@@ -493,6 +537,64 @@ class AppPreferencesNotifier extends Notifier<AppPreferences> {
     state = updated;
   }
 
+  Future<void> setShowSpawnBarrier(bool visible) async {
+    final updated = _readFromHive().copyWith(showSpawnBarrier: visible);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setShowUltOrbs(bool visible) async {
+    final updated = _readFromHive().copyWith(showUltOrbs: visible);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setShowRegionNames(bool visible) async {
+    final updated = _readFromHive().copyWith(showRegionNames: visible);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setDefaultNeutralTeamColorsForNewStrategies(bool enabled) async {
+    final updated = _readFromHive().copyWith(
+      defaultNeutralTeamColorsForNewStrategies: enabled,
+    );
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setDefaultAgentSizeForNewStrategies(double size) async {
+    final updated =
+        _readFromHive().copyWith(defaultAgentSizeForNewStrategies: size);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setDefaultAbilitySizeForNewStrategies(double size) async {
+    final updated =
+        _readFromHive().copyWith(defaultAbilitySizeForNewStrategies: size);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
   Future<void> setPagesBarExpandedHeight(double height) async {
     final updated = _readFromHive().copyWith(pagesBarExpandedHeight: height);
     await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
@@ -502,6 +604,66 @@ class AppPreferencesNotifier extends Notifier<AppPreferences> {
     state = updated;
   }
 
+  Future<void> setPagesBarWidth(double width) async {
+    final updated = _readFromHive().copyWith(pagesBarWidth: width);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setCustomColorValues(List<int> colorValues) async {
+    final updated = _readFromHive().copyWith(
+      customColorValues: colorValues.take(15).toList(growable: false),
+    );
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> setCustomShortcutBinding(
+    String shortcutId,
+    String serializedBinding,
+  ) async {
+    final current = _readFromHive();
+    final updatedBindings = {
+      ...current.customShortcutBindings,
+      shortcutId: serializedBinding,
+    };
+    final updated = current.copyWith(customShortcutBindings: updatedBindings);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> resetCustomShortcutBinding(String shortcutId) async {
+    final current = _readFromHive();
+    final updatedBindings = {...current.customShortcutBindings}
+      ..remove(shortcutId);
+    final updated = current.copyWith(customShortcutBindings: updatedBindings);
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
+  Future<void> resetAllCustomShortcutBindings() async {
+    final updated = _readFromHive().copyWith(
+      customShortcutBindings: const {},
+    );
+    await Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).put(
+      MapThemeProfilesProvider.appPreferencesSingletonKey,
+      updated,
+    );
+    state = updated;
+  }
+
   AppPreferences _readFromHive() {
     return Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox).get(
           MapThemeProfilesProvider.appPreferencesSingletonKey,
diff --git a/lib/screenshot/screenshot_view.dart b/lib/screenshot/screenshot_view.dart
index 7fb8e1ce..557ede28 100644
--- a/lib/screenshot/screenshot_view.dart
+++ b/lib/screenshot/screenshot_view.dart
@@ -12,7 +12,7 @@ import 'package:icarus/providers/agent_provider.dart';
 import 'package:icarus/providers/drawing_provider.dart';
 import 'package:icarus/providers/image_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/screenshot_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
@@ -60,6 +60,7 @@ class ScreenshotView extends ConsumerWidget {
     required this.strategySettings,
     required this.isAttack,
     required this.strategyState,
+    this.pageName,
     List<LineUpGroup> lineUpGroups = const [],
     @Deprecated('Use lineUpGroups instead') List<LineUp> lineUps = const [],
     required this.themeProfileId,
@@ -80,6 +81,7 @@ class ScreenshotView extends ConsumerWidget {
   final List<PlacedUtility> utilities;
   final StrategySettings strategySettings;
   final bool isAttack;
+  final String? pageName;
   final List<LineUpGroup> lineUpGroups;
   final String? themeProfileId;
   final MapThemePalette? themeOverridePalette;
@@ -219,7 +221,32 @@ class ScreenshotView extends ConsumerWidget {
               ),
             ),
           ),
-          // Add any other widgets you want to include in the screenshot
+          if (pageName?.trim().isNotEmpty ?? false)
+            Positioned(
+              left: 28,
+              bottom: 22,
+              child: SizedBox(
+                width: CoordinateSystem.screenShotSize.width - 56,
+                child: Text(
+                  pageName!.trim(),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    color: Color(0xffb8b8c2),
+                    decoration: TextDecoration.none,
+                    fontSize: 28,
+                    fontWeight: FontWeight.w600,
+                    shadows: [
+                      Shadow(
+                        color: Color(0xaa000000),
+                        offset: Offset(0, 1),
+                        blurRadius: 4,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
         ],
       ),
     );
diff --git a/lib/services/archive_manifest.dart b/lib/services/archive_manifest.dart
index cc26a6f8..09e031cb 100644
--- a/lib/services/archive_manifest.dart
+++ b/lib/services/archive_manifest.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:icarus/const/agents.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:path/path.dart' as path;
 
 const String archiveMetadataFileName = 'icarus-metadata.json';
@@ -111,7 +111,8 @@ class ArchiveFolderEntry {
       manifestId: _readRequiredString(json, 'manifestId'),
       name: _readRequiredString(json, 'name'),
       parentManifestId: _readNullableString(json, 'parentManifestId'),
-      archivePath: normalizeArchivePath(_readStringAllowEmpty(json, 'archivePath')),
+      archivePath:
+          normalizeArchivePath(_readStringAllowEmpty(json, 'archivePath')),
       icon: ArchiveIconDescriptor.fromJson(_readRequiredMap(json, 'icon')),
       color: FolderColor.values.firstWhere(
         (candidate) => candidate.name == colorName,
@@ -144,7 +145,8 @@ class ArchiveStrategyEntry {
   factory ArchiveStrategyEntry.fromJson(Map<String, dynamic> json) {
     return ArchiveStrategyEntry(
       name: _readRequiredString(json, 'name'),
-      archivePath: normalizeArchivePath(_readRequiredString(json, 'archivePath')),
+      archivePath:
+          normalizeArchivePath(_readRequiredString(json, 'archivePath')),
       folderManifestId: _readNullableString(json, 'folderManifestId'),
     );
   }
@@ -186,19 +188,32 @@ class ArchiveGlobals {
   const ArchiveGlobals({
     required this.themeProfiles,
     required this.defaultThemeProfileIdForNewStrategies,
+    required this.showSpawnBarrier,
+    required this.showUltOrbs,
+    required this.showRegionNames,
+    required this.customColorValues,
     required this.favoriteAgents,
   });
 
   final List<ArchiveThemeProfileEntry> themeProfiles;
   final String? defaultThemeProfileIdForNewStrategies;
+  final bool? showSpawnBarrier;
+  final bool? showUltOrbs;
+  final bool? showRegionNames;
+  final List<int> customColorValues;
   final List<String> favoriteAgents;
 
   Map<String, dynamic> toJson() {
     return {
-      'themeProfiles': themeProfiles.map((profile) => profile.toJson()).toList(),
+      'themeProfiles':
+          themeProfiles.map((profile) => profile.toJson()).toList(),
       'appPreferences': {
         'defaultThemeProfileIdForNewStrategies':
             defaultThemeProfileIdForNewStrategies,
+        'showSpawnBarrier': showSpawnBarrier,
+        'showUltOrbs': showUltOrbs,
+        'showRegionNames': showRegionNames,
+        'customColorValues': customColorValues,
       },
       'favoriteAgents': favoriteAgents,
     };
@@ -206,13 +221,14 @@ class ArchiveGlobals {
 
   factory ArchiveGlobals.fromJson(Map<String, dynamic> json) {
     final appPreferences = json['appPreferences'];
-    final appPreferencesMap =
-        appPreferences is Map ? Map<String, dynamic>.from(appPreferences) : null;
+    final appPreferencesMap = appPreferences is Map
+        ? Map<String, dynamic>.from(appPreferences)
+        : null;
 
     return ArchiveGlobals(
       themeProfiles: _readRequiredList(json, 'themeProfiles')
-          .map((entry) =>
-              ArchiveThemeProfileEntry.fromJson(Map<String, dynamic>.from(entry as Map)))
+          .map((entry) => ArchiveThemeProfileEntry.fromJson(
+              Map<String, dynamic>.from(entry as Map)))
           .toList(growable: false),
       defaultThemeProfileIdForNewStrategies: appPreferencesMap == null
           ? null
@@ -220,6 +236,20 @@ class ArchiveGlobals {
               appPreferencesMap,
               'defaultThemeProfileIdForNewStrategies',
             ),
+      showSpawnBarrier: appPreferencesMap == null
+          ? null
+          : _readNullableBool(appPreferencesMap, 'showSpawnBarrier'),
+      showUltOrbs: appPreferencesMap == null
+          ? null
+          : _readNullableBool(appPreferencesMap, 'showUltOrbs'),
+      showRegionNames: appPreferencesMap == null
+          ? null
+          : _readNullableBool(appPreferencesMap, 'showRegionNames'),
+      customColorValues: appPreferencesMap == null
+          ? const []
+          : _readOptionalList(appPreferencesMap, 'customColorValues')
+              .map(_readIntValue)
+              .toList(growable: false),
       favoriteAgents: _readRequiredList(json, 'favoriteAgents')
           .map((entry) => entry.toString())
           .toList(growable: false),
@@ -271,7 +301,8 @@ class ArchiveManifest {
   factory ArchiveManifest.fromJson(Map<String, dynamic> json) {
     final schemaVersion = _readRequiredInt(json, 'schemaVersion');
     if (schemaVersion != archiveManifestSchemaVersion) {
-      throw FormatException('Unsupported archive schema version: $schemaVersion');
+      throw FormatException(
+          'Unsupported archive schema version: $schemaVersion');
     }
 
     return ArchiveManifest(
@@ -282,8 +313,8 @@ class ArchiveManifest {
           DateTime.parse(_readRequiredString(json, 'exportedAt')).toUtc(),
       appVersionNumber: _readRequiredInt(json, 'appVersionNumber'),
       folders: _readRequiredList(json, 'folders')
-          .map((entry) =>
-              ArchiveFolderEntry.fromJson(Map<String, dynamic>.from(entry as Map)))
+          .map((entry) => ArchiveFolderEntry.fromJson(
+              Map<String, dynamic>.from(entry as Map)))
           .toList(growable: false),
       strategies: _readRequiredList(json, 'strategies')
           .map((entry) => ArchiveStrategyEntry.fromJson(
@@ -345,6 +376,15 @@ int? _readNullableInt(Map<String, dynamic> json, String key) {
   return _readRequiredInt(json, key);
 }
 
+int _readIntValue(dynamic value) {
+  if (value is int) return value;
+  if (value is String) {
+    final parsed = int.tryParse(value);
+    if (parsed != null) return parsed;
+  }
+  throw const FormatException('Expected int value');
+}
+
 String _readRequiredString(Map<String, dynamic> json, String key) {
   final value = json[key];
   if (value is String && value.isNotEmpty) {
@@ -372,6 +412,13 @@ String? _readNullableString(Map<String, dynamic> json, String key) {
   throw FormatException('Expected string or null for $key');
 }
 
+bool? _readNullableBool(Map<String, dynamic> json, String key) {
+  if (!json.containsKey(key) || json[key] == null) {
+    return null;
+  }
+  return _readRequiredBool(json, key);
+}
+
 bool _readRequiredBool(Map<String, dynamic> json, String key) {
   final value = json[key];
   if (value is bool) {
@@ -399,3 +446,10 @@ List<dynamic> _readRequiredList(Map<String, dynamic> json, String key) {
   }
   throw FormatException('Expected list for $key');
 }
+
+List<dynamic> _readOptionalList(Map<String, dynamic> json, String key) {
+  if (!json.containsKey(key) || json[key] == null) {
+    return const [];
+  }
+  return _readRequiredList(json, key);
+}
diff --git a/lib/sidebar.dart b/lib/sidebar.dart
index 6c0450dc..f0b0e753 100644
--- a/lib/sidebar.dart
+++ b/lib/sidebar.dart
@@ -21,7 +21,7 @@ class SideBarUI extends ConsumerStatefulWidget {
 
 class _SideBarUIState extends ConsumerState<SideBarUI> {
   static const BorderRadius _panelBorderRadius = BorderRadius.all(
-    Radius.circular(20),
+    Radius.circular(12),
   );
 
   ScrollController gridScrollController = ScrollController();
diff --git a/lib/widgets/better_color_picker.dart b/lib/widgets/better_color_picker.dart
new file mode 100644
index 00000000..538eca35
--- /dev/null
+++ b/lib/widgets/better_color_picker.dart
@@ -0,0 +1,2003 @@
+import 'dart:math' as math;
+import 'dart:ui' show FontFeature;
+
+import 'package:flutter/material.dart' as material;
+import 'package:flutter/services.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
+
+enum BetterColorPickerMode { rgb, hsl, hsv, hex }
+
+class BetterColorPickerPalette {
+  const BetterColorPickerPalette({
+    required this.surface,
+    required this.foreground,
+    required this.mutedForeground,
+    required this.inputBorder,
+    required this.fieldFill,
+  });
+
+  final material.Color surface;
+  final material.Color foreground;
+  final material.Color mutedForeground;
+  final material.Color inputBorder;
+  final material.Color fieldFill;
+
+  static const lightZinc = BetterColorPickerPalette(
+    surface: material.Color(0xFFFFFFFF),
+    foreground: material.Color(0xFF09090B),
+    mutedForeground: material.Color(0xFF71717A),
+    inputBorder: material.Color(0xFFE4E4E7),
+    fieldFill: material.Color(0x4DE4E4E7),
+  );
+
+  static const darkZinc = BetterColorPickerPalette(
+    surface: material.Color(0xFF09090B),
+    foreground: material.Color(0xFFFAFAFA),
+    mutedForeground: material.Color(0xFFA1A1AA),
+    inputBorder: material.Color(0xFF27272A),
+    fieldFill: material.Color(0x4D27272A),
+  );
+}
+
+class BetterColorPickerStyle {
+  const BetterColorPickerStyle({
+    this.lightPalette = BetterColorPickerPalette.lightZinc,
+    this.darkPalette = BetterColorPickerPalette.darkZinc,
+    this.textStyle,
+    this.monospaceTextStyle,
+    this.mainSliderRadius = 8,
+    this.channelSliderRadius = 4,
+    this.fieldRadius = 8,
+    this.swatchRadius = 8,
+    this.fieldHeight = 36,
+    this.dialogWidth = 420,
+    this.mainSliderMinExtent = 150,
+  });
+
+  final BetterColorPickerPalette lightPalette;
+  final BetterColorPickerPalette darkPalette;
+  final material.TextStyle? textStyle;
+  final material.TextStyle? monospaceTextStyle;
+  final double mainSliderRadius;
+  final double channelSliderRadius;
+  final double fieldRadius;
+  final double swatchRadius;
+  final double fieldHeight;
+  final double dialogWidth;
+  final double mainSliderMinExtent;
+
+  BetterColorPickerPalette paletteFor(material.Brightness brightness) {
+    return brightness == material.Brightness.dark ? darkPalette : lightPalette;
+  }
+}
+
+class BetterColorPicker extends material.StatefulWidget {
+  const BetterColorPicker({
+    super.key,
+    required this.value,
+    this.onChanged,
+    this.onChanging,
+    this.initialMode = BetterColorPickerMode.rgb,
+    this.onModeChanged,
+    this.showAlpha = false,
+    this.orientation = material.Axis.vertical,
+    this.spacing,
+    this.controlSpacing,
+    this.sliderSize,
+    this.style = const BetterColorPickerStyle(),
+  });
+
+  final material.Color value;
+  final material.ValueChanged<material.Color>? onChanged;
+  final material.ValueChanged<material.Color>? onChanging;
+  final BetterColorPickerMode initialMode;
+  final material.ValueChanged<BetterColorPickerMode>? onModeChanged;
+  final bool showAlpha;
+  final material.Axis orientation;
+  final double? spacing;
+  final double? controlSpacing;
+  final double? sliderSize;
+  final BetterColorPickerStyle style;
+
+  @override
+  material.State<BetterColorPicker> createState() => _BetterColorPickerState();
+}
+
+class _BetterColorPickerState extends material.State<BetterColorPicker> {
+  late BetterColorPickerMode _mode;
+  _PickerValue? _draftValue;
+
+  @override
+  void initState() {
+    super.initState();
+    _mode = widget.initialMode;
+  }
+
+  @override
+  void didUpdateWidget(covariant BetterColorPicker oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.initialMode != widget.initialMode) {
+      _mode = widget.initialMode;
+    }
+    if (oldWidget.value != widget.value) {
+      final draftValue = _draftValue;
+      if (draftValue == null || draftValue.color != widget.value) {
+        _draftValue = null;
+      }
+    }
+  }
+
+  _PickerValue get _effectiveValue =>
+      _draftValue ?? _PickerValue.fromColor(widget.value);
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final pickerWidth = _rgbPickerControlsWidth(showAlpha: widget.showAlpha);
+    final pickerScale = _pickerScaleFactor(pickerWidth: pickerWidth);
+    final spacing = (widget.spacing ?? 12.0) * pickerScale;
+    final controlSpacing = (widget.controlSpacing ?? 8.0) * pickerScale;
+    final sliderSize = (widget.sliderSize ?? 24.0) * pickerScale;
+    final mainSliderRadius = widget.style.mainSliderRadius * pickerScale;
+    final channelSliderRadius = widget.style.channelSliderRadius * pickerScale;
+    final sliderHandleSize = 16.0 * pickerScale;
+    final sliderHandleBorderWidth = math.max(1.0, 2.0 * pickerScale);
+    final alphaCheckboardSize = 8.0 * pickerScale;
+    final body = widget.orientation == material.Axis.horizontal
+        ? material.Column(
+            mainAxisSize: material.MainAxisSize.min,
+            crossAxisAlignment: material.CrossAxisAlignment.stretch,
+            children: [
+              material.IntrinsicHeight(
+                child: material.Row(
+                  mainAxisSize: material.MainAxisSize.min,
+                  crossAxisAlignment: material.CrossAxisAlignment.stretch,
+                  children: [
+                    material.Flexible(
+                      child: _buildMainSlider(
+                        sliderRadius: mainSliderRadius,
+                        sliderHandleSize: sliderHandleSize,
+                        sliderHandleBorderWidth: sliderHandleBorderWidth,
+                      ),
+                    ),
+                    material.SizedBox(width: spacing),
+                    ..._buildChannelSliders(
+                      isHorizontalLayout: true,
+                      sliderSize: sliderSize,
+                      spacing: controlSpacing,
+                      sliderRadius: channelSliderRadius,
+                      sliderHandleSize: sliderHandleSize,
+                      sliderHandleBorderWidth: sliderHandleBorderWidth,
+                      alphaCheckboardSize: alphaCheckboardSize,
+                    ),
+                  ],
+                ),
+              ),
+              material.SizedBox(height: spacing),
+              material.SizedBox(
+                width: pickerWidth,
+                child: _PickerControls(
+                  value: _effectiveValue,
+                  mode: _mode,
+                  showAlpha: widget.showAlpha,
+                  fieldHeight: widget.style.fieldHeight,
+                  fieldRadius: widget.style.fieldRadius,
+                  style: widget.style,
+                  targetWidth: pickerWidth,
+                  onModeChanged: (mode) {
+                    setState(() {
+                      _mode = mode;
+                    });
+                    widget.onModeChanged?.call(mode);
+                  },
+                  onChanged: _handleCommittedChange,
+                ),
+              ),
+            ],
+          )
+        : material.Column(
+            mainAxisSize: material.MainAxisSize.min,
+            crossAxisAlignment: material.CrossAxisAlignment.stretch,
+            children: [
+              material.SizedBox(
+                width: pickerWidth,
+                child: _buildMainSlider(
+                  sliderRadius: mainSliderRadius,
+                  sliderHandleSize: sliderHandleSize,
+                  sliderHandleBorderWidth: sliderHandleBorderWidth,
+                ),
+              ),
+              material.SizedBox(height: spacing),
+              ..._buildChannelSliders(
+                isHorizontalLayout: false,
+                sliderSize: sliderSize,
+                spacing: controlSpacing,
+                mainAxisExtent: pickerWidth,
+                sliderRadius: channelSliderRadius,
+                sliderHandleSize: sliderHandleSize,
+                sliderHandleBorderWidth: sliderHandleBorderWidth,
+                alphaCheckboardSize: alphaCheckboardSize,
+              ),
+              material.SizedBox(height: controlSpacing),
+              material.SizedBox(
+                width: pickerWidth,
+                child: _PickerControls(
+                  value: _effectiveValue,
+                  mode: _mode,
+                  showAlpha: widget.showAlpha,
+                  fieldHeight: widget.style.fieldHeight,
+                  fieldRadius: widget.style.fieldRadius,
+                  style: widget.style,
+                  targetWidth: pickerWidth,
+                  onModeChanged: (mode) {
+                    setState(() {
+                      _mode = mode;
+                    });
+                    widget.onModeChanged?.call(mode);
+                  },
+                  onChanged: _handleCommittedChange,
+                ),
+              ),
+            ],
+          );
+
+    return material.RepaintBoundary(
+      child: material.SizedBox(width: pickerWidth, child: body),
+    );
+  }
+
+  material.Widget _buildMainSlider({
+    required double sliderRadius,
+    required double sliderHandleSize,
+    required double sliderHandleBorderWidth,
+  }) {
+    return material.AspectRatio(
+      aspectRatio: 1,
+      child: material.ConstrainedBox(
+        constraints: material.BoxConstraints(
+          minWidth: widget.style.mainSliderMinExtent,
+          minHeight: widget.style.mainSliderMinExtent,
+        ),
+        child: _mode == BetterColorPickerMode.hsl
+            ? _HSLColorSlider(
+                color: _effectiveValue.hsl,
+                radius: material.Radius.circular(sliderRadius),
+                cursorDiameter: sliderHandleSize,
+                cursorBorderWidth: sliderHandleBorderWidth,
+                onChanging: (value) {
+                  _handleChangingChange(
+                    _effectiveValue
+                        .changeToHSLSaturation(value.saturation)
+                        .changeToHSLLightness(value.lightness),
+                  );
+                },
+                onChanged: (value) {
+                  _handleCommittedChange(
+                    _effectiveValue
+                        .changeToHSLSaturation(value.saturation)
+                        .changeToHSLLightness(value.lightness),
+                  );
+                },
+              )
+            : _HSVColorSlider(
+                value: _effectiveValue.hsv,
+                sliderType: _HSVSliderType.satVal,
+                radius: material.Radius.circular(sliderRadius),
+                cursorDiameter: sliderHandleSize,
+                cursorBorderWidth: sliderHandleBorderWidth,
+                onChanging: (value) {
+                  _handleChangingChange(
+                    _effectiveValue
+                        .changeToHSVSaturation(value.saturation)
+                        .changeToHSVValue(value.value),
+                  );
+                },
+                onChanged: (value) {
+                  _handleCommittedChange(
+                    _effectiveValue
+                        .changeToHSVSaturation(value.saturation)
+                        .changeToHSVValue(value.value),
+                  );
+                },
+              ),
+      ),
+    );
+  }
+
+  List<material.Widget> _buildChannelSliders({
+    required bool isHorizontalLayout,
+    required double sliderSize,
+    required double spacing,
+    required double sliderRadius,
+    required double sliderHandleSize,
+    required double sliderHandleBorderWidth,
+    required double alphaCheckboardSize,
+    double? mainAxisExtent,
+  }) {
+    final widgets = <material.Widget>[
+      material.SizedBox(
+        width: isHorizontalLayout ? sliderSize : mainAxisExtent,
+        height: isHorizontalLayout ? null : sliderSize,
+        child: _HSVColorSlider(
+          value: _effectiveValue.hsv.withSaturation(1).withValue(1),
+          sliderType: _HSVSliderType.hue,
+          reverse: !isHorizontalLayout,
+          radius: material.Radius.circular(sliderRadius),
+          cursorDiameter: sliderHandleSize,
+          cursorBorderWidth: sliderHandleBorderWidth,
+          onChanging: (value) {
+            _handleChangingChange(_effectiveValue.changeToHSVHue(value.hue));
+          },
+          onChanged: (value) {
+            _handleCommittedChange(_effectiveValue.changeToHSVHue(value.hue));
+          },
+        ),
+      ),
+    ];
+
+    if (widget.showAlpha) {
+      widgets.add(
+        material.SizedBox(
+          width: isHorizontalLayout ? sliderSize : mainAxisExtent,
+          height: isHorizontalLayout ? null : sliderSize,
+          child: _HSVColorSlider(
+            value: _effectiveValue.hsv,
+            sliderType: _HSVSliderType.alpha,
+            reverse: !isHorizontalLayout,
+            radius: material.Radius.circular(sliderRadius),
+            cursorDiameter: sliderHandleSize,
+            cursorBorderWidth: sliderHandleBorderWidth,
+            alphaCheckboardSize: alphaCheckboardSize,
+            onChanging: (value) {
+              _handleChangingChange(
+                _effectiveValue.changeToOpacity(value.alpha),
+              );
+            },
+            onChanged: (value) {
+              _handleCommittedChange(
+                _effectiveValue.changeToOpacity(value.alpha),
+              );
+            },
+          ),
+        ),
+      );
+    }
+
+    final wrapped = <material.Widget>[];
+    for (var i = 0; i < widgets.length; i++) {
+      wrapped.add(widgets[i]);
+      if (i < widgets.length - 1) {
+        wrapped.add(
+          isHorizontalLayout
+              ? material.SizedBox(width: spacing)
+              : material.SizedBox(height: spacing),
+        );
+      }
+    }
+    return wrapped;
+  }
+
+  void _handleChangingChange(_PickerValue value) {
+    setState(() {
+      _draftValue = value;
+    });
+    widget.onChanging?.call(value.color);
+  }
+
+  void _handleCommittedChange(_PickerValue value) {
+    setState(() {
+      _draftValue = value;
+    });
+    widget.onChanged?.call(value.color);
+  }
+}
+
+class BetterColorPickerField extends material.StatelessWidget {
+  const BetterColorPickerField({
+    super.key,
+    required this.value,
+    required this.onChanged,
+    this.onChanging,
+    this.initialMode = BetterColorPickerMode.rgb,
+    this.showAlpha = false,
+    this.orientation = material.Axis.vertical,
+    this.label,
+    this.enabled = true,
+    this.dialogTitle = 'Select color',
+    this.style = const BetterColorPickerStyle(),
+  });
+
+  final material.Color value;
+  final material.ValueChanged<material.Color> onChanged;
+  final material.ValueChanged<material.Color>? onChanging;
+  final BetterColorPickerMode initialMode;
+  final bool showAlpha;
+  final material.Axis orientation;
+  final String? label;
+  final bool enabled;
+  final String dialogTitle;
+  final BetterColorPickerStyle style;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final theme = material.Theme.of(context);
+    final borderColor = theme.colorScheme.outlineVariant;
+    final foregroundColor = enabled
+        ? theme.colorScheme.onSurface
+        : theme.colorScheme.onSurface.withValues(alpha: 0.38);
+    return material.InkWell(
+      onTap: enabled
+          ? () async {
+              final result = await showBetterColorPickerDialog(
+                context,
+                initialColor: value,
+                title: dialogTitle,
+                initialMode: initialMode,
+                showAlpha: showAlpha,
+                orientation: orientation,
+                onChanging: onChanging,
+                style: style,
+              );
+              if (result != null && context.mounted) {
+                onChanged(result);
+              }
+            }
+          : null,
+      borderRadius: material.BorderRadius.circular(12),
+      child: material.Container(
+        padding: const material.EdgeInsets.symmetric(
+          horizontal: 14,
+          vertical: 12,
+        ),
+        decoration: material.BoxDecoration(
+          border: material.Border.all(color: borderColor),
+          borderRadius: material.BorderRadius.circular(12),
+          color: enabled ? theme.colorScheme.surface : theme.disabledColor,
+        ),
+        child: material.Row(
+          mainAxisSize: material.MainAxisSize.min,
+          children: [
+            material.Expanded(
+              child: material.Column(
+                crossAxisAlignment: material.CrossAxisAlignment.start,
+                mainAxisSize: material.MainAxisSize.min,
+                children: [
+                  if (label != null)
+                    material.Padding(
+                      padding: const material.EdgeInsets.only(bottom: 4),
+                      child: material.Text(
+                        label!,
+                        style: theme.textTheme.labelSmall?.copyWith(
+                          color: theme.colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ),
+                  material.Text(
+                    _colorToHex(value, showAlpha: showAlpha),
+                    style: _monoTextStyle(
+                      context,
+                      style,
+                    ).copyWith(color: foregroundColor),
+                  ),
+                ],
+              ),
+            ),
+            const material.SizedBox(width: 12),
+            _ColorSwatch(color: value, size: 28, radius: style.swatchRadius),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<material.Color?> showBetterColorPickerDialog(
+  material.BuildContext context, {
+  required material.Color initialColor,
+  String title = 'Select color',
+  BetterColorPickerMode initialMode = BetterColorPickerMode.rgb,
+  bool showAlpha = false,
+  material.Axis orientation = material.Axis.vertical,
+  material.ValueChanged<material.Color>? onChanging,
+  BetterColorPickerStyle style = const BetterColorPickerStyle(),
+}) {
+  return material.showDialog<material.Color>(
+    context: context,
+    builder: (context) {
+      return _BetterColorPickerDialog(
+        initialColor: initialColor,
+        title: title,
+        initialMode: initialMode,
+        showAlpha: showAlpha,
+        orientation: orientation,
+        onChanging: onChanging,
+        style: style,
+      );
+    },
+  );
+}
+
+class _BetterColorPickerDialog extends material.StatefulWidget {
+  const _BetterColorPickerDialog({
+    required this.initialColor,
+    required this.title,
+    required this.initialMode,
+    required this.showAlpha,
+    required this.orientation,
+    required this.style,
+    this.onChanging,
+  });
+
+  final material.Color initialColor;
+  final String title;
+  final BetterColorPickerMode initialMode;
+  final bool showAlpha;
+  final material.Axis orientation;
+  final BetterColorPickerStyle style;
+  final material.ValueChanged<material.Color>? onChanging;
+
+  @override
+  material.State<_BetterColorPickerDialog> createState() =>
+      _BetterColorPickerDialogState();
+}
+
+class _BetterColorPickerDialogState
+    extends material.State<_BetterColorPickerDialog> {
+  late material.Color _value;
+  late final material.ValueNotifier<material.Color> _previewColor;
+
+  @override
+  void initState() {
+    super.initState();
+    _value = widget.initialColor;
+    _previewColor = material.ValueNotifier(widget.initialColor);
+  }
+
+  @override
+  void dispose() {
+    _previewColor.dispose();
+    super.dispose();
+  }
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final theme = material.Theme.of(context);
+    return material.AlertDialog(
+      title: material.Text(widget.title),
+      contentPadding: const material.EdgeInsets.fromLTRB(24, 20, 24, 0),
+      content: material.SizedBox(
+        width: widget.style.dialogWidth,
+        child: material.Column(
+          mainAxisSize: material.MainAxisSize.min,
+          crossAxisAlignment: material.CrossAxisAlignment.stretch,
+          children: [
+            material.ValueListenableBuilder<material.Color>(
+              valueListenable: _previewColor,
+              builder: (context, previewColor, child) {
+                return material.Row(
+                  children: [
+                    _ColorSwatch(
+                      color: previewColor,
+                      size: 44,
+                      radius: widget.style.swatchRadius,
+                    ),
+                    const material.SizedBox(width: 12),
+                    material.Expanded(
+                      child: material.Text(
+                        _colorToHex(previewColor, showAlpha: widget.showAlpha),
+                        style: _monoTextStyle(
+                          context,
+                          widget.style,
+                        ).merge(theme.textTheme.titleMedium),
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
+            const material.SizedBox(height: 20),
+            BetterColorPicker(
+              value: _value,
+              initialMode: widget.initialMode,
+              showAlpha: widget.showAlpha,
+              orientation: widget.orientation,
+              style: widget.style,
+              onChanging: (value) {
+                if (_previewColor.value != value) {
+                  _previewColor.value = value;
+                }
+                widget.onChanging?.call(value);
+              },
+              onChanged: (value) {
+                _value = value;
+                if (_previewColor.value != value) {
+                  _previewColor.value = value;
+                }
+              },
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        material.TextButton(
+          onPressed: () => material.Navigator.of(context).pop(),
+          child: const material.Text('Cancel'),
+        ),
+        material.FilledButton(
+          onPressed: () => material.Navigator.of(context).pop(_value),
+          child: const material.Text('Apply'),
+        ),
+      ],
+    );
+  }
+}
+
+class _PickerControls extends material.StatelessWidget {
+  const _PickerControls({
+    required this.value,
+    required this.mode,
+    required this.showAlpha,
+    required this.fieldHeight,
+    required this.fieldRadius,
+    required this.style,
+    this.targetWidth,
+    required this.onModeChanged,
+    required this.onChanged,
+  });
+
+  final _PickerValue value;
+  final BetterColorPickerMode mode;
+  final bool showAlpha;
+  final double fieldHeight;
+  final double fieldRadius;
+  final BetterColorPickerStyle style;
+  final double? targetWidth;
+  final material.ValueChanged<BetterColorPickerMode> onModeChanged;
+  final material.ValueChanged<_PickerValue> onChanged;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final palette = style.paletteFor(material.Theme.of(context).brightness);
+    final fields = <_GroupedFieldData>[
+      _GroupedFieldData(
+        width: 96,
+        builder: (scaledWidth, index, length) => _ModeField(
+          value: mode,
+          width: scaledWidth,
+          fieldHeight: fieldHeight,
+          fieldRadius: fieldRadius,
+          style: style,
+          palette: palette,
+          groupIndex: index,
+          groupLength: length,
+          onChanged: onModeChanged,
+        ),
+      ),
+      ...switch (mode) {
+        BetterColorPickerMode.rgb => _buildRgbFields(),
+        BetterColorPickerMode.hsl => _buildHslFields(),
+        BetterColorPickerMode.hsv => _buildHsvFields(),
+        BetterColorPickerMode.hex => _buildHexFields(),
+      },
+    ];
+    final preferredWidth =
+        targetWidth ?? _pickerControlsWidth(mode: mode, showAlpha: showAlpha);
+
+    return material.LayoutBuilder(
+      builder: (context, constraints) {
+        final resolvedTargetWidth = constraints.hasBoundedWidth
+            ? math.max(preferredWidth, constraints.maxWidth)
+            : preferredWidth;
+        final scaledWidths = _scaleGroupedFieldWidths(
+          widths: [for (final field in fields) field.width],
+          targetWidth: resolvedTargetWidth,
+        );
+
+        return material.SizedBox(
+          width: resolvedTargetWidth,
+          child: material.SingleChildScrollView(
+            scrollDirection: material.Axis.horizontal,
+            child: material.Row(
+              mainAxisSize: material.MainAxisSize.min,
+              children: [
+                for (var i = 0; i < fields.length; i++)
+                  fields[i].builder(scaledWidths[i], i, fields.length),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  List<_GroupedFieldData> _buildRgbFields() {
+    return [
+      _numberField(
+        width: 64,
+        value: value.red.toString(),
+        placeholder: 'Red',
+        min: 0,
+        max: 255,
+        onChanged: (next) => onChanged(value.changeToColorRed(next.toDouble())),
+      ),
+      _numberField(
+        width: 64,
+        value: value.green.toString(),
+        placeholder: 'Green',
+        min: 0,
+        max: 255,
+        onChanged: (next) =>
+            onChanged(value.changeToColorGreen(next.toDouble())),
+      ),
+      _numberField(
+        width: 64,
+        value: value.blue.toString(),
+        placeholder: 'Blue',
+        min: 0,
+        max: 255,
+        onChanged: (next) =>
+            onChanged(value.changeToColorBlue(next.toDouble())),
+      ),
+      if (showAlpha)
+        _numberField(
+          width: 64,
+          value: (value.opacity * 255).round().toString(),
+          placeholder: 'Alpha',
+          min: 0,
+          max: 255,
+          onChanged: (next) => onChanged(value.changeToOpacity(next / 255)),
+        ),
+    ];
+  }
+
+  List<_GroupedFieldData> _buildHslFields() {
+    return [
+      _numberField(
+        width: 64,
+        value: value.hslHue.round().toString(),
+        placeholder: 'Hue',
+        min: 0,
+        max: 360,
+        onChanged: (next) => onChanged(value.changeToHSLHue(next.toDouble())),
+      ),
+      _numberField(
+        width: 64,
+        value: (value.hslSat * 100).round().toString(),
+        placeholder: 'Sat',
+        min: 0,
+        max: 100,
+        onChanged: (next) => onChanged(value.changeToHSLSaturation(next / 100)),
+      ),
+      _numberField(
+        width: 64,
+        value: (value.hslLightness * 100).round().toString(),
+        placeholder: 'Lum',
+        min: 0,
+        max: 100,
+        onChanged: (next) => onChanged(value.changeToHSLLightness(next / 100)),
+      ),
+      if (showAlpha)
+        _numberField(
+          width: 64,
+          value: (value.opacity * 100).round().toString(),
+          placeholder: 'Alpha',
+          min: 0,
+          max: 100,
+          onChanged: (next) => onChanged(value.changeToOpacity(next / 100)),
+        ),
+    ];
+  }
+
+  List<_GroupedFieldData> _buildHsvFields() {
+    return [
+      _numberField(
+        width: 64,
+        value: value.hsvHue.round().toString(),
+        placeholder: 'Hue',
+        min: 0,
+        max: 360,
+        onChanged: (next) => onChanged(value.changeToHSVHue(next.toDouble())),
+      ),
+      _numberField(
+        width: 64,
+        value: (value.hsvSat * 100).round().toString(),
+        placeholder: 'Sat',
+        min: 0,
+        max: 100,
+        onChanged: (next) => onChanged(value.changeToHSVSaturation(next / 100)),
+      ),
+      _numberField(
+        width: 64,
+        value: (value.hsvValue * 100).round().toString(),
+        placeholder: 'Val',
+        min: 0,
+        max: 100,
+        onChanged: (next) => onChanged(value.changeToHSVValue(next / 100)),
+      ),
+      if (showAlpha)
+        _numberField(
+          width: 64,
+          value: (value.opacity * 100).round().toString(),
+          placeholder: 'Alpha',
+          min: 0,
+          max: 100,
+          onChanged: (next) => onChanged(value.changeToOpacity(next / 100)),
+        ),
+    ];
+  }
+
+  List<_GroupedFieldData> _buildHexFields() {
+    return [
+      _GroupedFieldData(
+        width: 104,
+        builder: (scaledWidth, index, length) => _PickerFieldFrame(
+          width: scaledWidth,
+          height: fieldHeight,
+          fieldRadius: fieldRadius,
+          style: style,
+          groupIndex: index,
+          groupLength: length,
+          child: _ValueField(
+            value: _colorToHex(value.color, showAlpha: false),
+            placeholder: 'HEX',
+            style: style,
+            keyboardType: material.TextInputType.text,
+            inputFormatters: const [_HexTextFormatter()],
+            onChanged: (raw) {
+              final parsed = _tryParseHex(raw);
+              if (parsed != null) {
+                onChanged(
+                  value
+                      .changeToColorRed(_red(parsed).toDouble())
+                      .changeToColorGreen(_green(parsed).toDouble())
+                      .changeToColorBlue(_blue(parsed).toDouble()),
+                );
+              }
+            },
+          ),
+        ),
+      ),
+      if (showAlpha)
+        _numberField(
+          width: 64,
+          value: (value.opacity * 100).round().toString(),
+          placeholder: 'Alpha',
+          min: 0,
+          max: 100,
+          onChanged: (next) => onChanged(value.changeToOpacity(next / 100)),
+        ),
+    ];
+  }
+
+  _GroupedFieldData _numberField({
+    required double width,
+    required String value,
+    required String placeholder,
+    required int min,
+    required int max,
+    required material.ValueChanged<int> onChanged,
+  }) {
+    return _GroupedFieldData(
+      width: width,
+      builder: (scaledWidth, index, length) => _PickerFieldFrame(
+        width: scaledWidth,
+        height: fieldHeight,
+        fieldRadius: fieldRadius,
+        style: style,
+        groupIndex: index,
+        groupLength: length,
+        child: _ValueField(
+          value: value,
+          placeholder: placeholder,
+          style: style,
+          keyboardType: material.TextInputType.number,
+          inputFormatters: [_IntegerRangeFormatter(min: min, max: max)],
+          onChanged: (raw) {
+            final parsed = int.tryParse(raw);
+            if (parsed != null) {
+              onChanged(parsed.clamp(min, max));
+            }
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class _GroupedFieldData {
+  const _GroupedFieldData({required this.width, required this.builder});
+
+  final double width;
+  final material.Widget Function(double width, int index, int length) builder;
+}
+
+double _pickerControlsWidth({
+  required BetterColorPickerMode mode,
+  required bool showAlpha,
+}) {
+  final widths = <double>[
+    96,
+    ...switch (mode) {
+      BetterColorPickerMode.rgb => [64, 64, 64, if (showAlpha) 64],
+      BetterColorPickerMode.hsl => [64, 64, 64, if (showAlpha) 64],
+      BetterColorPickerMode.hsv => [64, 64, 64, if (showAlpha) 64],
+      BetterColorPickerMode.hex => [104, if (showAlpha) 64],
+    },
+  ];
+
+  // Grouped fields overlap borders by 1px to avoid double-width separators.
+  return widths.reduce((sum, width) => sum + width) - (widths.length - 1);
+}
+
+double _rgbPickerControlsWidth({required bool showAlpha}) {
+  return _pickerControlsWidth(
+    mode: BetterColorPickerMode.rgb,
+    showAlpha: showAlpha,
+  );
+}
+
+List<double> _scaleGroupedFieldWidths({
+  required List<double> widths,
+  required double targetWidth,
+}) {
+  if (widths.isEmpty) {
+    return const [];
+  }
+
+  final overlapCount = widths.length - 1;
+  final totalBaseWidth = widths.reduce((sum, width) => sum + width);
+  final scale = (targetWidth + overlapCount) / totalBaseWidth;
+
+  return [for (final width in widths) width * scale];
+}
+
+double _pickerScaleFactor({required double pickerWidth}) {
+  return pickerWidth / _rgbPickerControlsWidth(showAlpha: false);
+}
+
+class _ModeField extends material.StatelessWidget {
+  const _ModeField({
+    required this.value,
+    required this.width,
+    required this.fieldHeight,
+    required this.fieldRadius,
+    required this.style,
+    required this.palette,
+    required this.groupIndex,
+    required this.groupLength,
+    required this.onChanged,
+  });
+
+  final BetterColorPickerMode value;
+  final double width;
+  final double fieldHeight;
+  final double fieldRadius;
+  final BetterColorPickerStyle style;
+  final BetterColorPickerPalette palette;
+  final int groupIndex;
+  final int groupLength;
+  final material.ValueChanged<BetterColorPickerMode> onChanged;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    return _PickerFieldFrame(
+      width: width,
+      height: fieldHeight,
+      fieldRadius: fieldRadius,
+      style: style,
+      groupIndex: groupIndex,
+      groupLength: groupLength,
+      child: ShadSelect<BetterColorPickerMode>(
+        initialValue: value,
+        minWidth: width,
+        maxWidth: width,
+        maxHeight: 180,
+        padding: const material.EdgeInsets.symmetric(horizontal: 12),
+        optionsPadding: const material.EdgeInsets.all(4),
+        decoration: ShadDecoration.none,
+        selectedOptionBuilder: (context, mode) {
+          return material.Text(
+            _modeLabel(mode),
+            style: _textStyle(context, style).copyWith(
+              color: palette.foreground,
+            ),
+          );
+        },
+        trailing: material.Icon(
+          material.Icons.unfold_more,
+          size: 16,
+          color: palette.mutedForeground,
+        ),
+        options: [
+          for (final mode in BetterColorPickerMode.values)
+            ShadOption(
+              value: mode,
+              child: material.Text(_modeLabel(mode)),
+            ),
+        ],
+        onChanged: (mode) {
+          if (mode != null) {
+            onChanged(mode);
+          }
+        },
+      ),
+    );
+  }
+}
+
+class _PickerFieldFrame extends material.StatelessWidget {
+  const _PickerFieldFrame({
+    required this.width,
+    required this.height,
+    required this.fieldRadius,
+    required this.style,
+    required this.groupIndex,
+    required this.groupLength,
+    required this.child,
+  });
+
+  final double width;
+  final double height;
+  final double fieldRadius;
+  final BetterColorPickerStyle style;
+  final int groupIndex;
+  final int groupLength;
+  final material.Widget child;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final palette = style.paletteFor(material.Theme.of(context).brightness);
+    final field = material.Container(
+      width: width,
+      height: height,
+      decoration: material.BoxDecoration(
+        color: palette.fieldFill,
+        borderRadius: _groupRadius(),
+        border: material.Border.all(color: palette.inputBorder),
+      ),
+      child: child,
+    );
+    if (groupIndex == 0) {
+      return field;
+    }
+    return material.Transform.translate(
+      offset: material.Offset(-groupIndex.toDouble(), 0),
+      child: field,
+    );
+  }
+
+  material.BorderRadius _groupRadius() {
+    final radius = material.Radius.circular(fieldRadius);
+    if (groupLength == 1) {
+      return material.BorderRadius.all(radius);
+    }
+    if (groupIndex == 0) {
+      return material.BorderRadius.horizontal(left: radius);
+    }
+    if (groupIndex == groupLength - 1) {
+      return material.BorderRadius.horizontal(right: radius);
+    }
+    return material.BorderRadius.zero;
+  }
+}
+
+class _ValueField extends material.StatefulWidget {
+  const _ValueField({
+    required this.value,
+    required this.placeholder,
+    required this.style,
+    this.onChanged,
+    this.inputFormatters,
+    this.keyboardType,
+  });
+
+  final String value;
+  final String placeholder;
+  final BetterColorPickerStyle style;
+  final material.ValueChanged<String>? onChanged;
+  final List<TextInputFormatter>? inputFormatters;
+  final material.TextInputType? keyboardType;
+
+  @override
+  material.State<_ValueField> createState() => _ValueFieldState();
+}
+
+class _ValueFieldState extends material.State<_ValueField> {
+  late final material.TextEditingController _controller;
+  bool _focused = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = material.TextEditingController(text: widget.value);
+  }
+
+  @override
+  void didUpdateWidget(covariant _ValueField oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (!_focused && oldWidget.value != widget.value) {
+      _controller.text = widget.value;
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final palette = widget.style.paletteFor(
+      material.Theme.of(context).brightness,
+    );
+    return material.Focus(
+      onFocusChange: (focused) {
+        setState(() {
+          _focused = focused;
+        });
+      },
+      child: TextEditingShortcutScope(
+        child: material.TextField(
+          controller: _controller,
+          onChanged: widget.onChanged == null
+              ? null
+              : (value) {
+                  if (_focused) {
+                    widget.onChanged!(value);
+                  }
+                },
+          keyboardType: widget.keyboardType,
+          inputFormatters: widget.inputFormatters,
+          maxLines: 1,
+          textAlignVertical: material.TextAlignVertical.center,
+          style: _monoTextStyle(
+            context,
+            widget.style,
+          ).copyWith(color: palette.foreground),
+          decoration: material.InputDecoration(
+            isDense: true,
+            border: material.InputBorder.none,
+            contentPadding: const material.EdgeInsets.symmetric(
+              horizontal: 12,
+              vertical: 10,
+            ),
+            hintText: widget.placeholder,
+            hintStyle: _textStyle(
+              context,
+              widget.style,
+            ).copyWith(color: palette.mutedForeground),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _PickerValue {
+  const _PickerValue._({
+    required this.color,
+    required this.hsv,
+    required this.hsl,
+  });
+
+  factory _PickerValue.fromColor(material.Color color) {
+    return _PickerValue._(
+      color: color,
+      hsv: material.HSVColor.fromColor(color),
+      hsl: material.HSLColor.fromColor(color),
+    );
+  }
+
+  factory _PickerValue.fromHSV(material.HSVColor hsv) {
+    final color = hsv.toColor();
+    return _PickerValue._(
+      color: color,
+      hsv: hsv,
+      hsl: material.HSLColor.fromColor(color),
+    );
+  }
+
+  factory _PickerValue.fromHSL(material.HSLColor hsl) {
+    final color = hsl.toColor();
+    return _PickerValue._(
+      color: color,
+      hsv: material.HSVColor.fromColor(color),
+      hsl: hsl,
+    );
+  }
+
+  final material.Color color;
+  final material.HSVColor hsv;
+  final material.HSLColor hsl;
+
+  int get red => _red(color);
+  int get green => _green(color);
+  int get blue => _blue(color);
+  double get opacity => color.a.clamp(0, 1);
+  double get hsvHue => hsv.hue;
+  double get hsvSat => hsv.saturation;
+  double get hsvValue => hsv.value;
+  double get hslHue => hsl.hue;
+  double get hslSat => hsl.saturation;
+  double get hslLightness => hsl.lightness;
+
+  _PickerValue changeToColorRed(double value) {
+    return _PickerValue.fromColor(
+      material.Color.fromARGB(
+        _alpha(color),
+        value.round().clamp(0, 255),
+        green,
+        blue,
+      ),
+    );
+  }
+
+  _PickerValue changeToColorGreen(double value) {
+    return _PickerValue.fromColor(
+      material.Color.fromARGB(
+        _alpha(color),
+        red,
+        value.round().clamp(0, 255),
+        blue,
+      ),
+    );
+  }
+
+  _PickerValue changeToColorBlue(double value) {
+    return _PickerValue.fromColor(
+      material.Color.fromARGB(
+        _alpha(color),
+        red,
+        green,
+        value.round().clamp(0, 255),
+      ),
+    );
+  }
+
+  _PickerValue changeToOpacity(double value) {
+    return _PickerValue.fromHSV(hsv.withAlpha(value.clamp(0, 1)));
+  }
+
+  _PickerValue changeToHSVHue(double value) {
+    return _PickerValue.fromHSV(hsv.withHue(value));
+  }
+
+  _PickerValue changeToHSVSaturation(double value) {
+    return _PickerValue.fromHSV(hsv.withSaturation(value.clamp(0, 1)));
+  }
+
+  _PickerValue changeToHSVValue(double value) {
+    return _PickerValue.fromHSV(hsv.withValue(value.clamp(0, 1)));
+  }
+
+  _PickerValue changeToHSLHue(double value) {
+    return _PickerValue.fromHSL(hsl.withHue(value));
+  }
+
+  _PickerValue changeToHSLSaturation(double value) {
+    return _PickerValue.fromHSL(hsl.withSaturation(value.clamp(0, 1)));
+  }
+
+  _PickerValue changeToHSLLightness(double value) {
+    return _PickerValue.fromHSL(hsl.withLightness(value.clamp(0, 1)));
+  }
+}
+
+enum _HSVSliderType { hue, satVal, alpha }
+
+class _HSVColorSlider extends material.StatefulWidget {
+  const _HSVColorSlider({
+    required this.value,
+    required this.sliderType,
+    required this.radius,
+    this.cursorDiameter = 16,
+    this.cursorBorderWidth = 2,
+    this.alphaCheckboardSize = 8,
+    this.onChanging,
+    this.onChanged,
+    this.reverse = false,
+  });
+
+  final material.HSVColor value;
+  final _HSVSliderType sliderType;
+  final material.Radius radius;
+  final double cursorDiameter;
+  final double cursorBorderWidth;
+  final double alphaCheckboardSize;
+  final material.ValueChanged<material.HSVColor>? onChanging;
+  final material.ValueChanged<material.HSVColor>? onChanged;
+  final bool reverse;
+
+  @override
+  material.State<_HSVColorSlider> createState() => _HSVColorSliderState();
+}
+
+class _HSVColorSliderState extends material.State<_HSVColorSlider> {
+  late double _currentHorizontal;
+  late double _currentVertical;
+  late double _hue;
+  late double _saturation;
+  late double _value;
+  late double _alpha;
+
+  @override
+  void initState() {
+    super.initState();
+    _syncFromWidget();
+  }
+
+  @override
+  void didUpdateWidget(covariant _HSVColorSlider oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      _syncFromWidget();
+    }
+  }
+
+  void _syncFromWidget() {
+    final hsv = widget.value;
+    _hue = hsv.hue;
+    _saturation = hsv.saturation;
+    _value = hsv.value;
+    _alpha = hsv.alpha;
+    _currentHorizontal = horizontal;
+    _currentVertical = vertical;
+  }
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final cursorDiameter = widget.cursorDiameter;
+    final radiusDivisor =
+        widget.sliderType == _HSVSliderType.satVal ? 2.0 : 4.0;
+    return material.GestureDetector(
+      onTapDown: (details) {
+        _updateColor(details.localPosition, context.size!);
+        widget.onChanged?.call(_currentColor);
+      },
+      onPanUpdate: (details) {
+        setState(() {
+          _updateColor(details.localPosition, context.size!);
+        });
+      },
+      onPanEnd: (_) => widget.onChanged?.call(_currentColor),
+      child: material.Stack(
+        clipBehavior: material.Clip.none,
+        children: [
+          if (widget.sliderType == _HSVSliderType.alpha)
+            material.Positioned.fill(
+              child: material.RepaintBoundary(
+                child: material.ClipRRect(
+                  borderRadius: material.BorderRadius.all(widget.radius),
+                  child: material.CustomPaint(
+                    painter: _AlphaPainter(
+                      checkboardSize: widget.alphaCheckboardSize,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          material.Positioned.fill(
+            child: material.RepaintBoundary(
+              child: material.ClipRRect(
+                borderRadius: material.BorderRadius.all(widget.radius),
+                child: material.CustomPaint(
+                  painter: _HSVColorSliderPainter(
+                    sliderType: widget.sliderType,
+                    color: _currentColor,
+                    reverse: widget.reverse,
+                  ),
+                ),
+              ),
+            ),
+          ),
+          material.Positioned(
+            left: -cursorDiameter / radiusDivisor,
+            right: -cursorDiameter / radiusDivisor,
+            top: -cursorDiameter / radiusDivisor,
+            bottom: -cursorDiameter / radiusDivisor,
+            child: widget.sliderType == _HSVSliderType.satVal
+                ? material.Align(
+                    alignment: material.Alignment(
+                      (_currentHorizontal.clamp(0, 1) * 2) - 1,
+                      (_currentVertical.clamp(0, 1) * 2) - 1,
+                    ),
+                    child: material.Container(
+                      width: cursorDiameter,
+                      height: cursorDiameter,
+                      decoration: material.BoxDecoration(
+                        shape: material.BoxShape.circle,
+                        color: _currentColor.toColor(),
+                        border: material.Border.all(
+                          color: material.Colors.white,
+                          width: widget.cursorBorderWidth,
+                        ),
+                      ),
+                    ),
+                  )
+                : _SingleAxisCursor(
+                    reverse: widget.reverse,
+                    horizontal: _currentHorizontal,
+                    vertical: _currentVertical,
+                    radius: widget.radius,
+                    thickness: cursorDiameter,
+                    borderWidth: widget.cursorBorderWidth,
+                    color: _currentColor.toColor(),
+                  ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  material.HSVColor get _currentColor {
+    return material.HSVColor.fromAHSV(
+      _alpha.clamp(0, 1),
+      _hue.clamp(0, 360),
+      _saturation.clamp(0, 1),
+      _value.clamp(0, 1),
+    );
+  }
+
+  void _updateColor(material.Offset localPosition, material.Size size) {
+    _currentHorizontal = (localPosition.dx / size.width).clamp(0, 1);
+    _currentVertical = (localPosition.dy / size.height).clamp(0, 1);
+    switch (widget.sliderType) {
+      case _HSVSliderType.hue:
+        _hue = (widget.reverse ? _currentHorizontal : _currentVertical) * 360;
+        break;
+      case _HSVSliderType.alpha:
+        _alpha = widget.reverse ? _currentHorizontal : _currentVertical;
+        break;
+      case _HSVSliderType.satVal:
+        if (widget.reverse) {
+          _saturation = _currentHorizontal;
+          _value = _currentVertical;
+        } else {
+          _saturation = _currentVertical;
+          _value = _currentHorizontal;
+        }
+        break;
+    }
+    widget.onChanging?.call(_currentColor);
+  }
+
+  double get vertical {
+    switch (widget.sliderType) {
+      case _HSVSliderType.hue:
+        return widget.value.hue / 360;
+      case _HSVSliderType.alpha:
+        return widget.value.alpha;
+      case _HSVSliderType.satVal:
+        return widget.reverse ? widget.value.value : widget.value.saturation;
+    }
+  }
+
+  double get horizontal {
+    switch (widget.sliderType) {
+      case _HSVSliderType.hue:
+        return widget.value.hue / 360;
+      case _HSVSliderType.alpha:
+        return widget.value.alpha;
+      case _HSVSliderType.satVal:
+        return widget.reverse ? widget.value.saturation : widget.value.value;
+    }
+  }
+}
+
+class _HSLColorSlider extends material.StatefulWidget {
+  const _HSLColorSlider({
+    required this.color,
+    required this.radius,
+    this.cursorDiameter = 16,
+    this.cursorBorderWidth = 2,
+    this.onChanging,
+    this.onChanged,
+  });
+
+  final material.HSLColor color;
+  final material.Radius radius;
+  final double cursorDiameter;
+  final double cursorBorderWidth;
+  final material.ValueChanged<material.HSLColor>? onChanging;
+  final material.ValueChanged<material.HSLColor>? onChanged;
+
+  @override
+  material.State<_HSLColorSlider> createState() => _HSLColorSliderState();
+}
+
+class _HSLColorSliderState extends material.State<_HSLColorSlider> {
+  late double _currentHorizontal;
+  late double _currentVertical;
+  late double _hue;
+  late double _saturation;
+  late double _lightness;
+  late double _alpha;
+
+  @override
+  void initState() {
+    super.initState();
+    _syncFromWidget();
+  }
+
+  @override
+  void didUpdateWidget(covariant _HSLColorSlider oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.color != widget.color) {
+      _syncFromWidget();
+    }
+  }
+
+  void _syncFromWidget() {
+    final hsl = widget.color;
+    _hue = hsl.hue;
+    _saturation = hsl.saturation;
+    _lightness = hsl.lightness;
+    _alpha = hsl.alpha;
+    _currentHorizontal = horizontal;
+    _currentVertical = vertical;
+  }
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final cursorDiameter = widget.cursorDiameter;
+    return material.GestureDetector(
+      onTapDown: (details) {
+        _updateColor(details.localPosition, context.size!);
+        widget.onChanged?.call(_currentColor);
+      },
+      onPanUpdate: (details) {
+        setState(() {
+          _updateColor(details.localPosition, context.size!);
+        });
+      },
+      onPanEnd: (_) => widget.onChanged?.call(_currentColor),
+      child: material.Stack(
+        clipBehavior: material.Clip.none,
+        children: [
+          material.Positioned.fill(
+            child: material.RepaintBoundary(
+              child: material.ClipRRect(
+                borderRadius: material.BorderRadius.all(widget.radius),
+                child: material.CustomPaint(
+                  painter: _HSLColorSliderPainter(color: _currentColor),
+                ),
+              ),
+            ),
+          ),
+          material.Positioned(
+            left: -cursorDiameter / 2,
+            right: -cursorDiameter / 2,
+            top: -cursorDiameter / 2,
+            bottom: -cursorDiameter / 2,
+            child: material.Align(
+              alignment: material.Alignment(
+                (_currentHorizontal.clamp(0, 1) * 2) - 1,
+                (_currentVertical.clamp(0, 1) * 2) - 1,
+              ),
+              child: material.Container(
+                width: cursorDiameter,
+                height: cursorDiameter,
+                decoration: material.BoxDecoration(
+                  shape: material.BoxShape.circle,
+                  color: _currentColor.toColor(),
+                  border: material.Border.all(
+                    color: material.Colors.white,
+                    width: widget.cursorBorderWidth,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  material.HSLColor get _currentColor {
+    return material.HSLColor.fromAHSL(
+      _alpha.clamp(0, 1),
+      _hue.clamp(0, 360),
+      _saturation.clamp(0, 1),
+      _lightness.clamp(0, 1),
+    );
+  }
+
+  void _updateColor(material.Offset localPosition, material.Size size) {
+    _currentHorizontal = (localPosition.dx / size.width).clamp(0, 1);
+    _currentVertical = (localPosition.dy / size.height).clamp(0, 1);
+    _saturation = _currentVertical;
+    _lightness = _currentHorizontal;
+    widget.onChanging?.call(_currentColor);
+  }
+
+  double get vertical => widget.color.saturation;
+
+  double get horizontal => widget.color.lightness;
+}
+
+class _SingleAxisCursor extends material.StatelessWidget {
+  const _SingleAxisCursor({
+    required this.reverse,
+    required this.horizontal,
+    required this.vertical,
+    required this.radius,
+    required this.thickness,
+    required this.borderWidth,
+    required this.color,
+  });
+
+  final bool reverse;
+  final double horizontal;
+  final double vertical;
+  final material.Radius radius;
+  final double thickness;
+  final double borderWidth;
+  final material.Color color;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    final alignment = material.Alignment(
+      (horizontal.clamp(0, 1) * 2) - 1,
+      (vertical.clamp(0, 1) * 2) - 1,
+    );
+    final handleCornerRadius =
+        radius.x < thickness / 4 ? radius.x : thickness / 4;
+    final handleRadius = material.Radius.circular(handleCornerRadius);
+    if (reverse) {
+      return material.Align(
+        alignment: alignment,
+        child: material.Container(
+          width: thickness,
+          height: double.infinity,
+          decoration: material.BoxDecoration(
+            color: color,
+            border: material.Border.all(
+              color: material.Colors.white,
+              width: borderWidth,
+            ),
+            borderRadius: material.BorderRadius.all(handleRadius),
+          ),
+        ),
+      );
+    }
+    return material.Align(
+      alignment: alignment,
+      child: material.Container(
+        width: double.infinity,
+        height: thickness,
+        decoration: material.BoxDecoration(
+          color: color,
+          border: material.Border.all(
+            color: material.Colors.white,
+            width: borderWidth,
+          ),
+          borderRadius: material.BorderRadius.all(handleRadius),
+        ),
+      ),
+    );
+  }
+}
+
+class _AlphaPainter extends material.CustomPainter {
+  const _AlphaPainter({required this.checkboardSize});
+
+  static const checkboardPrimary = material.Color(0xFFE0E0E0);
+  static const checkboardSecondary = material.Color(0xFFB0B0B0);
+  final double checkboardSize;
+
+  @override
+  void paint(material.Canvas canvas, material.Size size) {
+    final paint = material.Paint()
+      ..style = material.PaintingStyle.fill
+      ..color = checkboardPrimary;
+    canvas.drawRect(material.Offset.zero & size, paint);
+    paint.color = checkboardSecondary;
+    for (var x = 0.0; x < size.width; x += checkboardSize) {
+      for (var y = 0.0; y < size.height; y += checkboardSize) {
+        final isEvenColumn = (x / checkboardSize).floor().isEven;
+        final isEvenRow = (y / checkboardSize).floor().isEven;
+        if (isEvenColumn == isEvenRow) {
+          canvas.drawRect(
+            material.Rect.fromLTWH(x, y, checkboardSize, checkboardSize),
+            paint,
+          );
+        }
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant _AlphaPainter oldDelegate) {
+    return oldDelegate.checkboardSize != checkboardSize;
+  }
+}
+
+class _HSVColorSliderPainter extends material.CustomPainter {
+  _HSVColorSliderPainter({
+    required this.sliderType,
+    required this.color,
+    required this.reverse,
+  });
+
+  final _HSVSliderType sliderType;
+  final material.HSVColor color;
+  final bool reverse;
+
+  @override
+  void paint(material.Canvas canvas, material.Size size) {
+    final paint = material.Paint()
+      ..isAntiAlias = false
+      ..style = material.PaintingStyle.fill;
+
+    switch (sliderType) {
+      case _HSVSliderType.satVal:
+        final width = size.width / 100;
+        final height = size.height / 100;
+        for (var i = 0; i < 100; i++) {
+          for (var j = 0; j < 100; j++) {
+            paint.color = material.HSVColor.fromAHSV(
+              1,
+              color.hue,
+              reverse ? i / 100 : j / 100,
+              reverse ? j / 100 : i / 100,
+            ).toColor();
+            canvas.drawRect(
+              material.Rect.fromLTWH(i * width, j * height, width, height),
+              paint,
+            );
+          }
+        }
+        break;
+      case _HSVSliderType.hue:
+        if (reverse) {
+          final width = size.width / 360;
+          for (var i = 0; i < 360; i++) {
+            paint.color = material.HSVColor.fromAHSV(
+              1,
+              i.toDouble(),
+              color.saturation,
+              color.value,
+            ).toColor();
+            canvas.drawRect(
+              material.Rect.fromLTWH(i * width, 0, width, size.height),
+              paint,
+            );
+          }
+        } else {
+          final height = size.height / 360;
+          for (var i = 0; i < 360; i++) {
+            paint.color = material.HSVColor.fromAHSV(
+              1,
+              i.toDouble(),
+              color.saturation,
+              color.value,
+            ).toColor();
+            canvas.drawRect(
+              material.Rect.fromLTWH(0, i * height, size.width, height),
+              paint,
+            );
+          }
+        }
+        break;
+      case _HSVSliderType.alpha:
+        final opaque = material.Color.fromARGB(
+          255,
+          _red(color.toColor()),
+          _green(color.toColor()),
+          _blue(color.toColor()),
+        );
+        paint.shader = material.LinearGradient(
+          begin: reverse
+              ? material.Alignment.centerLeft
+              : material.Alignment.topCenter,
+          end: reverse
+              ? material.Alignment.centerRight
+              : material.Alignment.bottomCenter,
+          colors: [opaque.withValues(alpha: 0), opaque],
+        ).createShader(material.Offset.zero & size);
+        canvas.drawRect(material.Offset.zero & size, paint);
+        paint.shader = null;
+        break;
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant _HSVColorSliderPainter oldDelegate) {
+    if (oldDelegate.sliderType != sliderType ||
+        oldDelegate.reverse != reverse) {
+      return true;
+    }
+    switch (sliderType) {
+      case _HSVSliderType.satVal:
+        return oldDelegate.color.hue != color.hue;
+      case _HSVSliderType.hue:
+        return oldDelegate.color.saturation != color.saturation ||
+            oldDelegate.color.value != color.value;
+      case _HSVSliderType.alpha:
+        return oldDelegate.color.hue != color.hue ||
+            oldDelegate.color.saturation != color.saturation ||
+            oldDelegate.color.value != color.value;
+    }
+  }
+}
+
+class _HSLColorSliderPainter extends material.CustomPainter {
+  _HSLColorSliderPainter({required this.color});
+
+  final material.HSLColor color;
+
+  @override
+  void paint(material.Canvas canvas, material.Size size) {
+    final paint = material.Paint()
+      ..isAntiAlias = false
+      ..style = material.PaintingStyle.fill;
+    final width = size.width / 100;
+    final height = size.height / 100;
+    for (var i = 0; i < 100; i++) {
+      for (var j = 0; j < 100; j++) {
+        paint.color = material.HSLColor.fromAHSL(
+          1,
+          color.hue,
+          j / 100,
+          i / 100,
+        ).toColor();
+        canvas.drawRect(
+          material.Rect.fromLTWH(i * width, j * height, width, height),
+          paint,
+        );
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant _HSLColorSliderPainter oldDelegate) {
+    return oldDelegate.color.hue != color.hue;
+  }
+}
+
+class _IntegerRangeFormatter extends TextInputFormatter {
+  _IntegerRangeFormatter({required this.min, required this.max});
+
+  final int min;
+  final int max;
+
+  @override
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
+    final text = newValue.text;
+    if (text.isEmpty) {
+      return newValue;
+    }
+    if (!RegExp(r'^\d+$').hasMatch(text)) {
+      return oldValue;
+    }
+    final parsed = int.tryParse(text);
+    if (parsed == null || parsed < min || parsed > max) {
+      return oldValue;
+    }
+    return newValue;
+  }
+}
+
+class _HexTextFormatter extends TextInputFormatter {
+  const _HexTextFormatter();
+
+  @override
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
+    var text = newValue.text.toUpperCase().replaceAll(
+          RegExp(r'[^0-9A-F#]'),
+          '',
+        );
+    if (text.isEmpty) {
+      return newValue.copyWith(text: '');
+    }
+    if (!text.startsWith('#')) {
+      text = '#$text';
+    }
+    if (text.length > 7) {
+      text = text.substring(0, 7);
+    }
+    return newValue.copyWith(
+      text: text,
+      selection: material.TextSelection.collapsed(offset: text.length),
+    );
+  }
+}
+
+class _ColorSwatch extends material.StatelessWidget {
+  const _ColorSwatch({
+    required this.color,
+    required this.size,
+    required this.radius,
+  });
+
+  final material.Color color;
+  final double size;
+  final double radius;
+
+  @override
+  material.Widget build(material.BuildContext context) {
+    return material.Container(
+      width: size,
+      height: size,
+      decoration: material.BoxDecoration(
+        color: color,
+        borderRadius: material.BorderRadius.circular(radius),
+        border: material.Border.all(
+          color: material.Theme.of(context).colorScheme.outlineVariant,
+        ),
+      ),
+    );
+  }
+}
+
+material.TextStyle _textStyle(
+  material.BuildContext context,
+  BetterColorPickerStyle style,
+) {
+  return style.textStyle ?? material.Theme.of(context).textTheme.bodyMedium!;
+}
+
+material.TextStyle _monoTextStyle(
+  material.BuildContext context,
+  BetterColorPickerStyle style,
+) {
+  return style.monospaceTextStyle ??
+      _textStyle(
+        context,
+        style,
+      ).copyWith(fontFeatures: const [FontFeature.tabularFigures()]);
+}
+
+material.Color? _tryParseHex(String value) {
+  var hex = value.trim().toUpperCase();
+  if (hex.startsWith('#')) {
+    hex = hex.substring(1);
+  }
+  if (hex.length != 6) {
+    return null;
+  }
+  final parsed = int.tryParse(hex, radix: 16);
+  if (parsed == null) {
+    return null;
+  }
+  return material.Color(0xFF000000 | parsed);
+}
+
+String _modeLabel(BetterColorPickerMode mode) {
+  switch (mode) {
+    case BetterColorPickerMode.rgb:
+      return 'RGB';
+    case BetterColorPickerMode.hsl:
+      return 'HSL';
+    case BetterColorPickerMode.hsv:
+      return 'HSV';
+    case BetterColorPickerMode.hex:
+      return 'HEX';
+  }
+}
+
+String _colorToHex(material.Color color, {required bool showAlpha}) {
+  final red = _red(color).toRadixString(16).padLeft(2, '0');
+  final green = _green(color).toRadixString(16).padLeft(2, '0');
+  final blue = _blue(color).toRadixString(16).padLeft(2, '0');
+  if (!showAlpha) {
+    return '#$red$green$blue'.toUpperCase();
+  }
+  final alpha = _alpha(color).toRadixString(16).padLeft(2, '0');
+  return '#$alpha$red$green$blue'.toUpperCase();
+}
+
+int _red(material.Color color) => (color.r * 255).round().clamp(0, 255);
+
+int _green(material.Color color) => (color.g * 255).round().clamp(0, 255);
+
+int _blue(material.Color color) => (color.b * 255).round().clamp(0, 255);
+
+int _alpha(material.Color color) => (color.a * 255).round().clamp(0, 255);
diff --git a/lib/widgets/custom_search_field.dart b/lib/widgets/custom_search_field.dart
index faf2e7c0..12939e3c 100644
--- a/lib/widgets/custom_search_field.dart
+++ b/lib/widgets/custom_search_field.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/settings.dart';
-import 'package:icarus/const/shortcut_info.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
 
 /// A themed search text field that smoothly expands (slides out) when:
 /// - Hovered by the pointer
@@ -123,8 +123,7 @@ class _SearchTextFieldState extends ConsumerState<SearchTextField> {
         curve: widget.curve,
         // Let the height be intrinsic.
         alignment: Alignment.centerLeft,
-        child: Shortcuts(
-          shortcuts: ShortcutInfo.textEditingOverrides,
+        child: TextEditingShortcutScope(
           child: _buildField(textStyle, contentPadding, compact),
         ),
       ),
diff --git a/lib/widgets/custom_segmented_tabs.dart b/lib/widgets/custom_segmented_tabs.dart
index 0426bd10..db0d7d67 100644
--- a/lib/widgets/custom_segmented_tabs.dart
+++ b/lib/widgets/custom_segmented_tabs.dart
@@ -68,6 +68,9 @@ class CustomSegmentedTabs<T> extends StatefulWidget {
 }
 
 class _CustomSegmentedTabsState<T> extends State<CustomSegmentedTabs<T>> {
+  static const double _containerRadius = 6;
+  static const double _segmentRadius = 5;
+
   final GlobalKey _stackKey = GlobalKey();
   late List<GlobalKey> _tabKeys;
   late List<double> _segmentLefts;
@@ -179,7 +182,7 @@ class _CustomSegmentedTabsState<T> extends State<CustomSegmentedTabs<T>> {
       padding: widget.padding,
       decoration: BoxDecoration(
         color: Settings.tacticalVioletTheme.secondary,
-        borderRadius: BorderRadius.circular(10),
+        borderRadius: BorderRadius.circular(_containerRadius),
         border: Border.all(
           color: Settings.tacticalVioletTheme.border,
           width: 1,
@@ -205,15 +208,8 @@ class _CustomSegmentedTabsState<T> extends State<CustomSegmentedTabs<T>> {
                 bottom: 0,
                 child: DecoratedBox(
                   decoration: BoxDecoration(
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withAlpha(100),
-                        blurRadius: 2,
-                        offset: const Offset(0, 2),
-                      ),
-                    ],
                     color: Settings.tacticalVioletTheme.primary,
-                    borderRadius: BorderRadius.circular(8),
+                    borderRadius: BorderRadius.circular(_segmentRadius),
                   ),
                 ),
               ),
@@ -231,6 +227,7 @@ class _CustomSegmentedTabsState<T> extends State<CustomSegmentedTabs<T>> {
                     animationCurve: widget.animationCurve,
                     horizontalPadding: itemHorizontalPadding,
                     verticalPadding: itemVerticalPadding,
+                    borderRadius: _segmentRadius,
                   ),
                   if (index < widget.items.length - 1) SizedBox(width: itemGap),
                 ],
@@ -263,6 +260,7 @@ class _TabButton<T> extends StatelessWidget {
     required this.animationCurve,
     required this.horizontalPadding,
     required this.verticalPadding,
+    required this.borderRadius,
   });
 
   final SegmentedTabItem<T> item;
@@ -273,6 +271,7 @@ class _TabButton<T> extends StatelessWidget {
   final Curve animationCurve;
   final double horizontalPadding;
   final double verticalPadding;
+  final double borderRadius;
 
   @override
   Widget build(BuildContext context) {
@@ -287,7 +286,7 @@ class _TabButton<T> extends StatelessWidget {
       color: Colors.transparent,
       child: InkWell(
         mouseCursor: SystemMouseCursors.click,
-        borderRadius: BorderRadius.circular(8),
+        borderRadius: BorderRadius.circular(borderRadius),
         onTap: onTap,
         child: AnimatedContainer(
           duration: animationDuration,
@@ -298,7 +297,7 @@ class _TabButton<T> extends StatelessWidget {
             vertical: verticalPadding,
           ),
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(8),
+            borderRadius: BorderRadius.circular(borderRadius),
             color: showStaticFill && isSelected
                 ? Settings.tacticalVioletTheme.primary
                 : Colors.transparent,
diff --git a/lib/widgets/custom_text_field.dart b/lib/widgets/custom_text_field.dart
index 21022622..d55723ff 100644
--- a/lib/widgets/custom_text_field.dart
+++ b/lib/widgets/custom_text_field.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:icarus/const/shortcut_info.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
 class CustomTextField extends ConsumerWidget {
@@ -24,8 +24,7 @@ class CustomTextField extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Shortcuts(
-      shortcuts: ShortcutInfo.textEditingOverrides,
+    return TextEditingShortcutScope(
       child: ShadInput(
         controller: controller,
         textAlign: textAlign ?? TextAlign.start,
diff --git a/lib/widgets/dialogs/upload_image_dialog.dart b/lib/widgets/dialogs/upload_image_dialog.dart
index 7169a66c..0a68bed5 100644
--- a/lib/widgets/dialogs/upload_image_dialog.dart
+++ b/lib/widgets/dialogs/upload_image_dialog.dart
@@ -8,7 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/providers/image_provider.dart';
 import 'package:icarus/services/clipboard_service.dart';
-import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
+import 'package:icarus/widgets/sidebar_widgets/color_library.dart';
 
 import 'package:shadcn_ui/shadcn_ui.dart';
 
@@ -36,13 +36,6 @@ class _UploadImageDialogState extends ConsumerState<UploadImageDialog> {
   Uint8List? _selectedBytes;
   String? _selectedName;
   int? _selectedTagColorValue;
-  static const List<Color> _colorOptions = [
-    Color(0xFF22C55E),
-    Color(0xFF3B82F6),
-    Color(0xFFF59E0B),
-    Color(0xFFEF4444),
-    Color(0xFFA855F7),
-  ];
 
   @override
   void initState() {
@@ -215,33 +208,12 @@ class _UploadImageDialogState extends ConsumerState<UploadImageDialog> {
               const SizedBox(height: 12),
               const Text('Tag color'),
               const SizedBox(height: 6),
-              Wrap(
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.all(4.0),
-                    child: ColorButtons(
-                      height: 24,
-                      width: 24,
-                      color: const Color(0xFFC5C5C5),
-                      isSelected: _selectedTagColorValue == null,
-                      onTap: () =>
-                          setState(() => _selectedTagColorValue = null),
-                    ),
-                  ),
-                  for (final color in _colorOptions)
-                    Padding(
-                      padding: const EdgeInsets.all(4.0),
-                      child: ColorButtons(
-                        height: 24,
-                        width: 24,
-                        color: color,
-                        isSelected:
-                            _selectedTagColorValue == color.toARGB32(),
-                        onTap: () => setState(
-                            () => _selectedTagColorValue = color.toARGB32()),
-                      ),
-                    ),
-                ],
+              ColorLibrary(
+                includeEmpty: true,
+                selectedColorValue: _selectedTagColorValue,
+                onSelected: (colorValue) => setState(
+                  () => _selectedTagColorValue = colorValue,
+                ),
               ),
             ],
           ),
diff --git a/lib/widgets/draggable_widgets/ability/placed_ability_widget.dart b/lib/widgets/draggable_widgets/ability/placed_ability_widget.dart
index 1d23db46..32bc3ac0 100644
--- a/lib/widgets/draggable_widgets/ability/placed_ability_widget.dart
+++ b/lib/widgets/draggable_widgets/ability/placed_ability_widget.dart
@@ -8,6 +8,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/const/transition_data.dart';
 import 'package:icarus/providers/ability_provider.dart';
+import 'package:icarus/providers/duplicate_drag_modifier_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
 import 'package:icarus/providers/screen_zoom_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
@@ -43,7 +44,7 @@ bool _shouldShowRotatableHandle(
 
 class PlacedAbilityWidget extends ConsumerStatefulWidget {
   final PlacedAbility ability;
-  final Function(DraggableDetails details) onDragEnd;
+  final void Function(DraggableDetails details, String draggedId) onDragEnd;
   final String id;
   final PlacedWidget data;
   final double rotation;
@@ -74,6 +75,7 @@ class _PlacedAbilityWidgetState extends ConsumerState<PlacedAbilityWidget> {
   double? localRotation;
   double? localLength;
   bool isDragging = false;
+  String? _activeDragId;
 
   double _resolvedLengthFor(PlacedAbility ability, double rawLength) {
     final abilityData = ability.data.abilityData;
@@ -174,7 +176,7 @@ class _PlacedAbilityWidgetState extends ConsumerState<PlacedAbilityWidget> {
             ),
           ),
           childWhenDragging: const SizedBox.shrink(),
-          onDragEnd: widget.onDragEnd,
+          onDragEnd: (details) => widget.onDragEnd(details, widget.id),
           child: widget.ability.data.abilityData!.createWidget(
             id: widget.id,
             isAlly: isAlly,
@@ -342,15 +344,26 @@ class _PlacedAbilityWidgetState extends ConsumerState<PlacedAbilityWidget> {
             ),
             childWhenDragging: const SizedBox.shrink(),
             onDragStarted: () {
+              final shouldDuplicate =
+                  !widget.isLineUp && ref.read(duplicateDragModifierProvider);
+              final duplicateId = shouldDuplicate
+                  ? ref.read(abilityProvider.notifier).duplicateAbilityAt(
+                        sourceId: abilityRef.id,
+                        position: abilityRef.position,
+                      )
+                  : null;
               setState(() {
                 isDragging = true;
+                _activeDragId = duplicateId ?? abilityRef.id;
               });
             },
             onDragEnd: (DraggableDetails details) {
+              final dragId = _activeDragId ?? abilityRef.id;
               setState(() {
                 isDragging = false;
+                _activeDragId = null;
               });
-              widget.onDragEnd(details);
+              widget.onDragEnd(details, dragId);
             },
             // dragAnchorStrategy: pointDragAnchorStrategy,
             child: abilityData.createWidget(
@@ -392,7 +405,26 @@ class _PlacedAbilityWidgetState extends ConsumerState<PlacedAbilityWidget> {
           )),
         ),
         childWhenDragging: const SizedBox.shrink(),
-        onDragEnd: widget.onDragEnd,
+        onDragStarted: () {
+          final shouldDuplicate =
+              !widget.isLineUp && ref.read(duplicateDragModifierProvider);
+          final duplicateId = shouldDuplicate
+              ? ref.read(abilityProvider.notifier).duplicateAbilityAt(
+                    sourceId: abilityRef.id,
+                    position: abilityRef.position,
+                  )
+              : null;
+          setState(() {
+            _activeDragId = duplicateId ?? abilityRef.id;
+          });
+        },
+        onDragEnd: (details) {
+          final dragId = _activeDragId ?? abilityRef.id;
+          setState(() {
+            _activeDragId = null;
+          });
+          widget.onDragEnd(details, dragId);
+        },
         child: widget.ability.data.abilityData!.createWidget(
           id: widget.id,
           isAlly: isAlly,
diff --git a/lib/widgets/draggable_widgets/ability/placed_deadlock_barrier_mesh_widget.dart b/lib/widgets/draggable_widgets/ability/placed_deadlock_barrier_mesh_widget.dart
index f159fc71..ea1e8b48 100644
--- a/lib/widgets/draggable_widgets/ability/placed_deadlock_barrier_mesh_widget.dart
+++ b/lib/widgets/draggable_widgets/ability/placed_deadlock_barrier_mesh_widget.dart
@@ -12,6 +12,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/const/transition_data.dart';
 import 'package:icarus/providers/ability_provider.dart';
+import 'package:icarus/providers/duplicate_drag_modifier_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
 import 'package:icarus/providers/screen_zoom_provider.dart';
 import 'package:icarus/providers/screenshot_provider.dart';
@@ -33,7 +34,7 @@ class PlacedDeadlockBarrierMeshWidget extends ConsumerStatefulWidget {
   });
 
   final PlacedAbility ability;
-  final void Function(DraggableDetails details) onDragEnd;
+  final void Function(DraggableDetails details, String draggedId) onDragEnd;
   final String id;
   final PlacedWidget data;
   final bool isLineUp;
@@ -56,6 +57,7 @@ class _PlacedDeadlockBarrierMeshWidgetState
   bool _isDragging = false;
   bool _isRotating = false;
   bool _isRotationHandleHovered = false;
+  String? _activeDragId;
   Offset _rotationOriginGlobal = Offset.zero;
   late final AnimationController _animationController;
   late final Animation<double> _scaleAnimation;
@@ -206,14 +208,25 @@ class _PlacedDeadlockBarrierMeshWidgetState
               ),
               childWhenDragging: const SizedBox.shrink(),
               onDragStarted: () {
+                final shouldDuplicate =
+                    !widget.isLineUp && ref.read(duplicateDragModifierProvider);
+                final duplicateId = shouldDuplicate
+                    ? ref.read(abilityProvider.notifier).duplicateAbilityAt(
+                          sourceId: abilityRef.id,
+                          position: abilityRef.position,
+                        )
+                    : null;
                 setState(() {
                   _isDragging = true;
+                  _activeDragId = duplicateId ?? abilityRef.id;
                 });
               },
               onDragEnd: (details) {
-                widget.onDragEnd(details);
+                final dragId = _activeDragId ?? abilityRef.id;
+                widget.onDragEnd(details, dragId);
                 setState(() {
                   _isDragging = false;
+                  _activeDragId = null;
                 });
               },
               child: AbilityWidget(
diff --git a/lib/widgets/draggable_widgets/agents/agent_feedback_widget.dart b/lib/widgets/draggable_widgets/agents/agent_feedback_widget.dart
index 82dfa336..c11c1328 100644
--- a/lib/widgets/draggable_widgets/agents/agent_feedback_widget.dart
+++ b/lib/widgets/draggable_widgets/agents/agent_feedback_widget.dart
@@ -5,6 +5,7 @@ import 'package:icarus/const/coordinate_system.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
 import 'package:icarus/providers/team_provider.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
 
 class AgentFeedback extends ConsumerWidget {
   const AgentFeedback({
@@ -15,16 +16,24 @@ class AgentFeedback extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final coordinateSystem = CoordinateSystem.instance;
-    final agentSize = ref.watch(strategySettingsProvider).agentSize;
+    final strategySettings = ref.watch(strategySettingsProvider);
+    final agentSize = strategySettings.agentSize;
     final bool isAlly = ref.watch(teamProvider);
+    final backgroundColor =
+        isAlly ? Settings.allyBGColor : Settings.enemyBGColor;
+    final outlineColor =
+        isAlly ? Settings.allyOutlineColor : Settings.enemyOutlineColor;
     return ClipRRect(
       borderRadius: const BorderRadius.all(Radius.circular(3.0)),
       child: Container(
         decoration: BoxDecoration(
-          color: isAlly ? Settings.allyBGColor : Settings.enemyBGColor,
+          color: strategySettings.useNeutralTeamColors
+              ? ShadTheme.of(context).colorScheme.secondary
+              : backgroundColor,
           border: Border.all(
-            color:
-                isAlly ? Settings.allyOutlineColor : Settings.enemyOutlineColor,
+            color: strategySettings.useNeutralTeamColors
+                ? Settings.neutralTeamShade(outlineColor)
+                : outlineColor,
           ),
           borderRadius: const BorderRadius.all(
             Radius.circular(3),
diff --git a/lib/widgets/draggable_widgets/agents/agent_widget.dart b/lib/widgets/draggable_widgets/agents/agent_widget.dart
index 8a230a29..40c1baf6 100644
--- a/lib/widgets/draggable_widgets/agents/agent_widget.dart
+++ b/lib/widgets/draggable_widgets/agents/agent_widget.dart
@@ -3,14 +3,18 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/agents.dart';
 import 'package:icarus/const/coordinate_system.dart';
 import 'package:icarus/const/line_provider.dart';
+import 'package:icarus/const/maps.dart';
 import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/providers/agent_provider.dart';
 import 'package:icarus/providers/ability_bar_provider.dart';
 import 'package:icarus/providers/hovered_delete_target_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
+import 'package:icarus/providers/map_provider.dart';
+import 'package:icarus/providers/screen_zoom_provider.dart';
 import 'package:icarus/providers/screenshot_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
+import 'package:icarus/widgets/draggable_widgets/zoom_transform.dart';
 import 'package:icarus/widgets/mouse_watch.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
@@ -91,8 +95,11 @@ class AgentWidget extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final coordinateSystem = CoordinateSystem.instance;
+    final mapScale = Maps.mapScale[ref.watch(mapProvider).currentMap] ?? 1.0;
     final agentSize =
         forcedAgentSize ?? ref.watch(strategySettingsProvider).agentSize;
+    final useNeutralTeamColors =
+        ref.watch(strategySettingsProvider).useNeutralTeamColors;
     final isScreenshot = ref.watch(screenshotProvider);
     final deadProgress =
         (deadStateProgress ?? (state == AgentState.dead ? 1.0 : 0.0))
@@ -105,9 +112,9 @@ class AgentWidget extends ConsumerWidget {
     final agentImage = RepaintBoundary(child: Image.asset(agent.iconPath));
 
     // Determine background color
-    Color bgColor = Settings.enemyBGColor;
-    if (isAlly) {
-      bgColor = Settings.allyBGColor;
+    Color bgColor = isAlly ? Settings.allyBGColor : Settings.enemyBGColor;
+    if (useNeutralTeamColors) {
+      bgColor = ShadTheme.of(context).colorScheme.secondary;
     }
 
     final deadBgColor = isAlly ? _mutedAllyBGColor : _mutedEnemyBGColor;
@@ -118,9 +125,10 @@ class AgentWidget extends ConsumerWidget {
     }
 
     // Determine outline color
-    Color outlineColor = Settings.enemyOutlineColor;
-    if (isAlly) {
-      outlineColor = Settings.allyOutlineColor;
+    Color outlineColor =
+        isAlly ? Settings.allyOutlineColor : Settings.enemyOutlineColor;
+    if (useNeutralTeamColors) {
+      outlineColor = Settings.neutralTeamShade(outlineColor);
     }
 
     final deadOutlineColor =
@@ -192,6 +200,21 @@ class AgentWidget extends ConsumerWidget {
         : null;
 
     final contextMenuItems = <ShadContextMenuItem>[
+      if (!isScreenshot)
+        ShadContextMenuItem.raw(
+          variant: ShadContextMenuItemVariant.primary,
+          height: 36,
+          closeOnTap: false,
+          padding: const EdgeInsets.only(bottom: 4),
+          insetPadding: const EdgeInsets.only(left: 4, right: 4),
+          backgroundColor: Colors.transparent,
+          selectedBackgroundColor: Colors.transparent,
+          child: _AgentAbilityContextMenuRow(
+            agent: agent,
+            isAlly: isAlly,
+            mapScale: mapScale,
+          ),
+        ),
       if (lineUpId != null)
         ShadContextMenuItem(
           leading: const Icon(LucideIcons.plus),
@@ -275,6 +298,138 @@ class AgentWidget extends ConsumerWidget {
   }
 }
 
+class _AgentAbilityContextMenuRow extends ConsumerWidget {
+  const _AgentAbilityContextMenuRow({
+    required this.agent,
+    required this.isAlly,
+    required this.mapScale,
+  });
+
+  final AgentData agent;
+  final bool isAlly;
+  final double mapScale;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Row(
+      spacing: 4,
+      // crossAxisAlignment: CrossAxisAlignment.start,
+      //
+      mainAxisSize: MainAxisSize.max,
+      // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        for (final ability in agent.abilities)
+          _AgentAbilityContextMenuButton(
+            ability: ability,
+            isAlly: isAlly,
+            mapScale: mapScale,
+          ),
+      ],
+    );
+  }
+}
+
+class _AgentAbilityContextMenuButton extends ConsumerStatefulWidget {
+  const _AgentAbilityContextMenuButton({
+    required this.ability,
+    required this.isAlly,
+    required this.mapScale,
+  });
+
+  final AbilityInfo ability;
+  final bool isAlly;
+  final double mapScale;
+
+  @override
+  ConsumerState<_AgentAbilityContextMenuButton> createState() =>
+      _AgentAbilityContextMenuButtonState();
+}
+
+class _AgentAbilityContextMenuButtonState
+    extends ConsumerState<_AgentAbilityContextMenuButton> {
+  bool _isHovered = false;
+  bool _isPressed = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = ShadTheme.of(context);
+    final ability = widget.ability;
+    final background = _isHovered || _isPressed
+        ? theme.colorScheme.accent
+        : theme.colorScheme.secondary;
+    final borderColor = _isHovered || _isPressed
+        ? theme.colorScheme.ring
+        : theme.colorScheme.border;
+
+    return Draggable<DraggedAbilityData>(
+      data: DraggedAbilityData(
+        ability: ability,
+        isAlly: widget.isAlly,
+      ),
+      onDragStarted: () {
+        setState(() => _isPressed = false);
+        final interactionState = ref.read(interactionStateProvider);
+        if (interactionState == InteractionState.drawing ||
+            interactionState == InteractionState.erasing) {
+          ref
+              .read(interactionStateProvider.notifier)
+              .update(InteractionState.navigation);
+        }
+      },
+      dragAnchorStrategy: (draggable, context, position) {
+        final info = (draggable.data as DraggedAbilityData).ability;
+        final scaleFactor = CoordinateSystem.instance.scaleFactor *
+            ref.read(screenZoomProvider);
+        final abilitySize = ref.read(strategySettingsProvider).abilitySize;
+
+        return info.abilityData!
+            .getAnchorPoint(
+              mapScale: widget.mapScale,
+              abilitySize: abilitySize,
+            )
+            .scale(scaleFactor, scaleFactor);
+      },
+      feedback: Opacity(
+        opacity: Settings.feedbackOpacity,
+        child: ZoomTransform(
+          child: ability.abilityData!.createWidget(
+            id: null,
+            isAlly: widget.isAlly,
+            mapScale: widget.mapScale,
+          ),
+        ),
+      ),
+      child: MouseRegion(
+        cursor: SystemMouseCursors.grab,
+        onEnter: (_) => setState(() => _isHovered = true),
+        onExit: (_) => setState(() {
+          _isHovered = false;
+          _isPressed = false;
+        }),
+        child: GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onTapDown: (_) => setState(() => _isPressed = true),
+          onTapCancel: () => setState(() => _isPressed = false),
+          onTapUp: (_) => setState(() => _isPressed = false),
+          child: AnimatedContainer(
+            duration: const Duration(milliseconds: 120),
+            curve: Curves.easeOutCubic,
+            width: 36,
+            height: 36,
+            padding: const EdgeInsets.all(5),
+            decoration: BoxDecoration(
+              color: background,
+              borderRadius: BorderRadius.circular(6),
+              border: Border.all(color: borderColor),
+            ),
+            child: Image.asset(ability.iconPath),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
 List<double> _lerpColorMatrix(double t) {
   return List<double>.generate(
     _identityColorMatrix.length,
diff --git a/lib/widgets/draggable_widgets/image/placed_image_builder.dart b/lib/widgets/draggable_widgets/image/placed_image_builder.dart
index be3dd8b7..a433390a 100644
--- a/lib/widgets/draggable_widgets/image/placed_image_builder.dart
+++ b/lib/widgets/draggable_widgets/image/placed_image_builder.dart
@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/coordinate_system.dart';
 import 'package:icarus/const/image_scale_policy.dart';
 import 'package:icarus/const/placed_classes.dart';
+import 'package:icarus/providers/color_library_provider.dart';
 import 'package:icarus/providers/hovered_delete_target_provider.dart';
 import 'package:icarus/providers/image_provider.dart';
 
@@ -32,13 +33,6 @@ class _PlacedImageBuilderState extends State<PlacedImageBuilder> {
   double? localScale; // Make localScale nullable to check if it's initialized
   bool isPanning = false;
   bool isDragging = false;
-  static const List<Color> _tagPalette = [
-    Color(0xFF22C55E),
-    Color(0xFF3B82F6),
-    Color(0xFFF59E0B),
-    Color(0xFFEF4444),
-    Color(0xFFA855F7),
-  ];
 
   @override
   void initState() {
@@ -58,8 +52,8 @@ class _PlacedImageBuilderState extends State<PlacedImageBuilder> {
 
       if (ref.watch(placedImageProvider).images[index].scale != localScale &&
           !isPanning) {
-        localScale =
-            ImageScalePolicy.clamp(ref.read(placedImageProvider).images[index].scale);
+        localScale = ImageScalePolicy.clamp(
+            ref.read(placedImageProvider).images[index].scale);
       }
 
       return ImageScaleController(
@@ -156,40 +150,32 @@ class _PlacedImageBuilderState extends State<PlacedImageBuilder> {
               .updateTagColor(widget.placedImage.id, null);
         },
       ),
-      ..._tagPalette.map(
-        (color) => ShadContextMenuItem(
-          leading: Container(
-            width: 12,
-            height: 12,
-            decoration: BoxDecoration(
-              color: color,
-              shape: BoxShape.circle,
+      ...ref.watch(colorLibraryProvider).map(
+            (entry) => ShadContextMenuItem(
+              leading: Container(
+                width: 12,
+                height: 12,
+                decoration: BoxDecoration(
+                  color: entry.color,
+                  shape: BoxShape.circle,
+                ),
+              ),
+              child: Text(_labelForColor(entry)),
+              onPressed: () {
+                ref.read(placedImageProvider.notifier).updateTagColor(
+                    widget.placedImage.id, entry.color.toARGB32());
+              },
             ),
           ),
-          child: Text(_labelForColor(color)),
-          onPressed: () {
-            ref
-                .read(placedImageProvider.notifier)
-                .updateTagColor(widget.placedImage.id, color.toARGB32());
-          },
-        ),
-      ),
     ];
   }
 
-  String _labelForColor(Color color) {
-    if (color.toARGB32() == const Color(0xFF22C55E).toARGB32()) {
-      return 'Green tag';
-    }
-    if (color.toARGB32() == const Color(0xFF3B82F6).toARGB32()) {
-      return 'Blue tag';
-    }
-    if (color.toARGB32() == const Color(0xFFF59E0B).toARGB32()) {
-      return 'Amber tag';
-    }
-    if (color.toARGB32() == const Color(0xFFEF4444).toARGB32()) {
-      return 'Red tag';
-    }
-    return 'Purple tag';
+  String _labelForColor(ColorLibraryEntry entry) {
+    final kind = entry.isCustom ? 'custom' : 'default';
+    final hex = (entry.color.toARGB32() & 0x00FFFFFF)
+        .toRadixString(16)
+        .padLeft(6, '0')
+        .toUpperCase();
+    return '#$hex $kind tag';
   }
 }
diff --git a/lib/widgets/draggable_widgets/placed_widget_builder.dart b/lib/widgets/draggable_widgets/placed_widget_builder.dart
index 8e559976..1f698522 100644
--- a/lib/widgets/draggable_widgets/placed_widget_builder.dart
+++ b/lib/widgets/draggable_widgets/placed_widget_builder.dart
@@ -13,6 +13,7 @@ import 'package:icarus/providers/action_provider.dart';
 import 'package:icarus/providers/ability_bar_provider.dart';
 import 'package:icarus/providers/ability_provider.dart';
 import 'package:icarus/providers/agent_provider.dart';
+import 'package:icarus/providers/canvas_resize_provider.dart';
 import 'package:icarus/providers/duplicate_drag_modifier_provider.dart';
 import 'package:icarus/providers/hovered_delete_target_provider.dart';
 import 'package:icarus/providers/image_provider.dart';
@@ -151,16 +152,7 @@ class _PlacedWidgetBuilderState extends ConsumerState<PlacedWidgetBuilder> {
                       abilitySize: abilitySize,
                       mapScale: mapScale,
                     ),
-                    const Positioned.fill(
-                      child: LineUpLinePainter(),
-                    ),
-                    Stack(
-                      clipBehavior: Clip.none,
-                      children: [
-                        _LineUpAgents(),
-                        _LineUpAbilities(),
-                      ],
-                    ),
+                    const LineUpOverlay(),
                   ],
                 ),
               ),
@@ -190,6 +182,24 @@ class _PlacedWidgetBuilderState extends ConsumerState<PlacedWidgetBuilder> {
               ref
                   .read(abilityBarProvider.notifier)
                   .updateData(AgentData.agents[placedAgent.type]!);
+            } else if (details.data is DraggedAbilityData) {
+              final abilityData = details.data as DraggedAbilityData;
+              PlacedAbility placedAbility = PlacedAbility(
+                id: uuid.v4(),
+                data: abilityData.ability,
+                position: normalizedPosition,
+                isAlly: abilityData.isAlly,
+              );
+
+              if (ref.read(interactionStateProvider) ==
+                  InteractionState.lineUpPlacing) {
+                ref
+                    .read(lineUpProvider.notifier)
+                    .setCurrentAbility(placedAbility);
+                return;
+              }
+
+              ref.read(abilityProvider.notifier).addAbility(placedAbility);
             } else if (details.data is AbilityInfo) {
               PlacedAbility placedAbility = PlacedAbility(
                 id: uuid.v4(),
@@ -200,7 +210,9 @@ class _PlacedWidgetBuilderState extends ConsumerState<PlacedWidgetBuilder> {
 
               if (ref.read(interactionStateProvider) ==
                   InteractionState.lineUpPlacing) {
-                ref.read(lineUpProvider.notifier).setCurrentAbility(placedAbility);
+                ref
+                    .read(lineUpProvider.notifier)
+                    .setCurrentAbility(placedAbility);
                 return;
               }
 
@@ -375,7 +387,7 @@ class _AbilityList extends ConsumerWidget {
             ability: ability,
             id: ability.id,
             length: ability.length,
-            onDragEnd: (details) {
+            onDragEnd: (details, draggedId) {
               final renderBox = context.findRenderObject() as RenderBox;
               final localOffset = renderBox.globalToLocal(details.offset);
               final virtualOffset =
@@ -387,13 +399,13 @@ class _AbilityList extends ConsumerWidget {
                   virtualOffset.translate(safeArea.dx, safeArea.dy))) {
                 ref
                     .read(abilityProvider.notifier)
-                    .removeAbilityAsAction(ability.id);
+                    .removeAbilityAsAction(draggedId);
                 return;
               }
 
               ref
                   .read(abilityProvider.notifier)
-                  .updatePosition(virtualOffset, ability.id);
+                  .updatePosition(virtualOffset, draggedId);
             },
           ),
       ],
@@ -885,11 +897,30 @@ class _CustomShapeUtilityList extends ConsumerWidget {
   }
 }
 
+class LineUpOverlay extends StatelessWidget {
+  const LineUpOverlay({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      clipBehavior: Clip.none,
+      children: const [
+        Positioned.fill(
+          child: LineUpLinePainter(),
+        ),
+        _LineUpAgents(),
+        _LineUpAbilities(),
+      ],
+    );
+  }
+}
+
 class _LineUpAgents extends ConsumerWidget {
   const _LineUpAgents();
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    ref.watch(canvasResizeProvider);
     final groups = ref.watch(lineUpProvider).groups;
 
     return Stack(
@@ -906,6 +937,7 @@ class _LineUpAbilities extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    ref.watch(canvasResizeProvider);
     final groups = ref.watch(lineUpProvider).groups;
 
     return Stack(
diff --git a/lib/widgets/draggable_widgets/shared/framed_ability_icon_shell.dart b/lib/widgets/draggable_widgets/shared/framed_ability_icon_shell.dart
index 66f0a6a2..a3d143c8 100644
--- a/lib/widgets/draggable_widgets/shared/framed_ability_icon_shell.dart
+++ b/lib/widgets/draggable_widgets/shared/framed_ability_icon_shell.dart
@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/coordinate_system.dart';
 import 'package:icarus/const/line_provider.dart';
 import 'package:icarus/const/settings.dart';
+import 'package:icarus/providers/strategy_settings_provider.dart';
 
 class FramedAbilityIconShell extends ConsumerWidget {
   const FramedAbilityIconShell({
@@ -27,6 +28,10 @@ class FramedAbilityIconShell extends ConsumerWidget {
     final isLineUpHovered = lineUpId != null &&
         lineUpItemId != null &&
         (hoverTarget?.matchesAbility(lineUpId!, lineUpItemId!) ?? false);
+    final useNeutralTeamColors =
+        ref.watch(strategySettingsProvider).useNeutralTeamColors;
+    final outlineColor =
+        isAlly ? Settings.allyOutlineColor : Settings.enemyOutlineColor;
 
     return Container(
       width: coordinateSystem.scale(size),
@@ -38,9 +43,9 @@ class FramedAbilityIconShell extends ConsumerWidget {
         border: Border.all(
           color: isLineUpHovered
               ? Colors.deepPurpleAccent
-              : isAlly
-                  ? Settings.allyOutlineColor
-                  : Settings.enemyOutlineColor,
+              : useNeutralTeamColors
+                  ? Settings.neutralTeamShade(outlineColor)
+                  : outlineColor,
         ),
       ),
       child: ClipRRect(
diff --git a/lib/widgets/draggable_widgets/text/text_widget.dart b/lib/widgets/draggable_widgets/text/text_widget.dart
index 5c37bbc0..a31f7f6f 100644
--- a/lib/widgets/draggable_widgets/text/text_widget.dart
+++ b/lib/widgets/draggable_widgets/text/text_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/coordinate_system.dart';
-import 'package:icarus/const/shortcut_info.dart';
 import 'package:icarus/providers/text_draft_provider.dart';
 import 'package:icarus/providers/text_widget_height_provider.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
 
 class TextWidget extends ConsumerWidget {
   const TextWidget({
@@ -157,8 +157,7 @@ class _EditableTextWidgetState extends ConsumerState<_EditableTextWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return Shortcuts(
-      shortcuts: ShortcutInfo.textEditingOverrides,
+    return TextEditingShortcutScope(
       child: NotificationListener<SizeChangedLayoutNotification>(
         onNotification: (notification) {
           WidgetsBinding.instance.addPostFrameCallback((_) {
diff --git a/lib/widgets/folder_edit_dialog.dart b/lib/widgets/folder_edit_dialog.dart
index e982e8e2..c994407c 100644
--- a/lib/widgets/folder_edit_dialog.dart
+++ b/lib/widgets/folder_edit_dialog.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_colorpicker/flutter_colorpicker.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:icarus/providers/folder_provider.dart';
+import 'package:icarus/widgets/better_color_picker.dart';
 import 'package:icarus/widgets/color_picker_button.dart';
 import 'package:icarus/widgets/custom_text_field.dart';
 import 'package:icarus/widgets/dot_painter.dart';
 import 'package:icarus/widgets/folder_pill.dart';
+import 'package:icarus/widgets/icarus_color_picker_style.dart';
 import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
@@ -185,20 +186,28 @@ class _FolderEditDialogState extends ConsumerState<FolderEditDialog> {
                               ),
                             ],
                             child: Material(
+                              color: Colors.transparent,
                               child: SizedBox(
                                 width: 300,
-                                child: ColorPicker(
-                                  portraitOnly: true,
-                                  pickerColor:
-                                      Folder.folderColorMap[_selectedColor] ??
-                                          _customColor!,
-                                  onColorChanged: (color) {
+                                child: BetterColorPicker(
+                                  value: Folder
+                                          .folderColorMap[_selectedColor] ??
+                                      _customColor ??
+                                      Folder.folderColorMap[FolderColor.red]!,
+                                  initialMode: BetterColorPickerMode.hsv,
+                                  style: icarusColorPickerStyle,
+                                  onChanging: (color) {
+                                    setState(() {
+                                      _selectedColor = FolderColor.custom;
+                                      _customColor = color;
+                                    });
+                                  },
+                                  onChanged: (color) {
                                     setState(() {
                                       _selectedColor = FolderColor.custom;
                                       _customColor = color;
                                     });
                                   },
-                                  pickerAreaHeightPercent: 0.8,
                                 ),
                               ),
                             ),
diff --git a/lib/widgets/global_shortcuts.dart b/lib/widgets/global_shortcuts.dart
index 1b3ae744..0935f021 100644
--- a/lib/widgets/global_shortcuts.dart
+++ b/lib/widgets/global_shortcuts.dart
@@ -10,6 +10,7 @@ import 'package:icarus/providers/delete_menu_provider.dart';
 import 'package:icarus/providers/duplicate_drag_modifier_provider.dart';
 import 'package:icarus/providers/hovered_delete_target_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/pen_provider.dart';
 import 'package:icarus/providers/placement_center_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
@@ -64,7 +65,9 @@ class _GlobalShortcutsState extends ConsumerState<GlobalShortcuts>
       autofocus: true,
       // canRequestFocus: true,
       child: Shortcuts(
-        shortcuts: ShortcutInfo.globalShortcuts,
+        shortcuts: ShortcutInfo.globalShortcutsFor(
+          ref.watch(appPreferencesProvider).customShortcutBindings,
+        ),
         child: Actions(
           actions: {
             NavigationActionIntent: CallbackAction<NavigationActionIntent>(
diff --git a/lib/widgets/icarus_color_picker_style.dart b/lib/widgets/icarus_color_picker_style.dart
new file mode 100644
index 00000000..d6367854
--- /dev/null
+++ b/lib/widgets/icarus_color_picker_style.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:icarus/widgets/better_color_picker.dart';
+
+const icarusColorPickerStyle = BetterColorPickerStyle(
+  darkPalette: BetterColorPickerPalette(
+    surface: Color(0xff18181b),
+    foreground: Color(0xfffafafa),
+    mutedForeground: Color(0xffa1a1aa),
+    inputBorder: Color(0xff27272a),
+    fieldFill: Color(0xff27272a),
+  ),
+  lightPalette: BetterColorPickerPalette(
+    surface: Color(0xff18181b),
+    foreground: Color(0xfffafafa),
+    mutedForeground: Color(0xffa1a1aa),
+    inputBorder: Color(0xff27272a),
+    fieldFill: Color(0xff27272a),
+  ),
+  textStyle: TextStyle(
+    color: Color(0xfffafafa),
+    fontSize: 13,
+  ),
+  monospaceTextStyle: TextStyle(
+    color: Color(0xfffafafa),
+    fontSize: 13,
+    fontFeatures: [FontFeature.tabularFigures()],
+  ),
+  mainSliderRadius: 6,
+  channelSliderRadius: 4,
+  fieldRadius: 6,
+  swatchRadius: 6,
+  dialogWidth: 320,
+);
diff --git a/lib/widgets/line_up_placer.dart b/lib/widgets/line_up_placer.dart
index 21af8ea9..e88803b7 100644
--- a/lib/widgets/line_up_placer.dart
+++ b/lib/widgets/line_up_placer.dart
@@ -75,7 +75,7 @@ class _LineupPositionWidgetState extends ConsumerState<LineupPositionWidget> {
                   id: lineUp.currentAbility!.id,
                   length: lineUp.currentAbility!.length,
                   isLineUp: true,
-                  onDragEnd: (details) {
+                  onDragEnd: (details, _) {
                     RenderBox renderBox =
                         context.findRenderObject() as RenderBox;
                     Offset localOffset =
diff --git a/lib/widgets/map_theme_settings_section.dart b/lib/widgets/map_theme_settings_section.dart
index ad143650..ef0b7977 100644
--- a/lib/widgets/map_theme_settings_section.dart
+++ b/lib/widgets/map_theme_settings_section.dart
@@ -1,27 +1,45 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_colorpicker/flutter_colorpicker.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:icarus/widgets/better_color_picker.dart';
 import 'package:icarus/const/settings.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/widgets/custom_text_field.dart';
+import 'package:icarus/widgets/icarus_color_picker_style.dart';
 import 'package:icarus/widgets/settings_scope_card.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
+enum MapThemeSettingsScope {
+  strategy,
+  global,
+}
+
 class MapThemeSettingsSection extends StatelessWidget {
-  const MapThemeSettingsSection({super.key});
+  const MapThemeSettingsSection({
+    super.key,
+    required this.scope,
+    this.onManageProfiles,
+  });
+
+  final MapThemeSettingsScope scope;
+  final VoidCallback? onManageProfiles;
 
   @override
   Widget build(BuildContext context) {
-    return const Column(
+    final isStrategyScope = scope == MapThemeSettingsScope.strategy;
+
+    return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         SettingsScopeCard(
-          scope: SettingsScope.strategy,
-          title: "Map theme profiles",
-          description:
-              "Choose the active theme here. You can also set the default profile for new strategies.",
-          child: _ThemeProfilesSection(),
+          title: isStrategyScope ? "Strategy map theme" : "Theme profiles",
+          description: isStrategyScope
+              ? "Choose the color profile for this strategy."
+              : "Manage saved map color profiles and choose the default.",
+          child: _ThemeProfilesSection(
+            scope: scope,
+            onManageProfiles: onManageProfiles,
+          ),
         ),
       ],
     );
@@ -29,16 +47,29 @@ class MapThemeSettingsSection extends StatelessWidget {
 }
 
 class _ThemeProfilesSection extends StatelessWidget {
-  const _ThemeProfilesSection();
+  const _ThemeProfilesSection({
+    required this.scope,
+    this.onManageProfiles,
+  });
+
+  final MapThemeSettingsScope scope;
+  final VoidCallback? onManageProfiles;
 
   @override
   Widget build(BuildContext context) {
-    return const Column(
+    final isStrategyScope = scope == MapThemeSettingsScope.strategy;
+
+    return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        _ActiveThemeCard(),
-        SizedBox(height: 12),
-        _ProfileLibrarySection(),
+        if (isStrategyScope) ...[
+          const _ActiveThemeCard(),
+          const SizedBox(height: 12),
+        ],
+        _ProfileLibrarySection(
+          scope: scope,
+          onManageProfiles: onManageProfiles,
+        ),
       ],
     );
   }
@@ -94,7 +125,7 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
-            "Current assignment",
+            "Current strategy theme",
             style: ShadTheme.of(context).textTheme.small.copyWith(
                   color: Settings.tacticalVioletTheme.mutedForeground,
                   letterSpacing: 0.3,
@@ -142,45 +173,29 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
           Row(
             children: [
               Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(profile.name),
-                    const SizedBox(height: 2),
-                    Text(
-                      profile.isBuiltIn ? "Built-in profile" : "Custom profile",
-                      style: ShadTheme.of(context).textTheme.small.copyWith(
-                            color: Settings.tacticalVioletTheme.mutedForeground,
-                          ),
-                    ),
-                  ],
+                child: Text(
+                  profile.name,
+                  style: const TextStyle(fontWeight: FontWeight.w600),
                 ),
               ),
+              const SizedBox(width: 10),
               _PaletteSwatches(palette: profile.palette),
-            ],
-          ),
-          const SizedBox(height: 10),
-          Align(
-            alignment: Alignment.centerRight,
-            child: ShadButton(
-              onPressed: () {
-                _profileIdBeforeCustomize =
-                    ref.read(strategyThemeProvider).profileId ??
-                        MapThemeProfilesProvider.immutableDefaultProfileId;
-                ref
-                    .read(strategyProvider.notifier)
-                    .setThemeOverrideForCurrentStrategy(
-                        ref.read(effectiveMapThemePaletteProvider));
-              },
-              child: const Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Icon(Icons.edit_outlined, size: 14),
-                  SizedBox(width: 6),
-                  Text("Customize"),
-                ],
+              const SizedBox(width: 10),
+              ShadButton.secondary(
+                size: ShadButtonSize.sm,
+                leading: const Icon(Icons.edit_outlined, size: 14),
+                onPressed: () {
+                  _profileIdBeforeCustomize =
+                      ref.read(strategyThemeProvider).profileId ??
+                          MapThemeProfilesProvider.immutableDefaultProfileId;
+                  ref
+                      .read(strategyProvider.notifier)
+                      .setThemeOverrideForCurrentStrategy(
+                          ref.read(effectiveMapThemePaletteProvider));
+                },
+                child: const Text("Customize"),
               ),
-            ),
+            ],
           ),
         ],
       ),
@@ -202,7 +217,7 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
               borderRadius: BorderRadius.circular(4),
             ),
             child: Text(
-              "CUSTOM OVERRIDE",
+              "STRATEGY OVERRIDE",
               style: ShadTheme.of(context).textTheme.small.copyWith(
                     color: Settings.tacticalVioletTheme.primary,
                     fontSize: 10,
@@ -238,7 +253,7 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
                     _showSaveForm = false;
                   });
                 },
-                child: const Text("Reset"),
+                child: const Text("Revert to profile"),
               ),
               const SizedBox(width: 4),
               ShadButton(
@@ -298,23 +313,27 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
             child: ShadButton(
               onPressed: () async {
                 final trimmedName = _saveNameController.text.trim();
-                final didCreate = await ref
+                final createdProfile = await ref
                     .read(mapThemeProfilesProvider.notifier)
                     .createProfile(name: trimmedName, palette: palette);
-                if (!didCreate) {
+                if (createdProfile == null) {
                   Settings.showToast(
                     message: "Profile limit reached or invalid name.",
                     backgroundColor: Settings.tacticalVioletTheme.destructive,
                   );
                   return;
                 }
+                ref
+                    .read(strategyProvider.notifier)
+                    .setThemeProfileForCurrentStrategy(createdProfile.id);
                 if (!mounted) return;
                 Settings.showToast(
-                  message: "Profile saved.",
+                  message: "Profile saved and applied.",
                   backgroundColor: Settings.tacticalVioletTheme.primary,
                 );
                 setState(() {
                   _showSaveForm = false;
+                  _profileIdBeforeCustomize = null;
                 });
               },
               child: const Text("Save"),
@@ -329,7 +348,13 @@ class _ActiveThemeCardState extends ConsumerState<_ActiveThemeCard> {
 // ─── Zone 2: Profile Library (Global Preferences) ─────────────
 
 class _ProfileLibrarySection extends ConsumerStatefulWidget {
-  const _ProfileLibrarySection();
+  const _ProfileLibrarySection({
+    required this.scope,
+    this.onManageProfiles,
+  });
+
+  final MapThemeSettingsScope scope;
+  final VoidCallback? onManageProfiles;
 
   @override
   ConsumerState<_ProfileLibrarySection> createState() =>
@@ -343,6 +368,7 @@ class _ProfileLibrarySectionState
     final profilesState = ref.watch(mapThemeProfilesProvider);
     final strategyTheme = ref.watch(strategyThemeProvider);
     final hasActiveStrategy = ref.watch(strategyProvider).stratName != null;
+    final isStrategyScope = widget.scope == MapThemeSettingsScope.strategy;
 
     final activeProfileId = strategyTheme.overridePalette == null
         ? (strategyTheme.profileId ??
@@ -359,7 +385,7 @@ class _ProfileLibrarySectionState
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text(
-              "Profiles",
+              isStrategyScope ? "Choose a profile" : "Saved profiles",
               style: ShadTheme.of(context).textTheme.small.copyWith(
                     color: Settings.tacticalVioletTheme.mutedForeground,
                     letterSpacing: 0.3,
@@ -374,21 +400,36 @@ class _ProfileLibrarySectionState
           ],
         ),
         const SizedBox(height: 8),
+        if (isStrategyScope && widget.onManageProfiles != null) ...[
+          Align(
+            alignment: Alignment.centerLeft,
+            child: ShadButton.ghost(
+              size: ShadButtonSize.sm,
+              leading: const Icon(LucideIcons.arrowRight),
+              onPressed: widget.onManageProfiles!,
+              child: const Text("Manage profiles in App settings"),
+            ),
+          ),
+          const SizedBox(height: 8),
+        ],
         for (final profile in profilesState.profiles) ...[
           _ProfileListRow(
             title: profile.name,
             palette: profile.palette,
-            isSelected: activeProfileId == profile.id,
-            isDefault:
+            isSelected: isStrategyScope && activeProfileId == profile.id,
+            isDefault: !isStrategyScope &&
                 profile.id == profilesState.defaultProfileIdForNewStrategies,
-            onTap: hasActiveStrategy
+            onTap: isStrategyScope && hasActiveStrategy
                 ? () {
                     ref
                         .read(strategyProvider.notifier)
                         .setThemeProfileForCurrentStrategy(profile.id);
                   }
                 : null,
-            trailing: profile.isBuiltIn
+            trailing: isStrategyScope ||
+                    (profile.isBuiltIn &&
+                        profile.id ==
+                            profilesState.defaultProfileIdForNewStrategies)
                 ? null
                 : _ProfileContextMenuButton(
                     profile: profile,
@@ -450,29 +491,37 @@ class _ProfileContextMenuButtonState
 
   List<ShadContextMenuItem> _buildMenuItems() {
     return [
-      ShadContextMenuItem(
-        leading: const Icon(LucideIcons.pencil, size: 16),
-        onPressed: _renameProfile,
-        child: const Text("Rename"),
-      ),
       if (!widget.isDefault)
         ShadContextMenuItem(
           leading: const Icon(LucideIcons.star, size: 16),
           onPressed: _setAsDefault,
           child: const Text("Set as Default"),
         ),
-      ShadContextMenuItem(
-        leading: Icon(
-          LucideIcons.trash2,
-          size: 16,
-          color: Settings.tacticalVioletTheme.destructive,
+      if (!widget.profile.isBuiltIn)
+        ShadContextMenuItem(
+          leading: const Icon(LucideIcons.pencil, size: 16),
+          onPressed: _renameProfile,
+          child: const Text("Rename"),
         ),
-        onPressed: _deleteProfile,
-        child: Text(
-          "Delete",
-          style: TextStyle(color: Settings.tacticalVioletTheme.destructive),
+      if (!widget.profile.isBuiltIn)
+        ShadContextMenuItem(
+          leading: const Icon(LucideIcons.palette, size: 16),
+          onPressed: _editProfilePalette,
+          child: const Text("Edit colors"),
+        ),
+      if (!widget.profile.isBuiltIn)
+        ShadContextMenuItem(
+          leading: Icon(
+            LucideIcons.trash2,
+            size: 16,
+            color: Settings.tacticalVioletTheme.destructive,
+          ),
+          onPressed: _deleteProfile,
+          child: Text(
+            "Delete",
+            style: TextStyle(color: Settings.tacticalVioletTheme.destructive),
+          ),
         ),
-      ),
     ];
   }
 
@@ -488,6 +537,25 @@ class _ProfileContextMenuButtonState
         .renameProfile(profileId: widget.profile.id, newName: newName);
   }
 
+  Future<void> _editProfilePalette() async {
+    final nextPalette = await _showProfilePaletteDialog(
+      context: context,
+      profile: widget.profile,
+    );
+    if (nextPalette == null) return;
+
+    await ref.read(mapThemeProfilesProvider.notifier).updateProfilePalette(
+          profileId: widget.profile.id,
+          palette: nextPalette,
+        );
+    if (!mounted) return;
+
+    Settings.showToast(
+      message: "Profile colors updated.",
+      backgroundColor: Settings.tacticalVioletTheme.primary,
+    );
+  }
+
   Future<void> _setAsDefault() async {
     await ref
         .read(mapThemeProfilesProvider.notifier)
@@ -535,7 +603,8 @@ class _ProfileListRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      mouseCursor: SystemMouseCursors.click,
+      mouseCursor:
+          onTap == null ? SystemMouseCursors.basic : SystemMouseCursors.click,
       borderRadius: BorderRadius.circular(10),
       onTap: onTap,
       child: AnimatedContainer(
@@ -777,15 +846,68 @@ Future<Color?> _showColorPickerDialog({
               color: Colors.transparent,
               child: SizedBox(
                 width: 320,
-                child: ColorPicker(
-                  portraitOnly: true,
-                  pickerColor: workingColor,
-                  onColorChanged: (color) {
+                child: BetterColorPicker(
+                  value: workingColor,
+                  initialMode: BetterColorPickerMode.hsv,
+                  style: icarusColorPickerStyle,
+                  onChanging: (color) {
+                    setState(() {
+                      workingColor = color;
+                    });
+                  },
+                  onChanged: (color) {
                     setState(() {
                       workingColor = color;
                     });
                   },
-                  pickerAreaHeightPercent: 0.8,
+                ),
+              ),
+            ),
+          );
+        },
+      );
+    },
+  );
+}
+
+Future<MapThemePalette?> _showProfilePaletteDialog({
+  required BuildContext context,
+  required MapThemeProfile profile,
+}) async {
+  var workingPalette = profile.palette;
+  return showShadDialog<MapThemePalette>(
+    context: context,
+    builder: (dialogContext) {
+      return StatefulBuilder(
+        builder: (context, setState) {
+          return ShadDialog(
+            title: Text("Edit ${profile.name}"),
+            description: const Text(
+              "Changes apply anywhere this profile is used.",
+            ),
+            actions: [
+              ShadButton.secondary(
+                onPressed: () => Navigator.of(dialogContext).pop(),
+                child: const Text("Cancel"),
+              ),
+              ShadButton(
+                onPressed: () =>
+                    Navigator.of(dialogContext).pop(workingPalette),
+                child: const Text("Save colors"),
+              ),
+            ],
+            child: Material(
+              color: Colors.transparent,
+              child: SizedBox(
+                width: 360,
+                child: _PaletteEditor(
+                  label: "",
+                  palette: workingPalette,
+                  onChanged: (nextPalette) {
+                    setState(() {
+                      workingPalette = nextPalette;
+                    });
+                  },
                 ),
               ),
             ),
diff --git a/lib/widgets/numeric_drag_input.dart b/lib/widgets/numeric_drag_input.dart
index c719353b..43aa1de7 100644
--- a/lib/widgets/numeric_drag_input.dart
+++ b/lib/widgets/numeric_drag_input.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
 /// A numeric text field that supports drag-to-adjust: drag left/right to
@@ -244,29 +245,31 @@ class _NumericDragInputState extends State<NumericDragInput> {
         final leadingPadding = _resolveInsets(context, widget.leadingPadding);
         final trailingPadding = _resolveInsets(context, widget.trailingPadding);
         final suffix = widget.suffix?.trim();
-        final textField = TextField(
-          controller: _controller,
-          focusNode: _focusNode,
-          keyboardType: widget.keyboardType,
-          onSubmitted: (_) => _commitText(),
-          maxLines: 1,
-          style: valueStyle,
-          inputFormatters: suffix != null && suffix.isNotEmpty
-              ? [_SuffixFormatter(suffix)]
-              : null,
-          decoration: InputDecoration(
-            border: InputBorder.none,
-            enabledBorder: InputBorder.none,
-            focusedBorder: InputBorder.none,
-            errorBorder: InputBorder.none,
-            disabledBorder: InputBorder.none,
-            hoverColor: Colors.transparent,
-            filled: true,
-            fillColor: Colors.transparent,
-            hintText: widget.hintText,
-            hintStyle: hintStyle,
-            isCollapsed: true,
-            contentPadding: EdgeInsets.zero,
+        final textField = TextEditingShortcutScope(
+          child: TextField(
+            controller: _controller,
+            focusNode: _focusNode,
+            keyboardType: widget.keyboardType,
+            onSubmitted: (_) => _commitText(),
+            maxLines: 1,
+            style: valueStyle,
+            inputFormatters: suffix != null && suffix.isNotEmpty
+                ? [_SuffixFormatter(suffix)]
+                : null,
+            decoration: InputDecoration(
+              border: InputBorder.none,
+              enabledBorder: InputBorder.none,
+              focusedBorder: InputBorder.none,
+              errorBorder: InputBorder.none,
+              disabledBorder: InputBorder.none,
+              hoverColor: Colors.transparent,
+              filled: true,
+              fillColor: Colors.transparent,
+              hintText: widget.hintText,
+              hintStyle: hintStyle,
+              isCollapsed: true,
+              contentPadding: EdgeInsets.zero,
+            ),
           ),
         );
 
diff --git a/lib/widgets/page_transition_overlay.dart b/lib/widgets/page_transition_overlay.dart
index b18277cd..6319ab72 100644
--- a/lib/widgets/page_transition_overlay.dart
+++ b/lib/widgets/page_transition_overlay.dart
@@ -16,6 +16,8 @@ import 'package:icarus/widgets/draggable_widgets/agents/placed_view_cone_agent_w
 import 'package:icarus/widgets/draggable_widgets/image/image_widget.dart';
 import 'package:icarus/widgets/draggable_widgets/text/text_widget.dart';
 
+const Curve _pageTransitionCurve = Curves.easeOutCubic;
+
 Offset _overlayScreenPosition({
   required PlacedWidget widget,
   required CoordinateSystem coordinateSystem,
@@ -69,7 +71,9 @@ class _PageTransitionOverlayState extends ConsumerState<PageTransitionOverlay>
     if (_controller == null) {
       _controller = AnimationController(vsync: this, duration: duration)
         ..addListener(() {
-          // ref.read(transitionProvider.notifier).setProgress(_controller!.value);
+          ref.read(transitionProvider.notifier).setProgress(
+                _pageTransitionCurve.transform(_controller!.value),
+              );
           setState(() {});
         })
         ..addStatusListener((status) {
@@ -261,7 +265,7 @@ class _PageTransitionOverlayState extends ConsumerState<PageTransitionOverlay>
       return const SizedBox.shrink();
     }
 
-    final t = Curves.easeInOutCubic.transform(_controller!.value);
+    final t = _pageTransitionCurve.transform(_controller!.value);
     final agentSize =
         _lerpRequired(state.startAgentSize, state.endAgentSize, t);
     final abilitySize =
diff --git a/lib/widgets/pages_bar.dart b/lib/widgets/pages_bar.dart
index 341cb49f..7c20005e 100644
--- a/lib/widgets/pages_bar.dart
+++ b/lib/widgets/pages_bar.dart
@@ -3,13 +3,17 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive_ce_flutter/hive_flutter.dart';
 import 'package:icarus/const/hive_boxes.dart';
 import 'package:icarus/const/settings.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
+import 'package:icarus/providers/transition_provider.dart';
 import 'package:icarus/widgets/custom_text_field.dart';
 import 'package:icarus/widgets/dialogs/confirm_alert_dialog.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
+const double _pagesBarCornerRadius = 12;
+const double _pagesBarInnerButtonRadius = 6;
+
 class PagesBar extends ConsumerStatefulWidget {
   const PagesBar({super.key});
 
@@ -19,16 +23,25 @@ class PagesBar extends ConsumerStatefulWidget {
 
 class _PagesBarState extends ConsumerState<PagesBar> {
   static const double _defaultExpandedHeight = 310;
-  static final double _minExpandedHeight = _ExpandedPanel.minHeightForVisibleRows(
+  static const double _defaultWidth = 224;
+  static const double _minWidth = 224;
+  static const double _maxWidth = 420;
+  static const double _widthResizeHandleWidth = 8;
+  static final double _minExpandedHeight =
+      _ExpandedPanel.minHeightForVisibleRows(
     2,
   );
   static const double _maxExpandedHeight = 520;
 
   bool _expanded = false;
-  bool _isResizing = false;
+  bool _isHeightResizing = false;
+  bool _isWidthResizing = false;
   double? _liveExpandedHeight;
+  double? _liveWidth;
   double? _persistedExpandedHeightCache;
+  double? _persistedWidthCache;
   final GlobalKey _expandedPanelKey = GlobalKey();
+  final GlobalKey _barKey = GlobalKey();
 
   StrategyData? _strategy(Box<StrategyData> box, String id) => box.get(id);
 
@@ -36,14 +49,24 @@ class _PagesBarState extends ConsumerState<PagesBar> {
     return height.clamp(_minExpandedHeight, _maxExpandedHeight).toDouble();
   }
 
+  double _clampWidth(double width) {
+    return width.clamp(_minWidth, _maxWidth).toDouble();
+  }
+
   double _effectiveExpandedHeight(double persistedHeight) {
     final baseHeight = _persistedExpandedHeightCache ?? persistedHeight;
     return _clampExpandedHeight(
-      _isResizing ? (_liveExpandedHeight ?? baseHeight) : baseHeight,
+      _isHeightResizing ? (_liveExpandedHeight ?? baseHeight) : baseHeight,
     );
   }
 
-  void _startResize() {
+  double _effectiveWidth(double persistedWidth) {
+    final baseWidth = _persistedWidthCache ?? persistedWidth;
+    return _clampWidth(
+        _isWidthResizing ? (_liveWidth ?? baseWidth) : baseWidth);
+  }
+
+  void _startHeightResize() {
     final context = _expandedPanelKey.currentContext;
     final renderBox = context?.findRenderObject() as RenderBox?;
     final renderedHeight = renderBox != null && renderBox.hasSize
@@ -51,12 +74,12 @@ class _PagesBarState extends ConsumerState<PagesBar> {
         : (_persistedExpandedHeightCache ?? _defaultExpandedHeight);
 
     setState(() {
-      _isResizing = true;
+      _isHeightResizing = true;
       _liveExpandedHeight = _clampExpandedHeight(renderedHeight);
     });
   }
 
-  void _updateResize(Offset globalPosition) {
+  void _updateHeightResize(Offset globalPosition) {
     final context = _expandedPanelKey.currentContext;
     if (context == null) return;
 
@@ -76,8 +99,8 @@ class _PagesBarState extends ConsumerState<PagesBar> {
     });
   }
 
-  Future<void> _endResize() async {
-    if (!_isResizing) return;
+  Future<void> _endHeightResize() async {
+    if (!_isHeightResizing) return;
 
     final height = _clampExpandedHeight(
       _liveExpandedHeight ??
@@ -86,7 +109,7 @@ class _PagesBarState extends ConsumerState<PagesBar> {
     );
 
     setState(() {
-      _isResizing = false;
+      _isHeightResizing = false;
       _liveExpandedHeight = null;
       _persistedExpandedHeightCache = height;
     });
@@ -101,9 +124,64 @@ class _PagesBarState extends ConsumerState<PagesBar> {
     });
   }
 
+  void _startWidthResize() {
+    final context = _barKey.currentContext;
+    final renderBox = context?.findRenderObject() as RenderBox?;
+    final renderedWidth = renderBox != null && renderBox.hasSize
+        ? renderBox.size.width
+        : (_persistedWidthCache ?? _defaultWidth);
+
+    setState(() {
+      _isWidthResizing = true;
+      _liveWidth = _clampWidth(renderedWidth);
+    });
+  }
+
+  void _updateWidthResize(Offset globalPosition) {
+    final context = _barKey.currentContext;
+    if (context == null) return;
+
+    final renderBox = context.findRenderObject() as RenderBox?;
+    if (renderBox == null || !renderBox.hasSize) return;
+
+    final localPosition = renderBox.globalToLocal(globalPosition);
+    final nextWidth = _clampWidth(localPosition.dx);
+    final currentWidth = _liveWidth;
+    if (currentWidth != null && (nextWidth - currentWidth).abs() < 0.5) {
+      return;
+    }
+
+    setState(() {
+      _liveWidth = nextWidth;
+    });
+  }
+
+  Future<void> _endWidthResize() async {
+    if (!_isWidthResizing) return;
+
+    final width =
+        _clampWidth(_liveWidth ?? _persistedWidthCache ?? _defaultWidth);
+
+    setState(() {
+      _isWidthResizing = false;
+      _liveWidth = null;
+      _persistedWidthCache = width;
+    });
+
+    await ref.read(appPreferencesProvider.notifier).setPagesBarWidth(width);
+
+    if (!mounted) return;
+    setState(() {
+      _persistedWidthCache = null;
+    });
+  }
+
   Future<void> _collapsePanel() async {
-    if (_isResizing) {
-      await _endResize();
+    if (_isHeightResizing) {
+      await _endHeightResize();
+    }
+    if (_isWidthResizing) {
+      await _endWidthResize();
     }
     if (!mounted) return;
     setState(() => _expanded = false);
@@ -203,6 +281,9 @@ class _PagesBarState extends ConsumerState<PagesBar> {
     final persistedExpandedHeight = ref.watch(
       appPreferencesProvider.select((prefs) => prefs.pagesBarExpandedHeight),
     );
+    final persistedWidth = ref.watch(
+      appPreferencesProvider.select((prefs) => prefs.pagesBarWidth),
+    );
     final box = Hive.box<StrategyData>(HiveBoxNames.strategiesBox);
 
     return ValueListenableBuilder(
@@ -222,38 +303,63 @@ class _PagesBarState extends ConsumerState<PagesBar> {
             )
             .name;
 
-        return Container(
-          decoration: BoxDecoration(
-            color: Settings.tacticalVioletTheme.card,
-            borderRadius: BorderRadius.circular(16),
-            border: Border.all(
-              color: Settings.tacticalVioletTheme.border,
-              width: 2,
-            ),
-          ),
-          width: 224,
-          padding: EdgeInsets.zero,
-          child: _expanded
-              ? _ExpandedPanel(
-                  pages: pages,
-                  activePageId: activePageId,
-                  height: _effectiveExpandedHeight(persistedExpandedHeight),
-                  panelKey: _expandedPanelKey,
-                  onSelect: _selectPage,
-                  onRename: (p) => _renamePage(strat, p),
-                  onDelete: (p) => _deletePage(strat, p),
-                  onAdd: _addPage,
-                  onCollapse: _collapsePanel,
-                  onResizeStart: _startResize,
-                  onResizeUpdate: _updateResize,
-                  onResizeEnd: _endResize,
-                  isResizeActive: _isResizing,
-                )
-              : _CollapsedPill(
-                  activeName: activeName,
-                  onAdd: _addPage,
-                  onToggle: () => setState(() => _expanded = true),
+        final width = _effectiveWidth(persistedWidth);
+
+        return Stack(
+          clipBehavior: Clip.none,
+          children: [
+            Container(
+              key: _barKey,
+              decoration: BoxDecoration(
+                color: Settings.tacticalVioletTheme.card,
+                borderRadius: BorderRadius.circular(_pagesBarCornerRadius),
+                border: Border.all(
+                  color: Settings.tacticalVioletTheme.border,
+                  width: 2,
                 ),
+              ),
+              width: width,
+              padding: EdgeInsets.zero,
+              child: Padding(
+                padding: const EdgeInsets.only(right: _widthResizeHandleWidth),
+                child: _expanded
+                    ? _ExpandedPanel(
+                        pages: pages,
+                        activePageId: activePageId,
+                        height:
+                            _effectiveExpandedHeight(persistedExpandedHeight),
+                        panelKey: _expandedPanelKey,
+                        onSelect: _selectPage,
+                        onRename: (p) => _renamePage(strat, p),
+                        onDelete: (p) => _deletePage(strat, p),
+                        onAdd: _addPage,
+                        onCollapse: _collapsePanel,
+                        onResizeStart: _startHeightResize,
+                        onResizeUpdate: _updateHeightResize,
+                        onResizeEnd: _endHeightResize,
+                        isResizeActive: _isHeightResizing,
+                      )
+                    : _CollapsedPill(
+                        activeName: activeName,
+                        onAdd: _addPage,
+                        onToggle: () => setState(() => _expanded = true),
+                      ),
+              ),
+            ),
+            Positioned(
+              top: 0,
+              right: 2,
+              bottom: 0,
+              child: _ResizeHandle(
+                width: _widthResizeHandleWidth,
+                axis: Axis.horizontal,
+                onResizeStart: _startWidthResize,
+                onResizeUpdate: _updateWidthResize,
+                onResizeEnd: _endWidthResize,
+                isActive: _isWidthResizing,
+              ),
+            ),
+          ],
         );
       },
     );
@@ -303,7 +409,6 @@ class _CollapsedPill extends StatelessWidget {
             onPressed: onToggle,
             icon: const Icon(Icons.keyboard_arrow_down, color: Colors.white),
           ),
-          const SizedBox(width: 4),
         ],
       ),
     );
@@ -344,9 +449,9 @@ class _ExpandedPanel extends ConsumerWidget {
 
   static const double _rowHeight = 40; // each page tile height
   static const double _verticalSpacing = 10; // separator height
-  static const double _resizeHandleHeight = 6;
+  static const double _resizeHandleHeight = 8;
   static const double _headerFooterHeight = 48 + 1; // bottom bar + divider
-  static const double _topPadding = 6; // handle + gap should match side inset
+  static const double _topPadding = 0; // handle + gap should match side inset
   static const double _bottomPadding = 0; // list bottom padding inside Expanded
 
   static double minHeightForVisibleRows(int visibleRows) {
@@ -374,6 +479,7 @@ class _ExpandedPanel extends ConsumerWidget {
     final activeIndex = activePageId == null
         ? -1
         : pages.indexWhere((p) => p.id == activePageId);
+    final transitionState = ref.watch(transitionProvider);
 
     int? backwardIndex;
     int? forwardIndex;
@@ -392,6 +498,7 @@ class _ExpandedPanel extends ConsumerWidget {
         children: [
           _ResizeHandle(
             height: _resizeHandleHeight,
+            axis: Axis.vertical,
             onResizeStart: onResizeStart,
             onResizeUpdate: onResizeUpdate,
             onResizeEnd: onResizeEnd,
@@ -400,61 +507,67 @@ class _ExpandedPanel extends ConsumerWidget {
           Expanded(
             child: Padding(
               padding: const EdgeInsets.only(top: _topPadding),
-              child: ReorderableListView.builder(
-                onReorder: (oldIndex, newIndex) {
-                  ref
-                      .read(strategyProvider.notifier)
-                      .reorderPage(oldIndex, newIndex);
-                },
-                padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
-                shrinkWrap: false,
-                physics:
-                    needsScroll ? null : const NeverScrollableScrollPhysics(),
-                itemCount: pages.length,
-                buildDefaultDragHandles: false,
-                proxyDecorator: proxyDecorator,
-                itemBuilder: (ctx, i) {
-                  bool showForwardIndicator = false;
-                  bool showBackwardIndicator = false;
-                  final p = pages[i];
-
-                  if (pages.length != 1) {
-                    if (pages.length == 2) {
-                      if (activeIndex == 0 && activeIndex != i) {
-                        showForwardIndicator = true;
-                      } else if (activeIndex == 1 && activeIndex != i) {
-                        showBackwardIndicator = true;
-                      }
-                    } else {
-                      if (forwardIndex != null && i == forwardIndex) {
-                        showForwardIndicator = true;
-                      }
-                      if (backwardIndex != null &&
-                          i == backwardIndex &&
-                          forwardIndex != backwardIndex) {
-                        showBackwardIndicator = true;
+              child: ScrollConfiguration(
+                behavior:
+                    ScrollConfiguration.of(context).copyWith(scrollbars: false),
+                child: ReorderableListView.builder(
+                  onReorder: (oldIndex, newIndex) {
+                    ref
+                        .read(strategyProvider.notifier)
+                        .reorderPage(oldIndex, newIndex);
+                  },
+                  padding: const EdgeInsets.fromLTRB(8, 0, 0, 8),
+                  shrinkWrap: false,
+                  physics:
+                      needsScroll ? null : const NeverScrollableScrollPhysics(),
+                  itemCount: pages.length,
+                  buildDefaultDragHandles: false,
+                  proxyDecorator: proxyDecorator,
+                  itemBuilder: (ctx, i) {
+                    bool showForwardIndicator = false;
+                    bool showBackwardIndicator = false;
+                    final p = pages[i];
+
+                    if (pages.length != 1) {
+                      if (pages.length == 2) {
+                        if (activeIndex == 0 && activeIndex != i) {
+                          showForwardIndicator = true;
+                        } else if (activeIndex == 1 && activeIndex != i) {
+                          showBackwardIndicator = true;
+                        }
+                      } else {
+                        if (forwardIndex != null && i == forwardIndex) {
+                          showForwardIndicator = true;
+                        }
+                        if (backwardIndex != null &&
+                            i == backwardIndex &&
+                            forwardIndex != backwardIndex) {
+                          showBackwardIndicator = true;
+                        }
                       }
                     }
-                  }
 
-                  return ReorderableDragStartListener(
-                    key: ValueKey(p.id),
-                    index: i,
-                    child: Padding(
-                      padding: const EdgeInsets.only(bottom: 8),
-                      child: _PageRow(
-                        page: p,
-                        active: p.id == activePageId,
-                        showBackwardIndicator: showBackwardIndicator,
-                        showForwardIndicator: showForwardIndicator,
-                        onSelect: onSelect,
-                        onRename: onRename,
-                        onDelete: onDelete,
-                        disableDelete: pages.length == 1,
+                    return ReorderableDragStartListener(
+                      key: ValueKey(p.id),
+                      index: i,
+                      child: Padding(
+                        padding: const EdgeInsets.only(bottom: 8),
+                        child: _PageRow(
+                          page: p,
+                          active: p.id == activePageId,
+                          showBackwardIndicator: showBackwardIndicator,
+                          showForwardIndicator: showForwardIndicator,
+                          transitionProgress:
+                              _rowTransitionProgress(transitionState, p.id),
+                          onSelect: onSelect,
+                          onRename: onRename,
+                          onDelete: onDelete,
+                          disableDelete: pages.length == 1,
+                        ),
                       ),
-                    ),
-                  );
-                },
+                    );
+                  },
+                ),
               ),
             ),
           ),
@@ -478,7 +591,6 @@ class _ExpandedPanel extends ConsumerWidget {
                   icon:
                       const Icon(Icons.keyboard_arrow_up, color: Colors.white),
                 ),
-                const SizedBox(width: 4),
               ],
             ),
           ),
@@ -486,18 +598,32 @@ class _ExpandedPanel extends ConsumerWidget {
       ),
     );
   }
+
+  double? _rowTransitionProgress(PageTransitionState state, String pageId) {
+    if (state.phase != PageTransitionPhase.preparing &&
+        state.phase != PageTransitionPhase.animating) {
+      return null;
+    }
+    if (state.sourcePageId == pageId) return 1 - state.progress;
+    if (state.targetPageId == pageId) return state.progress;
+    return null;
+  }
 }
 
 class _ResizeHandle extends StatelessWidget {
   const _ResizeHandle({
-    required this.height,
+    this.height,
+    this.width,
+    required this.axis,
     required this.onResizeStart,
     required this.onResizeUpdate,
     required this.onResizeEnd,
     required this.isActive,
   });
 
-  final double height;
+  final double? height;
+  final double? width;
+  final Axis axis;
   final VoidCallback onResizeStart;
   final ValueChanged<Offset> onResizeUpdate;
   final Future<void> Function() onResizeEnd;
@@ -507,6 +633,8 @@ class _ResizeHandle extends StatelessWidget {
   Widget build(BuildContext context) {
     return _ResizeHandleStateful(
       height: height,
+      width: width,
+      axis: axis,
       onResizeStart: onResizeStart,
       onResizeUpdate: onResizeUpdate,
       onResizeEnd: onResizeEnd,
@@ -517,14 +645,18 @@ class _ResizeHandle extends StatelessWidget {
 
 class _ResizeHandleStateful extends StatefulWidget {
   const _ResizeHandleStateful({
-    required this.height,
+    this.height,
+    this.width,
+    required this.axis,
     required this.onResizeStart,
     required this.onResizeUpdate,
     required this.onResizeEnd,
     required this.isActive,
   });
 
-  final double height;
+  final double? height;
+  final double? width;
+  final Axis axis;
   final VoidCallback onResizeStart;
   final ValueChanged<Offset> onResizeUpdate;
   final Future<void> Function() onResizeEnd;
@@ -542,31 +674,33 @@ class _ResizeHandleStatefulState extends State<_ResizeHandleStateful> {
     final isHighlighted = widget.isActive || _isHovered;
     final handleColor = isHighlighted
         ? Settings.tacticalVioletTheme.primary
-        : Settings.tacticalVioletTheme.mutedForeground.withValues(alpha: 0.5);
+        : Colors.transparent;
+    final isHorizontalResize = widget.axis == Axis.horizontal;
 
     return MouseRegion(
-      cursor: SystemMouseCursors.resizeUpDown,
+      cursor: isHorizontalResize
+          ? SystemMouseCursors.resizeLeftRight
+          : SystemMouseCursors.resizeUpDown,
       onEnter: (_) => setState(() => _isHovered = true),
       onExit: (_) => setState(() => _isHovered = false),
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
-        onVerticalDragStart: (_) => widget.onResizeStart(),
-        onVerticalDragUpdate: (details) =>
-            widget.onResizeUpdate(details.globalPosition),
-        onVerticalDragEnd: (_) {
+        onPanStart: (_) => widget.onResizeStart(),
+        onPanUpdate: (details) => widget.onResizeUpdate(details.globalPosition),
+        onPanEnd: (_) {
           widget.onResizeEnd();
         },
-        onVerticalDragCancel: () {
+        onPanCancel: () {
           widget.onResizeEnd();
         },
         child: SizedBox(
-          height: widget.height,
-          width: double.infinity,
+          height: widget.height ?? double.infinity,
+          width: widget.width ?? double.infinity,
           child: Center(
             child: AnimatedContainer(
               duration: const Duration(milliseconds: 120),
-              width: 36,
-              height: 2,
+              width: isHorizontalResize ? 2 : 36,
+              height: isHorizontalResize ? 36 : 2,
               decoration: BoxDecoration(
                 color: handleColor,
                 borderRadius: BorderRadius.circular(999),
@@ -579,12 +713,13 @@ class _ResizeHandleStatefulState extends State<_ResizeHandleStateful> {
   }
 }
 
-class _PageRow extends StatelessWidget {
+class _PageRow extends StatefulWidget {
   const _PageRow({
     required this.page,
     required this.active,
     required this.showBackwardIndicator,
     required this.showForwardIndicator,
+    required this.transitionProgress,
     required this.onSelect,
     required this.onRename,
     required this.onDelete,
@@ -595,93 +730,145 @@ class _PageRow extends StatelessWidget {
   final bool active;
   final bool showBackwardIndicator;
   final bool showForwardIndicator;
+  final double? transitionProgress;
   final ValueChanged<String> onSelect;
   final ValueChanged<StrategyPage> onRename;
   final ValueChanged<StrategyPage> onDelete;
   final bool disableDelete;
 
   static const double _rowHeight = 40;
+  static const double _rowRadius = 6;
+
+  @override
+  State<_PageRow> createState() => _PageRowState();
+}
+
+class _PageRowState extends State<_PageRow> {
+  bool _hovered = false;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final bg = active
+    final fillProgress = widget.transitionProgress?.clamp(0.0, 1.0);
+    final showActions =
+        _hovered || widget.active || widget.transitionProgress != null;
+    final bg = widget.active && fillProgress == null
         ? Settings.tacticalVioletTheme.primary
         : Settings.tacticalVioletTheme.card;
-    return Material(
-      // color: bg,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: InkWell(
-        mouseCursor: SystemMouseCursors.click,
-        borderRadius: BorderRadius.circular(14),
-        onTap: () => onSelect(page.id),
-        child: Container(
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(12),
-            border: Border.all(
-              color: Settings.tacticalVioletTheme.border,
-              width: 1,
-            ),
-            boxShadow: [
-              BoxShadow(
-                  color:
-                      Settings.tacticalVioletTheme.card.withValues(alpha: 0.2),
-                  blurRadius: 12,
-                  offset: const Offset(0, 4))
-            ],
-            color: bg,
-          ),
-          height: _rowHeight,
-          child: Padding(
-            padding: const EdgeInsets.only(left: 12),
-            child: Row(
-              children: [
-                Expanded(
-                  child: Text(
-                    page.name,
-                    overflow: TextOverflow.ellipsis,
-                    style: theme.textTheme.titleMedium?.copyWith(
-                      color: Colors.white,
-                      fontWeight: active ? FontWeight.w600 : FontWeight.w500,
-                      fontSize: 14,
-                    ),
-                  ),
+    return MouseRegion(
+      onEnter: (_) => setState(() => _hovered = true),
+      onExit: (_) => setState(() => _hovered = false),
+      child: Material(
+        // color: bg,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(_PageRow._rowRadius),
+        ),
+        child: InkWell(
+          mouseCursor: SystemMouseCursors.click,
+          borderRadius: BorderRadius.circular(_PageRow._rowRadius),
+          onTap: () => widget.onSelect(widget.page.id),
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(_PageRow._rowRadius),
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(_PageRow._rowRadius),
+                border: Border.all(
+                  color: Settings.tacticalVioletTheme.border,
+                  width: 1,
                 ),
-                if (showBackwardIndicator || showForwardIndicator) ...[
-                  const SizedBox(width: 6),
-                  if (showBackwardIndicator) const _KeybindBadge(label: "A"),
-                  if (showBackwardIndicator && showForwardIndicator)
-                    const SizedBox(width: 4),
-                  if (showForwardIndicator) const _KeybindBadge(label: "D"),
-                  const SizedBox(width: 2),
+                boxShadow: [
+                  BoxShadow(
+                      color: Settings.tacticalVioletTheme.card
+                          .withValues(alpha: 0.2),
+                      blurRadius: 12,
+                      offset: const Offset(0, 4))
                 ],
-                ShadTooltip(
-                  builder: (context) => const Text("Rename"),
-                  child: ShadIconButton.ghost(
-                    hoverBackgroundColor: Colors.transparent,
-                    foregroundColor: Colors.white,
-                    icon: const Icon(Icons.edit, size: 18, color: Colors.white),
-                    onPressed: () => onRename(page),
-                  ),
-                ),
-                ShadTooltip(
-                  builder: (context) => const Text("Delete"),
-                  child: ShadIconButton.ghost(
-                    hoverForegroundColor:
-                        Settings.tacticalVioletTheme.destructive,
-                    hoverBackgroundColor: Colors.transparent,
-                    foregroundColor:
-                        disableDelete ? Colors.white24 : Colors.white,
-                    icon: const Icon(
-                      Icons.delete,
-                      size: 18,
+                color: bg,
+              ),
+              height: _PageRow._rowHeight,
+              child: Stack(
+                children: [
+                  if (fillProgress != null)
+                    Positioned.fill(
+                      child: FractionallySizedBox(
+                        widthFactor: fillProgress,
+                        alignment: Alignment.centerLeft,
+                        child: DecoratedBox(
+                          decoration: BoxDecoration(
+                            color: Settings.tacticalVioletTheme.primary,
+                          ),
+                        ),
+                      ),
+                    ),
+                  Positioned.fill(
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 12, right: 8),
+                      child: Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              widget.page.name,
+                              overflow: TextOverflow.ellipsis,
+                              style: theme.textTheme.titleMedium?.copyWith(
+                                color: Colors.white,
+                                fontWeight: widget.active
+                                    ? FontWeight.w600
+                                    : FontWeight.w500,
+                                fontSize: 14,
+                              ),
+                            ),
+                          ),
+                          if (widget.showBackwardIndicator ||
+                              widget.showForwardIndicator) ...[
+                            const SizedBox(width: 6),
+                            if (widget.showBackwardIndicator)
+                              const _KeybindBadge(label: "A"),
+                            if (widget.showBackwardIndicator &&
+                                widget.showForwardIndicator)
+                              const SizedBox(width: 4),
+                            if (widget.showForwardIndicator)
+                              const _KeybindBadge(label: "D"),
+                            const SizedBox(width: 2),
+                          ],
+                          if (showActions) ...[
+                            ShadTooltip(
+                              builder: (context) => const Text("Rename"),
+                              child: ShadIconButton.ghost(
+                                width: 24,
+                                hoverBackgroundColor: Colors.transparent,
+                                foregroundColor: Colors.white,
+                                icon: const Icon(LucideIcons.pen,
+                                    size: 18, color: Colors.white),
+                                onPressed: () => widget.onRename(widget.page),
+                              ),
+                            ),
+                            const SizedBox(width: 2),
+                            ShadTooltip(
+                              builder: (context) => const Text("Delete"),
+                              child: ShadIconButton.ghost(
+                                width: 24,
+                                hoverForegroundColor:
+                                    Settings.tacticalVioletTheme.destructive,
+                                hoverBackgroundColor: Colors.transparent,
+                                foregroundColor: widget.disableDelete
+                                    ? Colors.white24
+                                    : Colors.white,
+                                icon: const Icon(
+                                  LucideIcons.trash,
+                                  size: 18,
+                                ),
+                                onPressed: widget.disableDelete
+                                    ? null
+                                    : () => widget.onDelete(widget.page),
+                              ),
+                            ),
+                          ],
+                        ],
+                      ),
                     ),
-                    onPressed: disableDelete ? null : () => onDelete(page),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
         ),
@@ -753,7 +940,7 @@ class _SquareIconButton extends StatelessWidget {
         onPressed: onTap,
         decoration: ShadDecoration(
           border: ShadBorder(
-            radius: BorderRadius.circular(12),
+            radius: BorderRadius.circular(_pagesBarInnerButtonRadius),
           ),
         ),
       ),
diff --git a/lib/widgets/save_and_load_button.dart b/lib/widgets/save_and_load_button.dart
index 0405bc1d..24363a66 100644
--- a/lib/widgets/save_and_load_button.dart
+++ b/lib/widgets/save_and_load_button.dart
@@ -40,8 +40,7 @@ class _SaveAndLoadButtonState extends ConsumerState<SaveAndLoadButton> {
             child: ShadIconButton.ghost(
               foregroundColor: Colors.white,
               onPressed: () async {
-                showShadSheet(
-                  side: ShadSheetSide.left,
+                showShadDialog(
                   context: context,
                   builder: (context) => const SettingsTab(),
                 );
@@ -149,6 +148,7 @@ class _SaveAndLoadButtonState extends ConsumerState<SaveAndLoadButton> {
                                 utilities: activePage.utilityData,
                                 strategySettings: activePage.settings,
                                 strategyState: ref.read(strategyProvider),
+                                pageName: activePage.name,
                                 lineUpGroups: activePage.lineUpGroups,
                                 themeProfileId: newStrat.themeProfileId,
                                 themeOverridePalette:
diff --git a/lib/widgets/settings_scope_card.dart b/lib/widgets/settings_scope_card.dart
index 7a6d4d28..26dea21e 100644
--- a/lib/widgets/settings_scope_card.dart
+++ b/lib/widgets/settings_scope_card.dart
@@ -2,22 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:icarus/const/settings.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
-enum SettingsScope {
-  strategy,
-  workspace,
-}
-
 class SettingsScopeCard extends StatelessWidget {
   const SettingsScopeCard({
     super.key,
-    required this.scope,
     required this.title,
     required this.description,
     required this.child,
     this.trailing,
   });
 
-  final SettingsScope scope;
   final String title;
   final String description;
   final Widget child;
@@ -47,7 +40,7 @@ class SettingsScopeCard extends StatelessWidget {
         ),
         const SizedBox(height: 4),
         Text(
-          '$description ${_scopeDescription(scope)}',
+          description,
           style: ShadTheme.of(context).textTheme.small.copyWith(
                 color: Settings.tacticalVioletTheme.mutedForeground,
                 height: 1.35,
@@ -59,12 +52,3 @@ class SettingsScopeCard extends StatelessWidget {
     );
   }
 }
-
-String _scopeDescription(SettingsScope scope) {
-  switch (scope) {
-    case SettingsScope.strategy:
-      return 'Saved with this strategy.';
-    case SettingsScope.workspace:
-      return 'Only affects this workspace.';
-  }
-}
diff --git a/lib/widgets/settings_tab.dart b/lib/widgets/settings_tab.dart
index ac86558f..aea1f70b 100644
--- a/lib/widgets/settings_tab.dart
+++ b/lib/widgets/settings_tab.dart
@@ -1,196 +1,1276 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter/services.dart';
 import 'package:hive_ce/hive.dart';
 import 'package:icarus/const/hive_boxes.dart';
 import 'package:icarus/const/settings.dart';
+import 'package:icarus/const/shortcut_info.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/marker_sizes_sync.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
 import 'package:icarus/widgets/map_theme_settings_section.dart';
 import 'package:icarus/widgets/settings_scope_card.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
-class SettingsTab extends ConsumerWidget {
+enum _SettingsMode {
+  strategy,
+  global,
+  shortcuts,
+}
+
+enum _SettingsSection {
+  strategyObjects,
+  strategyMapTheme,
+  globalDefaults,
+  globalSaving,
+  globalMapVisibility,
+  globalMapProfiles,
+  shortcuts,
+}
+
+class SettingsTab extends ConsumerStatefulWidget {
   const SettingsTab({super.key});
 
+  static const double _dialogWidth = 860;
+  static const double _dialogHeight = 640;
+  static const double _navigationWidth = 196;
+
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<SettingsTab> createState() => _SettingsTabState();
+}
+
+class _SettingsTabState extends ConsumerState<SettingsTab> {
+  _SettingsMode _mode = _SettingsMode.strategy;
+  _SettingsSection _selectedSection = _SettingsSection.strategyObjects;
+  final ScrollController _scrollController = ScrollController();
+  final Map<_SettingsSection, GlobalKey> _sectionKeys = {
+    for (final section in _SettingsSection.values) section: GlobalKey(),
+  };
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final activeStrategyName = ref.watch(strategyProvider).stratName;
     final strategySettings = ref.watch(strategySettingsProvider);
     final mapState = ref.watch(mapProvider);
     final appPreferences = ref.watch(appPreferencesProvider);
+    final scopeLabel = switch (_mode) {
+      _SettingsMode.strategy => 'Current strategy',
+      _SettingsMode.global => 'App-wide',
+      _SettingsMode.shortcuts => 'App-wide',
+    };
+    final scopeValue = switch (_mode) {
+      _SettingsMode.strategy => activeStrategyName,
+      _SettingsMode.global => 'Defaults',
+      _SettingsMode.shortcuts => 'Keybinds',
+    };
 
-    // Left/right sheets default to expandCrossSide + minHeight only, so width
-    // stays unbounded and the panel stretches to the full overlay. Cap width to
-    // match the sidebar panel (content + ShadDialog's default horizontal padding).
-    return ShadSheet(
+    return ShadDialog(
       constraints: const BoxConstraints(
-        maxWidth: Settings.sideBarPanelWidth + 48,
+        maxWidth: SettingsTab._dialogWidth,
+        maxHeight: SettingsTab._dialogHeight,
       ),
-      // Avoid nested scroll views; the outer ShadDialog scroll shows a desktop bar.
+      padding: EdgeInsets.zero,
       scrollable: false,
-      title: Row(
+      closeIconPosition: const ShadPosition(top: 18, right: 18),
+      child: Material(
+        color: Colors.transparent,
+        child: SizedBox(
+          width: SettingsTab._dialogWidth,
+          height: SettingsTab._dialogHeight,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              _SettingsNavigationRail(
+                mode: _mode,
+                selectedSection: _selectedSection,
+                onSectionSelected: _selectSection,
+              ),
+              Container(
+                width: 1,
+                color:
+                    Settings.tacticalVioletTheme.border.withValues(alpha: 0.9),
+              ),
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(24, 22, 24, 0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.only(right: 36),
+                        child: _SettingsScopeHeader(
+                          label: scopeLabel,
+                          value: scopeValue,
+                        ),
+                      ),
+                      const SizedBox(height: 14),
+                      Expanded(
+                        child: ScrollConfiguration(
+                          behavior: ScrollConfiguration.of(context)
+                              .copyWith(scrollbars: false),
+                          child: SingleChildScrollView(
+                            controller: _scrollController,
+                            child: AnimatedSwitcher(
+                              duration: const Duration(milliseconds: 180),
+                              switchInCurve: Curves.easeOutCubic,
+                              switchOutCurve: Curves.easeInCubic,
+                              child: switch (_mode) {
+                                _SettingsMode.strategy =>
+                                  _StrategySettingsSections(
+                                    key: const ValueKey('strategy-settings'),
+                                    sectionKeys: _sectionKeys,
+                                    activeStrategyName: activeStrategyName,
+                                    strategySettings: strategySettings,
+                                    onManageThemeProfiles: () => _selectSection(
+                                      _SettingsSection.globalMapProfiles,
+                                    ),
+                                  ),
+                                _SettingsMode.global => _GlobalSettingsSections(
+                                    key: const ValueKey('global-settings'),
+                                    sectionKeys: _sectionKeys,
+                                    appPreferences: appPreferences,
+                                    mapState: mapState,
+                                  ),
+                                _SettingsMode.shortcuts =>
+                                  _ShortcutSettingsSection(
+                                    key: _sectionKeys[
+                                        _SettingsSection.shortcuts],
+                                  ),
+                              },
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _selectSection(_SettingsSection section) {
+    final nextMode = _modeForSection(section);
+    setState(() {
+      _mode = nextMode;
+      _selectedSection = section;
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final context = _sectionKeys[section]?.currentContext;
+      if (context == null || !mounted) return;
+      Scrollable.ensureVisible(
+        context,
+        duration: const Duration(milliseconds: 220),
+        curve: Curves.easeOutCubic,
+        alignment: 0,
+      );
+    });
+  }
+
+  _SettingsMode _modeForSection(_SettingsSection section) {
+    switch (section) {
+      case _SettingsSection.strategyObjects:
+      case _SettingsSection.strategyMapTheme:
+        return _SettingsMode.strategy;
+      case _SettingsSection.globalDefaults:
+      case _SettingsSection.globalSaving:
+      case _SettingsSection.globalMapVisibility:
+      case _SettingsSection.globalMapProfiles:
+        return _SettingsMode.global;
+      case _SettingsSection.shortcuts:
+        return _SettingsMode.shortcuts;
+    }
+  }
+}
+
+class _SettingsScopeHeader extends StatelessWidget {
+  const _SettingsScopeHeader({
+    required this.label,
+    required this.value,
+  });
+
+  final String label;
+  final String? value;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = ShadTheme.of(context);
+    final displayValue = value ?? 'Open strategy';
+
+    return Row(
+      children: [
+        Text(
+          label.toUpperCase(),
+          style: theme.textTheme.small.copyWith(
+            color: Settings.tacticalVioletTheme.mutedForeground,
+            fontWeight: FontWeight.w800,
+            letterSpacing: 0.45,
+          ),
+        ),
+        const SizedBox(width: 10),
+        Flexible(
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 5),
+            decoration: BoxDecoration(
+              color: Settings.tacticalVioletTheme.secondary
+                  .withValues(alpha: 0.72),
+              borderRadius: BorderRadius.circular(999),
+              border: Border.all(
+                color:
+                    Settings.tacticalVioletTheme.border.withValues(alpha: 0.9),
+              ),
+            ),
+            child: Text(
+              displayValue,
+              overflow: TextOverflow.ellipsis,
+              style: theme.textTheme.small.copyWith(
+                color: Settings.tacticalVioletTheme.foreground,
+                fontWeight: FontWeight.w700,
+                height: 1.1,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _StrategySettingsSections extends ConsumerWidget {
+  const _StrategySettingsSections({
+    super.key,
+    required this.sectionKeys,
+    required this.activeStrategyName,
+    required this.strategySettings,
+    required this.onManageThemeProfiles,
+  });
+
+  final Map<_SettingsSection, GlobalKey> sectionKeys;
+  final String? activeStrategyName;
+  final StrategySettings strategySettings;
+  final VoidCallback onManageThemeProfiles;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SettingsScopeCard(
+          key: sectionKeys[_SettingsSection.strategyObjects],
+          title: "Strategy object styling",
+          description: activeStrategyName == null
+              ? "Resize markers and control how placed objects render."
+              : "Changes apply to \"$activeStrategyName\".",
+          child: Column(
+            children: [
+              _SettingsSliderTile(
+                icon: Icons.person_pin_circle_outlined,
+                title: "Agent markers",
+                description:
+                    "Resize placed agents and view tools for this strategy.",
+                value: strategySettings.agentSize,
+                min: Settings.agentSizeMin,
+                max: Settings.agentSizeMax,
+                divisions: 15,
+                accentColor: Settings.tacticalVioletTheme.primary,
+                onChanged: (value) {
+                  ref
+                      .read(strategySettingsProvider.notifier)
+                      .updateAgentSize(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsSliderTile(
+                icon: Icons.auto_awesome_outlined,
+                title: "Ability markers",
+                description:
+                    "Resize utility icons and placement helpers for this strategy.",
+                value: strategySettings.abilitySize,
+                min: Settings.abilitySizeMin,
+                max: Settings.abilitySizeMax,
+                divisions: 15,
+                accentColor: Settings.tacticalVioletTheme.primary,
+                onChanged: (value) {
+                  ref
+                      .read(strategySettingsProvider.notifier)
+                      .updateAbilitySize(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsToggleTile(
+                icon: Icons.contrast_outlined,
+                title: "Neutral team marker colors",
+                description:
+                    "Render ally and enemy marker accents as matching-brightness greys.",
+                value: strategySettings.useNeutralTeamColors,
+                onChanged: (value) {
+                  WidgetsBinding.instance.addPostFrameCallback((_) {
+                    if (!context.mounted) return;
+                    ref
+                        .read(strategySettingsProvider.notifier)
+                        .updateNeutralTeamColors(value);
+                    ref
+                        .read(strategyProvider.notifier)
+                        .applyNeutralTeamColorsToAllPages(value);
+                  });
+                },
+              ),
+              const _PageMarkerSizesSyncBanner(),
+            ],
+          ),
+        ),
+        const SizedBox(height: 20),
+        const _SectionDivider(),
+        const SizedBox(height: 20),
+        KeyedSubtree(
+          key: sectionKeys[_SettingsSection.strategyMapTheme],
+          child: MapThemeSettingsSection(
+            scope: MapThemeSettingsScope.strategy,
+            onManageProfiles: onManageThemeProfiles,
+          ),
+        ),
+        const SizedBox(height: 24),
+      ],
+    );
+  }
+}
+
+class _GlobalSettingsSections extends ConsumerWidget {
+  const _GlobalSettingsSections({
+    super.key,
+    required this.sectionKeys,
+    required this.appPreferences,
+    required this.mapState,
+  });
+
+  final Map<_SettingsSection, GlobalKey> sectionKeys;
+  final AppPreferences appPreferences;
+  final MapState mapState;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SettingsScopeCard(
+          key: sectionKeys[_SettingsSection.globalDefaults],
+          title: "New strategy defaults",
+          description: "Set the marker styling each new strategy starts with.",
+          child: Column(
+            children: [
+              _SettingsSliderTile(
+                icon: Icons.person_pin_circle_outlined,
+                title: "Default agent markers",
+                description:
+                    "Default size for agent markers in new strategies.",
+                value: appPreferences.defaultAgentSizeForNewStrategies,
+                min: Settings.agentSizeMin,
+                max: Settings.agentSizeMax,
+                divisions: 15,
+                accentColor: Settings.tacticalVioletTheme.primary,
+                onChanged: (value) {
+                  ref
+                      .read(appPreferencesProvider.notifier)
+                      .setDefaultAgentSizeForNewStrategies(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsSliderTile(
+                icon: Icons.auto_awesome_outlined,
+                title: "Default ability markers",
+                description:
+                    "Default size for ability markers in new strategies.",
+                value: appPreferences.defaultAbilitySizeForNewStrategies,
+                min: Settings.abilitySizeMin,
+                max: Settings.abilitySizeMax,
+                divisions: 15,
+                accentColor: Settings.tacticalVioletTheme.primary,
+                onChanged: (value) {
+                  ref
+                      .read(appPreferencesProvider.notifier)
+                      .setDefaultAbilitySizeForNewStrategies(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsToggleTile(
+                icon: Icons.contrast_outlined,
+                title: "Neutral marker colors by default",
+                description:
+                    "Use grey ally and enemy accents for new strategies.",
+                value: appPreferences.defaultNeutralTeamColorsForNewStrategies,
+                onChanged: (value) {
+                  WidgetsBinding.instance.addPostFrameCallback((_) {
+                    if (!context.mounted) return;
+                    ref
+                        .read(appPreferencesProvider.notifier)
+                        .setDefaultNeutralTeamColorsForNewStrategies(value);
+                  });
+                },
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 20),
+        const _SectionDivider(),
+        const SizedBox(height: 20),
+        SettingsScopeCard(
+          key: sectionKeys[_SettingsSection.globalSaving],
+          title: "Workspace behavior",
+          description:
+              "Control how Icarus persists strategy edits while you work.",
+          child: Column(
+            children: [
+              _SettingsToggleTile(
+                icon: Icons.save_outlined,
+                title: "Autosave",
+                description:
+                    "Automatically save the current strategy after 15 seconds of inactivity. When off, Icarus will ask before you leave unsaved work.",
+                value: appPreferences.autosaveEnabled,
+                onChanged: (value) async {
+                  await ref
+                      .read(appPreferencesProvider.notifier)
+                      .setAutosaveEnabled(value);
+                  ref
+                      .read(strategyProvider.notifier)
+                      .refreshAutosaveScheduling();
+                },
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 20),
+        const _SectionDivider(),
+        const SizedBox(height: 20),
+        SettingsScopeCard(
+          key: sectionKeys[_SettingsSection.globalMapVisibility],
+          title: "Workspace map visibility",
+          description: "Show or hide map reference layers while you work.",
+          child: Column(
+            children: [
+              _SettingsToggleTile(
+                icon: Icons.grid_on_rounded,
+                title: "Spawn barriers",
+                description:
+                    "Keep round-start barrier guides visible on the map.",
+                value: mapState.showSpawnBarrier,
+                onChanged: (value) {
+                  ref.read(mapProvider.notifier).updateSpawnBarrier(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsToggleTile(
+                icon: Icons.location_on_outlined,
+                title: "Region names",
+                description: "Show map callout names directly on the canvas.",
+                value: mapState.showRegionNames,
+                onChanged: (value) {
+                  ref.read(mapProvider.notifier).updateRegionNames(value);
+                },
+              ),
+              const _SettingsItemDivider(),
+              _SettingsToggleTile(
+                icon: Icons.radio_button_checked_outlined,
+                title: "Ultimate orbs",
+                description: "Display orb pickup markers on supported maps.",
+                value: mapState.showUltOrbs,
+                onChanged: (value) {
+                  ref.read(mapProvider.notifier).updateUltOrbs(value);
+                },
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 20),
+        const _SectionDivider(),
+        const SizedBox(height: 20),
+        KeyedSubtree(
+          key: sectionKeys[_SettingsSection.globalMapProfiles],
+          child: const MapThemeSettingsSection(
+            scope: MapThemeSettingsScope.global,
+          ),
+        ),
+        const SizedBox(height: 24),
+      ],
+    );
+  }
+}
+
+class _ShortcutSettingsSection extends ConsumerStatefulWidget {
+  const _ShortcutSettingsSection({super.key});
+
+  @override
+  ConsumerState<_ShortcutSettingsSection> createState() =>
+      _ShortcutSettingsSectionState();
+}
+
+class _ShortcutSettingsSectionState
+    extends ConsumerState<_ShortcutSettingsSection> {
+  final TextEditingController _searchController = TextEditingController();
+  String _query = '';
+  String? _editingShortcutId;
+  String? _duplicateMessage;
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final customBindings = ref.watch(
+      appPreferencesProvider.select((prefs) => prefs.customShortcutBindings),
+    );
+    final visibleDefinitions = ShortcutInfo.editableShortcuts
+        .where(
+          (definition) => ShortcutInfo.matchesSearch(
+            definition,
+            _query,
+            customBindings,
+          ),
+        )
+        .toList(growable: false);
+
+    return SettingsScopeCard(
+      title: "Keybinds",
+      description:
+          "Edit app-wide keybinds. Search accepts action names or keys.",
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(
-            LucideIcons.pencil,
-            size: 18,
-            color: Settings.tacticalVioletTheme.primary,
+          Row(
+            children: [
+              Expanded(
+                child: _ShortcutSearchField(
+                  controller: _searchController,
+                  onChanged: (value) => setState(() => _query = value),
+                ),
+              ),
+              const SizedBox(width: 12),
+              ShadButton.secondary(
+                size: ShadButtonSize.sm,
+                leading: const Icon(Icons.restart_alt_outlined, size: 15),
+                onPressed: customBindings.isEmpty
+                    ? null
+                    : () {
+                        setState(() {
+                          _editingShortcutId = null;
+                          _duplicateMessage = null;
+                        });
+                        ref
+                            .read(appPreferencesProvider.notifier)
+                            .resetAllCustomShortcutBindings();
+                      },
+                child: const Text("Restore Defaults"),
+              ),
+            ],
           ),
-          const SizedBox(width: 8),
-          Text("Settings", style: ShadTheme.of(context).textTheme.h3),
+          const SizedBox(height: 14),
+          const _ShortcutTableHeader(),
+          const SizedBox(height: 4),
+          if (visibleDefinitions.isEmpty)
+            const _ShortcutEmptySearch()
+          else
+            for (final definition in visibleDefinitions) ...[
+              _ShortcutBindingRow(
+                definition: definition,
+                customBindings: customBindings,
+                isEditing: _editingShortcutId == definition.id,
+                duplicateMessage: _editingShortcutId == definition.id
+                    ? _duplicateMessage
+                    : null,
+                onEdit: () {
+                  setState(() {
+                    _editingShortcutId = definition.id;
+                    _duplicateMessage = null;
+                  });
+                },
+                onCancel: () {
+                  setState(() {
+                    _editingShortcutId = null;
+                    _duplicateMessage = null;
+                  });
+                },
+                onReset: ShortcutInfo.isDefaultBinding(
+                  definition.id,
+                  customBindings,
+                )
+                    ? null
+                    : () {
+                        setState(() {
+                          _editingShortcutId = null;
+                          _duplicateMessage = null;
+                        });
+                        ref
+                            .read(appPreferencesProvider.notifier)
+                            .resetCustomShortcutBinding(definition.id);
+                      },
+                onCaptured: (binding, triggerShake) {
+                  final duplicate = ShortcutInfo.findDuplicateBinding(
+                    editingShortcutId: definition.id,
+                    binding: binding,
+                    customBindings: customBindings,
+                  );
+                  if (duplicate != null) {
+                    triggerShake();
+                    setState(() {
+                      _duplicateMessage =
+                          "${binding.displayLabel()} is already bound to ${duplicate.title}.";
+                    });
+                    return;
+                  }
+                  ref
+                      .read(appPreferencesProvider.notifier)
+                      .setCustomShortcutBinding(
+                        definition.id,
+                        binding.serialize(),
+                      );
+                  setState(() {
+                    _editingShortcutId = null;
+                    _duplicateMessage = null;
+                  });
+                },
+              ),
+              const _SettingsItemDivider(),
+            ],
         ],
       ),
-      description: const Text(
-        "Adjust strategy sizing and workspace visibility from one place.",
+    );
+  }
+}
+
+class _ShortcutSearchField extends StatelessWidget {
+  const _ShortcutSearchField({
+    required this.controller,
+    required this.onChanged,
+  });
+
+  final TextEditingController controller;
+  final ValueChanged<String> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 38,
+      child: TextEditingShortcutScope(
+        child: TextField(
+          controller: controller,
+          onChanged: onChanged,
+          style: TextStyle(
+            color: Settings.tacticalVioletTheme.foreground,
+            fontSize: 13,
+          ),
+          cursorColor: Settings.tacticalVioletTheme.primary,
+          decoration: InputDecoration(
+            isDense: true,
+            hintText: "Search actions or keys...",
+            hintStyle: TextStyle(
+              color: Settings.tacticalVioletTheme.mutedForeground,
+              fontSize: 13,
+            ),
+            prefixIcon: Icon(
+              Icons.search,
+              size: 17,
+              color: Settings.tacticalVioletTheme.mutedForeground,
+            ),
+            contentPadding:
+                const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+            filled: true,
+            fillColor: Settings.tacticalVioletTheme.card,
+            enabledBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(8),
+              borderSide: BorderSide(
+                color: Settings.tacticalVioletTheme.border,
+              ),
+            ),
+            focusedBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(8),
+              borderSide: BorderSide(
+                color: Settings.tacticalVioletTheme.primary,
+                width: 1.4,
+              ),
+            ),
+          ),
+        ),
       ),
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: SizedBox(
-          width: Settings.sideBarContentWidth,
-          child: Material(
-            color: Colors.transparent,
-            child: ScrollConfiguration(
-              behavior:
-                  ScrollConfiguration.of(context).copyWith(scrollbars: false),
-              child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    SettingsScopeCard(
-                      scope: SettingsScope.strategy,
-                      title: "Page object sizing",
-                      description: activeStrategyName == null
-                          ? "Resize placed objects for the current strategy page."
-                          : "Resize placed objects for \"$activeStrategyName\".",
-                      child: Column(
-                        children: [
-                          _SettingsSliderTile(
-                            icon: Icons.person_pin_circle_outlined,
-                            title: "Agent markers",
-                            description:
-                                "Resize placed agents and view tools for this strategy.",
-                            value: strategySettings.agentSize,
-                            min: Settings.agentSizeMin,
-                            max: Settings.agentSizeMax,
-                            divisions: 15,
-                            accentColor: Settings.tacticalVioletTheme.primary,
-                            onChanged: (value) {
-                              ref
-                                  .read(strategySettingsProvider.notifier)
-                                  .updateAgentSize(value);
-                            },
-                          ),
-                          const _SettingsItemDivider(),
-                          _SettingsSliderTile(
-                            icon: Icons.auto_awesome_outlined,
-                            title: "Ability markers",
-                            description:
-                                "Resize utility icons and placement helpers for this strategy.",
-                            value: strategySettings.abilitySize,
-                            min: Settings.abilitySizeMin,
-                            max: Settings.abilitySizeMax,
-                            divisions: 15,
-                            accentColor: Settings.tacticalVioletTheme.primary,
-                            onChanged: (value) {
-                              ref
-                                  .read(strategySettingsProvider.notifier)
-                                  .updateAbilitySize(value);
-                            },
-                          ),
-                          const _PageMarkerSizesSyncBanner(),
-                        ],
-                      ),
+    );
+  }
+}
+
+class _ShortcutTableHeader extends StatelessWidget {
+  const _ShortcutTableHeader();
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = ShadTheme.of(context);
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              "Action",
+              style: theme.textTheme.small.copyWith(
+                color: Settings.tacticalVioletTheme.mutedForeground,
+                fontWeight: FontWeight.w800,
+                letterSpacing: 0.35,
+              ),
+            ),
+          ),
+          SizedBox(
+            width: 132,
+            child: Align(
+              alignment: Alignment.centerRight,
+              child: Text(
+                "Binding",
+                style: theme.textTheme.small.copyWith(
+                  color: Settings.tacticalVioletTheme.mutedForeground,
+                  fontWeight: FontWeight.w800,
+                  letterSpacing: 0.35,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ShortcutBindingRow extends StatelessWidget {
+  const _ShortcutBindingRow({
+    required this.definition,
+    required this.customBindings,
+    required this.isEditing,
+    required this.onEdit,
+    required this.onCancel,
+    required this.onCaptured,
+    this.duplicateMessage,
+    this.onReset,
+  });
+
+  final IcarusShortcutDefinition definition;
+  final Map<String, String> customBindings;
+  final bool isEditing;
+  final String? duplicateMessage;
+  final VoidCallback onEdit;
+  final VoidCallback onCancel;
+  final VoidCallback? onReset;
+  final void Function(IcarusKeyBinding binding, VoidCallback triggerShake)
+      onCaptured;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = ShadTheme.of(context);
+    final binding = ShortcutInfo.effectiveBindingFor(
+      definition.id,
+      customBindings,
+    );
+
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 160),
+      curve: Curves.easeOutCubic,
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+      color: isEditing
+          ? Settings.tacticalVioletTheme.primary.withValues(alpha: 0.06)
+          : Colors.transparent,
+      child: Column(
+        children: [
+          Row(
+            children: [
+              Expanded(
+                child: Text(
+                  definition.title,
+                  style: theme.textTheme.p.copyWith(
+                    color: Settings.tacticalVioletTheme.foreground,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+              ),
+              if (onReset != null)
+                ShadTooltip(
+                  builder: (_) => const Text("Reset to default"),
+                  child: ShadIconButton.ghost(
+                    icon: const Icon(Icons.undo_outlined, size: 15),
+                    onPressed: onReset,
+                  ),
+                )
+              else
+                const SizedBox(width: 32),
+              const SizedBox(width: 8),
+              SizedBox(
+                width: 132,
+                child: Align(
+                  alignment: Alignment.centerRight,
+                  child: InkWell(
+                    borderRadius: BorderRadius.circular(8),
+                    onTap: onEdit,
+                    child: _ShortcutBindingPill(
+                      label: binding.displayLabel(),
+                      isEditing: isEditing,
                     ),
-                    const SizedBox(height: 20),
-                    const _SectionDivider(),
-                    const SizedBox(height: 20),
-                    SettingsScopeCard(
-                      scope: SettingsScope.workspace,
-                      title: "Saving",
-                      description:
-                          "Control how Icarus persists strategy edits while you work.",
-                      child: Column(
-                        children: [
-                          _SettingsToggleTile(
-                            icon: Icons.save_outlined,
-                            title: "Autosave",
-                            description:
-                                "Automatically save the current strategy after 15 seconds of inactivity. When off, Icarus will ask before you leave unsaved work.",
-                            value: appPreferences.autosaveEnabled,
-                            onChanged: (value) async {
-                              await ref
-                                  .read(appPreferencesProvider.notifier)
-                                  .setAutosaveEnabled(value);
-                              ref
-                                  .read(strategyProvider.notifier)
-                                  .refreshAutosaveScheduling();
-                            },
-                          ),
-                        ],
-                      ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          AnimatedSwitcher(
+            duration: const Duration(milliseconds: 160),
+            child: isEditing
+                ? Padding(
+                    padding: const EdgeInsets.only(top: 10),
+                    child: _ShortcutCaptureField(
+                      duplicateMessage: duplicateMessage,
+                      onCancel: onCancel,
+                      onCaptured: onCaptured,
                     ),
-                    const SizedBox(height: 20),
-                    const _SectionDivider(),
-                    const SizedBox(height: 20),
-                    SettingsScopeCard(
-                      scope: SettingsScope.workspace,
-                      title: "Map visibility helpers",
-                      description:
-                          "Show or hide map reference layers while you work.",
-                      child: Column(
-                        children: [
-                          _SettingsToggleTile(
-                            icon: Icons.grid_on_rounded,
-                            title: "Spawn barriers",
-                            description:
-                                "Keep round-start barrier guides visible on the map.",
-                            value: mapState.showSpawnBarrier,
-                            onChanged: (value) {
-                              ref
-                                  .read(mapProvider.notifier)
-                                  .updateSpawnBarrier(value);
-                            },
+                  )
+                : const SizedBox.shrink(),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ShortcutBindingPill extends StatelessWidget {
+  const _ShortcutBindingPill({
+    required this.label,
+    required this.isEditing,
+  });
+
+  final String label;
+  final bool isEditing;
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 160),
+      curve: Curves.easeOutCubic,
+      constraints: const BoxConstraints(minWidth: 56),
+      padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 6),
+      decoration: BoxDecoration(
+        color: isEditing
+            ? Settings.tacticalVioletTheme.primary.withValues(alpha: 0.16)
+            : Settings.tacticalVioletTheme.secondary.withValues(alpha: 0.76),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(
+          color: isEditing
+              ? Settings.tacticalVioletTheme.primary.withValues(alpha: 0.34)
+              : Settings.tacticalVioletTheme.border.withValues(alpha: 0.9),
+        ),
+      ),
+      child: Text(
+        label,
+        textAlign: TextAlign.center,
+        overflow: TextOverflow.ellipsis,
+        style: ShadTheme.of(context).textTheme.small.copyWith(
+              color: Settings.tacticalVioletTheme.foreground,
+              fontWeight: FontWeight.w800,
+              height: 1.1,
+            ),
+      ),
+    );
+  }
+}
+
+class _ShortcutCaptureField extends StatefulWidget {
+  const _ShortcutCaptureField({
+    required this.onCaptured,
+    required this.onCancel,
+    this.duplicateMessage,
+  });
+
+  final void Function(IcarusKeyBinding binding, VoidCallback triggerShake)
+      onCaptured;
+  final VoidCallback onCancel;
+  final String? duplicateMessage;
+
+  @override
+  State<_ShortcutCaptureField> createState() => _ShortcutCaptureFieldState();
+}
+
+class _ShortcutCaptureFieldState extends State<_ShortcutCaptureField>
+    with SingleTickerProviderStateMixin {
+  late final FocusNode _focusNode;
+  late final AnimationController _shakeController;
+  late final Animation<double> _shakeAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _focusNode = FocusNode();
+    _shakeController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 260),
+    );
+    _shakeAnimation = TweenSequence<double>([
+      TweenSequenceItem(tween: Tween(begin: 0, end: -7), weight: 1),
+      TweenSequenceItem(tween: Tween(begin: -7, end: 7), weight: 2),
+      TweenSequenceItem(tween: Tween(begin: 7, end: -4), weight: 2),
+      TweenSequenceItem(tween: Tween(begin: -4, end: 0), weight: 1),
+    ]).animate(
+      CurvedAnimation(parent: _shakeController, curve: Curves.easeOutCubic),
+    );
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) _focusNode.requestFocus();
+    });
+  }
+
+  @override
+  void dispose() {
+    _focusNode.dispose();
+    _shakeController.dispose();
+    super.dispose();
+  }
+
+  void _triggerShake() {
+    _shakeController
+      ..reset()
+      ..forward();
+  }
+
+  KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent) return KeyEventResult.ignored;
+    if (event.logicalKey == LogicalKeyboardKey.escape) {
+      widget.onCancel();
+      return KeyEventResult.handled;
+    }
+
+    final binding = IcarusKeyBinding.fromPressedKeys(
+      HardwareKeyboard.instance.logicalKeysPressed,
+    );
+    if (!binding.isComplete) return KeyEventResult.handled;
+    widget.onCaptured(binding, _triggerShake);
+    return KeyEventResult.handled;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasDuplicate = widget.duplicateMessage != null;
+    return Focus(
+      focusNode: _focusNode,
+      onKeyEvent: _handleKeyEvent,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          AnimatedBuilder(
+            animation: _shakeAnimation,
+            builder: (context, child) {
+              return Transform.translate(
+                offset: Offset(_shakeAnimation.value, 0),
+                child: child,
+              );
+            },
+            child: Container(
+              height: 38,
+              padding: const EdgeInsets.symmetric(horizontal: 12),
+              decoration: BoxDecoration(
+                color: Settings.tacticalVioletTheme.card,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(
+                  color: hasDuplicate
+                      ? Settings.tacticalVioletTheme.destructive
+                      : Settings.tacticalVioletTheme.primary
+                          .withValues(alpha: 0.65),
+                  width: hasDuplicate ? 1.4 : 1,
+                ),
+              ),
+              child: Row(
+                children: [
+                  Icon(
+                    Icons.keyboard_alt_outlined,
+                    size: 17,
+                    color: hasDuplicate
+                        ? Settings.tacticalVioletTheme.destructive
+                        : Settings.tacticalVioletTheme.primary,
+                  ),
+                  const SizedBox(width: 9),
+                  Expanded(
+                    child: Text(
+                      "Press new shortcut...",
+                      style: ShadTheme.of(context).textTheme.small.copyWith(
+                            color: Settings.tacticalVioletTheme.foreground,
+                            fontWeight: FontWeight.w700,
                           ),
-                          const _SettingsItemDivider(),
-                          _SettingsToggleTile(
-                            icon: Icons.location_on_outlined,
-                            title: "Region names",
-                            description:
-                                "Show map callout names directly on the canvas.",
-                            value: mapState.showRegionNames,
-                            onChanged: (value) {
-                              ref
-                                  .read(mapProvider.notifier)
-                                  .updateRegionNames(value);
-                            },
+                    ),
+                  ),
+                  ShadButton.ghost(
+                    size: ShadButtonSize.sm,
+                    onPressed: widget.onCancel,
+                    child: const Text("Cancel"),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          AnimatedSwitcher(
+            duration: const Duration(milliseconds: 160),
+            child: hasDuplicate
+                ? Padding(
+                    key: ValueKey(widget.duplicateMessage),
+                    padding: const EdgeInsets.only(top: 7),
+                    child: Text(
+                      widget.duplicateMessage!,
+                      style: ShadTheme.of(context).textTheme.small.copyWith(
+                            color: Settings.tacticalVioletTheme.destructive,
+                            fontWeight: FontWeight.w700,
                           ),
-                          const _SettingsItemDivider(),
-                          _SettingsToggleTile(
-                            icon: Icons.radio_button_checked_outlined,
-                            title: "Ultimate orbs",
-                            description:
-                                "Display orb pickup markers on supported maps.",
-                            value: mapState.showUltOrbs,
-                            onChanged: (value) {
-                              ref
-                                  .read(mapProvider.notifier)
-                                  .updateUltOrbs(value);
-                            },
+                    ),
+                  )
+                : Padding(
+                    padding: const EdgeInsets.only(top: 7),
+                    child: Text(
+                      "Escape cancels. Ctrl and Cmd are saved as one platform-aware Primary modifier.",
+                      style: ShadTheme.of(context).textTheme.small.copyWith(
+                            color: Settings.tacticalVioletTheme.mutedForeground,
                           ),
-                        ],
-                      ),
                     ),
-                    const SizedBox(height: 20),
-                    const _SectionDivider(),
-                    const SizedBox(height: 20),
-                    const MapThemeSettingsSection(),
-                    const SizedBox(height: 4),
-                  ],
+                  ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ShortcutEmptySearch extends StatelessWidget {
+  const _ShortcutEmptySearch();
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 28),
+      child: Center(
+        child: Text(
+          "No shortcuts match that search.",
+          style: ShadTheme.of(context).textTheme.small.copyWith(
+                color: Settings.tacticalVioletTheme.mutedForeground,
+                fontWeight: FontWeight.w600,
+              ),
+        ),
+      ),
+    );
+  }
+}
+
+class _SettingsNavigationRail extends StatelessWidget {
+  const _SettingsNavigationRail({
+    required this.mode,
+    required this.selectedSection,
+    required this.onSectionSelected,
+  });
+
+  final _SettingsMode mode;
+  final _SettingsSection selectedSection;
+  final ValueChanged<_SettingsSection> onSectionSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: SettingsTab._navigationWidth,
+      color: Settings.tacticalVioletTheme.card.withValues(alpha: 0.72),
+      padding: const EdgeInsets.fromLTRB(14, 18, 12, 16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Settings",
+            style: ShadTheme.of(context).textTheme.h4.copyWith(
+                  color: Settings.tacticalVioletTheme.foreground,
+                  fontWeight: FontWeight.w700,
                 ),
+          ),
+          const SizedBox(height: 18),
+          _SettingsNavHeader(
+            label: "Current strategy",
+            isActive: mode == _SettingsMode.strategy,
+            onTap: () => onSectionSelected(_SettingsSection.strategyObjects),
+          ),
+          const SizedBox(height: 4),
+          _SettingsNavItem(
+            icon: Icons.tune_outlined,
+            label: "Object styling",
+            isSelected: selectedSection == _SettingsSection.strategyObjects,
+            onTap: () => onSectionSelected(_SettingsSection.strategyObjects),
+          ),
+          _SettingsNavItem(
+            icon: Icons.palette_outlined,
+            label: "Map theme",
+            isSelected: selectedSection == _SettingsSection.strategyMapTheme,
+            onTap: () => onSectionSelected(_SettingsSection.strategyMapTheme),
+          ),
+          const SizedBox(height: 16),
+          _SettingsNavHeader(
+            label: "App-wide",
+            isActive: mode == _SettingsMode.global,
+            onTap: () => onSectionSelected(_SettingsSection.globalDefaults),
+          ),
+          const SizedBox(height: 4),
+          _SettingsNavItem(
+            icon: Icons.auto_fix_high_outlined,
+            label: "Defaults",
+            isSelected: selectedSection == _SettingsSection.globalDefaults,
+            onTap: () => onSectionSelected(_SettingsSection.globalDefaults),
+          ),
+          _SettingsNavItem(
+            icon: Icons.save_outlined,
+            label: "Autosave",
+            isSelected: selectedSection == _SettingsSection.globalSaving,
+            onTap: () => onSectionSelected(_SettingsSection.globalSaving),
+          ),
+          _SettingsNavItem(
+            icon: Icons.map_outlined,
+            label: "Map layers",
+            isSelected: selectedSection == _SettingsSection.globalMapVisibility,
+            onTap: () =>
+                onSectionSelected(_SettingsSection.globalMapVisibility),
+          ),
+          _SettingsNavItem(
+            icon: Icons.format_color_fill_outlined,
+            label: "Theme profiles",
+            isSelected: selectedSection == _SettingsSection.globalMapProfiles,
+            onTap: () => onSectionSelected(_SettingsSection.globalMapProfiles),
+          ),
+          _SettingsNavItem(
+            icon: Icons.keyboard_alt_outlined,
+            label: "Keybinds",
+            isSelected: selectedSection == _SettingsSection.shortcuts,
+            onTap: () => onSectionSelected(_SettingsSection.shortcuts),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SettingsNavHeader extends StatelessWidget {
+  const _SettingsNavHeader({
+    required this.label,
+    required this.isActive,
+    required this.onTap,
+  });
+
+  final String label;
+  final bool isActive;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final color = isActive
+        ? Settings.tacticalVioletTheme.foreground
+        : Settings.tacticalVioletTheme.mutedForeground;
+
+    return InkWell(
+      borderRadius: BorderRadius.circular(8),
+      onTap: onTap,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 7),
+        child: Row(
+          children: [
+            AnimatedContainer(
+              duration: const Duration(milliseconds: 160),
+              curve: Curves.easeOutCubic,
+              width: 6,
+              height: 6,
+              decoration: BoxDecoration(
+                color: isActive
+                    ? Settings.tacticalVioletTheme.primary
+                    : Settings.tacticalVioletTheme.mutedForeground
+                        .withValues(alpha: 0.36),
+                shape: BoxShape.circle,
               ),
             ),
+            const SizedBox(width: 8),
+            Text(
+              label,
+              style: ShadTheme.of(context).textTheme.small.copyWith(
+                    color: color,
+                    fontWeight: isActive ? FontWeight.w800 : FontWeight.w700,
+                    letterSpacing: 0.25,
+                  ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _SettingsNavItem extends StatelessWidget {
+  const _SettingsNavItem({
+    required this.icon,
+    required this.label,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  final IconData icon;
+  final String label;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 4),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(8),
+        onTap: onTap,
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 160),
+          curve: Curves.easeOutCubic,
+          height: 38,
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          decoration: BoxDecoration(
+            color: isSelected
+                ? Settings.tacticalVioletTheme.primary.withValues(alpha: 0.14)
+                : Colors.transparent,
+            borderRadius: BorderRadius.circular(8),
+            border: Border.all(
+              color: isSelected
+                  ? Settings.tacticalVioletTheme.primary.withValues(alpha: 0.24)
+                  : Colors.transparent,
+            ),
+          ),
+          child: Row(
+            children: [
+              Icon(
+                icon,
+                size: 16,
+                color: isSelected
+                    ? Settings.tacticalVioletTheme.foreground
+                    : Settings.tacticalVioletTheme.mutedForeground,
+              ),
+              const SizedBox(width: 8),
+              Expanded(
+                child: Text(
+                  label,
+                  overflow: TextOverflow.ellipsis,
+                  style: ShadTheme.of(context).textTheme.small.copyWith(
+                        color: isSelected
+                            ? Settings.tacticalVioletTheme.foreground
+                            : Settings.tacticalVioletTheme.mutedForeground,
+                        fontWeight:
+                            isSelected ? FontWeight.w700 : FontWeight.w500,
+                      ),
+                ),
+              ),
+            ],
           ),
         ),
       ),
@@ -473,7 +1553,7 @@ class _PageMarkerSizesSyncBannerState
                     ),
               ),
               const SizedBox(height: 8),
-              ShadButton.outline(
+              ShadButton(
                 size: ShadButtonSize.sm,
                 onPressed: _busy
                     ? null
diff --git a/lib/widgets/sidebar_widgets/color_library.dart b/lib/widgets/sidebar_widgets/color_library.dart
new file mode 100644
index 00000000..e952de07
--- /dev/null
+++ b/lib/widgets/sidebar_widgets/color_library.dart
@@ -0,0 +1,250 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:icarus/const/settings.dart';
+import 'package:icarus/providers/color_library_provider.dart';
+import 'package:icarus/widgets/better_color_picker.dart';
+import 'package:icarus/widgets/icarus_color_picker_style.dart';
+import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
+import 'package:shadcn_ui/shadcn_ui.dart';
+
+class ColorLibrary extends ConsumerWidget {
+  const ColorLibrary({
+    super.key,
+    required this.selectedColorValue,
+    required this.onSelected,
+    this.includeEmpty = false,
+    this.emptyColor = const Color(0xFFC5C5C5),
+  });
+
+  final int? selectedColorValue;
+  final ValueChanged<int?> onSelected;
+  final bool includeEmpty;
+  final Color emptyColor;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final entries = ref.watch(colorLibraryProvider);
+    final canAdd = ref.watch(
+      colorLibraryControllerProvider.select(
+        (colors) => colors.length < ColorLibraryController.customColorLimit,
+      ),
+    );
+
+    return Wrap(
+      children: [
+        if (includeEmpty)
+          _SwatchPadding(
+            child: ColorButtons(
+              height: 26,
+              width: 26,
+              color: emptyColor,
+              isSelected: selectedColorValue == null,
+              onTap: () => onSelected(null),
+            ),
+          ),
+        for (final entry in entries)
+          _SwatchPadding(
+            child: entry.isCustom
+                ? ShadContextMenuRegion(
+                    items: [
+                      ShadContextMenuItem(
+                        leading: const Icon(LucideIcons.pencil, size: 14),
+                        child: const Text('Edit'),
+                        onPressed: () => _editColor(context, ref, entry),
+                      ),
+                      ShadContextMenuItem(
+                        leading: Icon(
+                          LucideIcons.trash2,
+                          size: 14,
+                          color: Settings.tacticalVioletTheme.destructive,
+                        ),
+                        child: Text(
+                          'Delete',
+                          style: TextStyle(
+                            color: Settings.tacticalVioletTheme.destructive,
+                          ),
+                        ),
+                        onPressed: () => ref
+                            .read(colorLibraryControllerProvider.notifier)
+                            .deleteColor(entry.customIndex!),
+                      ),
+                    ],
+                    child: ColorButtons(
+                      height: 26,
+                      width: 26,
+                      color: entry.color,
+                      isSelected: selectedColorValue == entry.color.toARGB32(),
+                      onTap: () => onSelected(entry.color.toARGB32()),
+                    ),
+                  )
+                : ColorButtons(
+                    height: 26,
+                    width: 26,
+                    color: entry.color,
+                    isSelected: selectedColorValue == entry.color.toARGB32(),
+                    onTap: () => onSelected(entry.color.toARGB32()),
+                  ),
+          ),
+        if (canAdd)
+          _SwatchPadding(
+            child: ColorPickerButton(
+              onTap: () => _addColor(context, ref),
+            ),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _addColor(BuildContext context, WidgetRef ref) async {
+    final picked = await _showColorLibraryDialog(
+      context: context,
+      initialColor: Colors.white,
+      title: 'Add color',
+    );
+    if (picked == null) return;
+    await ref.read(colorLibraryControllerProvider.notifier).addColor(picked);
+    onSelected(picked.toARGB32());
+  }
+
+  Future<void> _editColor(
+    BuildContext context,
+    WidgetRef ref,
+    ColorLibraryEntry entry,
+  ) async {
+    final picked = await _showColorLibraryDialog(
+      context: context,
+      initialColor: entry.color,
+      title: 'Edit color',
+    );
+    if (picked == null) return;
+    await ref
+        .read(colorLibraryControllerProvider.notifier)
+        .updateColor(entry.customIndex!, picked);
+    onSelected(picked.toARGB32());
+  }
+}
+
+Future<Color?> _showColorLibraryDialog({
+  required BuildContext context,
+  required Color initialColor,
+  required String title,
+}) async {
+  var workingColor = initialColor;
+  return showShadDialog<Color>(
+    context: context,
+    builder: (context) {
+      return StatefulBuilder(
+        builder: (context, setState) {
+          return ShadDialog(
+            title: Text(title),
+            actions: [
+              ShadButton.secondary(
+                onPressed: () => Navigator.of(context).pop(),
+                child: const Text('Cancel'),
+              ),
+              ShadButton(
+                onPressed: () => Navigator.of(context).pop(workingColor),
+                child: const Text('Apply'),
+              ),
+            ],
+            child: Material(
+              color: Colors.transparent,
+              child: SizedBox(
+                width: 320,
+                child: BetterColorPicker(
+                  value: workingColor,
+                  initialMode: BetterColorPickerMode.hsv,
+                  style: icarusColorPickerStyle,
+                  onChanging: (color) {
+                    setState(() {
+                      workingColor = color;
+                    });
+                  },
+                  onChanged: (color) {
+                    setState(() {
+                      workingColor = color;
+                    });
+                  },
+                ),
+              ),
+            ),
+          );
+        },
+      );
+    },
+  );
+}
+
+class _SwatchPadding extends StatelessWidget {
+  const _SwatchPadding({required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(4),
+      child: child,
+    );
+  }
+}
+
+class ColorPickerButton extends StatefulWidget {
+  const ColorPickerButton({
+    super.key,
+    required this.onTap,
+  });
+
+  final VoidCallback onTap;
+
+  @override
+  State<ColorPickerButton> createState() => _ColorPickerButtonState();
+}
+
+class _ColorPickerButtonState extends State<ColorPickerButton> {
+  Color _borderColor = Colors.transparent;
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 200),
+      height: 26,
+      width: 26,
+      decoration: BoxDecoration(
+        borderRadius: const BorderRadius.all(Radius.circular(4)),
+        border: Border.all(
+          color: _borderColor,
+          width: 3,
+          strokeAlign: BorderSide.strokeAlignCenter,
+        ),
+      ),
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        onEnter: (_) => setState(() => _borderColor = Colors.white),
+        onExit: (_) => setState(() => _borderColor = Colors.transparent),
+        child: GestureDetector(
+          onTap: widget.onTap,
+          child: Center(
+            child: Container(
+              height: 24,
+              width: 24,
+              decoration: BoxDecoration(
+                borderRadius: const BorderRadius.all(Radius.circular(4)),
+                border: Border.all(
+                  color: const Color(0xFF272727),
+                  width: 1,
+                  strokeAlign: BorderSide.strokeAlignCenter,
+                ),
+              ),
+              child: Icon(
+                LucideIcons.plus,
+                size: 16,
+                color: Settings.tacticalVioletTheme.foreground,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/sidebar_widgets/custom_shape_tools.dart b/lib/widgets/sidebar_widgets/custom_shape_tools.dart
index c2c87b14..abac7181 100644
--- a/lib/widgets/sidebar_widgets/custom_shape_tools.dart
+++ b/lib/widgets/sidebar_widgets/custom_shape_tools.dart
@@ -14,7 +14,7 @@ import 'package:icarus/providers/utility_provider.dart';
 import 'package:icarus/widgets/draggable_widgets/utilities/custom_circle_utility_widget.dart';
 import 'package:icarus/widgets/numeric_drag_input.dart';
 import 'package:icarus/widgets/selectable_icon_button.dart';
-import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
+import 'package:icarus/widgets/sidebar_widgets/color_library.dart';
 import 'package:icarus/widgets/draggable_widgets/utilities/custom_rectangle_utility_widget.dart';
 import 'package:icarus/widgets/draggable_widgets/zoom_transform.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
@@ -36,14 +36,6 @@ class _CustomShapeToolsState extends ConsumerState<CustomShapeTools> {
   static const int _defaultOpacityPercent = 30;
   static const int _defaultColorValue = 0xFF22C55E;
 
-  static const List<Color> _colorOptions = [
-    Color(0xFF22C55E),
-    Color(0xFF3B82F6),
-    Color(0xFFF59E0B),
-    Color(0xFFEF4444),
-    Color(0xFFA855F7),
-  ];
-
   _CustomShapeKind _shape = _CustomShapeKind.circle;
   double _diameterMeters = _defaultCircleDiameterMeters;
   double _rectWidthMeters = _defaultRectangleWidthMeters;
@@ -53,7 +45,8 @@ class _CustomShapeToolsState extends ConsumerState<CustomShapeTools> {
 
   @override
   Widget build(BuildContext context) {
-    final currentMap = ref.watch(mapProvider.select((state) => state.currentMap));
+    final currentMap =
+        ref.watch(mapProvider.select((state) => state.currentMap));
     final mapScale = Maps.mapScale[currentMap] ?? 1.0;
     final draggableData = _buildToolData(mapScale);
 
@@ -233,20 +226,12 @@ class _CustomShapeToolsState extends ConsumerState<CustomShapeTools> {
   }
 
   Widget _buildColorPicker() {
-    return Row(
-      children: [
-        for (final color in _colorOptions)
-          Padding(
-            padding: const EdgeInsets.all(4.0),
-            child: ColorButtons(
-              height: 26,
-              width: 26,
-              color: color,
-              isSelected: _selectedColor == color,
-              onTap: () => setState(() => _selectedColor = color),
-            ),
-          ),
-      ],
+    return ColorLibrary(
+      selectedColorValue: _selectedColor.toARGB32(),
+      onSelected: (colorValue) {
+        if (colorValue == null) return;
+        setState(() => _selectedColor = Color(colorValue));
+      },
     );
   }
 
diff --git a/lib/widgets/sidebar_widgets/drawing_tools.dart b/lib/widgets/sidebar_widgets/drawing_tools.dart
index b52f09ae..9c047bb3 100644
--- a/lib/widgets/sidebar_widgets/drawing_tools.dart
+++ b/lib/widgets/sidebar_widgets/drawing_tools.dart
@@ -6,7 +6,7 @@ import 'package:icarus/const/traversal_speed.dart';
 import 'package:icarus/providers/pen_provider.dart';
 import 'package:icarus/widgets/custom_segmented_tabs.dart';
 import 'package:icarus/widgets/selectable_icon_button.dart';
-import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
+import 'package:icarus/widgets/sidebar_widgets/color_library.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 
 class DrawingTools extends ConsumerWidget {
@@ -30,26 +30,16 @@ class DrawingTools extends ConsumerWidget {
         children: [
           const Text("Color"),
           // const SizedBox(height: 10),
-          Row(
-            children: [
-              for (final (index, colorOption) in ref
-                  .watch(penProvider.select(
-                    (state) => state.listOfColors,
-                  ))
-                  .indexed)
-                Padding(
-                  padding: const EdgeInsets.all(4.0),
-                  child: ColorButtons(
-                    height: 26,
-                    width: 26,
-                    color: colorOption.color,
-                    isSelected: colorOption.isSelected,
-                    onTap: () {
-                      ref.read(penProvider.notifier).setColor(index);
-                    },
-                  ),
-                ),
-            ],
+          ColorLibrary(
+            selectedColorValue: ref.watch(
+              penProvider.select((state) => state.color.toARGB32()),
+            ),
+            onSelected: (colorValue) async {
+              if (colorValue == null) return;
+              final notifier = ref.read(penProvider.notifier);
+              notifier.updateValue(color: Color(colorValue));
+              await notifier.buildCursors();
+            },
           ),
           const SizedBox(height: 4),
           Row(
diff --git a/lib/widgets/sidebar_widgets/text_tools.dart b/lib/widgets/sidebar_widgets/text_tools.dart
index afb05fe2..3aa2efde 100644
--- a/lib/widgets/sidebar_widgets/text_tools.dart
+++ b/lib/widgets/sidebar_widgets/text_tools.dart
@@ -10,7 +10,7 @@ import 'package:icarus/providers/screen_zoom_provider.dart';
 import 'package:icarus/providers/text_provider.dart';
 import 'package:icarus/widgets/draggable_widgets/text/text_widget.dart';
 import 'package:icarus/widgets/draggable_widgets/zoom_transform.dart';
-import 'package:icarus/widgets/sidebar_widgets/color_buttons.dart';
+import 'package:icarus/widgets/sidebar_widgets/color_library.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
 import 'package:uuid/uuid.dart';
 
@@ -22,14 +22,6 @@ class TextTools extends ConsumerStatefulWidget {
 }
 
 class _TextToolsState extends ConsumerState<TextTools> {
-  static const List<Color> _colorOptions = [
-    Color(0xFF22C55E),
-    Color(0xFF3B82F6),
-    Color(0xFFF59E0B),
-    Color(0xFFEF4444),
-    Color(0xFFA855F7),
-  ];
-
   int? _selectedTagColorValue;
 
   @override
@@ -104,31 +96,12 @@ class _TextToolsState extends ConsumerState<TextTools> {
   }
 
   Widget _buildColorPicker() {
-    return Wrap(
-      children: [
-        Padding(
-          padding: const EdgeInsets.all(4.0),
-          child: ColorButtons(
-            height: 26,
-            width: 26,
-            color: const Color(0xFFC5C5C5),
-            isSelected: _selectedTagColorValue == null,
-            onTap: () => setState(() => _selectedTagColorValue = null),
-          ),
-        ),
-        for (final color in _colorOptions)
-          Padding(
-            padding: const EdgeInsets.all(4.0),
-            child: ColorButtons(
-              height: 26,
-              width: 26,
-              color: color,
-              isSelected: _selectedTagColorValue == color.toARGB32(),
-              onTap: () =>
-                  setState(() => _selectedTagColorValue = color.toARGB32()),
-            ),
-          ),
-      ],
+    return ColorLibrary(
+      includeEmpty: true,
+      selectedColorValue: _selectedTagColorValue,
+      onSelected: (colorValue) => setState(
+        () => _selectedTagColorValue = colorValue,
+      ),
     );
   }
 
diff --git a/lib/widgets/sidebar_widgets/tool_grid.dart b/lib/widgets/sidebar_widgets/tool_grid.dart
index d858e486..a4f81fdf 100644
--- a/lib/widgets/sidebar_widgets/tool_grid.dart
+++ b/lib/widgets/sidebar_widgets/tool_grid.dart
@@ -6,9 +6,11 @@ import 'package:icarus/const/custom_icons.dart';
 import 'package:icarus/const/default_placement.dart';
 import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/const/settings.dart';
+import 'package:icarus/const/shortcut_info.dart';
 import 'package:icarus/const/utilities.dart';
 import 'package:icarus/providers/image_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/pen_provider.dart';
 import 'package:icarus/providers/placement_center_provider.dart';
 import 'package:icarus/providers/screen_zoom_provider.dart';
@@ -94,6 +96,11 @@ class ToolGrid extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final currentInteractionState = ref.watch(interactionStateProvider);
+    final shortcutBindings =
+        ref.watch(appPreferencesProvider).customShortcutBindings;
+    String shortcutLabel(IcarusShortcutAction action) {
+      return ShortcutInfo.displayLabelFor(action.name, shortcutBindings);
+    }
 
     // void showImageDialog() {
     //   showDialog(
@@ -125,7 +132,7 @@ class ToolGrid extends ConsumerWidget {
               SelectableIconButton(
                 icon: const Icon(Icons.draw),
                 tooltip: "Draw",
-                shortcutLabel: 'Q',
+                shortcutLabel: shortcutLabel(IcarusShortcutAction.draw),
                 onPressed: () {
                   switch (currentInteractionState) {
                     case InteractionState.drawing:
@@ -142,7 +149,7 @@ class ToolGrid extends ConsumerWidget {
               ),
               SelectableIconButton(
                 tooltip: "Eraser",
-                shortcutLabel: 'W',
+                shortcutLabel: shortcutLabel(IcarusShortcutAction.erase),
                 onPressed: () async {
                   await ref.read(penProvider.notifier).buildCursors();
                   switch (currentInteractionState) {
@@ -164,7 +171,7 @@ class ToolGrid extends ConsumerWidget {
               ),
               SelectableIconButton(
                 tooltip: "Add Text",
-                shortcutLabel: 'T',
+                shortcutLabel: shortcutLabel(IcarusShortcutAction.addText),
                 onPressed: () {
                   switch (currentInteractionState) {
                     case InteractionState.textTools:
@@ -242,7 +249,7 @@ class ToolGrid extends ConsumerWidget {
               ),
               SelectableIconButton(
                 tooltip: "Add Lineup",
-                shortcutLabel: 'G',
+                shortcutLabel: shortcutLabel(IcarusShortcutAction.addLineup),
                 onPressed: () async {
                   if (kIsWeb) {
                     Settings.showToast(
diff --git a/lib/widgets/strategy_quick_switcher.dart b/lib/widgets/strategy_quick_switcher.dart
index 98112108..d2f2581d 100644
--- a/lib/widgets/strategy_quick_switcher.dart
+++ b/lib/widgets/strategy_quick_switcher.dart
@@ -8,6 +8,7 @@ import 'package:icarus/const/settings.dart';
 import 'package:icarus/const/shortcut_info.dart';
 import 'package:icarus/providers/agent_filter_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/services/unsaved_strategy_guard.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
@@ -357,7 +358,11 @@ class _StrategyQuickSwitcherState extends ConsumerState<StrategyQuickSwitcher> {
                               ),
                               child: Shortcuts(
                                 shortcuts: <ShortcutActivator, Intent>{
-                                  ...ShortcutInfo.textEditingOverrides,
+                                  ...ShortcutInfo.textEditingOverridesFor(
+                                    ref
+                                        .watch(appPreferencesProvider)
+                                        .customShortcutBindings,
+                                  ),
                                   const SingleActivator(
                                     LogicalKeyboardKey.escape,
                                   ): const DismissIntent(),
diff --git a/lib/widgets/text_editing_shortcut_scope.dart b/lib/widgets/text_editing_shortcut_scope.dart
new file mode 100644
index 00000000..63fa2631
--- /dev/null
+++ b/lib/widgets/text_editing_shortcut_scope.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:hive_ce_flutter/hive_flutter.dart';
+import 'package:icarus/const/hive_boxes.dart';
+import 'package:icarus/const/shortcut_info.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
+
+class TextEditingShortcutScope extends ConsumerWidget {
+  const TextEditingShortcutScope({
+    super.key,
+    required this.child,
+    this.extraShortcuts = const {},
+  });
+
+  final Widget child;
+  final Map<ShortcutActivator, Intent> extraShortcuts;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final customShortcutBindings =
+        Hive.isBoxOpen(HiveBoxNames.appPreferencesBox)
+            ? ref.watch(appPreferencesProvider).customShortcutBindings
+            : const <String, String>{};
+
+    return Shortcuts(
+      shortcuts: {
+        ...ShortcutInfo.textEditingOverridesFor(
+          customShortcutBindings,
+        ),
+        ...extraShortcuts,
+      },
+      child: child,
+    );
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index b6fb56e7..6988a16e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -374,14 +374,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.2"
-  flutter_colorpicker:
-    dependency: "direct main"
-    description:
-      name: flutter_colorpicker
-      sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
   flutter_inappwebview:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 0ac374b7..b353e75b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,7 +30,6 @@ dependencies:
   image: ^4.5.4
   http: ^1.6.0
   screenshot: ^3.0.0
-  flutter_colorpicker: ^1.1.0
   archive: ^4.0.7
   flutter_portal: ^1.1.4
   shadcn_ui: ^0.40.3
diff --git a/scripts/publish_pages_branch.ps1 b/scripts/publish_pages_branch.ps1
index 0a93997c..c4dd2f1b 100644
--- a/scripts/publish_pages_branch.ps1
+++ b/scripts/publish_pages_branch.ps1
@@ -22,6 +22,11 @@ if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($remoteUrl)) {
     throw "Could not resolve git remote URL for '$Remote'."
 }
 
+$remoteUri = $null
+if ($remoteUrl -match '^https://') {
+    $remoteUri = [System.Uri]$remoteUrl
+}
+
 $versionInfo = Get-VersionInfo -RepoRoot $repoRoot
 $tempRoot = Join-Path ([System.IO.Path]::GetTempPath()) ("icarus-pages-" + [System.Guid]::NewGuid().ToString("N"))
 
@@ -31,6 +36,21 @@ try {
     Invoke-RepoCommand -WorkingDirectory $tempRoot -Command "git" -Arguments @("init")
     Invoke-RepoCommand -WorkingDirectory $tempRoot -Command "git" -Arguments @("remote", "add", $Remote, $remoteUrl)
 
+    if (-not [string]::IsNullOrWhiteSpace($env:GITHUB_TOKEN) -and $null -ne $remoteUri) {
+        $tokenBytes = [System.Text.Encoding]::ASCII.GetBytes("x-access-token:$($env:GITHUB_TOKEN)")
+        $tokenHeader = "AUTHORIZATION: basic {0}" -f [System.Convert]::ToBase64String($tokenBytes)
+        Push-Location $tempRoot
+        try {
+            & git config ("http.https://{0}/.extraheader" -f $remoteUri.Host) $tokenHeader
+            if ($LASTEXITCODE -ne 0) {
+                throw "Failed to configure authenticated git access for $($remoteUri.Host)."
+            }
+        }
+        finally {
+            Pop-Location
+        }
+    }
+
     $branchExists = $false
     $branchProbe = & git -C $repoRoot ls-remote --heads $Remote $Branch 2>$null
     if ($LASTEXITCODE -eq 0 -and -not [string]::IsNullOrWhiteSpace(($branchProbe | Out-String).Trim())) {
diff --git a/scripts/watch_flutter_hot_reload.ps1 b/scripts/watch_flutter_hot_reload.ps1
new file mode 100644
index 00000000..e98167ea
--- /dev/null
+++ b/scripts/watch_flutter_hot_reload.ps1
@@ -0,0 +1,111 @@
+param(
+    [string]$Device = "windows",
+    [string[]]$WatchPath = @("lib", "assets", "pubspec.yaml"),
+    [int]$DebounceMs = 750
+)
+
+$ErrorActionPreference = "Stop"
+$repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
+
+function New-RepoWatcher {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Path
+    )
+
+    $resolved = Resolve-Path (Join-Path $repoRoot $Path)
+    $item = Get-Item -LiteralPath $resolved
+    $watcher = [System.IO.FileSystemWatcher]::new()
+
+    if ($item.PSIsContainer) {
+        $watcher.Path = $item.FullName
+        $watcher.IncludeSubdirectories = $true
+        $watcher.Filter = "*.*"
+    }
+    else {
+        $watcher.Path = $item.DirectoryName
+        $watcher.IncludeSubdirectories = $false
+        $watcher.Filter = $item.Name
+    }
+
+    $watcher.NotifyFilter = [System.IO.NotifyFilters]'FileName, DirectoryName, LastWrite, Size'
+    $watcher.EnableRaisingEvents = $true
+    return $watcher
+}
+
+$process = [System.Diagnostics.Process]::new()
+$process.StartInfo.FileName = "cmd.exe"
+$process.StartInfo.Arguments = "/c fvm flutter run -d $Device"
+$process.StartInfo.WorkingDirectory = $repoRoot
+$process.StartInfo.UseShellExecute = $false
+$process.StartInfo.RedirectStandardInput = $true
+
+Write-Host "Starting: fvm flutter run -d $Device"
+[void]$process.Start()
+
+$lastReload = [DateTime]::MinValue
+$syncRoot = [object]::new()
+
+$action = {
+    $path = $Event.SourceEventArgs.FullPath
+    $name = [System.IO.Path]::GetFileName($path)
+
+    if ($name -like "*.tmp" -or
+        $name -like "*.swp" -or
+        $name -like "*.lock" -or
+        $path -match "\\\.dart_tool\\" -or
+        $path -match "\\build\\") {
+        return
+    }
+
+    [System.Threading.Monitor]::Enter($syncRoot)
+    try {
+        $now = [DateTime]::UtcNow
+        if (($now - $script:lastReload).TotalMilliseconds -lt $DebounceMs) {
+            return
+        }
+
+        $script:lastReload = $now
+        if (-not $process.HasExited) {
+            Write-Host "Hot reload: $path"
+            $process.StandardInput.WriteLine("r")
+        }
+    }
+    finally {
+        [System.Threading.Monitor]::Exit($syncRoot)
+    }
+}
+
+$watchers = @()
+$subscriptions = @()
+
+foreach ($path in $WatchPath) {
+    $watcher = New-RepoWatcher -Path $path
+    $watchers += $watcher
+
+    foreach ($eventName in @("Changed", "Created", "Deleted", "Renamed")) {
+        $subscriptions += Register-ObjectEvent -InputObject $watcher -EventName $eventName -Action $action
+    }
+
+    Write-Host "Watching: $path"
+}
+
+try {
+    while (-not $process.HasExited) {
+        Start-Sleep -Milliseconds 250
+    }
+}
+finally {
+    foreach ($subscription in $subscriptions) {
+        Unregister-Event -SubscriptionId $subscription.Id -ErrorAction SilentlyContinue
+    }
+
+    foreach ($watcher in $watchers) {
+        $watcher.Dispose()
+    }
+
+    if (-not $process.HasExited) {
+        $process.StandardInput.WriteLine("q")
+        $process.WaitForExit(5000)
+    }
+}
diff --git a/skills-lock.json b/skills-lock.json
new file mode 100644
index 00000000..be09a3a5
--- /dev/null
+++ b/skills-lock.json
@@ -0,0 +1,11 @@
+{
+  "version": 1,
+  "skills": {
+    "impeccable": {
+      "source": "pbakaus/impeccable",
+      "sourceType": "github",
+      "skillPath": ".agents/skills/impeccable/SKILL.md",
+      "computedHash": "18257101114a8828fecefc41967dd03e297682424242477ac3e74c3588857c89"
+    }
+  }
+}
diff --git a/test/ability_visibility_widgets_test.dart b/test/ability_visibility_widgets_test.dart
index d7ef3c56..b8a52a3b 100644
--- a/test/ability_visibility_widgets_test.dart
+++ b/test/ability_visibility_widgets_test.dart
@@ -82,7 +82,7 @@ void main() {
             children: [
               PlacedAbilityWidget(
                 ability: ability,
-                onDragEnd: (_) {},
+                onDragEnd: (_, __) {},
                 id: ability.id,
                 data: ability,
                 rotation: ability.rotation,
@@ -237,7 +237,7 @@ void main() {
             children: [
               PlacedAbilityWidget(
                 ability: ability,
-                onDragEnd: (_) {},
+                onDragEnd: (_, __) {},
                 id: ability.id,
                 data: ability,
                 rotation: ability.rotation,
@@ -292,7 +292,7 @@ void main() {
             children: [
               PlacedAbilityWidget(
                 ability: ability,
-                onDragEnd: (_) {},
+                onDragEnd: (_, __) {},
                 id: ability.id,
                 data: ability,
                 rotation: ability.rotation,
@@ -420,7 +420,7 @@ void main() {
             children: [
               PlacedAbilityWidget(
                 ability: sectorAbility,
-                onDragEnd: (_) {},
+                onDragEnd: (_, __) {},
                 id: sectorAbility.id,
                 data: sectorAbility,
                 rotation: sectorAbility.rotation,
@@ -1163,7 +1163,7 @@ Future<void> _pumpPlacedAbility(
         children: [
           PlacedAbilityWidget(
             ability: ability,
-            onDragEnd: (_) {},
+            onDragEnd: (_, __) {},
             id: ability.id,
             data: ability,
             rotation: ability.rotation,
@@ -1194,6 +1194,8 @@ ProviderContainer _createLineUpContainer() {
   );
 }
 
+
+
 Future<void> _pumpLineUpAbilities(
   WidgetTester tester, {
   required ProviderContainer container,
@@ -1280,5 +1282,3 @@ AbilityInfo _sectorAbilityInfo() {
     ),
   );
 }
-
-
diff --git a/test/color_persistence_test.dart b/test/color_persistence_test.dart
new file mode 100644
index 00000000..8fd012ac
--- /dev/null
+++ b/test/color_persistence_test.dart
@@ -0,0 +1,350 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hive_ce/hive.dart';
+import 'package:hive_ce/src/binary/binary_reader_impl.dart';
+import 'package:hive_ce/src/binary/binary_writer_impl.dart';
+import 'package:icarus/const/agents.dart';
+import 'package:icarus/const/bounding_box.dart';
+import 'package:icarus/const/drawing_element.dart';
+import 'package:icarus/const/placed_classes.dart';
+import 'package:icarus/const/traversal_speed.dart';
+import 'package:icarus/const/utilities.dart';
+import 'package:icarus/hive/hive_adapters.dart';
+import 'package:icarus/hive/hive_registration.dart';
+import 'package:icarus/providers/drawing_provider.dart';
+import 'package:icarus/providers/strategy_page.dart';
+import 'package:icarus/providers/strategy_settings_provider.dart';
+
+const int _testColorAdapterTypeId = 220;
+
+class _TestColorAdapter extends TypeAdapter<Color> {
+  @override
+  final typeId = _testColorAdapterTypeId;
+
+  @override
+  Color read(BinaryReader reader) {
+    return Color((reader.read() as num).toInt());
+  }
+
+  @override
+  void write(BinaryWriter writer, Color obj) {
+    writer.write(obj.toARGB32());
+  }
+}
+
+void _ensureAdaptersRegistered() {
+  if (!Hive.isAdapterRegistered(20)) {
+    registerIcarusAdapters(Hive);
+  }
+  if (!Hive.isAdapterRegistered(_testColorAdapterTypeId)) {
+    Hive.registerAdapter(_TestColorAdapter());
+  }
+}
+
+Map<int, dynamic> _readAdapterFields(
+  void Function(BinaryWriterImpl writer) writeObject,
+) {
+  _ensureAdaptersRegistered();
+  final writer = BinaryWriterImpl(Hive);
+  writeObject(writer);
+  final reader = BinaryReaderImpl(Uint8List.fromList(writer.toBytes()), Hive);
+  final numOfFields = reader.readByte();
+  return <int, dynamic>{
+    for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+  };
+}
+
+BinaryReaderImpl _legacyFieldReader(Map<int, dynamic> fields) {
+  _ensureAdaptersRegistered();
+  final writer = BinaryWriterImpl(Hive)..writeByte(fields.length);
+  for (final entry in fields.entries) {
+    writer
+      ..writeByte(entry.key)
+      ..write(entry.value);
+  }
+  return BinaryReaderImpl(Uint8List.fromList(writer.toBytes()), Hive);
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('JSON color persistence', () {
+    test('strategy page exports user-editable colors as ints', () {
+      final page = StrategyPage(
+        id: 'page-1',
+        name: 'Page 1',
+        drawingData: [
+          Line(
+            id: 'line-1',
+            lineStart: const Offset(1, 2),
+            lineEnd: const Offset(3, 4),
+            color: const Color(0xFFAA5500),
+            boundingBox: BoundingBox(
+              min: const Offset(1, 2),
+              max: const Offset(3, 4),
+            ),
+            isDotted: false,
+            hasArrow: true,
+          ),
+        ],
+        agentData: const [],
+        abilityData: const [],
+        textData: [
+          PlacedText(
+            id: 'text-1',
+            position: const Offset(5, 6),
+            tagColorValue: 0xFF22C55E,
+          )..text = 'Tagged text',
+        ],
+        imageData: [
+          PlacedImage(
+            id: 'image-1',
+            position: const Offset(7, 8),
+            aspectRatio: 1.5,
+            scale: 200,
+            fileExtension: '.png',
+            tagColorValue: 0xFF3B82F6,
+          ),
+        ],
+        utilityData: [
+          PlacedUtility(
+            id: 'utility-1',
+            position: const Offset(9, 10),
+            type: UtilityType.customCircle,
+            customDiameter: 12,
+            customColorValue: 0xFFEF4444,
+            customOpacityPercent: 35,
+          ),
+        ],
+        sortIndex: 0,
+        isAttack: true,
+        settings: StrategySettings(),
+      );
+
+      final payload = page.toJson('strategy-1');
+      final drawingJson = (payload['drawingData'] as List<dynamic>).single
+          as Map<String, dynamic>;
+      final textJson =
+          (payload['textData'] as List<dynamic>).single as Map<String, dynamic>;
+      final imageJson = (payload['imageData'] as List<dynamic>).single
+          as Map<String, dynamic>;
+      final utilityJson = (payload['utilityData'] as List<dynamic>).single
+          as Map<String, dynamic>;
+
+      expect(drawingJson['colorValue'], 0xFFAA5500);
+      expect(drawingJson.containsKey('color'), isFalse);
+      expect(textJson['tagColorValue'], 0xFF22C55E);
+      expect(imageJson['tagColorValue'], 0xFF3B82F6);
+      expect(utilityJson['customColorValue'], 0xFFEF4444);
+    });
+
+    test('legacy drawing color strings still deserialize', () {
+      final decoded = DrawingProvider.fromJson(jsonEncode([
+        {
+          'type': 'lineDrawing',
+          'id': 'line-legacy',
+          'color': '#FF22C55E',
+          'isDotted': false,
+          'hasArrow': false,
+          'lineStart': {'dx': 1.0, 'dy': 2.0},
+          'lineEnd': {'dx': 3.0, 'dy': 4.0},
+        },
+        {
+          'type': 'freeDrawing',
+          'id': 'free-legacy',
+          'color': '#FFEF4444',
+          'isDotted': false,
+          'hasArrow': false,
+          'listOfPoints': [
+            {'dx': 5.0, 'dy': 6.0},
+            {'dx': 7.0, 'dy': 8.0},
+          ],
+        },
+      ]));
+
+      expect((decoded[0] as Line).colorValue, 0xFF22C55E);
+      expect((decoded[1] as FreeDrawing).colorValue, 0xFFEF4444);
+    });
+
+    test('malformed drawing color payloads fall back to white', () {
+      final decoded = DrawingProvider.fromJson(jsonEncode([
+        {
+          'type': 'lineDrawing',
+          'id': 'line-corrupt',
+          'isDotted': false,
+          'hasArrow': false,
+          'lineStart': {'dx': 1.0, 'dy': 2.0},
+          'lineEnd': {'dx': 3.0, 'dy': 4.0},
+        },
+      ]));
+
+      expect((decoded.single as Line).colorValue, 0xFFFFFFFF);
+    });
+  });
+
+  group('Hive color persistence', () {
+    test('drawing adapters write integer color fields', () {
+      final freeDrawingFields = _readAdapterFields(
+        (writer) => FreeDrawingAdapter().write(
+          writer,
+          FreeDrawing(
+            id: 'free-1',
+            listOfPoints: const [Offset(1, 2), Offset(3, 4)],
+            color: const Color(0xFF22C55E),
+            isDotted: false,
+            hasArrow: false,
+          ),
+        ),
+      );
+      final lineFields = _readAdapterFields(
+        (writer) => LineAdapter().write(
+          writer,
+          Line(
+            id: 'line-1',
+            lineStart: const Offset(1, 2),
+            lineEnd: const Offset(3, 4),
+            color: const Color(0xFF3B82F6),
+            boundingBox: BoundingBox(
+              min: const Offset(1, 2),
+              max: const Offset(3, 4),
+            ),
+            isDotted: false,
+            hasArrow: true,
+          ),
+        ),
+      );
+      final rectangleFields = _readAdapterFields(
+        (writer) => RectangleDrawingAdapter().write(
+          writer,
+          RectangleDrawing(
+            id: 'rect-1',
+            start: const Offset(1, 2),
+            end: const Offset(3, 4),
+            color: const Color(0xFFF59E0B),
+            boundingBox: BoundingBox(
+              min: const Offset(1, 2),
+              max: const Offset(3, 4),
+            ),
+            isDotted: true,
+            hasArrow: false,
+          ),
+        ),
+      );
+      final ellipseFields = _readAdapterFields(
+        (writer) => EllipseDrawingAdapter().write(
+          writer,
+          EllipseDrawing(
+            id: 'ellipse-1',
+            start: const Offset(1, 2),
+            end: const Offset(3, 4),
+            color: const Color(0xFFA855F7),
+            boundingBox: BoundingBox(
+              min: const Offset(1, 2),
+              max: const Offset(3, 4),
+            ),
+            isDotted: true,
+            hasArrow: false,
+          ),
+        ),
+      );
+
+      expect(freeDrawingFields[2], 0xFF22C55E);
+      expect(lineFields[2], 0xFF3B82F6);
+      expect(rectangleFields[2], 0xFFF59E0B);
+      expect(ellipseFields[2], 0xFFA855F7);
+
+      expect(freeDrawingFields.values.whereType<Color>(), isEmpty);
+      expect(lineFields.values.whereType<Color>(), isEmpty);
+      expect(rectangleFields.values.whereType<Color>(), isEmpty);
+      expect(ellipseFields.values.whereType<Color>(), isEmpty);
+    });
+
+    test('drawing adapters still read legacy Hive Color payloads', () {
+      final restoredLine = LineAdapter().read(
+        _legacyFieldReader({
+          0: const Offset(1, 2),
+          1: const Offset(3, 4),
+          2: const Color(0xFFEF4444),
+          3: true,
+          4: false,
+          5: 'legacy-line',
+          6: BoundingBox(
+            min: const Offset(1, 2),
+            max: const Offset(3, 4),
+          ),
+          7: false,
+          8: TraversalSpeedProfile.walking,
+          9: 5.0,
+        }),
+      );
+
+      expect(restoredLine.colorValue, 0xFFEF4444);
+      expect(restoredLine.color, const Color(0xFFEF4444));
+    });
+
+    test('placed model adapters continue writing integer color fields', () {
+      final textFields = _readAdapterFields(
+        (writer) => PlacedTextAdapter().write(
+          writer,
+          PlacedText(
+            id: 'text-1',
+            position: const Offset(1, 2),
+            tagColorValue: 0xFF22C55E,
+          )..text = 'hello',
+        ),
+      );
+      final imageFields = _readAdapterFields(
+        (writer) => PlacedImageAdapter().write(
+          writer,
+          PlacedImage(
+            id: 'image-1',
+            position: const Offset(3, 4),
+            aspectRatio: 1.5,
+            scale: 200,
+            fileExtension: '.png',
+            tagColorValue: 0xFF3B82F6,
+          ),
+        ),
+      );
+      final utilityFields = _readAdapterFields(
+        (writer) => PlacedUtilityAdapter().write(
+          writer,
+          PlacedUtility(
+            id: 'utility-1',
+            position: const Offset(5, 6),
+            type: UtilityType.customRectangle,
+            customWidth: 4,
+            customLength: 8,
+            customColorValue: 0xFFF59E0B,
+            customOpacityPercent: 45,
+          ),
+        ),
+      );
+      final circleAgentFields = _readAdapterFields(
+        (writer) => PlacedCircleAgentAdapter().write(
+          writer,
+          PlacedCircleAgent(
+            id: 'circle-agent-1',
+            type: AgentType.jett,
+            position: const Offset(7, 8),
+            diameterMeters: 12,
+            colorValue: 0xFFA855F7,
+            opacityPercent: 60,
+          ),
+        ),
+      );
+
+      expect(textFields[5], 0xFF22C55E);
+      expect(imageFields[9], 0xFF3B82F6);
+      expect(utilityFields[11], 0xFFF59E0B);
+      expect(circleAgentFields[1], 0xFFA855F7);
+      expect(textFields.values.whereType<Color>(), isEmpty);
+      expect(imageFields.values.whereType<Color>(), isEmpty);
+      expect(utilityFields.values.whereType<Color>(), isEmpty);
+      expect(circleAgentFields.values.whereType<Color>(), isEmpty);
+    });
+  });
+}
diff --git a/test/drawing_provider_test.dart b/test/drawing_provider_test.dart
index 7cc09efb..02acc1e4 100644
--- a/test/drawing_provider_test.dart
+++ b/test/drawing_provider_test.dart
@@ -66,6 +66,10 @@ void main() {
       final decodedJson = jsonDecode(encoded) as List<dynamic>;
 
       expect(decodedJson.single, containsPair('type', 'lineDrawing'));
+      expect(
+        decodedJson.single,
+        containsPair('colorValue', Colors.red.toARGB32()),
+      );
       expect(decodedJson.single, containsPair('isDotted', true));
       expect(decodedJson.single, containsPair('hasArrow', true));
       expect(decodedJson.single, containsPair('showTraversalTime', true));
@@ -77,6 +81,7 @@ void main() {
       final decoded = DrawingProvider.fromJson(encoded).single as Line;
       expect(decoded.lineStart, const Offset(10, 20));
       expect(decoded.lineEnd, const Offset(30, 40));
+      expect(decoded.colorValue, Colors.red.toARGB32());
       expect(decoded.boundingBox!.min, const Offset(10, 20));
       expect(decoded.boundingBox!.max, const Offset(30, 40));
       expect(decoded.isDotted, isTrue);
@@ -103,6 +108,10 @@ void main() {
       final decodedJson = jsonDecode(encoded) as List<dynamic>;
 
       expect(decodedJson.single, containsPair('type', 'ellipseDrawing'));
+      expect(
+        decodedJson.single,
+        containsPair('colorValue', Colors.purple.toARGB32()),
+      );
       expect(decodedJson.single, containsPair('isDotted', true));
       expect(decodedJson.single, containsPair('hasArrow', false));
 
@@ -110,6 +119,7 @@ void main() {
           DrawingProvider.fromJson(encoded).single as EllipseDrawing;
       expect(decoded.start, const Offset(10, 20));
       expect(decoded.end, const Offset(40, 70));
+      expect(decoded.colorValue, Colors.purple.toARGB32());
       expect(decoded.boundingBox!.min, const Offset(10, 20));
       expect(decoded.boundingBox!.max, const Offset(40, 70));
       expect(decoded.isDotted, isTrue);
diff --git a/test/lineup_add_item_interaction_test.dart b/test/lineup_add_item_interaction_test.dart
index 5ad3cbd9..42fafa84 100644
--- a/test/lineup_add_item_interaction_test.dart
+++ b/test/lineup_add_item_interaction_test.dart
@@ -13,6 +13,7 @@ import 'package:icarus/providers/canvas_resize_provider.dart';
 import 'package:icarus/providers/interaction_state_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
 import 'package:icarus/widgets/draggable_widgets/ability/placed_ability_widget.dart';
+import 'package:icarus/widgets/draggable_widgets/placed_widget_builder.dart';
 import 'package:icarus/widgets/draggable_widgets/agents/agent_widget.dart';
 import 'package:icarus/widgets/line_up_placer.dart';
 import 'package:shadcn_ui/shadcn_ui.dart';
@@ -321,6 +322,59 @@ void main() {
     expect(resizedAgentTopLeft.dy, closeTo(expectedAgentTopLeft.dy, 0.001));
   });
 
+  testWidgets('persistent lineup overlay repositions and rescales on resize',
+      (tester) async {
+    final container = _createContainer();
+    final group = _breachGroup();
+    container.read(lineUpProvider.notifier).addGroup(group);
+
+    CoordinateSystem(playAreaSize: const Size(900, 600));
+    await _pumpHarness(
+      tester,
+      container: container,
+      child: const SizedBox(
+        width: 900,
+        height: 600,
+        child: LineUpOverlay(),
+      ),
+    );
+
+    final agentFinder = find.byType(AgentWidget);
+    final initialAgentTopLeft = tester.getTopLeft(agentFinder);
+    final initialAgentSize = tester.getSize(agentFinder);
+    final initialAbilityTopLeft = tester
+        .getTopLeft(find.byKey(const ValueKey('lineup-ability-breach-item')));
+    final initialAbilitySize = tester
+        .getSize(find.byKey(const ValueKey('lineup-ability-breach-item')));
+
+    CoordinateSystem(playAreaSize: const Size(1200, 800));
+    container.read(canvasResizeProvider.notifier).increment();
+    await tester.pump();
+
+    final resizedAgentTopLeft = tester.getTopLeft(agentFinder);
+    final resizedAgentSize = tester.getSize(agentFinder);
+    final resizedAbilityTopLeft = tester
+        .getTopLeft(find.byKey(const ValueKey('lineup-ability-breach-item')));
+    final resizedAbilitySize = tester
+        .getSize(find.byKey(const ValueKey('lineup-ability-breach-item')));
+
+    expect(resizedAgentTopLeft, isNot(initialAgentTopLeft));
+    expect(resizedAbilityTopLeft, isNot(initialAbilityTopLeft));
+    expect(resizedAgentSize, isNot(initialAgentSize));
+    expect(resizedAbilitySize, isNot(initialAbilitySize));
+
+    final coordinateSystem = CoordinateSystem.instance;
+    final expectedAgentTopLeft =
+        coordinateSystem.coordinateToScreen(group.agent.position);
+    final expectedAbilityTopLeft = coordinateSystem
+        .coordinateToScreen(group.items.single.ability.position);
+
+    expect(resizedAgentTopLeft.dx, closeTo(expectedAgentTopLeft.dx, 0.001));
+    expect(resizedAgentTopLeft.dy, closeTo(expectedAgentTopLeft.dy, 0.001));
+    expect(resizedAbilityTopLeft.dx, closeTo(expectedAbilityTopLeft.dx, 0.001));
+    expect(resizedAbilityTopLeft.dy, closeTo(expectedAbilityTopLeft.dy, 0.001));
+  });
+
   testWidgets('locked add-item mode rejects dragging a different agent',
       (tester) async {
     final container = _createContainer();
diff --git a/test/resizable_square_ability_test.dart b/test/resizable_square_ability_test.dart
index 62e0961e..c2515192 100644
--- a/test/resizable_square_ability_test.dart
+++ b/test/resizable_square_ability_test.dart
@@ -198,7 +198,7 @@ void main() {
             children: [
               PlacedAbilityWidget(
                 ability: placedAbility,
-                onDragEnd: (_) {},
+                onDragEnd: (_, __) {},
                 id: placedAbility.id,
                 data: placedAbility,
                 rotation: placedAbility.rotation,
diff --git a/test/screenshot_view_test.dart b/test/screenshot_view_test.dart
index bae34e7d..eb97ddfe 100644
--- a/test/screenshot_view_test.dart
+++ b/test/screenshot_view_test.dart
@@ -12,7 +12,7 @@ import 'package:icarus/providers/agent_provider.dart';
 import 'package:icarus/providers/drawing_provider.dart';
 import 'package:icarus/providers/image_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/pen_provider.dart';
 import 'package:icarus/providers/screenshot_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
@@ -168,6 +168,7 @@ void main() {
     bool showSpawnBarrier = false,
     bool showRegionNames = false,
     bool showUltOrbs = false,
+    String? pageName,
   }) {
     final strategyState = StrategyState(
       isSaved: true,
@@ -217,6 +218,7 @@ void main() {
             strategySettings: StrategySettings(),
             isAttack: isAttack,
             strategyState: strategyState,
+            pageName: pageName,
             lineUps: const <LineUp>[],
             themeProfileId: null,
             themeOverridePalette: null,
@@ -348,4 +350,24 @@ void main() {
     expect(ultOrbTransform.transform.storage[0], -1);
     expect(ultOrbTransform.transform.storage[5], -1);
   });
+
+  testWidgets('page name is shown in the lower-left screenshot corner',
+      (tester) async {
+    await tester.pumpWidget(
+      buildHarness(
+        isAttack: true,
+        pageName: 'A Execute',
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final labelFinder = find.text('A Execute');
+
+    expect(labelFinder, findsOneWidget);
+    expect(tester.getBottomLeft(labelFinder).dx, 28);
+    expect(
+      tester.getBottomLeft(labelFinder).dy,
+      lessThan(CoordinateSystem.screenShotSize.height),
+    );
+  });
 }
diff --git a/test/sector_circle_ability_test.dart b/test/sector_circle_ability_test.dart
index 286229b6..07fc4005 100644
--- a/test/sector_circle_ability_test.dart
+++ b/test/sector_circle_ability_test.dart
@@ -555,7 +555,7 @@ class _PlacedSectorAbilityHarness extends ConsumerWidget {
       children: [
         PlacedAbilityWidget(
           ability: ability,
-          onDragEnd: (_) {},
+          onDragEnd: (_, __) {},
           id: ability.id,
           data: ability,
           rotation: ability.rotation,
@@ -627,4 +627,3 @@ SectorCirclePainter _sectorPainter(WidgetTester tester) {
   return customPaint.painter! as SectorCirclePainter;
 }
 
-
diff --git a/test/shortcut_info_test.dart b/test/shortcut_info_test.dart
new file mode 100644
index 00000000..c9dfeb4c
--- /dev/null
+++ b/test/shortcut_info_test.dart
@@ -0,0 +1,111 @@
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:icarus/const/shortcut_info.dart';
+
+void main() {
+  test('primary modifier displays as the active platform modifier', () {
+    const binding = IcarusKeyBinding(
+      trigger: LogicalKeyboardKey.keyS,
+      primary: true,
+    );
+
+    expect(binding.displayLabel(platform: TargetPlatform.windows), 'Ctrl S');
+    expect(binding.displayLabel(platform: TargetPlatform.macOS), 'Cmd S');
+  });
+
+  test('duplicate lookup compares logical primary bindings', () {
+    final duplicate = ShortcutInfo.findDuplicateBinding(
+      editingShortcutId: IcarusShortcutAction.draw.name,
+      binding: const IcarusKeyBinding(trigger: LogicalKeyboardKey.keyD),
+      customBindings: const {},
+    );
+
+    expect(duplicate?.action, IcarusShortcutAction.forwardPage);
+  });
+
+  test('duplicate lookup rejects reserved undo and redo bindings', () {
+    final undoDuplicate = ShortcutInfo.findDuplicateBinding(
+      editingShortcutId: IcarusShortcutAction.draw.name,
+      binding: const IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyZ,
+        primary: true,
+      ),
+      customBindings: const {},
+    );
+    final redoDuplicate = ShortcutInfo.findDuplicateBinding(
+      editingShortcutId: IcarusShortcutAction.draw.name,
+      binding: const IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyZ,
+        primary: true,
+        shift: true,
+      ),
+      customBindings: const {},
+    );
+
+    expect(undoDuplicate?.title, 'Undo');
+    expect(redoDuplicate?.title, 'Redo');
+  });
+
+  test('effective bindings ignore custom bindings reserved for undo and redo',
+      () {
+    const reservedUndoBinding = IcarusKeyBinding(
+      trigger: LogicalKeyboardKey.keyZ,
+      primary: true,
+    );
+    final binding = ShortcutInfo.effectiveBindingFor(
+      IcarusShortcutAction.draw.name,
+      {
+        IcarusShortcutAction.draw.name: reservedUndoBinding.serialize(),
+      },
+    );
+
+    expect(binding, const IcarusKeyBinding(trigger: LogicalKeyboardKey.keyQ));
+  });
+
+  test('search matches both action title and key chord', () {
+    const bindings = <String, String>{};
+    final saveDefinition =
+        ShortcutInfo.definitionsById[IcarusShortcutAction.saveStrategy.name]!;
+
+    expect(
+      ShortcutInfo.matchesSearch(
+        saveDefinition,
+        'save',
+        bindings,
+        platform: TargetPlatform.windows,
+      ),
+      isTrue,
+    );
+    expect(
+      ShortcutInfo.matchesSearch(
+        saveDefinition,
+        'ctrl s',
+        bindings,
+        platform: TargetPlatform.windows,
+      ),
+      isTrue,
+    );
+  });
+
+  test('text editing overrides follow custom shortcut bindings', () {
+    const customDrawBinding = IcarusKeyBinding(
+      trigger: LogicalKeyboardKey.keyP,
+    );
+    final shortcuts = ShortcutInfo.textEditingOverridesFor({
+      IcarusShortcutAction.draw.name: customDrawBinding.serialize(),
+    });
+
+    expect(
+      shortcuts[
+          customDrawBinding.toActivator(platform: TargetPlatform.windows)],
+      isA<DoNothingAndStopPropagationIntent>(),
+    );
+    expect(
+      shortcuts[const IcarusKeyBinding(
+        trigger: LogicalKeyboardKey.keyQ,
+      ).toActivator(platform: TargetPlatform.windows)],
+      isNull,
+    );
+  });
+}
diff --git a/test/strategy_folder_import_test.dart b/test/strategy_folder_import_test.dart
index b5c3df41..759467f4 100644
--- a/test/strategy_folder_import_test.dart
+++ b/test/strategy_folder_import_test.dart
@@ -15,7 +15,7 @@ import 'package:icarus/const/settings.dart';
 import 'package:icarus/hive/hive_registration.dart';
 import 'package:icarus/providers/favorite_agents_provider.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/services/archive_manifest.dart';
 import 'package:path/path.dart' as path;
@@ -235,7 +235,9 @@ void main() {
     expect(result.issues.single.path, zipFile.path);
     expect(_folderByName('Manifest Root').parentID, currentFolder.id);
     expect(
-      Hive.box<Folder>(HiveBoxNames.foldersBox).values.map((folder) => folder.name),
+      Hive.box<Folder>(HiveBoxNames.foldersBox)
+          .values
+          .map((folder) => folder.name),
       containsAll(['Current', 'Manifest Root']),
     );
     expect(Hive.box<Folder>(HiveBoxNames.foldersBox).values, hasLength(2));
@@ -287,7 +289,9 @@ void main() {
     expect(result.issues.single.path, sourceRoot.path);
     expect(_folderByName('Manifest Root').parentID, currentFolder.id);
     expect(
-      Hive.box<Folder>(HiveBoxNames.foldersBox).values.map((folder) => folder.name),
+      Hive.box<Folder>(HiveBoxNames.foldersBox)
+          .values
+          .map((folder) => folder.name),
       containsAll(['Current', 'Manifest Root']),
     );
     expect(Hive.box<Folder>(HiveBoxNames.foldersBox).values, hasLength(2));
@@ -332,7 +336,8 @@ void main() {
         .buildFolderExportDirectoryForTest(rootFolder.id);
 
     try {
-      final exportedRoot = exportDirectory.listSync().whereType<Directory>().single;
+      final exportedRoot =
+          exportDirectory.listSync().whereType<Directory>().single;
       final manifestFile =
           File(path.join(exportedRoot.path, archiveMetadataFileName));
       expect(await manifestFile.exists(), isTrue);
@@ -378,21 +383,23 @@ void main() {
     }
   });
 
-  test('library backup restores global state and theme profile links', () async {
+  test('library backup restores global state and theme profile links',
+      () async {
     final themeProvider = container.read(mapThemeProfilesProvider.notifier);
     final palette = MapThemePalette(
       baseColorValue: 0xFF0F172A,
       detailColorValue: 0xFF38BDF8,
       highlightColorValue: 0xFFF97316,
     );
-    expect(
-      await themeProvider.createProfile(name: 'Tournament', palette: palette),
-      isTrue,
+    final customProfile = await themeProvider.createProfile(
+      name: 'Tournament',
+      palette: palette,
     );
-    final customProfile = Hive.box<MapThemeProfile>(HiveBoxNames.mapThemeProfilesBox)
-        .values
-        .firstWhere((profile) => profile.name == 'Tournament');
-    await themeProvider.setDefaultProfileForNewStrategies(customProfile.id);
+    expect(customProfile, isNotNull);
+    await themeProvider.setDefaultProfileForNewStrategies(customProfile!.id);
+    await container
+        .read(appPreferencesProvider.notifier)
+        .setCustomColorValues(const [0xFF22C55E, 0xFF38BDF8]);
     await container
         .read(favoriteAgentsProvider.notifier)
         .toggleFavorite(AgentType.jett);
@@ -462,6 +469,12 @@ void main() {
             ?.defaultThemeProfileIdForNewStrategies,
         restoredProfile.id,
       );
+      expect(
+        Hive.box<AppPreferences>(HiveBoxNames.appPreferencesBox)
+            .get(MapThemeProfilesProvider.appPreferencesSingletonKey)
+            ?.customColorValues,
+        const [0xFF22C55E, 0xFF38BDF8],
+      );
       expect(
         Hive.box<bool>(HiveBoxNames.favoriteAgentsBox).containsKey('jett'),
         isTrue,
diff --git a/test/strategy_integrity_test.dart b/test/strategy_integrity_test.dart
index be0072d3..0644d46e 100644
--- a/test/strategy_integrity_test.dart
+++ b/test/strategy_integrity_test.dart
@@ -25,7 +25,7 @@ import 'package:icarus/providers/agent_provider.dart';
 import 'package:icarus/providers/drawing_provider.dart';
 import 'package:icarus/providers/folder_provider.dart';
 import 'package:icarus/providers/map_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
diff --git a/test/strategy_settings_provider_test.dart b/test/strategy_settings_provider_test.dart
new file mode 100644
index 00000000..6583c386
--- /dev/null
+++ b/test/strategy_settings_provider_test.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:icarus/const/settings.dart';
+import 'package:icarus/providers/strategy_settings_provider.dart';
+
+void main() {
+  test('strategy settings json defaults neutral team colors off', () {
+    final settings = StrategySettings.fromJson(const {
+      'agentSize': 35,
+      'abilitySize': 25,
+    });
+
+    expect(settings.useNeutralTeamColors, isFalse);
+  });
+
+  test('strategy settings json persists neutral team colors', () {
+    final settings = StrategySettings(useNeutralTeamColors: true);
+
+    expect(settings.toJson()['useNeutralTeamColors'], isTrue);
+    expect(
+      StrategySettings.fromJson(settings.toJson()).useNeutralTeamColors,
+      isTrue,
+    );
+  });
+
+  test('neutral team shade keeps lightness and removes saturation', () {
+    final original = HSLColor.fromColor(Settings.allyBGColor);
+    final neutral = HSLColor.fromColor(
+      Settings.neutralTeamShade(Settings.allyBGColor),
+    );
+
+    expect(neutral.saturation, 0);
+    expect(neutral.lightness, closeTo(original.lightness, 0.001));
+  });
+}
diff --git a/test/text_editing_shortcut_scope_test.dart b/test/text_editing_shortcut_scope_test.dart
new file mode 100644
index 00000000..834327d1
--- /dev/null
+++ b/test/text_editing_shortcut_scope_test.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:icarus/widgets/text_editing_shortcut_scope.dart';
+
+void main() {
+  testWidgets('renders without an opened app preferences Hive box',
+      (tester) async {
+    await tester.pumpWidget(
+      const ProviderScope(
+        child: MaterialApp(
+          home: Scaffold(
+            body: TextEditingShortcutScope(
+              child: TextField(),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    expect(find.byType(TextField), findsOneWidget);
+    expect(tester.takeException(), isNull);
+  });
+}
diff --git a/test/text_provider_test.dart b/test/text_provider_test.dart
index c6375ae3..1e24af87 100644
--- a/test/text_provider_test.dart
+++ b/test/text_provider_test.dart
@@ -11,7 +11,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/hive/hive_registration.dart';
 import 'package:icarus/providers/action_provider.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
diff --git a/test/text_widget_resilience_test.dart b/test/text_widget_resilience_test.dart
index bae2e4af..a714aca4 100644
--- a/test/text_widget_resilience_test.dart
+++ b/test/text_widget_resilience_test.dart
@@ -11,7 +11,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/hive/hive_registration.dart';
 import 'package:icarus/providers/action_provider.dart';
 import 'package:icarus/providers/folder_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';
diff --git a/test/unsaved_strategy_guard_test.dart b/test/unsaved_strategy_guard_test.dart
index 067a84a4..10dbdc7d 100644
--- a/test/unsaved_strategy_guard_test.dart
+++ b/test/unsaved_strategy_guard_test.dart
@@ -12,7 +12,7 @@ import 'package:icarus/const/placed_classes.dart';
 import 'package:icarus/hive/hive_registration.dart';
 import 'package:icarus/providers/folder_provider.dart';
 import 'package:icarus/providers/in_app_debug_provider.dart';
-import 'package:icarus/providers/map_theme_provider.dart';
+import 'package:icarus/providers/user_preferences_provider.dart';
 import 'package:icarus/providers/strategy_page.dart';
 import 'package:icarus/providers/strategy_provider.dart';
 import 'package:icarus/providers/strategy_settings_provider.dart';