diff --git a/README.md b/README.md
index 1aa92d6..e4d535a 100644
--- a/README.md
+++ b/README.md
@@ -55,15 +55,11 @@ A text-form relational graph covering:
 | `env-vars` | Environment variable management — .env files, vercel env commands, OIDC tokens |
 | `knowledge-update` | Knowledge update guidance for the plugin |
 | `marketplace` | Integration discovery, installation, auto-provisioned env vars, unified billing |
-| `next-cache-components` | Next.js 16 Cache Components — PPR, `use cache`, cacheLife, cacheTag, updateTag |
 | `next-forge` | Production SaaS monorepo starter — Turborepo, Clerk, Prisma/Neon, Stripe, shadcn/ui |
-| `next-upgrade` | Next.js version upgrades — codemods, migration guides, dependency updates |
-| `nextjs` | App Router, Server Components, Server Actions, Cache Components, routing, rendering strategies |
 | `react-best-practices` | React/Next.js performance optimization — 64 rules across 8 categories |
 | `routing-middleware` | Request interception before cache, rewrites, redirects, personalization — Edge/Node.js/Bun runtimes |
 | `runtime-cache` | Ephemeral per-region key-value cache, tag-based invalidation, shared across Functions/Middleware/Builds |
 | `shadcn` | shadcn/ui — CLI, component installation, custom registries, theming, Tailwind CSS integration |
-| `turbopack` | Next.js bundler, HMR, configuration, Turbopack vs Webpack |
 | `vercel-agent` | AI-powered code review, incident investigation, SDK installation, PR analysis |
 | `vercel-cli` | All CLI commands — deploy, env, dev, domains, cache management, MCP integration, marketplace |
 | `vercel-functions` | Serverless, Edge, Fluid Compute, streaming, Cron Jobs, configuration |
@@ -185,10 +181,7 @@ skills/<name>/
 |-------|--------------|
 | `ai-sdk` | [vercel/ai](https://github.com/vercel/ai) |
 | `chat-sdk` | [vercel/chat](https://github.com/vercel/chat) |
-| `next-cache-components` | [vercel-labs/next-skills](https://github.com/vercel-labs/next-skills) |
 | `next-forge` | [vercel/next-forge](https://github.com/vercel/next-forge) |
-| `next-upgrade` | [vercel-labs/next-skills](https://github.com/vercel-labs/next-skills) |
-| `nextjs` | [vercel-labs/next-skills](https://github.com/vercel-labs/next-skills) |
 | `react-best-practices` | [vercel-labs/agent-skills](https://github.com/vercel-labs/agent-skills) |
 | `vercel-cli` | [vercel/vercel](https://github.com/vercel/vercel) |
 | `vercel-sandbox` | [vercel-labs/agent-browser](https://github.com/vercel-labs/agent-browser) |
diff --git a/agents/performance-optimizer.md b/agents/performance-optimizer.md
index b93725d..e798c1a 100644
--- a/agents/performance-optimizer.md
+++ b/agents/performance-optimizer.md
@@ -117,272 +117,6 @@ CLS > 0.1?
 
 ---
 
-## Rendering Strategy Decision Tree
-
-<!-- Sourced from nextjs skill: references/rsc-boundaries.md -->
-# RSC Boundaries
-
-Detect and prevent invalid patterns when crossing Server/Client component boundaries.
-
-## Detection Rules
-
-### 1. Async Client Components Are Invalid
-
-Client components **cannot** be async functions. Only Server Components can be async.
-
-**Detect:** File has `'use client'` AND component is `async function` or returns `Promise`
-
-```tsx
-// Bad: async client component
-'use client'
-export default async function UserProfile() {
-  const user = await getUser() // Cannot await in client component
-  return <div>{user.name}</div>
-}
-
-// Good: Remove async, fetch data in parent server component
-// page.tsx (server component - no 'use client')
-export default async function Page() {
-  const user = await getUser()
-  return <UserProfile user={user} />
-}
-
-// UserProfile.tsx (client component)
-'use client'
-export function UserProfile({ user }: { user: User }) {
-  return <div>{user.name}</div>
-}
-```
-
-```tsx
-// Bad: async arrow function client component
-'use client'
-const Dashboard = async () => {
-  const data = await fetchDashboard()
-  return <div>{data}</div>
-}
-
-// Good: Fetch in server component, pass data down
-```
-
-### 2. Non-Serializable Props to Client Components
-
-Props passed from Server → Client must be JSON-serializable.
-
-**Detect:** Server component passes these to a client component:
-- Functions (except Server Actions with `'use server'`)
-- `Date` objects
-- `Map`, `Set`, `WeakMap`, `WeakSet`
-- Class instances
-- `Symbol` (unless globally registered)
-- Circular references
-
-```tsx
-// Bad: Function prop
-// page.tsx (server)
-export default function Page() {
-  const handleClick = () => console.log('clicked')
-  return <ClientButton onClick={handleClick} />
-}
-
-// Good: Define function inside client component
-// ClientButton.tsx
-'use client'
-export function ClientButton() {
-  const handleClick = () => console.log('clicked')
-  return <button onClick={handleClick}>Click</button>
-}
-```
-
-```tsx
-// Bad: Date object (silently becomes string, then crashes)
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt} /> // Date object
-}
-
-// PostCard.tsx (client) - will crash on .getFullYear()
-'use client'
-export function PostCard({ createdAt }: { createdAt: Date }) {
-  return <span>{createdAt.getFullYear()}</span> // Runtime error!
-}
-
-// Good: Serialize to string on server
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt.toISOString()} />
-}
-
-// PostCard.tsx (client)
-'use client'
-export function PostCard({ createdAt }: { createdAt: string }) {
-  const date = new Date(createdAt)
-  return <span>{date.getFullYear()}</span>
-}
-```
-
-```tsx
-// Bad: Class instance
-const user = new UserModel(data)
-<ClientProfile user={user} /> // Methods will be stripped
-
-// Good: Pass plain object
-const user = await getUser()
-<ClientProfile user={{ id: user.id, name: user.name }} />
-```
-
-```tsx
-// Bad: Map/Set
-<ClientComponent items={new Map([['a', 1]])} />
-
-// Good: Convert to array/object
-<ClientComponent items={Object.fromEntries(map)} />
-<ClientComponent items={Array.from(set)} />
-```
-
-### 3. Server Actions Are the Exception
-
-Functions marked with `'use server'` CAN be passed to client components.
-
-```tsx
-// Valid: Server Action can be passed
-// actions.ts
-'use server'
-export async function submitForm(formData: FormData) {
-  // server-side logic
-}
-
-// page.tsx (server)
-import { submitForm } from './actions'
-export default function Page() {
-  return <ClientForm onSubmit={submitForm} /> // OK!
-}
-
-// ClientForm.tsx (client)
-'use client'
-export function ClientForm({ onSubmit }: { onSubmit: (data: FormData) => Promise<void> }) {
-  return <form action={onSubmit}>...</form>
-}
-```
-
-## Quick Reference
-
-| Pattern | Valid? | Fix |
-|---------|--------|-----|
-| `'use client'` + `async function` | No | Fetch in server parent, pass data |
-| Pass `() => {}` to client | No | Define in client or use server action |
-| Pass `new Date()` to client | No | Use `.toISOString()` |
-| Pass `new Map()` to client | No | Convert to object/array |
-| Pass class instance to client | No | Pass plain object |
-| Pass server action to client | Yes | - |
-| Pass `string/number/boolean` | Yes | - |
-| Pass plain object/array | Yes | - |
-
----
-
-## Bundle Size Analysis
-
-<!-- Sourced from nextjs skill: references/bundling.md > Bundle Analysis -->
-Analyze bundle size with the built-in analyzer (Next.js 16.1+):
-
-```bash
-next experimental-analyze
-```
-
-This opens an interactive UI to:
-- Filter by route, environment (client/server), and type
-- Inspect module sizes and import chains
-- View treemap visualization
-
-Save output for comparison:
-
-```bash
-next experimental-analyze --output
-# Output saved to .next/diagnostics/analyze
-```
-
-Reference: https://nextjs.org/docs/app/guides/package-bundling
-
----
-
-## Caching Strategy Matrix
-
-<!-- Sourced from nextjs skill: references/data-patterns.md > Decision Tree -->
-```
-Need to fetch data?
-├── From a Server Component?
-│   └── Use: Fetch directly (no API needed)
-│
-├── From a Client Component?
-│   ├── Is it a mutation (POST/PUT/DELETE)?
-│   │   └── Use: Server Action
-│   └── Is it a read (GET)?
-│       └── Use: Route Handler OR pass from Server Component
-│
-├── Need external API access (webhooks, third parties)?
-│   └── Use: Route Handler
-│
-└── Need REST API for mobile app / external clients?
-    └── Use: Route Handler
-```
-
-### Cache Invalidation Patterns
-
-<!-- Sourced from next-cache-components skill: Cache Invalidation -->
-### `cacheTag()` - Tag Cached Content
-
-```tsx
-import { cacheTag } from 'next/cache'
-
-async function getProducts() {
-  'use cache'
-  cacheTag('products')
-  return db.products.findMany()
-}
-
-async function getProduct(id: string) {
-  'use cache'
-  cacheTag('products', `product-${id}`)
-  return db.products.findUnique({ where: { id } })
-}
-```
-
-### `updateTag()` - Immediate Invalidation
-
-Use when you need the cache refreshed within the same request:
-
-```tsx
-'use server'
-
-import { updateTag } from 'next/cache'
-
-export async function updateProduct(id: string, data: FormData) {
-  await db.products.update({ where: { id }, data })
-  updateTag(`product-${id}`)  // Immediate - same request sees fresh data
-}
-```
-
-### `revalidateTag()` - Background Revalidation
-
-Use for stale-while-revalidate behavior:
-
-```tsx
-'use server'
-
-import { revalidateTag } from 'next/cache'
-
-export async function createPost(data: FormData) {
-  await db.posts.create({ data })
-  revalidateTag('posts')  // Background - next request sees fresh data
-}
-```
-
----
-
----
-
 ## Performance Audit Checklist
 
 Run through this when asked to optimize a Vercel application:
@@ -400,536 +134,6 @@ Run through this when asked to optimize a Vercel application:
 
 ---
 
-## Specific Fix Patterns
-
-### Image Optimization
-
-<!-- Sourced from nextjs skill: references/image.md -->
-# Image Optimization
-
-Use `next/image` for automatic image optimization.
-
-## Always Use next/image
-
-```tsx
-// Bad: Avoid native img
-<img src="/hero.png" alt="Hero" />
-
-// Good: Use next/image
-import Image from 'next/image'
-<Image src="/hero.png" alt="Hero" width={800} height={400} />
-```
-
-## Required Props
-
-Images need explicit dimensions to prevent layout shift:
-
-```tsx
-// Local images - dimensions inferred automatically
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" />
-
-// Remote images - must specify width/height
-<Image src="https://example.com/image.jpg" alt="Hero" width={800} height={400} />
-
-// Or use fill for parent-relative sizing
-<div style={{ position: 'relative', width: '100%', height: 400 }}>
-  <Image src="/hero.png" alt="Hero" fill style={{ objectFit: 'cover' }} />
-</div>
-```
-
-## Remote Images Configuration
-
-Remote domains must be configured in `next.config.js`:
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    remotePatterns: [
-      {
-        protocol: 'https',
-        hostname: 'example.com',
-        pathname: '/images/**',
-      },
-      {
-        protocol: 'https',
-        hostname: '*.cdn.com', // Wildcard subdomain
-      },
-    ],
-  },
-}
-```
-
-## Responsive Images
-
-Use `sizes` to tell the browser which size to download:
-
-```tsx
-// Full-width hero
-<Image
-  src="/hero.png"
-  alt="Hero"
-  fill
-  sizes="100vw"
-/>
-
-// Responsive grid (3 columns on desktop, 1 on mobile)
-<Image
-  src="/card.png"
-  alt="Card"
-  fill
-  sizes="(max-width: 768px) 100vw, 33vw"
-/>
-
-// Fixed sidebar image
-<Image
-  src="/avatar.png"
-  alt="Avatar"
-  width={200}
-  height={200}
-  sizes="200px"
-/>
-```
-
-## Blur Placeholder
-
-Prevent layout shift with placeholders:
-
-```tsx
-// Local images - automatic blur hash
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" placeholder="blur" />
-
-// Remote images - provide blurDataURL
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="blur"
-  blurDataURL="data:image/jpeg;base64,/9j/4AAQSkZJRg..."
-/>
-
-// Or use color placeholder
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="empty"
-  style={{ backgroundColor: '#e0e0e0' }}
-/>
-```
-
-## Priority Loading
-
-Use `priority` for above-the-fold images (LCP):
-
-```tsx
-// Hero image - loads immediately
-<Image src="/hero.png" alt="Hero" fill priority />
-
-// Below-fold images - lazy loaded by default (no priority needed)
-<Image src="/card.png" alt="Card" width={400} height={300} />
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Missing sizes with fill - downloads largest image
-<Image src="/hero.png" alt="Hero" fill />
-
-// Good: Add sizes for proper responsive behavior
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" />
-
-// Bad: Using width/height for aspect ratio only
-<Image src="/hero.png" alt="Hero" width={16} height={9} />
-
-// Good: Use actual display dimensions or fill with sizes
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" style={{ objectFit: 'cover' }} />
-
-// Bad: Remote image without config
-<Image src="https://untrusted.com/image.jpg" alt="Image" width={400} height={300} />
-// Error: Invalid src prop, hostname not configured
-
-// Good: Add hostname to next.config.js remotePatterns
-```
-
-## Static Export
-
-When using `output: 'export'`, use `unoptimized` or custom loader:
-
-```tsx
-// Option 1: Disable optimization
-<Image src="/hero.png" alt="Hero" width={800} height={400} unoptimized />
-
-// Option 2: Global config
-// next.config.js
-module.exports = {
-  output: 'export',
-  images: { unoptimized: true },
-}
-
-// Option 3: Custom loader (Cloudinary, Imgix, etc.)
-const cloudinaryLoader = ({ src, width, quality }) => {
-  return `https://res.cloudinary.com/demo/image/upload/w_${width},q_${quality || 75}/${src}`
-}
-
-<Image loader={cloudinaryLoader} src="sample.jpg" alt="Sample" width={800} height={400} />
-```
-
-### Font Loading
-
-<!-- Sourced from nextjs skill: references/font.md -->
-# Font Optimization
-
-Use `next/font` for automatic font optimization with zero layout shift.
-
-## Google Fonts
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={inter.className}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-## Multiple Fonts
-
-```tsx
-import { Inter, Roboto_Mono } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-const robotoMono = Roboto_Mono({
-  subsets: ['latin'],
-  variable: '--font-roboto-mono',
-})
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={`${inter.variable} ${robotoMono.variable}`}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-Use in CSS:
-```css
-body {
-  font-family: var(--font-inter);
-}
-
-code {
-  font-family: var(--font-roboto-mono);
-}
-```
-
-## Font Weights and Styles
-
-```tsx
-// Single weight
-const inter = Inter({
-  subsets: ['latin'],
-  weight: '400',
-})
-
-// Multiple weights
-const inter = Inter({
-  subsets: ['latin'],
-  weight: ['400', '500', '700'],
-})
-
-// Variable font (recommended) - includes all weights
-const inter = Inter({
-  subsets: ['latin'],
-  // No weight needed - variable fonts support all weights
-})
-
-// With italic
-const inter = Inter({
-  subsets: ['latin'],
-  style: ['normal', 'italic'],
-})
-```
-
-## Local Fonts
-
-```tsx
-import localFont from 'next/font/local'
-
-const myFont = localFont({
-  src: './fonts/MyFont.woff2',
-})
-
-// Multiple files for different weights
-const myFont = localFont({
-  src: [
-    {
-      path: './fonts/MyFont-Regular.woff2',
-      weight: '400',
-      style: 'normal',
-    },
-    {
-      path: './fonts/MyFont-Bold.woff2',
-      weight: '700',
-      style: 'normal',
-    },
-  ],
-})
-
-// Variable font
-const myFont = localFont({
-  src: './fonts/MyFont-Variable.woff2',
-  variable: '--font-my-font',
-})
-```
-
-## Tailwind CSS Integration
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-export default function RootLayout({ children }) {
-  return (
-    <html lang="en" className={inter.variable}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-```js
-// tailwind.config.js
-module.exports = {
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: ['var(--font-inter)'],
-      },
-    },
-  },
-}
-```
-
-## Preloading Subsets
-
-Only load needed character subsets:
-
-```tsx
-// Latin only (most common)
-const inter = Inter({ subsets: ['latin'] })
-
-// Multiple subsets
-const inter = Inter({ subsets: ['latin', 'latin-ext', 'cyrillic'] })
-```
-
-## Display Strategy
-
-Control font loading behavior:
-
-```tsx
-const inter = Inter({
-  subsets: ['latin'],
-  display: 'swap', // Default - shows fallback, swaps when loaded
-})
-
-// Options:
-// 'auto' - browser decides
-// 'block' - short block period, then swap
-// 'swap' - immediate fallback, swap when ready (recommended)
-// 'fallback' - short block, short swap, then fallback
-// 'optional' - short block, no swap (use if font is optional)
-```
-
-## Don't Use Manual Font Links
-
-Always use `next/font` instead of `<link>` tags for Google Fonts.
-
-```tsx
-// Bad: Manual link tag (blocks rendering, no optimization)
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Bad: Missing display and preconnect
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Good: Use next/font (self-hosted, zero layout shift)
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Importing font in every component
-// components/Button.tsx
-import { Inter } from 'next/font/google'
-const inter = Inter({ subsets: ['latin'] }) // Creates new instance each time!
-
-// Good: Import once in layout, use CSS variable
-// app/layout.tsx
-const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-
-// Bad: Using @import in CSS (blocks rendering)
-/* globals.css */
-@import url('https://fonts.googleapis.com/css2?family=Inter');
-
-// Good: Use next/font (self-hosted, no network request)
-import { Inter } from 'next/font/google'
-
-// Bad: Loading all weights when only using a few
-const inter = Inter({ subsets: ['latin'] }) // Loads all weights
-
-// Good: Specify only needed weights (for non-variable fonts)
-const inter = Inter({ subsets: ['latin'], weight: ['400', '700'] })
-
-// Bad: Missing subset - loads all characters
-const inter = Inter({})
-
-// Good: Always specify subset
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Font in Specific Components
-
-```tsx
-// For component-specific fonts, export from a shared file
-// lib/fonts.ts
-import { Inter, Playfair_Display } from 'next/font/google'
-
-export const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-export const playfair = Playfair_Display({ subsets: ['latin'], variable: '--font-playfair' })
-
-// components/Heading.tsx
-import { playfair } from '@/lib/fonts'
-
-export function Heading({ children }) {
-  return <h1 className={playfair.className}>{children}</h1>
-}
-```
-
-### Cache Components (Next.js 16)
-
-<!-- Sourced from next-cache-components skill: use cache Directive -->
-### File Level
-
-```tsx
-'use cache'
-
-export default async function Page() {
-  // Entire page is cached
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Component Level
-
-```tsx
-export async function CachedComponent() {
-  'use cache'
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Function Level
-
-```tsx
-export async function getData() {
-  'use cache'
-  return db.query('SELECT * FROM posts')
-}
-```
-
----
-
-### Optimistic UI for Server Actions
-
-<!-- Sourced from nextjs skill: references/data-patterns.md > Client Component Data Fetching -->
-When Client Components need data:
-
-### Option 1: Pass from Server Component (Preferred)
-
-```tsx
-// Server Component
-async function Page() {
-  const data = await fetchData();
-  return <ClientComponent initialData={data} />;
-}
-
-// Client Component
-'use client';
-function ClientComponent({ initialData }) {
-  const [data, setData] = useState(initialData);
-  // ...
-}
-```
-
-### Option 2: Fetch on Mount (When Necessary)
-
-```tsx
-'use client';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    fetch('/api/data')
-      .then(r => r.json())
-      .then(setData);
-  }, []);
-
-  if (!data) return <Loading />;
-  return <div>{data.value}</div>;
-}
-```
-
-### Option 3: Server Action for Reads (Works But Not Ideal)
-
-Server Actions can be called from Client Components for reads, but this is not their intended purpose:
-
-```tsx
-'use client';
-import { getData } from './actions';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    getData().then(setData);
-  }, []);
-
-  return <div>{data?.value}</div>;
-}
-```
-
-**Note**: Server Actions always use POST, so no HTTP caching. Prefer Route Handlers for cacheable reads.
-
----
-
 Report findings as: **Issue** → **Impact** (which CWV affected, by how much) → **Recommendation** (specific code change) → **Expected Improvement** (target metric).
 
-Always reference the **Next.js skill** (`⤳ skill: nextjs`) for framework patterns. For monitoring setup, configure drains via Dashboard or REST API.
+For monitoring setup, configure drains via Dashboard or REST API.
diff --git a/agents/performance-optimizer.md.tmpl b/agents/performance-optimizer.md.tmpl
index 8c26992..e798c1a 100644
--- a/agents/performance-optimizer.md.tmpl
+++ b/agents/performance-optimizer.md.tmpl
@@ -117,32 +117,6 @@ CLS > 0.1?
 
 ---
 
-## Rendering Strategy Decision Tree
-
-<!-- Sourced from nextjs skill: references/rsc-boundaries.md -->
-{{include:skill:nextjs:file:references/rsc-boundaries.md}}
-
----
-
-## Bundle Size Analysis
-
-<!-- Sourced from nextjs skill: references/bundling.md > Bundle Analysis -->
-{{include:skill:nextjs:file:references/bundling.md:Bundle Analysis}}
-
----
-
-## Caching Strategy Matrix
-
-<!-- Sourced from nextjs skill: references/data-patterns.md > Decision Tree -->
-{{include:skill:nextjs:file:references/data-patterns.md:Decision Tree}}
-
-### Cache Invalidation Patterns
-
-<!-- Sourced from next-cache-components skill: Cache Invalidation -->
-{{include:skill:next-cache-components:Cache Invalidation}}
-
----
-
 ## Performance Audit Checklist
 
 Run through this when asked to optimize a Vercel application:
@@ -160,30 +134,6 @@ Run through this when asked to optimize a Vercel application:
 
 ---
 
-## Specific Fix Patterns
-
-### Image Optimization
-
-<!-- Sourced from nextjs skill: references/image.md -->
-{{include:skill:nextjs:file:references/image.md}}
-
-### Font Loading
-
-<!-- Sourced from nextjs skill: references/font.md -->
-{{include:skill:nextjs:file:references/font.md}}
-
-### Cache Components (Next.js 16)
-
-<!-- Sourced from next-cache-components skill: use cache Directive -->
-{{include:skill:next-cache-components:`use cache` Directive}}
-
-### Optimistic UI for Server Actions
-
-<!-- Sourced from nextjs skill: references/data-patterns.md > Client Component Data Fetching -->
-{{include:skill:nextjs:file:references/data-patterns.md:Client Component Data Fetching}}
-
----
-
 Report findings as: **Issue** → **Impact** (which CWV affected, by how much) → **Recommendation** (specific code change) → **Expected Improvement** (target metric).
 
-Always reference the **Next.js skill** (`⤳ skill: nextjs`) for framework patterns. For monitoring setup, configure drains via Dashboard or REST API.
+For monitoring setup, configure drains via Dashboard or REST API.
diff --git a/generated/build-from-skills.manifest.json b/generated/build-from-skills.manifest.json
index a07dbfe..ad1547c 100644
--- a/generated/build-from-skills.manifest.json
+++ b/generated/build-from-skills.manifest.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "generatedAt": "2026-06-11T01:55:09.119Z",
+  "generatedAt": "2026-06-16T23:46:02.405Z",
   "templates": [
     {
       "template": "agents/ai-architect.md.tmpl",
@@ -28,68 +28,8 @@
     {
       "template": "agents/performance-optimizer.md.tmpl",
       "output": "agents/performance-optimizer.md",
-      "dependencies": [
-        "nextjs",
-        "next-cache-components"
-      ],
-      "includes": [
-        {
-          "marker": "{{include:skill:nextjs:file:references/rsc-boundaries.md}}",
-          "skillName": "nextjs",
-          "target": "file:references/rsc-boundaries.md",
-          "type": "section",
-          "lineNumber": 123
-        },
-        {
-          "marker": "{{include:skill:nextjs:file:references/bundling.md:Bundle Analysis}}",
-          "skillName": "nextjs",
-          "target": "file:references/bundling.md:Bundle Analysis",
-          "type": "section",
-          "lineNumber": 130
-        },
-        {
-          "marker": "{{include:skill:nextjs:file:references/data-patterns.md:Decision Tree}}",
-          "skillName": "nextjs",
-          "target": "file:references/data-patterns.md:Decision Tree",
-          "type": "section",
-          "lineNumber": 137
-        },
-        {
-          "marker": "{{include:skill:next-cache-components:Cache Invalidation}}",
-          "skillName": "next-cache-components",
-          "target": "Cache Invalidation",
-          "type": "section",
-          "lineNumber": 142
-        },
-        {
-          "marker": "{{include:skill:nextjs:file:references/image.md}}",
-          "skillName": "nextjs",
-          "target": "file:references/image.md",
-          "type": "section",
-          "lineNumber": 168
-        },
-        {
-          "marker": "{{include:skill:nextjs:file:references/font.md}}",
-          "skillName": "nextjs",
-          "target": "file:references/font.md",
-          "type": "section",
-          "lineNumber": 173
-        },
-        {
-          "marker": "{{include:skill:next-cache-components:`use cache` Directive}}",
-          "skillName": "next-cache-components",
-          "target": "`use cache` Directive",
-          "type": "section",
-          "lineNumber": 178
-        },
-        {
-          "marker": "{{include:skill:nextjs:file:references/data-patterns.md:Client Component Data Fetching}}",
-          "skillName": "nextjs",
-          "target": "file:references/data-patterns.md:Client Component Data Fetching",
-          "type": "section",
-          "lineNumber": 183
-        }
-      ]
+      "dependencies": [],
+      "includes": []
     },
     {
       "template": "agents/deployment-expert.md.tmpl",
diff --git a/generated/skill-catalog.md b/generated/skill-catalog.md
index bc3412f..3e643d0 100644
--- a/generated/skill-catalog.md
+++ b/generated/skill-catalog.md
@@ -1,8 +1,8 @@
 # Skill Catalog
 
 > Auto-generated by `scripts/generate-catalog.ts` — do not edit manually.
-> Generated: 2026-06-09T19:40:07.166Z
-> Skills: 28
+> Generated: 2026-06-16T23:46:02.431Z
+> Skills: 24
 
 ## Table of Contents
 
@@ -29,16 +29,12 @@
 | `verification` | 7 | 0 | 8 | 0 |
 | `auth` | 6 | 14 | 12 | 0 |
 | `deployments-cicd` | 6 | 6 | 7 | 0 |
-| `next-cache-components` | 6 | 5 | 1 | 1 |
 | `next-forge` | 6 | 32 | 8 | 21 |
-| `next-upgrade` | 6 | 2 | 5 | 0 |
 | `routing-middleware` | 6 | 20 | 1 | 0 |
 | `runtime-cache` | 6 | 4 | 4 | 0 |
 | `shadcn` | 6 | 7 | 6 | 0 |
-| `nextjs` | 5 | 15 | 7 | 0 |
-| `vercel-connect` | 5 | 0 | 6 | 3 |
+| `vercel-connect` | 5 | 2 | 6 | 4 |
 | `react-best-practices` | 4 | 8 | 0 | 2 |
-| `turbopack` | 4 | 1 | 2 | 0 |
 | `vercel-agent` | 4 | 6 | 1 | 0 |
 | `vercel-cli` | 4 | 5 | 7 | 0 |
 | `vercel-sandbox` | 4 | 0 | 4 | 1 |
@@ -521,34 +517,6 @@
 - `vercel deploy` (bash)
 - `vercel build` (bash)
 
-#### `next-cache-components` (priority 6)
-
-**Path patterns:**
-- `next.config.*`
-- `app/**`
-- `src/app/**`
-- `apps/*/app/**`
-- `apps/*/src/app/**`
-
-**Bash patterns:**
-- `\bnext\s+(dev|build)\b`
-
-**Import patterns:**
-- `next/cache`
-
-**Matched examples:**
-- `next.config.ts` (path)
-- `next.config.js` (path)
-- `next.config.mjs` (path)
-- `app/api/chat/route.ts` (path)
-- `app/api/completion/route.ts` (path)
-- `app/layout.tsx` (path)
-- `src/app/layout.tsx` (path)
-- `app/api/bot/route.ts` (path)
-- `next dev` (bash)
-- `next build` (bash)
-- `next dev --turbo` (bash)
-
 #### `next-forge` (priority 6)
 
 **Path patterns:**
@@ -621,24 +589,6 @@
 **Matched examples:**
 - `apps/web/vercel.json` (path)
 
-#### `next-upgrade` (priority 6)
-
-**Path patterns:**
-- `next.config.*`
-- `package.json`
-
-**Bash patterns:**
-- `\bnpx\s+@next/codemod\b`
-- `\bnpm\s+(install|i|add)\s+[^\n]*\bnext@`
-- `\bpnpm\s+(install|i|add)\s+[^\n]*\bnext@`
-- `\bbun\s+(install|i|add)\s+[^\n]*\bnext@`
-- `\byarn\s+add\s+[^\n]*\bnext@`
-
-**Matched examples:**
-- `next.config.ts` (path)
-- `next.config.js` (path)
-- `next.config.mjs` (path)
-
 #### `routing-middleware` (priority 6)
 
 **Path patterns:**
@@ -715,54 +665,11 @@
 - `npx shadcn add button` (bash)
 - `npx create-next-app` (bash)
 
-#### `nextjs` (priority 5)
+#### `vercel-connect` (priority 5)
 
 **Path patterns:**
-- `next.config.*`
-- `next-env.d.ts`
-- `app/**`
-- `pages/**`
-- `src/app/**`
-- `src/pages/**`
-- `tailwind.config.*`
-- `postcss.config.*`
-- `tsconfig.json`
-- `tsconfig.*.json`
-- `apps/*/app/**`
-- `apps/*/pages/**`
-- `apps/*/src/app/**`
-- `apps/*/src/pages/**`
-- `apps/*/next.config.*`
-
-**Bash patterns:**
-- `\bnext\s+(dev|build|start|lint)\b`
-- `\bnext\s+experimental-analyze\b`
-- `\bnpx\s+create-next-app\b`
-- `\bbunx\s+create-next-app\b`
-- `\bnpm\s+run\s+(dev|build|start)\b`
-- `\bpnpm\s+(dev|build)\b`
-- `\bbun\s+run\s+(dev|build)\b`
-
-**Matched examples:**
-- `next.config.ts` (path)
-- `next.config.js` (path)
-- `next.config.mjs` (path)
-- `app/api/chat/route.ts` (path)
-- `app/api/completion/route.ts` (path)
-- `app/layout.tsx` (path)
-- `src/app/layout.tsx` (path)
-- `pages/api/auth/[...nextauth].ts` (path)
-- `pages/api/hello.ts` (path)
-- `app/api/bot/route.ts` (path)
-- `next dev` (bash)
-- `next build` (bash)
-- `next dev --turbo` (bash)
-- `npm run dev` (bash)
-- `pnpm dev` (bash)
-- `bun run dev` (bash)
-- `npx create-next-app` (bash)
-
-#### `vercel-connect` (priority 5)
+- `agent/connections/**`
+- `agent/channels/**`
 
 **Bash patterns:**
 - `\bvercel\s+connect\b`
@@ -774,6 +681,7 @@
 
 **Import patterns:**
 - `@vercel/connect`
+- `@vercel/connect/eve`
 - `@vercel/connect/authjs`
 - `@vercel/connect/betterauth`
 
@@ -796,21 +704,6 @@
 **Matched examples:**
 - `components/ui/button.tsx` (path)
 
-#### `turbopack` (priority 4)
-
-**Path patterns:**
-- `next.config.*`
-
-**Bash patterns:**
-- `\bnext\s+dev\s+--turbo\b`
-- `\bnext\s+dev\s+--turbopack\b`
-
-**Matched examples:**
-- `next.config.ts` (path)
-- `next.config.js` (path)
-- `next.config.mjs` (path)
-- `next dev --turbo` (bash)
-
 #### `vercel-agent` (priority 4)
 
 **Path patterns:**
@@ -893,18 +786,11 @@ Shows which skills compete on shared file targets.
 | `middleware.ts` | `auth` (6), `routing-middleware` (6) |
 | `middleware.js` | `auth` (6), `routing-middleware` (6) |
 | `src/middleware.ts` | `auth` (6), `routing-middleware` (6) |
-| `next.config.ts` | `next-cache-components` (6), `next-upgrade` (6), `nextjs` (5), `turbopack` (4) |
-| `next.config.js` | `next-cache-components` (6), `next-upgrade` (6), `nextjs` (5), `turbopack` (4) |
-| `next.config.mjs` | `next-cache-components` (6), `next-upgrade` (6), `nextjs` (5), `turbopack` (4) |
-| `app/api/chat/route.ts` | `ai-sdk` (8), `chat-sdk` (8), `vercel-functions` (8), `next-cache-components` (6), `nextjs` (5) |
-| `app/api/completion/route.ts` | `ai-sdk` (8), `vercel-functions` (8), `next-cache-components` (6), `nextjs` (5) |
-| `app/layout.tsx` | `next-cache-components` (6), `nextjs` (5) |
-| `src/app/layout.tsx` | `next-cache-components` (6), `nextjs` (5) |
-| `pages/api/auth/[...nextauth].ts` | `vercel-functions` (8), `nextjs` (5) |
+| `app/api/chat/route.ts` | `ai-sdk` (8), `chat-sdk` (8), `vercel-functions` (8) |
+| `app/api/completion/route.ts` | `ai-sdk` (8), `vercel-functions` (8) |
 | `components/ui/button.tsx` | `shadcn` (6), `react-best-practices` (4) |
 | `.github/workflows/deploy.yml` | `deployments-cicd` (6), `vercel-agent` (4) |
-| `pages/api/hello.ts` | `vercel-functions` (8), `nextjs` (5) |
-| `app/api/bot/route.ts` | `chat-sdk` (8), `vercel-functions` (8), `next-cache-components` (6), `nextjs` (5) |
+| `app/api/bot/route.ts` | `chat-sdk` (8), `vercel-functions` (8) |
 
 ## Bash Overlap Matrix
 
@@ -918,13 +804,6 @@ Shows which skills compete on shared bash commands.
 | `vercel env add` | `env-vars` (7), `vercel-cli` (4) |
 | `vercel logs` | `vercel-functions` (8), `vercel-cli` (4) |
 | `vercel build` | `deployments-cicd` (6), `vercel-cli` (4) |
-| `next dev` | `verification` (7), `next-cache-components` (6), `nextjs` (5) |
-| `next build` | `next-cache-components` (6), `nextjs` (5) |
-| `next dev --turbo` | `verification` (7), `next-cache-components` (6), `nextjs` (5), `turbopack` (4) |
-| `npm run dev` | `verification` (7), `nextjs` (5) |
-| `pnpm dev` | `verification` (7), `nextjs` (5) |
-| `bun run dev` | `verification` (7), `nextjs` (5) |
-| `npx create-next-app` | `shadcn` (6), `nextjs` (5) |
 | `vercel integration add` | `vercel-cli` (4), `marketplace` (3) |
 | `vercel firewall` | `vercel-firewall` (7), `vercel-cli` (4) |
 
@@ -938,11 +817,11 @@ Shows which skills compete on shared bash commands.
 
 **Priority 7:** `ai-gateway`, `env-vars`, `microfrontends`, `vercel-firewall`, `vercel-storage`, `verification`
 
-**Priority 6:** `auth`, `deployments-cicd`, `next-cache-components`, `next-forge`, `next-upgrade`, `routing-middleware`, `runtime-cache`, `shadcn`
+**Priority 6:** `auth`, `deployments-cicd`, `next-forge`, `routing-middleware`, `runtime-cache`, `shadcn`
 
-**Priority 5:** `nextjs`, `vercel-connect`
+**Priority 5:** `vercel-connect`
 
-**Priority 4:** `react-best-practices`, `turbopack`, `vercel-agent`, `vercel-cli`, `vercel-sandbox`
+**Priority 4:** `react-best-practices`, `vercel-agent`, `vercel-cli`, `vercel-sandbox`
 
 **Priority 3:** `marketplace`
 
diff --git a/generated/skill-manifest.json b/generated/skill-manifest.json
index 3245285..5b91c9c 100644
--- a/generated/skill-manifest.json
+++ b/generated/skill-manifest.json
@@ -1,5 +1,5 @@
 {
-  "generatedAt": "2026-06-11T01:55:09.087Z",
+  "generatedAt": "2026-06-16T23:46:02.375Z",
   "version": 2,
   "skills": {
     "vercel-agent": {
@@ -125,29 +125,12 @@
         "\\bnpx\\s+@vercel/config\\b"
       ],
       "importRegexSources": [],
-      "validate": [
-        {
-          "pattern": "NextResponse.*from\\s+[''\"]next/server[''\"]|from\\s+[''\"]next/server[''\"].*NextResponse",
-          "message": "Next.js middleware.ts is renamed to proxy.ts in Next.js 16 — rename the file and use the Node.js runtime. Run Skill(nextjs) for proxy.ts migration guidance.",
-          "severity": "recommended",
-          "skipIfFileContains": "proxy\\.ts|runtime.*nodejs",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from middleware.ts to proxy.ts with correct file placement, Node.js runtime, and Next.js 16 patterns.",
-          "upgradeMode": "soft"
-        }
-      ],
       "chainTo": [
         {
           "pattern": "from\\s+[''\"\"]next-auth[''\"\"]",
           "targetSkill": "auth",
           "message": "Auth logic in middleware — loading Auth guidance for Clerk/Auth0 integration patterns."
         },
-        {
-          "pattern": "NextResponse.*from\\s+[''\"]next/server[''\"]|from\\s+[''\"]next/server[''\"].*NextResponse",
-          "targetSkill": "nextjs",
-          "message": "middleware.ts with next/server imports detected — loading Next.js guidance for proxy.ts migration (Next.js 16 renames middleware.ts to proxy.ts with Node.js runtime).",
-          "skipIfFileContains": "proxy\\.ts|runtime.*nodejs"
-        },
         {
           "pattern": "from\\s+[''\"\"](jsonwebtoken)[''\"\"]|jwt\\.(verify|decode)\\(",
           "targetSkill": "auth",
@@ -462,22 +445,12 @@
         }
       ],
       "chainTo": [
-        {
-          "pattern": "from\\\\s+['\\\"]@vercel/postgres['\\\"]",
-          "targetSkill": "nextjs",
-          "message": "@vercel/postgres is sunset — loading Next.js guidance for integrating @neondatabase/serverless with App Router."
-        },
         {
           "pattern": "@vercel/postgres",
           "targetSkill": "vercel-storage",
           "message": "@vercel/postgres is sunset — migrate to @neondatabase/serverless. Run `vercel integration add neon` for one-click Marketplace provisioning with unified billing.",
           "skipIfFileContains": "@neondatabase/serverless|from\\\\s+['\\\"]@neondatabase"
         },
-        {
-          "pattern": "from\\\\s+['\\\"]@vercel/kv['\\\"]",
-          "targetSkill": "nextjs",
-          "message": "@vercel/kv is sunset — loading Next.js guidance for integrating @upstash/redis with App Router."
-        },
         {
           "pattern": "createPool\\\\s*\\\\(|from\\\\s+['\\\"]@vercel/postgres/pool['\\\"]",
           "targetSkill": "vercel-storage",
@@ -1203,65 +1176,6 @@
         ]
       }
     },
-    "turbopack": {
-      "priority": 4,
-      "summary": "",
-      "docs": [
-        "https://turbo.build/pack/docs",
-        "https://nextjs.org/docs/architecture/turbopack"
-      ],
-      "sitemap": "https://turbo.build/sitemap.xml",
-      "pathPatterns": [
-        "next.config.*"
-      ],
-      "bashPatterns": [
-        "\\bnext\\s+dev\\s+--turbo\\b",
-        "\\bnext\\s+dev\\s+--turbopack\\b"
-      ],
-      "importPatterns": [],
-      "bodyPath": "skills/turbopack/SKILL.md",
-      "pathRegexSources": [
-        "^next\\.config\\.[^/]*$"
-      ],
-      "bashRegexSources": [
-        "\\bnext\\s+dev\\s+--turbo\\b",
-        "\\bnext\\s+dev\\s+--turbopack\\b"
-      ],
-      "importRegexSources": [],
-      "chainTo": [
-        {
-          "pattern": "webpack\\s*:\\s*\\(|webpack\\s*\\(config",
-          "targetSkill": "nextjs",
-          "message": "Webpack config detected — loading Next.js guidance for migrating webpack customizations to Turbopack top-level config in Next.js 16."
-        },
-        {
-          "pattern": "turbopack\\s*:\\s*\\{|experimental\\.turbopack",
-          "targetSkill": "nextjs",
-          "message": "Turbopack configuration detected — loading Next.js guidance for top-level turbopack config syntax in Next.js 16 (moved from experimental.turbopack)."
-        }
-      ],
-      "retrieval": {
-        "aliases": [
-          "next bundler",
-          "turbopack",
-          "fast bundler",
-          "hmr"
-        ],
-        "intents": [
-          "enable turbopack",
-          "fix build issue",
-          "speed up dev server",
-          "configure bundler"
-        ],
-        "entities": [
-          "Turbopack",
-          "HMR",
-          "bundler",
-          "next dev --turbopack"
-        ],
-        "examples": []
-      }
-    },
     "marketplace": {
       "priority": 3,
       "summary": "",
@@ -2610,391 +2524,6 @@
         "examples": []
       }
     },
-    "nextjs": {
-      "priority": 5,
-      "summary": "",
-      "docs": [
-        "https://nextjs.org/docs",
-        "https://nextjs.org/docs/app"
-      ],
-      "sitemap": "https://nextjs.org/sitemap.xml",
-      "pathPatterns": [
-        "next.config.*",
-        "next-env.d.ts",
-        "app/**",
-        "pages/**",
-        "src/app/**",
-        "src/pages/**",
-        "tailwind.config.*",
-        "postcss.config.*",
-        "tsconfig.json",
-        "tsconfig.*.json",
-        "apps/*/app/**",
-        "apps/*/pages/**",
-        "apps/*/src/app/**",
-        "apps/*/src/pages/**",
-        "apps/*/next.config.*"
-      ],
-      "bashPatterns": [
-        "\\bnext\\s+(dev|build|start|lint)\\b",
-        "\\bnext\\s+experimental-analyze\\b",
-        "\\bnpx\\s+create-next-app\\b",
-        "\\bbunx\\s+create-next-app\\b",
-        "\\bnpm\\s+run\\s+(dev|build|start)\\b",
-        "\\bpnpm\\s+(dev|build)\\b",
-        "\\bbun\\s+run\\s+(dev|build)\\b"
-      ],
-      "importPatterns": [],
-      "bodyPath": "skills/nextjs/SKILL.md",
-      "pathRegexSources": [
-        "^next\\.config\\.[^/]*$",
-        "^next-env\\.d\\.ts$",
-        "^app\\/.*$",
-        "^pages\\/.*$",
-        "^src\\/app\\/.*$",
-        "^src\\/pages\\/.*$",
-        "^tailwind\\.config\\.[^/]*$",
-        "^postcss\\.config\\.[^/]*$",
-        "^tsconfig\\.json$",
-        "^tsconfig\\.[^/]*\\.json$",
-        "^apps\\/[^/]*\\/app\\/.*$",
-        "^apps\\/[^/]*\\/pages\\/.*$",
-        "^apps\\/[^/]*\\/src\\/app\\/.*$",
-        "^apps\\/[^/]*\\/src\\/pages\\/.*$",
-        "^apps\\/[^/]*\\/next\\.config\\.[^/]*$"
-      ],
-      "bashRegexSources": [
-        "\\bnext\\s+(dev|build|start|lint)\\b",
-        "\\bnext\\s+experimental-analyze\\b",
-        "\\bnpx\\s+create-next-app\\b",
-        "\\bbunx\\s+create-next-app\\b",
-        "\\bnpm\\s+run\\s+(dev|build|start)\\b",
-        "\\bpnpm\\s+(dev|build)\\b",
-        "\\bbun\\s+run\\s+(dev|build)\\b"
-      ],
-      "importRegexSources": [],
-      "validate": [
-        {
-          "pattern": "export.*getServerSideProps",
-          "message": "getServerSideProps is removed in App Router — use server components or route handlers",
-          "severity": "error",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from Pages Router getServerSideProps to App Router server components with async data fetching.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "getServerSideProps",
-          "message": "getServerSideProps is a Pages Router pattern — migrate to App Router server components",
-          "severity": "warn"
-        },
-        {
-          "pattern": "export.*getStaticProps",
-          "message": "getStaticProps is removed in App Router — use generateStaticParams + server components instead",
-          "severity": "error",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from Pages Router getStaticProps to App Router generateStaticParams with server components.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "getStaticProps",
-          "message": "getStaticProps is a Pages Router pattern — migrate to App Router generateStaticParams + server components",
-          "severity": "warn"
-        },
-        {
-          "pattern": "from\\s+['\"]next/router['\"]",
-          "message": "next/router is Pages Router only — use next/navigation for App Router",
-          "severity": "error",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from next/router to next/navigation with useRouter, usePathname, useSearchParams hooks.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "(useState|useEffect)",
-          "message": "React hooks require \"use client\" directive — add it at the top of client components",
-          "severity": "warn",
-          "skipIfFileContains": "^['\\\"]use client['\\\"]"
-        },
-        {
-          "pattern": "from\\s+['\"]next/head['\"]",
-          "message": "next/head is Pages Router — use export const metadata or generateMetadata() in App Router. Run Skill(nextjs) for metadata API guidance.",
-          "severity": "error",
-          "skipIfFileContains": "export\\s+(const\\s+)?metadata|generateMetadata",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from next/head to the App Router metadata API (export const metadata / generateMetadata()).",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "export\\s+(default\\s+)?function\\s+middleware",
-          "message": "middleware() is renamed to proxy() in Next.js 16 — rename the function and the file to proxy.ts. Run Skill(routing-middleware) for proxy.ts migration guidance.",
-          "severity": "recommended",
-          "upgradeToSkill": "routing-middleware",
-          "upgradeWhy": "Guides migration from middleware.ts to proxy.ts with correct file placement, runtime config, and request interception patterns.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "revalidateTag\\(\\s*['\"][^'\"]+['\"]\\s*\\)",
-          "message": "Single-arg revalidateTag(tag) is deprecated in Next.js 16 — pass a cacheLife profile: revalidateTag(tag, \"max\")",
-          "severity": "recommended",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from single-arg revalidateTag to the Next.js 16 two-arg API with cacheLife profiles.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "\\bcacheHandler\\s*:",
-          "message": "Singular cacheHandler is deprecated in Next.js 16 — use cacheHandlers (plural) with per-type handlers",
-          "severity": "recommended",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from singular cacheHandler to Next.js 16 cacheHandlers (plural) with per-type handler config.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "useRef\\(\\s*\\)",
-          "message": "useRef() requires an initial value in React 19 — use useRef(null) or useRef(0)",
-          "severity": "error"
-        },
-        {
-          "pattern": "next\\s+export",
-          "message": "next export was removed — use output: \"export\" in next.config.js for static export",
-          "severity": "error",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from next export CLI command to output: \"export\" in next.config for static site generation.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "(?<!await )\\bcookies\\(\\s*\\)",
-          "message": "cookies() is async in Next.js 16 — add await: const cookieStore = await cookies()",
-          "severity": "error",
-          "skipIfFileContains": "^['\\\"]use client['\\\"]"
-        },
-        {
-          "pattern": "(?<!await )\\bheaders\\(\\s*\\)",
-          "message": "headers() is async in Next.js 16 — add await: const headersList = await headers()",
-          "severity": "error",
-          "skipIfFileContains": "^['\\\"]use client['\\\"]"
-        },
-        {
-          "pattern": "=\\s*(?!await\\b)params\\b",
-          "message": "params is async in Next.js 16 — add await: const { slug } = await params",
-          "severity": "recommended",
-          "skipIfFileContains": "^['\\\"]use client['\\\"]"
-        },
-        {
-          "pattern": "=\\s*(?!await\\b)searchParams\\b",
-          "message": "searchParams is async in Next.js 16 — add await: const { query } = await searchParams",
-          "severity": "recommended",
-          "skipIfFileContains": "^['\\\"]use client['\\\"]"
-        },
-        {
-          "pattern": "from\\s+[''\"\"](next-auth|@auth/core)[''\"\"]|NextAuth\\(|getServerSession\\(",
-          "message": "Legacy auth pattern detected. Modern Vercel apps should use Clerk, Descope, or Auth0 for managed authentication.",
-          "severity": "recommended",
-          "skipIfFileContains": "@clerk/|@descope/|@auth0/",
-          "upgradeToSkill": "auth",
-          "upgradeWhy": "Migrate from next-auth/manual JWT to a managed auth provider (Clerk, Descope, Auth0) for better Vercel integration.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "NextApiRequest|NextApiResponse|export\\s+default\\s+function\\s+handler",
-          "message": "Pages Router API handler detected. Use App Router route handlers with named HTTP exports instead.",
-          "severity": "recommended",
-          "skipIfFileContains": "export\\s+(async\\s+)?function\\s+(GET|POST|PUT|PATCH|DELETE)",
-          "upgradeToSkill": "vercel-functions",
-          "upgradeWhy": "Migrate from Pages Router API routes to App Router route handlers with Web Request/Response API.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "from\\s+[''\"\"](lru-cache|node-cache|memory-cache)[''\"\"]|new\\s+(LRUCache|NodeCache)\\(",
-          "message": "In-process cache detected. Serverless deployments lose process memory between invocations.",
-          "severity": "recommended",
-          "upgradeToSkill": "runtime-cache",
-          "upgradeWhy": "Replace process-memory caches with Vercel Runtime Cache for shared, region-aware caching.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "from\\s+[''\"\"](express|fastify|koa|hapi)[''\"\"]|require\\s*\\(\\s*[''\"\"](express|fastify|koa|hapi)[''\"\"]",
-          "message": "Express/Fastify/Koa/Hapi server framework detected in a Next.js project. Use Next.js route handlers or proxy.ts for request handling instead.",
-          "severity": "recommended",
-          "skipIfFileContains": "proxy\\.ts|from\\s+[''\"\"](next/server)[''\"\"]|@vercel/functions",
-          "upgradeToSkill": "routing-middleware",
-          "upgradeWhy": "Replace custom server frameworks with Next.js proxy.ts for request interception and route handlers for API endpoints.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "from\\s+[''\"\"](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''\"\"]|require\\s*\\(\\s*[''\"\"](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''\"\"]",
-          "message": "Heavy ORM detected. Consider using lightweight serverless-native alternatives like Drizzle, Prisma, or direct Neon for better cold start performance.",
-          "severity": "recommended",
-          "skipIfFileContains": "from\\s+[''\"\"](drizzle-orm|@neondatabase|@prisma/client|prisma)[''\"\"]",
-          "upgradeToSkill": "vercel-storage",
-          "upgradeWhy": "Migrate from heavy ORMs to serverless-native database clients (Drizzle + Neon, Prisma, or @neondatabase/serverless) for faster cold starts.",
-          "upgradeMode": "soft"
-        },
-        {
-          "pattern": "fonts\\.googleapis\\.com|from\\s+[''\"\"](fontsource|@fontsource)[''\"\"]|<link[^>]*fonts\\.googleapis",
-          "message": "External font loader detected. Use next/font for zero-CLS, self-hosted font loading with automatic optimization.",
-          "severity": "recommended",
-          "skipIfFileContains": "next/font",
-          "upgradeToSkill": "nextjs",
-          "upgradeWhy": "Guides migration from external font loaders to next/font with Geist Sans/Mono for zero-CLS font optimization.",
-          "upgradeMode": "soft"
-        }
-      ],
-      "chainTo": [
-        {
-          "pattern": "export\\s+(default\\s+)?function\\s+middleware",
-          "targetSkill": "routing-middleware",
-          "message": "middleware() is renamed to proxy() in Next.js 16 — loading Routing Middleware guidance for proxy.ts migration."
-        },
-        {
-          "pattern": "from\\\\s+['\\\"]@vercel/(postgres|kv)['\\\"]",
-          "targetSkill": "vercel-storage",
-          "message": "Sunset storage package detected — loading Vercel Storage guidance for Neon/Upstash migration."
-        },
-        {
-          "pattern": "from\\\\s+['\\\"]@ai-sdk/(anthropic|openai)['\\\"]",
-          "targetSkill": "ai-gateway",
-          "message": "Direct AI provider SDK import — loading AI Gateway guidance for unified model routing with failover and cost tracking."
-        },
-        {
-          "pattern": "from\\s+[''\"\"](next-auth|@auth/core)[''\"\"]|NextAuth\\(|getServerSession\\(",
-          "targetSkill": "auth",
-          "message": "Legacy auth pattern detected — loading managed authentication guidance (Clerk, Descope, Auth0)."
-        },
-        {
-          "pattern": "NextApiRequest|NextApiResponse|export\\s+default\\s+function\\s+handler",
-          "targetSkill": "vercel-functions",
-          "message": "Pages Router API handler detected — loading Vercel Functions guidance for App Router migration."
-        },
-        {
-          "pattern": "from\\s+[''\"\"](lru-cache|node-cache|memory-cache)[''\"\"]|new\\s+(LRUCache|NodeCache)\\(",
-          "targetSkill": "runtime-cache",
-          "message": "In-process cache detected — loading Runtime Cache guidance for serverless-compatible caching."
-        },
-        {
-          "pattern": "fetch\\s*\\(\\s*[''\"\"](https?://)?(api\\.openai\\.com|api\\.anthropic\\.com|api\\.cohere\\.ai)",
-          "targetSkill": "ai-gateway",
-          "message": "Raw AI provider fetch URL detected — loading AI Gateway guidance for unified routing, failover, and OIDC auth.",
-          "skipIfFileContains": "@ai-sdk/|from\\s+[''\"\"](ai)[''\"\"]|ai-gateway|gateway\\("
-        },
-        {
-          "pattern": "jwt\\.(sign|verify|decode)\\(|from\\s+[''\"\"](jsonwebtoken)[''\"\"]|new\\s+SignJWT\\(|jwtVerify\\(",
-          "targetSkill": "auth",
-          "message": "Manual JWT token handling detected — loading Auth guidance for managed authentication (Clerk, Descope, Auth0).",
-          "skipIfFileContains": "clerkMiddleware|@clerk/|@auth0/|@descope/|from\\s+[''\"\"](next-auth)[''\"\"]"
-        },
-        {
-          "pattern": "from\\s+[''\"]@/components/ui/|from\\s+[''\"]@/components/ui[''\"\"]",
-          "targetSkill": "shadcn",
-          "message": "shadcn/ui component imports detected — loading shadcn guidance for component composition, theming, and registry patterns.",
-          "skipIfFileContains": "shadcn|components\\.json"
-        },
-        {
-          "pattern": "from\\s+[''\"\"](styled-components|@emotion/(react|styled)|@mui/material)[''\"\"]",
-          "targetSkill": "shadcn",
-          "message": "CSS-in-JS library detected — loading shadcn/ui guidance for Tailwind CSS + Radix UI component patterns (Vercel recommended).",
-          "skipIfFileContains": "@/components/ui|shadcn"
-        },
-        {
-          "pattern": "getInitialProps",
-          "targetSkill": "nextjs",
-          "message": "getInitialProps is a legacy Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.",
-          "skipIfFileContains": "app/.*page\\.|generateStaticParams|use cache"
-        },
-        {
-          "pattern": "export.*getServerSideProps|getServerSideProps\\s*\\(",
-          "targetSkill": "nextjs",
-          "message": "getServerSideProps is a Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.",
-          "skipIfFileContains": "generateStaticParams|use cache|app/.*page\\."
-        },
-        {
-          "pattern": "export.*getStaticProps|getStaticProps\\s*\\(",
-          "targetSkill": "nextjs",
-          "message": "getStaticProps is a Pages Router pattern — loading Next.js guidance for App Router migration with generateStaticParams and server components.",
-          "skipIfFileContains": "generateStaticParams|use cache|app/.*page\\."
-        },
-        {
-          "pattern": "_app\\.(tsx?|jsx?)",
-          "targetSkill": "nextjs",
-          "message": "_app.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx migration.",
-          "skipIfFileContains": "app/layout\\.|app/.*layout\\."
-        },
-        {
-          "pattern": "_document\\.(tsx?|jsx?)",
-          "targetSkill": "nextjs",
-          "message": "_document.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx with metadata API migration.",
-          "skipIfFileContains": "app/layout\\.|app/.*layout\\."
-        },
-        {
-          "pattern": "from\\\\s+['\\\"]next/document['\\\"]",
-          "targetSkill": "nextjs",
-          "message": "next/document is Pages Router only — loading Next.js guidance for App Router layout.tsx with html/body structure.",
-          "skipIfFileContains": "app/layout\\.|app/.*layout\\."
-        },
-        {
-          "pattern": "pages/api/",
-          "targetSkill": "vercel-functions",
-          "message": "Pages Router API route (pages/api/) detected — loading Vercel Functions guidance for App Router route handlers with named HTTP exports.",
-          "skipIfFileContains": "export\\s+(async\\s+)?function\\s+(GET|POST|PUT|PATCH|DELETE)"
-        }
-      ],
-      "promptSignals": {
-        "phrases": [
-          "next.js",
-          "nextjs",
-          "app router",
-          "server component",
-          "server action"
-        ],
-        "allOf": [
-          [
-            "middleware",
-            "next"
-          ],
-          [
-            "layout",
-            "route"
-          ]
-        ],
-        "anyOf": [
-          "pages router",
-          "getserversideprops",
-          "use server"
-        ],
-        "noneOf": [],
-        "minScore": 6
-      },
-      "retrieval": {
-        "aliases": [
-          "next.js",
-          "nextjs app",
-          "react framework",
-          "app router"
-        ],
-        "intents": [
-          "set up routing and layouts in a Next.js app",
-          "choose between server and client components for a feature",
-          "configure data fetching or caching in App Router",
-          "add middleware or proxy logic to handle requests",
-          "set up server rendering for React pages",
-          "add a new page with dynamic route segments"
-        ],
-        "entities": [
-          "App Router",
-          "Server Components",
-          "Server Actions",
-          "generateMetadata",
-          "layout",
-          "proxy",
-          "next.config"
-        ],
-        "examples": [
-          "add a new page with dynamic routing",
-          "should this be a server or client component",
-          "set up middleware for auth redirects",
-          "configure caching for this data fetch",
-          "set up server rendering for my pages"
-        ]
-      }
-    },
     "microfrontends": {
       "priority": 7,
       "summary": "",
@@ -3271,98 +2800,6 @@
         "examples": []
       }
     },
-    "next-upgrade": {
-      "priority": 6,
-      "summary": "",
-      "docs": [
-        "https://nextjs.org/docs/app/guides/upgrading",
-        "https://nextjs.org/docs/app/guides/upgrading/codemods"
-      ],
-      "pathPatterns": [
-        "next.config.*",
-        "package.json"
-      ],
-      "bashPatterns": [
-        "\\bnpx\\s+@next/codemod\\b",
-        "\\bnpm\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\bpnpm\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\bbun\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\byarn\\s+add\\s+[^\\n]*\\bnext@"
-      ],
-      "importPatterns": [],
-      "bodyPath": "skills/next-upgrade/SKILL.md",
-      "pathRegexSources": [
-        "^next\\.config\\.[^/]*$",
-        "^package\\.json$"
-      ],
-      "bashRegexSources": [
-        "\\bnpx\\s+@next/codemod\\b",
-        "\\bnpm\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\bpnpm\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\bbun\\s+(install|i|add)\\s+[^\\n]*\\bnext@",
-        "\\byarn\\s+add\\s+[^\\n]*\\bnext@"
-      ],
-      "importRegexSources": [],
-      "chainTo": [
-        {
-          "pattern": "getServerSideProps|getStaticProps|next/router|next/head|next/document",
-          "targetSkill": "nextjs",
-          "message": "Pages Router patterns detected during upgrade — loading Next.js best practices for App Router migration."
-        }
-      ],
-      "promptSignals": {
-        "phrases": [
-          "upgrade next",
-          "upgrade nextjs",
-          "migrate next",
-          "update next.js",
-          "next.js upgrade",
-          "nextjs migration",
-          "next codemod"
-        ],
-        "allOf": [
-          [
-            "upgrade",
-            "next"
-          ],
-          [
-            "migrate",
-            "next"
-          ],
-          [
-            "update",
-            "nextjs"
-          ]
-        ],
-        "anyOf": [
-          "breaking changes",
-          "codemod",
-          "migration guide",
-          "version upgrade"
-        ],
-        "noneOf": [],
-        "minScore": 6
-      },
-      "retrieval": {
-        "aliases": [
-          "next upgrade",
-          "nextjs migration",
-          "next codemod"
-        ],
-        "intents": [
-          "upgrade Next.js to latest version",
-          "run Next.js codemods",
-          "migrate between major Next.js versions"
-        ],
-        "entities": [
-          "codemod",
-          "migration",
-          "upgrade",
-          "breaking changes"
-        ],
-        "examples": []
-      }
-    },
     "chat-sdk": {
       "priority": 8,
       "summary": "",
@@ -4041,109 +3478,6 @@
         ]
       }
     },
-    "next-cache-components": {
-      "priority": 6,
-      "summary": "",
-      "docs": [
-        "https://nextjs.org/docs/app/getting-started/cache-components",
-        "https://nextjs.org/docs/app/api-reference/directives/use-cache"
-      ],
-      "pathPatterns": [
-        "next.config.*",
-        "app/**",
-        "src/app/**",
-        "apps/*/app/**",
-        "apps/*/src/app/**"
-      ],
-      "bashPatterns": [
-        "\\bnext\\s+(dev|build)\\b"
-      ],
-      "importPatterns": [
-        "next/cache"
-      ],
-      "bodyPath": "skills/next-cache-components/SKILL.md",
-      "pathRegexSources": [
-        "^next\\.config\\.[^/]*$",
-        "^app\\/.*$",
-        "^src\\/app\\/.*$",
-        "^apps\\/[^/]*\\/app\\/.*$",
-        "^apps\\/[^/]*\\/src\\/app\\/.*$"
-      ],
-      "bashRegexSources": [
-        "\\bnext\\s+(dev|build)\\b"
-      ],
-      "importRegexSources": [
-        {
-          "source": "(?:from\\s+|require\\s*\\(\\s*|import\\s*\\(\\s*)['\"]next\\/cache(?:\\/[^'\"]*)?['\"]",
-          "flags": "m"
-        }
-      ],
-      "chainTo": [
-        {
-          "pattern": "use cache",
-          "targetSkill": "nextjs",
-          "message": "Cache component detected — loading Next.js best practices for RSC boundaries and data patterns alongside caching.",
-          "skipIfFileContains": "next-best-practices"
-        }
-      ],
-      "promptSignals": {
-        "phrases": [
-          "use cache",
-          "cache components",
-          "partial prerendering",
-          "PPR",
-          "cacheLife",
-          "cacheTag",
-          "updateTag",
-          "unstable_cache"
-        ],
-        "allOf": [
-          [
-            "cache",
-            "component"
-          ],
-          [
-            "cache",
-            "directive"
-          ],
-          [
-            "partial",
-            "prerender"
-          ]
-        ],
-        "anyOf": [
-          "revalidateTag",
-          "stale",
-          "revalidate",
-          "cache profile"
-        ],
-        "noneOf": [],
-        "minScore": 6
-      },
-      "retrieval": {
-        "aliases": [
-          "cache components",
-          "partial prerendering",
-          "PPR",
-          "use cache"
-        ],
-        "intents": [
-          "enable partial prerendering in Next.js",
-          "cache async data with use cache directive",
-          "invalidate cache with cacheTag",
-          "migrate from unstable_cache"
-        ],
-        "entities": [
-          "use cache",
-          "cacheLife",
-          "cacheTag",
-          "updateTag",
-          "revalidateTag",
-          "PPR"
-        ],
-        "examples": []
-      }
-    },
     "env-vars": {
       "priority": 7,
       "summary": "",
diff --git a/hooks/session-start-profiler.mjs b/hooks/session-start-profiler.mjs
index ab637be..80c6ba0 100644
--- a/hooks/session-start-profiler.mjs
+++ b/hooks/session-start-profiler.mjs
@@ -20,10 +20,6 @@ import { hasSessionStartActivationMarkers } from "./session-start-activation.mjs
 import { buildSkillMap } from "./skill-map-frontmatter.mjs";
 import { refreshActiveSessionMarker, trackDauActiveToday } from "./telemetry.mjs";
 var FILE_MARKERS = [
-  { file: "next.config.js", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.mjs", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.ts", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.mts", skills: ["nextjs", "turbopack"] },
   { file: "vercel.json", skills: ["vercel-cli", "deployments-cicd", "vercel-functions"] },
   { file: "middleware.ts", skills: ["routing-middleware"] },
   { file: "middleware.js", skills: ["routing-middleware"] },
@@ -31,7 +27,6 @@ var FILE_MARKERS = [
   { file: ".env.local", skills: ["env-vars"] }
 ];
 var PACKAGE_MARKERS = {
-  "next": ["nextjs"],
   "ai": ["ai-sdk"],
   "@ai-sdk/openai": ["ai-sdk"],
   "@ai-sdk/anthropic": ["ai-sdk"],
@@ -74,7 +69,6 @@ var SETUP_RESOURCE_DEPENDENCIES = {
 };
 var SETUP_MODE_THRESHOLD = 3;
 var GREENFIELD_DEFAULT_SKILLS = [
-  "nextjs",
   "ai-sdk",
   "vercel-cli",
   "env-vars"
diff --git a/hooks/src/session-start-profiler.mts b/hooks/src/session-start-profiler.mts
index 45f7c54..47ffb60 100644
--- a/hooks/src/session-start-profiler.mts
+++ b/hooks/src/session-start-profiler.mts
@@ -68,10 +68,6 @@ interface GreenfieldResult {
  * Mapping from marker file / condition to skill slugs.
  */
 const FILE_MARKERS: FileMarker[] = [
-  { file: "next.config.js", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.mjs", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.ts", skills: ["nextjs", "turbopack"] },
-  { file: "next.config.mts", skills: ["nextjs", "turbopack"] },
   { file: "vercel.json", skills: ["vercel-cli", "deployments-cicd", "vercel-functions"] },
   { file: "middleware.ts", skills: ["routing-middleware"] },
   { file: "middleware.js", skills: ["routing-middleware"] },
@@ -83,7 +79,6 @@ const FILE_MARKERS: FileMarker[] = [
  * Dependency names in package.json -> skill slugs.
  */
 const PACKAGE_MARKERS: Record<string, string[]> = {
-  "next": ["nextjs"],
   "ai": ["ai-sdk"],
   "@ai-sdk/openai": ["ai-sdk"],
   "@ai-sdk/anthropic": ["ai-sdk"],
@@ -131,7 +126,6 @@ const SETUP_RESOURCE_DEPENDENCIES: Record<string, string> = {
 
 const SETUP_MODE_THRESHOLD = 3;
 const GREENFIELD_DEFAULT_SKILLS: string[] = [
-  "nextjs",
   "ai-sdk",
   "vercel-cli",
   "env-vars",
diff --git a/hooks/src/vercel-context.mts b/hooks/src/vercel-context.mts
index 467ce90..2f5e309 100644
--- a/hooks/src/vercel-context.mts
+++ b/hooks/src/vercel-context.mts
@@ -31,10 +31,6 @@ interface ManagedContextChunkOptions {
 }
 
 const SKILL_TO_CHUNK: Record<string, ChunkSectionMapping> = {
-  "nextjs": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "next-cache-components": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "next-upgrade": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "turbopack": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
   "next-forge": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
   "ai-sdk": { chunkId: "ai-stack", heading: "AI Stack" },
   "ai-gateway": { chunkId: "ai-stack", heading: "AI Stack" },
diff --git a/hooks/vercel-context.mjs b/hooks/vercel-context.mjs
index 114047c..af23c2d 100644
--- a/hooks/vercel-context.mjs
+++ b/hooks/vercel-context.mjs
@@ -10,10 +10,6 @@ var PLUGIN_ROOT = resolvePluginRoot();
 var DEFAULT_CONTEXT_CHUNK_BUDGET_BYTES = 1800;
 var CONTEXT_CHUNK_KIND = "seen-context-chunks";
 var SKILL_TO_CHUNK = {
-  "nextjs": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "next-cache-components": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "next-upgrade": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
-  "turbopack": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
   "next-forge": { chunkId: "nextjs-platform", heading: "Next.js and Rendering" },
   "ai-sdk": { chunkId: "ai-stack", heading: "AI Stack" },
   "ai-gateway": { chunkId: "ai-stack", heading: "AI Stack" },
diff --git a/skills/next-cache-components/SKILL.md b/skills/next-cache-components/SKILL.md
deleted file mode 100644
index 26e5ae3..0000000
--- a/skills/next-cache-components/SKILL.md
+++ /dev/null
@@ -1,487 +0,0 @@
----
-name: next-cache-components
-description: Next.js 16 Cache Components guidance — PPR, use cache directive, cacheLife, cacheTag, updateTag, and migration from unstable_cache. Use when implementing partial prerendering, caching strategies, or migrating from older Next.js cache patterns.
-metadata:
-  priority: 6
-  docs:
-    - "https://nextjs.org/docs/app/getting-started/cache-components"
-    - "https://nextjs.org/docs/app/api-reference/directives/use-cache"
-  pathPatterns:
-    - 'next.config.*'
-    - 'app/**'
-    - 'src/app/**'
-    - 'apps/*/app/**'
-    - 'apps/*/src/app/**'
-  importPatterns:
-    - "next/cache"
-  bashPatterns:
-    - '\bnext\s+(dev|build)\b'
-  promptSignals:
-    phrases:
-      - "use cache"
-      - "cache components"
-      - "partial prerendering"
-      - "PPR"
-      - "cacheLife"
-      - "cacheTag"
-      - "updateTag"
-      - "unstable_cache"
-    allOf:
-      - [cache, component]
-      - [cache, directive]
-      - [partial, prerender]
-    anyOf:
-      - "revalidateTag"
-      - "stale"
-      - "revalidate"
-      - "cache profile"
-    noneOf: []
-    minScore: 6
-  validate:
-    -
-      pattern: 'unstable_cache\s*\('
-      message: 'unstable_cache is deprecated in Next.js 16 — use the "use cache" directive with cacheTag() and cacheLife() instead'
-      severity: recommended
-      upgradeToSkill: next-cache-components
-      upgradeWhy: 'Guides migration from unstable_cache to use cache directive with cacheTag and cacheLife.'
-    -
-      pattern: '\bcacheHandler\s*:'
-      message: 'Singular cacheHandler is deprecated in Next.js 16 — use cacheHandlers (plural) with per-type handlers'
-      severity: recommended
-    -
-      pattern: revalidateTag\(\s*['"][^'"]+['"]\s*\)
-      message: 'Single-arg revalidateTag(tag) is deprecated in Next.js 16 — pass a cacheLife profile: revalidateTag(tag, "max")'
-      severity: recommended
-retrieval:
-  aliases:
-    - cache components
-    - partial prerendering
-    - PPR
-    - use cache
-  intents:
-    - enable partial prerendering in Next.js
-    - cache async data with use cache directive
-    - invalidate cache with cacheTag
-    - migrate from unstable_cache
-  entities:
-    - use cache
-    - cacheLife
-    - cacheTag
-    - updateTag
-    - revalidateTag
-    - PPR
-chainTo:
-  -
-    pattern: 'use cache'
-    targetSkill: nextjs
-    message: 'Cache component detected — loading Next.js best practices for RSC boundaries and data patterns alongside caching.'
-    skipIfFileContains: 'next-best-practices'
-
----
-
-# Cache Components (Next.js 16+)
-
-Cache Components enable Partial Prerendering (PPR) - mix static, cached, and dynamic content in a single route.
-
-## Enable Cache Components
-
-```ts
-// next.config.ts
-import type { NextConfig } from 'next'
-
-const nextConfig: NextConfig = {
-  cacheComponents: true,
-}
-
-export default nextConfig
-```
-
-This replaces the old `experimental.ppr` flag.
-
----
-
-## Three Content Types
-
-With Cache Components enabled, content falls into three categories:
-
-### 1. Static (Auto-Prerendered)
-
-Synchronous code, imports, pure computations - prerendered at build time:
-
-```tsx
-export default function Page() {
-  return (
-    <header>
-      <h1>Our Blog</h1>  {/* Static - instant */}
-      <nav>...</nav>
-    </header>
-  )
-}
-```
-
-### 2. Cached (`use cache`)
-
-Async data that doesn't need fresh fetches every request:
-
-```tsx
-async function BlogPosts() {
-  'use cache'
-  cacheLife('hours')
-
-  const posts = await db.posts.findMany()
-  return <PostList posts={posts} />
-}
-```
-
-### 3. Dynamic (Suspense)
-
-Runtime data that must be fresh - wrap in Suspense:
-
-```tsx
-import { Suspense } from 'react'
-
-export default function Page() {
-  return (
-    <>
-      <BlogPosts />  {/* Cached */}
-
-      <Suspense fallback={<p>Loading...</p>}>
-        <UserPreferences />  {/* Dynamic - streams in */}
-      </Suspense>
-    </>
-  )
-}
-
-async function UserPreferences() {
-  const theme = (await cookies()).get('theme')?.value
-  return <p>Theme: {theme}</p>
-}
-```
-
----
-
-## `use cache` Directive
-
-### File Level
-
-```tsx
-'use cache'
-
-export default async function Page() {
-  // Entire page is cached
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Component Level
-
-```tsx
-export async function CachedComponent() {
-  'use cache'
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Function Level
-
-```tsx
-export async function getData() {
-  'use cache'
-  return db.query('SELECT * FROM posts')
-}
-```
-
----
-
-## Cache Profiles
-
-### Built-in Profiles
-
-```tsx
-'use cache'                    // Default: 5m stale, 15m revalidate
-```
-
-```tsx
-'use cache: remote'           // Platform-provided cache (Redis, KV)
-```
-
-```tsx
-'use cache: private'          // For compliance, allows runtime APIs
-```
-
-### `cacheLife()` - Custom Lifetime
-
-```tsx
-import { cacheLife } from 'next/cache'
-
-async function getData() {
-  'use cache'
-  cacheLife('hours')  // Built-in profile
-  return fetch('/api/data')
-}
-```
-
-Built-in profiles: `'default'`, `'minutes'`, `'hours'`, `'days'`, `'weeks'`, `'max'`
-
-### Inline Configuration
-
-```tsx
-async function getData() {
-  'use cache'
-  cacheLife({
-    stale: 3600,      // 1 hour - serve stale while revalidating
-    revalidate: 7200, // 2 hours - background revalidation interval
-    expire: 86400,    // 1 day - hard expiration
-  })
-  return fetch('/api/data')
-}
-```
-
----
-
-## Cache Invalidation
-
-### `cacheTag()` - Tag Cached Content
-
-```tsx
-import { cacheTag } from 'next/cache'
-
-async function getProducts() {
-  'use cache'
-  cacheTag('products')
-  return db.products.findMany()
-}
-
-async function getProduct(id: string) {
-  'use cache'
-  cacheTag('products', `product-${id}`)
-  return db.products.findUnique({ where: { id } })
-}
-```
-
-### `updateTag()` - Immediate Invalidation
-
-Use when you need the cache refreshed within the same request:
-
-```tsx
-'use server'
-
-import { updateTag } from 'next/cache'
-
-export async function updateProduct(id: string, data: FormData) {
-  await db.products.update({ where: { id }, data })
-  updateTag(`product-${id}`)  // Immediate - same request sees fresh data
-}
-```
-
-### `revalidateTag()` - Background Revalidation
-
-Use for stale-while-revalidate behavior:
-
-```tsx
-'use server'
-
-import { revalidateTag } from 'next/cache'
-
-export async function createPost(data: FormData) {
-  await db.posts.create({ data })
-  revalidateTag('posts')  // Background - next request sees fresh data
-}
-```
-
----
-
-## Runtime Data Constraint
-
-**Cannot** access `cookies()`, `headers()`, or `searchParams` inside `use cache`.
-
-### Solution: Pass as Arguments
-
-```tsx
-// Wrong - runtime API inside use cache
-async function CachedProfile() {
-  'use cache'
-  const session = (await cookies()).get('session')?.value  // Error!
-  return <div>{session}</div>
-}
-
-// Correct - extract outside, pass as argument
-async function ProfilePage() {
-  const session = (await cookies()).get('session')?.value
-  return <CachedProfile sessionId={session} />
-}
-
-async function CachedProfile({ sessionId }: { sessionId: string }) {
-  'use cache'
-  // sessionId becomes part of cache key automatically
-  const data = await fetchUserData(sessionId)
-  return <div>{data.name}</div>
-}
-```
-
-### Exception: `use cache: private`
-
-For compliance requirements when you can't refactor:
-
-```tsx
-async function getData() {
-  'use cache: private'
-  const session = (await cookies()).get('session')?.value  // Allowed
-  return fetchData(session)
-}
-```
-
----
-
-## Cache Key Generation
-
-Cache keys are automatic based on:
-- **Build ID** - invalidates all caches on deploy
-- **Function ID** - hash of function location
-- **Serializable arguments** - props become part of key
-- **Closure variables** - outer scope values included
-
-```tsx
-async function Component({ userId }: { userId: string }) {
-  const getData = async (filter: string) => {
-    'use cache'
-    // Cache key = userId (closure) + filter (argument)
-    return fetch(`/api/users/${userId}?filter=${filter}`)
-  }
-  return getData('active')
-}
-```
-
----
-
-## Complete Example
-
-```tsx
-import { Suspense } from 'react'
-import { cookies } from 'next/headers'
-import { cacheLife, cacheTag } from 'next/cache'
-
-export default function DashboardPage() {
-  return (
-    <>
-      {/* Static shell - instant from CDN */}
-      <header><h1>Dashboard</h1></header>
-      <nav>...</nav>
-
-      {/* Cached - fast, revalidates hourly */}
-      <Stats />
-
-      {/* Dynamic - streams in with fresh data */}
-      <Suspense fallback={<NotificationsSkeleton />}>
-        <Notifications />
-      </Suspense>
-    </>
-  )
-}
-
-async function Stats() {
-  'use cache'
-  cacheLife('hours')
-  cacheTag('dashboard-stats')
-
-  const stats = await db.stats.aggregate()
-  return <StatsDisplay stats={stats} />
-}
-
-async function Notifications() {
-  const userId = (await cookies()).get('userId')?.value
-  const notifications = await db.notifications.findMany({
-    where: { userId, read: false }
-  })
-  return <NotificationList items={notifications} />
-}
-```
-
----
-
-## Migration from Previous Versions
-
-| Old Config | Replacement |
-|-----------|-------------|
-| `experimental.ppr` | `cacheComponents: true` |
-| `dynamic = 'force-dynamic'` | Remove (default behavior) |
-| `dynamic = 'force-static'` | `'use cache'` + `cacheLife('max')` |
-| `revalidate = N` | `cacheLife({ revalidate: N })` |
-| `unstable_cache()` | `'use cache'` directive |
-
-### Migrating `unstable_cache` to `use cache`
-
-`unstable_cache` has been replaced by the `use cache` directive in Next.js 16. When `cacheComponents` is enabled, convert `unstable_cache` calls to `use cache` functions:
-
-**Before (`unstable_cache`):**
-
-```tsx
-import { unstable_cache } from 'next/cache'
-
-const getCachedUser = unstable_cache(
-  async (id) => getUser(id),
-  ['my-app-user'],
-  {
-    tags: ['users'],
-    revalidate: 60,
-  }
-)
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const user = await getCachedUser(id)
-  return <div>{user.name}</div>
-}
-```
-
-**After (`use cache`):**
-
-```tsx
-import { cacheLife, cacheTag } from 'next/cache'
-
-async function getCachedUser(id: string) {
-  'use cache'
-  cacheTag('users')
-  cacheLife({ revalidate: 60 })
-  return getUser(id)
-}
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const user = await getCachedUser(id)
-  return <div>{user.name}</div>
-}
-```
-
-Key differences:
-- **No manual cache keys** - `use cache` generates keys automatically from function arguments and closures. The `keyParts` array from `unstable_cache` is no longer needed.
-- **Tags** - Replace `options.tags` with `cacheTag()` calls inside the function.
-- **Revalidation** - Replace `options.revalidate` with `cacheLife({ revalidate: N })` or a built-in profile like `cacheLife('minutes')`.
-- **Dynamic data** - `unstable_cache` did not support `cookies()` or `headers()` inside the callback. The same restriction applies to `use cache`, but you can use `'use cache: private'` if needed.
-
----
-
-## Limitations
-
-- **Edge runtime not supported** - requires Node.js
-- **Static export not supported** - needs server
-- **Non-deterministic values** (`Math.random()`, `Date.now()`) execute once at build time inside `use cache`
-
-For request-time randomness outside cache:
-
-```tsx
-import { connection } from 'next/server'
-
-async function DynamicContent() {
-  await connection()  // Defer to request time
-  const id = crypto.randomUUID()  // Different per request
-  return <div>{id}</div>
-}
-```
-
-Sources:
-- [Cache Components Guide](https://nextjs.org/docs/app/getting-started/cache-components)
-- [use cache Directive](https://nextjs.org/docs/app/api-reference/directives/use-cache)
-- [unstable_cache (legacy)](https://nextjs.org/docs/app/api-reference/functions/unstable_cache)
diff --git a/skills/next-cache-components/overlay.yaml b/skills/next-cache-components/overlay.yaml
deleted file mode 100644
index 1addecb..0000000
--- a/skills/next-cache-components/overlay.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: next-cache-components
-description: Next.js 16 Cache Components guidance — PPR, use cache directive, cacheLife, cacheTag, updateTag, and migration from unstable_cache. Use when implementing partial prerendering, caching strategies, or migrating from older Next.js cache patterns.
-metadata:
-  priority: 6
-  docs:
-    - "https://nextjs.org/docs/app/getting-started/cache-components"
-    - "https://nextjs.org/docs/app/api-reference/directives/use-cache"
-  pathPatterns:
-    - 'next.config.*'
-    - 'app/**'
-    - 'src/app/**'
-    - 'apps/*/app/**'
-    - 'apps/*/src/app/**'
-  importPatterns:
-    - "next/cache"
-  bashPatterns:
-    - '\bnext\s+(dev|build)\b'
-  promptSignals:
-    phrases:
-      - "use cache"
-      - "cache components"
-      - "partial prerendering"
-      - "PPR"
-      - "cacheLife"
-      - "cacheTag"
-      - "updateTag"
-      - "unstable_cache"
-    allOf:
-      - [cache, component]
-      - [cache, directive]
-      - [partial, prerender]
-    anyOf:
-      - "revalidateTag"
-      - "stale"
-      - "revalidate"
-      - "cache profile"
-    noneOf: []
-    minScore: 6
-  validate:
-    -
-      pattern: 'unstable_cache\s*\('
-      message: 'unstable_cache is deprecated in Next.js 16 — use the "use cache" directive with cacheTag() and cacheLife() instead'
-      severity: recommended
-      upgradeToSkill: next-cache-components
-      upgradeWhy: 'Guides migration from unstable_cache to use cache directive with cacheTag and cacheLife.'
-    -
-      pattern: '\bcacheHandler\s*:'
-      message: 'Singular cacheHandler is deprecated in Next.js 16 — use cacheHandlers (plural) with per-type handlers'
-      severity: recommended
-    -
-      pattern: revalidateTag\(\s*['"][^'"]+['"]\s*\)
-      message: 'Single-arg revalidateTag(tag) is deprecated in Next.js 16 — pass a cacheLife profile: revalidateTag(tag, "max")'
-      severity: recommended
-retrieval:
-  aliases:
-    - cache components
-    - partial prerendering
-    - PPR
-    - use cache
-  intents:
-    - enable partial prerendering in Next.js
-    - cache async data with use cache directive
-    - invalidate cache with cacheTag
-    - migrate from unstable_cache
-  entities:
-    - use cache
-    - cacheLife
-    - cacheTag
-    - updateTag
-    - revalidateTag
-    - PPR
-chainTo:
-  -
-    pattern: 'use cache'
-    targetSkill: nextjs
-    message: 'Cache component detected — loading Next.js best practices for RSC boundaries and data patterns alongside caching.'
-    skipIfFileContains: 'next-best-practices'
-
diff --git a/skills/next-cache-components/upstream/SKILL.md b/skills/next-cache-components/upstream/SKILL.md
deleted file mode 100644
index 13a8961..0000000
--- a/skills/next-cache-components/upstream/SKILL.md
+++ /dev/null
@@ -1,411 +0,0 @@
----
-name: next-cache-components
-description: Next.js 16 Cache Components - PPR, use cache directive, cacheLife, cacheTag, updateTag
----
-
-# Cache Components (Next.js 16+)
-
-Cache Components enable Partial Prerendering (PPR) - mix static, cached, and dynamic content in a single route.
-
-## Enable Cache Components
-
-```ts
-// next.config.ts
-import type { NextConfig } from 'next'
-
-const nextConfig: NextConfig = {
-  cacheComponents: true,
-}
-
-export default nextConfig
-```
-
-This replaces the old `experimental.ppr` flag.
-
----
-
-## Three Content Types
-
-With Cache Components enabled, content falls into three categories:
-
-### 1. Static (Auto-Prerendered)
-
-Synchronous code, imports, pure computations - prerendered at build time:
-
-```tsx
-export default function Page() {
-  return (
-    <header>
-      <h1>Our Blog</h1>  {/* Static - instant */}
-      <nav>...</nav>
-    </header>
-  )
-}
-```
-
-### 2. Cached (`use cache`)
-
-Async data that doesn't need fresh fetches every request:
-
-```tsx
-async function BlogPosts() {
-  'use cache'
-  cacheLife('hours')
-
-  const posts = await db.posts.findMany()
-  return <PostList posts={posts} />
-}
-```
-
-### 3. Dynamic (Suspense)
-
-Runtime data that must be fresh - wrap in Suspense:
-
-```tsx
-import { Suspense } from 'react'
-
-export default function Page() {
-  return (
-    <>
-      <BlogPosts />  {/* Cached */}
-
-      <Suspense fallback={<p>Loading...</p>}>
-        <UserPreferences />  {/* Dynamic - streams in */}
-      </Suspense>
-    </>
-  )
-}
-
-async function UserPreferences() {
-  const theme = (await cookies()).get('theme')?.value
-  return <p>Theme: {theme}</p>
-}
-```
-
----
-
-## `use cache` Directive
-
-### File Level
-
-```tsx
-'use cache'
-
-export default async function Page() {
-  // Entire page is cached
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Component Level
-
-```tsx
-export async function CachedComponent() {
-  'use cache'
-  const data = await fetchData()
-  return <div>{data}</div>
-}
-```
-
-### Function Level
-
-```tsx
-export async function getData() {
-  'use cache'
-  return db.query('SELECT * FROM posts')
-}
-```
-
----
-
-## Cache Profiles
-
-### Built-in Profiles
-
-```tsx
-'use cache'                    // Default: 5m stale, 15m revalidate
-```
-
-```tsx
-'use cache: remote'           // Platform-provided cache (Redis, KV)
-```
-
-```tsx
-'use cache: private'          // For compliance, allows runtime APIs
-```
-
-### `cacheLife()` - Custom Lifetime
-
-```tsx
-import { cacheLife } from 'next/cache'
-
-async function getData() {
-  'use cache'
-  cacheLife('hours')  // Built-in profile
-  return fetch('/api/data')
-}
-```
-
-Built-in profiles: `'default'`, `'minutes'`, `'hours'`, `'days'`, `'weeks'`, `'max'`
-
-### Inline Configuration
-
-```tsx
-async function getData() {
-  'use cache'
-  cacheLife({
-    stale: 3600,      // 1 hour - serve stale while revalidating
-    revalidate: 7200, // 2 hours - background revalidation interval
-    expire: 86400,    // 1 day - hard expiration
-  })
-  return fetch('/api/data')
-}
-```
-
----
-
-## Cache Invalidation
-
-### `cacheTag()` - Tag Cached Content
-
-```tsx
-import { cacheTag } from 'next/cache'
-
-async function getProducts() {
-  'use cache'
-  cacheTag('products')
-  return db.products.findMany()
-}
-
-async function getProduct(id: string) {
-  'use cache'
-  cacheTag('products', `product-${id}`)
-  return db.products.findUnique({ where: { id } })
-}
-```
-
-### `updateTag()` - Immediate Invalidation
-
-Use when you need the cache refreshed within the same request:
-
-```tsx
-'use server'
-
-import { updateTag } from 'next/cache'
-
-export async function updateProduct(id: string, data: FormData) {
-  await db.products.update({ where: { id }, data })
-  updateTag(`product-${id}`)  // Immediate - same request sees fresh data
-}
-```
-
-### `revalidateTag()` - Background Revalidation
-
-Use for stale-while-revalidate behavior:
-
-```tsx
-'use server'
-
-import { revalidateTag } from 'next/cache'
-
-export async function createPost(data: FormData) {
-  await db.posts.create({ data })
-  revalidateTag('posts')  // Background - next request sees fresh data
-}
-```
-
----
-
-## Runtime Data Constraint
-
-**Cannot** access `cookies()`, `headers()`, or `searchParams` inside `use cache`.
-
-### Solution: Pass as Arguments
-
-```tsx
-// Wrong - runtime API inside use cache
-async function CachedProfile() {
-  'use cache'
-  const session = (await cookies()).get('session')?.value  // Error!
-  return <div>{session}</div>
-}
-
-// Correct - extract outside, pass as argument
-async function ProfilePage() {
-  const session = (await cookies()).get('session')?.value
-  return <CachedProfile sessionId={session} />
-}
-
-async function CachedProfile({ sessionId }: { sessionId: string }) {
-  'use cache'
-  // sessionId becomes part of cache key automatically
-  const data = await fetchUserData(sessionId)
-  return <div>{data.name}</div>
-}
-```
-
-### Exception: `use cache: private`
-
-For compliance requirements when you can't refactor:
-
-```tsx
-async function getData() {
-  'use cache: private'
-  const session = (await cookies()).get('session')?.value  // Allowed
-  return fetchData(session)
-}
-```
-
----
-
-## Cache Key Generation
-
-Cache keys are automatic based on:
-- **Build ID** - invalidates all caches on deploy
-- **Function ID** - hash of function location
-- **Serializable arguments** - props become part of key
-- **Closure variables** - outer scope values included
-
-```tsx
-async function Component({ userId }: { userId: string }) {
-  const getData = async (filter: string) => {
-    'use cache'
-    // Cache key = userId (closure) + filter (argument)
-    return fetch(`/api/users/${userId}?filter=${filter}`)
-  }
-  return getData('active')
-}
-```
-
----
-
-## Complete Example
-
-```tsx
-import { Suspense } from 'react'
-import { cookies } from 'next/headers'
-import { cacheLife, cacheTag } from 'next/cache'
-
-export default function DashboardPage() {
-  return (
-    <>
-      {/* Static shell - instant from CDN */}
-      <header><h1>Dashboard</h1></header>
-      <nav>...</nav>
-
-      {/* Cached - fast, revalidates hourly */}
-      <Stats />
-
-      {/* Dynamic - streams in with fresh data */}
-      <Suspense fallback={<NotificationsSkeleton />}>
-        <Notifications />
-      </Suspense>
-    </>
-  )
-}
-
-async function Stats() {
-  'use cache'
-  cacheLife('hours')
-  cacheTag('dashboard-stats')
-
-  const stats = await db.stats.aggregate()
-  return <StatsDisplay stats={stats} />
-}
-
-async function Notifications() {
-  const userId = (await cookies()).get('userId')?.value
-  const notifications = await db.notifications.findMany({
-    where: { userId, read: false }
-  })
-  return <NotificationList items={notifications} />
-}
-```
-
----
-
-## Migration from Previous Versions
-
-| Old Config | Replacement |
-|-----------|-------------|
-| `experimental.ppr` | `cacheComponents: true` |
-| `dynamic = 'force-dynamic'` | Remove (default behavior) |
-| `dynamic = 'force-static'` | `'use cache'` + `cacheLife('max')` |
-| `revalidate = N` | `cacheLife({ revalidate: N })` |
-| `unstable_cache()` | `'use cache'` directive |
-
-### Migrating `unstable_cache` to `use cache`
-
-`unstable_cache` has been replaced by the `use cache` directive in Next.js 16. When `cacheComponents` is enabled, convert `unstable_cache` calls to `use cache` functions:
-
-**Before (`unstable_cache`):**
-
-```tsx
-import { unstable_cache } from 'next/cache'
-
-const getCachedUser = unstable_cache(
-  async (id) => getUser(id),
-  ['my-app-user'],
-  {
-    tags: ['users'],
-    revalidate: 60,
-  }
-)
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const user = await getCachedUser(id)
-  return <div>{user.name}</div>
-}
-```
-
-**After (`use cache`):**
-
-```tsx
-import { cacheLife, cacheTag } from 'next/cache'
-
-async function getCachedUser(id: string) {
-  'use cache'
-  cacheTag('users')
-  cacheLife({ revalidate: 60 })
-  return getUser(id)
-}
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const user = await getCachedUser(id)
-  return <div>{user.name}</div>
-}
-```
-
-Key differences:
-- **No manual cache keys** - `use cache` generates keys automatically from function arguments and closures. The `keyParts` array from `unstable_cache` is no longer needed.
-- **Tags** - Replace `options.tags` with `cacheTag()` calls inside the function.
-- **Revalidation** - Replace `options.revalidate` with `cacheLife({ revalidate: N })` or a built-in profile like `cacheLife('minutes')`.
-- **Dynamic data** - `unstable_cache` did not support `cookies()` or `headers()` inside the callback. The same restriction applies to `use cache`, but you can use `'use cache: private'` if needed.
-
----
-
-## Limitations
-
-- **Edge runtime not supported** - requires Node.js
-- **Static export not supported** - needs server
-- **Non-deterministic values** (`Math.random()`, `Date.now()`) execute once at build time inside `use cache`
-
-For request-time randomness outside cache:
-
-```tsx
-import { connection } from 'next/server'
-
-async function DynamicContent() {
-  await connection()  // Defer to request time
-  const id = crypto.randomUUID()  // Different per request
-  return <div>{id}</div>
-}
-```
-
-Sources:
-- [Cache Components Guide](https://nextjs.org/docs/app/getting-started/cache-components)
-- [use cache Directive](https://nextjs.org/docs/app/api-reference/directives/use-cache)
-- [unstable_cache (legacy)](https://nextjs.org/docs/app/api-reference/functions/unstable_cache)
diff --git a/skills/next-upgrade/SKILL.md b/skills/next-upgrade/SKILL.md
deleted file mode 100644
index e2ca3ff..0000000
--- a/skills/next-upgrade/SKILL.md
+++ /dev/null
@@ -1,103 +0,0 @@
----
-name: next-upgrade
-description: Upgrade Next.js to the latest version following official migration guides and codemods. Use when upgrading Next.js versions, running codemods, or migrating between major releases.
-metadata:
-  priority: 6
-  docs:
-    - "https://nextjs.org/docs/app/guides/upgrading"
-    - "https://nextjs.org/docs/app/guides/upgrading/codemods"
-  pathPatterns:
-    - 'next.config.*'
-    - 'package.json'
-  bashPatterns:
-    - '\bnpx\s+@next/codemod\b'
-    - '\bnpm\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\bpnpm\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\bbun\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\byarn\s+add\s+[^\n]*\bnext@'
-  promptSignals:
-    phrases:
-      - "upgrade next"
-      - "upgrade nextjs"
-      - "migrate next"
-      - "update next.js"
-      - "next.js upgrade"
-      - "nextjs migration"
-      - "next codemod"
-    allOf:
-      - [upgrade, next]
-      - [migrate, next]
-      - [update, nextjs]
-    anyOf:
-      - "breaking changes"
-      - "codemod"
-      - "migration guide"
-      - "version upgrade"
-    noneOf: []
-    minScore: 6
-retrieval:
-  aliases:
-    - next upgrade
-    - nextjs migration
-    - next codemod
-  intents:
-    - upgrade Next.js to latest version
-    - run Next.js codemods
-    - migrate between major Next.js versions
-  entities:
-    - codemod
-    - migration
-    - upgrade
-    - breaking changes
-chainTo:
-  -
-    pattern: 'getServerSideProps|getStaticProps|next/router|next/head|next/document'
-    targetSkill: nextjs
-    message: 'Pages Router patterns detected during upgrade — loading Next.js best practices for App Router migration.'
-
----
-
-# Upgrade Next.js
-
-Upgrade the current project to the latest Next.js version following official migration guides.
-
-## Instructions
-
-1. **Detect current version**: Read `package.json` to identify the current Next.js version and related dependencies (React, React DOM, etc.)
-
-2. **Fetch the latest upgrade guide**: Use WebFetch to get the official upgrade documentation:
-   - Codemods: https://nextjs.org/docs/app/guides/upgrading/codemods
-   - Version-specific guides (adjust version as needed):
-     - https://nextjs.org/docs/app/guides/upgrading/version-16 
-     - https://nextjs.org/docs/app/guides/upgrading/version-15
-     - https://nextjs.org/docs/app/guides/upgrading/version-14
-
-3. **Determine upgrade path**: Based on current version, identify which migration steps apply. For major version jumps, upgrade incrementally (e.g., 13 → 14 → 15).
-
-4. **Run codemods first**: Next.js provides codemods to automate breaking changes:
-   ```bash
-   npx @next/codemod@latest <transform> <path>
-   ```
-   Common transforms:
-   - `next-async-request-api` - Updates async Request APIs (v15)
-   - `next-request-geo-ip` - Migrates geo/ip properties (v15)
-   - `next-dynamic-access-named-export` - Transforms dynamic imports (v15)
-
-5. **Update dependencies**: Upgrade Next.js and peer dependencies together:
-   ```bash
-   npm install next@latest react@latest react-dom@latest
-   ```
-
-6. **Review breaking changes**: Check the upgrade guide for manual changes needed:
-   - API changes (e.g., async params in v15)
-   - Configuration changes in `next.config.js`
-   - Deprecated features being removed
-
-7. **Update TypeScript types** (if applicable):
-   ```bash
-   npm install @types/react@latest @types/react-dom@latest
-   ```
-
-8. **Test the upgrade**:
-   - Run `npm run build` to check for build errors
-   - Run `npm run dev` and test key functionality
diff --git a/skills/next-upgrade/overlay.yaml b/skills/next-upgrade/overlay.yaml
deleted file mode 100644
index a3d729e..0000000
--- a/skills/next-upgrade/overlay.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: next-upgrade
-description: Upgrade Next.js to the latest version following official migration guides and codemods. Use when upgrading Next.js versions, running codemods, or migrating between major releases.
-metadata:
-  priority: 6
-  docs:
-    - "https://nextjs.org/docs/app/guides/upgrading"
-    - "https://nextjs.org/docs/app/guides/upgrading/codemods"
-  pathPatterns:
-    - 'next.config.*'
-    - 'package.json'
-  bashPatterns:
-    - '\bnpx\s+@next/codemod\b'
-    - '\bnpm\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\bpnpm\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\bbun\s+(install|i|add)\s+[^\n]*\bnext@'
-    - '\byarn\s+add\s+[^\n]*\bnext@'
-  promptSignals:
-    phrases:
-      - "upgrade next"
-      - "upgrade nextjs"
-      - "migrate next"
-      - "update next.js"
-      - "next.js upgrade"
-      - "nextjs migration"
-      - "next codemod"
-    allOf:
-      - [upgrade, next]
-      - [migrate, next]
-      - [update, nextjs]
-    anyOf:
-      - "breaking changes"
-      - "codemod"
-      - "migration guide"
-      - "version upgrade"
-    noneOf: []
-    minScore: 6
-retrieval:
-  aliases:
-    - next upgrade
-    - nextjs migration
-    - next codemod
-  intents:
-    - upgrade Next.js to latest version
-    - run Next.js codemods
-    - migrate between major Next.js versions
-  entities:
-    - codemod
-    - migration
-    - upgrade
-    - breaking changes
-chainTo:
-  -
-    pattern: 'getServerSideProps|getStaticProps|next/router|next/head|next/document'
-    targetSkill: nextjs
-    message: 'Pages Router patterns detected during upgrade — loading Next.js best practices for App Router migration.'
-
diff --git a/skills/next-upgrade/upstream/SKILL.md b/skills/next-upgrade/upstream/SKILL.md
deleted file mode 100644
index a96bf91..0000000
--- a/skills/next-upgrade/upstream/SKILL.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: next-upgrade
-description: Upgrade Next.js to the latest version following official migration guides and codemods
-argument-hint: "[target-version]"
----
-
-# Upgrade Next.js
-
-Upgrade the current project to the latest Next.js version following official migration guides.
-
-## Instructions
-
-1. **Detect current version**: Read `package.json` to identify the current Next.js version and related dependencies (React, React DOM, etc.)
-
-2. **Fetch the latest upgrade guide**: Use WebFetch to get the official upgrade documentation:
-   - Codemods: https://nextjs.org/docs/app/guides/upgrading/codemods
-   - Version-specific guides (adjust version as needed):
-     - https://nextjs.org/docs/app/guides/upgrading/version-16 
-     - https://nextjs.org/docs/app/guides/upgrading/version-15
-     - https://nextjs.org/docs/app/guides/upgrading/version-14
-
-3. **Determine upgrade path**: Based on current version, identify which migration steps apply. For major version jumps, upgrade incrementally (e.g., 13 → 14 → 15).
-
-4. **Run codemods first**: Next.js provides codemods to automate breaking changes:
-   ```bash
-   npx @next/codemod@latest <transform> <path>
-   ```
-   Common transforms:
-   - `next-async-request-api` - Updates async Request APIs (v15)
-   - `next-request-geo-ip` - Migrates geo/ip properties (v15)
-   - `next-dynamic-access-named-export` - Transforms dynamic imports (v15)
-
-5. **Update dependencies**: Upgrade Next.js and peer dependencies together:
-   ```bash
-   npm install next@latest react@latest react-dom@latest
-   ```
-
-6. **Review breaking changes**: Check the upgrade guide for manual changes needed:
-   - API changes (e.g., async params in v15)
-   - Configuration changes in `next.config.js`
-   - Deprecated features being removed
-
-7. **Update TypeScript types** (if applicable):
-   ```bash
-   npm install @types/react@latest @types/react-dom@latest
-   ```
-
-8. **Test the upgrade**:
-   - Run `npm run build` to check for build errors
-   - Run `npm run dev` and test key functionality
diff --git a/skills/nextjs/SKILL.md b/skills/nextjs/SKILL.md
deleted file mode 100644
index 07fae30..0000000
--- a/skills/nextjs/SKILL.md
+++ /dev/null
@@ -1,434 +0,0 @@
----
-name: nextjs
-description: Next.js App Router expert guidance. Use when building, debugging, or architecting Next.js applications — routing, Server Components, Server Actions, Cache Components, layouts, middleware/proxy, data fetching, rendering strategies, and deployment on Vercel.
-metadata:
-  priority: 5
-  docs:
-    - "https://nextjs.org/docs"
-    - "https://nextjs.org/docs/app"
-  sitemap: "https://nextjs.org/sitemap.xml"
-  pathPatterns:
-    - 'next.config.*'
-    - 'next-env.d.ts'
-    - 'app/**'
-    - 'pages/**'
-    - 'src/app/**'
-    - 'src/pages/**'
-    - 'tailwind.config.*'
-    - 'postcss.config.*'
-    - 'tsconfig.json'
-    - 'tsconfig.*.json'
-    - 'apps/*/app/**'
-    - 'apps/*/pages/**'
-    - 'apps/*/src/app/**'
-    - 'apps/*/src/pages/**'
-    - 'apps/*/next.config.*'
-  bashPatterns:
-    - '\bnext\s+(dev|build|start|lint)\b'
-    - '\bnext\s+experimental-analyze\b'
-    - '\bnpx\s+create-next-app\b'
-    - '\bbunx\s+create-next-app\b'
-    - '\bnpm\s+run\s+(dev|build|start)\b'
-    - '\bpnpm\s+(dev|build)\b'
-    - '\bbun\s+run\s+(dev|build)\b'
-  promptSignals:
-    phrases:
-      - "next.js"
-      - "nextjs"
-      - "app router"
-      - "server component"
-      - "server action"
-    allOf:
-      - [middleware, next]
-      - [layout, route]
-    anyOf:
-      - "pages router"
-      - "getserversideprops"
-      - "use server"
-    noneOf: []
-    minScore: 6
-validate:
-  -
-    pattern: export.*getServerSideProps
-    message: 'getServerSideProps is removed in App Router — use server components or route handlers'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from Pages Router getServerSideProps to App Router server components with async data fetching.'
-  -
-    pattern: getServerSideProps
-    message: 'getServerSideProps is a Pages Router pattern — migrate to App Router server components'
-    severity: warn
-  -
-    pattern: export.*getStaticProps
-    message: 'getStaticProps is removed in App Router — use generateStaticParams + server components instead'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from Pages Router getStaticProps to App Router generateStaticParams with server components.'
-  -
-    pattern: getStaticProps
-    message: 'getStaticProps is a Pages Router pattern — migrate to App Router generateStaticParams + server components'
-    severity: warn
-  -
-    pattern: from\s+['"]next/router['"]
-    message: 'next/router is Pages Router only — use next/navigation for App Router'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next/router to next/navigation with useRouter, usePathname, useSearchParams hooks.'
-  -
-    pattern: (useState|useEffect)
-    message: 'React hooks require "use client" directive — add it at the top of client components'
-    severity: warn
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: from\s+['"]next/head['"]
-    message: 'next/head is Pages Router — use export const metadata or generateMetadata() in App Router. Run Skill(nextjs) for metadata API guidance.'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next/head to the App Router metadata API (export const metadata / generateMetadata()).'
-    skipIfFileContains: export\s+(const\s+)?metadata|generateMetadata
-  -
-    pattern: export\s+(default\s+)?function\s+middleware
-    message: 'middleware() is renamed to proxy() in Next.js 16 — rename the function and the file to proxy.ts. Run Skill(routing-middleware) for proxy.ts migration guidance.'
-    severity: recommended
-    upgradeToSkill: routing-middleware
-    upgradeWhy: 'Guides migration from middleware.ts to proxy.ts with correct file placement, runtime config, and request interception patterns.'
-  -
-    pattern: revalidateTag\(\s*['"][^'"]+['"]\s*\)
-    message: 'Single-arg revalidateTag(tag) is deprecated in Next.js 16 — pass a cacheLife profile: revalidateTag(tag, "max")'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from single-arg revalidateTag to the Next.js 16 two-arg API with cacheLife profiles.'
-  -
-    pattern: '\bcacheHandler\s*:'
-    message: 'Singular cacheHandler is deprecated in Next.js 16 — use cacheHandlers (plural) with per-type handlers'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from singular cacheHandler to Next.js 16 cacheHandlers (plural) with per-type handler config.'
-  -
-    pattern: useRef\(\s*\)
-    message: 'useRef() requires an initial value in React 19 — use useRef(null) or useRef(0)'
-    severity: error
-  -
-    pattern: next\s+export
-    message: 'next export was removed — use output: "export" in next.config.js for static export'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next export CLI command to output: "export" in next.config for static site generation.'
-  -
-    pattern: (?<!await )\bcookies\(\s*\)
-    message: 'cookies() is async in Next.js 16 — add await: const cookieStore = await cookies()'
-    severity: error
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: (?<!await )\bheaders\(\s*\)
-    message: 'headers() is async in Next.js 16 — add await: const headersList = await headers()'
-    severity: error
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: =\s*(?!await\b)params\b
-    message: 'params is async in Next.js 16 — add await: const { slug } = await params'
-    severity: recommended
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: =\s*(?!await\b)searchParams\b
-    message: 'searchParams is async in Next.js 16 — add await: const { query } = await searchParams'
-    severity: recommended
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: 'from\s+[''""](next-auth|@auth/core)[''""]|NextAuth\(|getServerSession\('
-    message: 'Legacy auth pattern detected. Modern Vercel apps should use Clerk, Descope, or Auth0 for managed authentication.'
-    severity: recommended
-    upgradeToSkill: auth
-    upgradeWhy: 'Migrate from next-auth/manual JWT to a managed auth provider (Clerk, Descope, Auth0) for better Vercel integration.'
-    skipIfFileContains: '@clerk/|@descope/|@auth0/'
-  -
-    pattern: 'NextApiRequest|NextApiResponse|export\s+default\s+function\s+handler'
-    message: 'Pages Router API handler detected. Use App Router route handlers with named HTTP exports instead.'
-    severity: recommended
-    upgradeToSkill: vercel-functions
-    upgradeWhy: 'Migrate from Pages Router API routes to App Router route handlers with Web Request/Response API.'
-    skipIfFileContains: 'export\s+(async\s+)?function\s+(GET|POST|PUT|PATCH|DELETE)'
-  -
-    pattern: 'from\s+[''""](lru-cache|node-cache|memory-cache)[''""]|new\s+(LRUCache|NodeCache)\('
-    message: 'In-process cache detected. Serverless deployments lose process memory between invocations.'
-    severity: recommended
-    upgradeToSkill: runtime-cache
-    upgradeWhy: 'Replace process-memory caches with Vercel Runtime Cache for shared, region-aware caching.'
-  -
-    pattern: 'from\s+[''""](express|fastify|koa|hapi)[''""]|require\s*\(\s*[''""](express|fastify|koa|hapi)[''""]'
-    message: 'Express/Fastify/Koa/Hapi server framework detected in a Next.js project. Use Next.js route handlers or proxy.ts for request handling instead.'
-    severity: recommended
-    upgradeToSkill: routing-middleware
-    upgradeWhy: 'Replace custom server frameworks with Next.js proxy.ts for request interception and route handlers for API endpoints.'
-    skipIfFileContains: 'proxy\.ts|from\s+[''""](next/server)[''""]|@vercel/functions'
-  -
-    pattern: 'from\s+[''""](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''""]|require\s*\(\s*[''""](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''""]'
-    message: 'Heavy ORM detected. Consider using lightweight serverless-native alternatives like Drizzle, Prisma, or direct Neon for better cold start performance.'
-    severity: recommended
-    upgradeToSkill: vercel-storage
-    upgradeWhy: 'Migrate from heavy ORMs to serverless-native database clients (Drizzle + Neon, Prisma, or @neondatabase/serverless) for faster cold starts.'
-    skipIfFileContains: 'from\s+[''""](drizzle-orm|@neondatabase|@prisma/client|prisma)[''""]'
-  -
-    pattern: 'fonts\.googleapis\.com|from\s+[''""](fontsource|@fontsource)[''""]|<link[^>]*fonts\.googleapis'
-    message: 'External font loader detected. Use next/font for zero-CLS, self-hosted font loading with automatic optimization.'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from external font loaders to next/font with Geist Sans/Mono for zero-CLS font optimization.'
-    skipIfFileContains: 'next/font'
-chainTo:
-  -
-    pattern: 'export\s+(default\s+)?function\s+middleware'
-    targetSkill: routing-middleware
-    message: 'middleware() is renamed to proxy() in Next.js 16 — loading Routing Middleware guidance for proxy.ts migration.'
-  -
-    pattern: "from\\s+['\"]@vercel/(postgres|kv)['\"]"
-    targetSkill: vercel-storage
-    message: 'Sunset storage package detected — loading Vercel Storage guidance for Neon/Upstash migration.'
-  -
-    pattern: "from\\s+['\"]@ai-sdk/(anthropic|openai)['\"]"
-    targetSkill: ai-gateway
-    message: 'Direct AI provider SDK import — loading AI Gateway guidance for unified model routing with failover and cost tracking.'
-  -
-    pattern: 'from\s+[''""](next-auth|@auth/core)[''""]|NextAuth\(|getServerSession\('
-    targetSkill: auth
-    message: 'Legacy auth pattern detected — loading managed authentication guidance (Clerk, Descope, Auth0).'
-  -
-    pattern: 'NextApiRequest|NextApiResponse|export\s+default\s+function\s+handler'
-    targetSkill: vercel-functions
-    message: 'Pages Router API handler detected — loading Vercel Functions guidance for App Router migration.'
-  -
-    pattern: 'from\s+[''""](lru-cache|node-cache|memory-cache)[''""]|new\s+(LRUCache|NodeCache)\('
-    targetSkill: runtime-cache
-    message: 'In-process cache detected — loading Runtime Cache guidance for serverless-compatible caching.'
-  -
-    pattern: 'fetch\s*\(\s*[''""](https?://)?(api\.openai\.com|api\.anthropic\.com|api\.cohere\.ai)'
-    targetSkill: ai-gateway
-    message: 'Raw AI provider fetch URL detected — loading AI Gateway guidance for unified routing, failover, and OIDC auth.'
-    skipIfFileContains: '@ai-sdk/|from\s+[''""](ai)[''""]|ai-gateway|gateway\('
-  -
-    pattern: 'jwt\.(sign|verify|decode)\(|from\s+[''""](jsonwebtoken)[''""]|new\s+SignJWT\(|jwtVerify\('
-    targetSkill: auth
-    message: 'Manual JWT token handling detected — loading Auth guidance for managed authentication (Clerk, Descope, Auth0).'
-    skipIfFileContains: 'clerkMiddleware|@clerk/|@auth0/|@descope/|from\s+[''""](next-auth)[''""]'
-  -
-    pattern: 'from\s+[''"]@/components/ui/|from\s+[''"]@/components/ui[''""]'
-    targetSkill: shadcn
-    message: 'shadcn/ui component imports detected — loading shadcn guidance for component composition, theming, and registry patterns.'
-    skipIfFileContains: 'shadcn|components\.json'
-  -
-    pattern: 'from\s+[''""](styled-components|@emotion/(react|styled)|@mui/material)[''""]'
-    targetSkill: shadcn
-    message: 'CSS-in-JS library detected — loading shadcn/ui guidance for Tailwind CSS + Radix UI component patterns (Vercel recommended).'
-    skipIfFileContains: '@/components/ui|shadcn'
-  -
-    pattern: 'getInitialProps'
-    targetSkill: nextjs
-    message: 'getInitialProps is a legacy Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.'
-    skipIfFileContains: 'app/.*page\.|generateStaticParams|use cache'
-  -
-    pattern: 'export.*getServerSideProps|getServerSideProps\s*\('
-    targetSkill: nextjs
-    message: 'getServerSideProps is a Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.'
-    skipIfFileContains: 'generateStaticParams|use cache|app/.*page\.'
-  -
-    pattern: 'export.*getStaticProps|getStaticProps\s*\('
-    targetSkill: nextjs
-    message: 'getStaticProps is a Pages Router pattern — loading Next.js guidance for App Router migration with generateStaticParams and server components.'
-    skipIfFileContains: 'generateStaticParams|use cache|app/.*page\.'
-  -
-    pattern: '_app\.(tsx?|jsx?)'
-    targetSkill: nextjs
-    message: '_app.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx migration.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: '_document\.(tsx?|jsx?)'
-    targetSkill: nextjs
-    message: '_document.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx with metadata API migration.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: "from\\s+['\"]next/document['\"]"
-    targetSkill: nextjs
-    message: 'next/document is Pages Router only — loading Next.js guidance for App Router layout.tsx with html/body structure.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: 'pages/api/'
-    targetSkill: vercel-functions
-    message: 'Pages Router API route (pages/api/) detected — loading Vercel Functions guidance for App Router route handlers with named HTTP exports.'
-    skipIfFileContains: 'export\s+(async\s+)?function\s+(GET|POST|PUT|PATCH|DELETE)'
-retrieval:
-  aliases:
-    - next.js
-    - nextjs app
-    - react framework
-    - app router
-  intents:
-    - set up routing and layouts in a Next.js app
-    - choose between server and client components for a feature
-    - configure data fetching or caching in App Router
-    - add middleware or proxy logic to handle requests
-    - set up server rendering for React pages
-    - add a new page with dynamic route segments
-  entities:
-    - App Router
-    - Server Components
-    - Server Actions
-    - generateMetadata
-    - layout
-    - proxy
-    - next.config
-  examples:
-    - add a new page with dynamic routing
-    - should this be a server or client component
-    - set up middleware for auth redirects
-    - configure caching for this data fetch
-    - set up server rendering for my pages
-
----
-
-# Next.js Best Practices
-
-Apply these rules when writing or reviewing Next.js code.
-
-## File Conventions
-
-See [file-conventions.md](./file-conventions.md) for:
-- Project structure and special files
-- Route segments (dynamic, catch-all, groups)
-- Parallel and intercepting routes
-- Middleware rename in v16 (middleware → proxy)
-
-## RSC Boundaries
-
-Detect invalid React Server Component patterns.
-
-See [rsc-boundaries.md](./rsc-boundaries.md) for:
-- Async client component detection (invalid)
-- Non-serializable props detection
-- Server Action exceptions
-
-## Async Patterns
-
-Next.js 15+ async API changes.
-
-See [async-patterns.md](./async-patterns.md) for:
-- Async `params` and `searchParams`
-- Async `cookies()` and `headers()`
-- Migration codemod
-
-## Runtime Selection
-
-See [runtime-selection.md](./runtime-selection.md) for:
-- Default to Node.js runtime
-- When Edge runtime is appropriate
-
-## Directives
-
-See [directives.md](./directives.md) for:
-- `'use client'`, `'use server'` (React)
-- `'use cache'` (Next.js)
-
-## Functions
-
-See [functions.md](./functions.md) for:
-- Navigation hooks: `useRouter`, `usePathname`, `useSearchParams`, `useParams`
-- Server functions: `cookies`, `headers`, `draftMode`, `after`
-- Generate functions: `generateStaticParams`, `generateMetadata`
-
-## Error Handling
-
-See [error-handling.md](./error-handling.md) for:
-- `error.tsx`, `global-error.tsx`, `not-found.tsx`
-- `redirect`, `permanentRedirect`, `notFound`
-- `forbidden`, `unauthorized` (auth errors)
-- `unstable_rethrow` for catch blocks
-
-## Data Patterns
-
-See [data-patterns.md](./data-patterns.md) for:
-- Server Components vs Server Actions vs Route Handlers
-- Avoiding data waterfalls (`Promise.all`, Suspense, preload)
-- Client component data fetching
-
-## Route Handlers
-
-See [route-handlers.md](./route-handlers.md) for:
-- `route.ts` basics
-- GET handler conflicts with `page.tsx`
-- Environment behavior (no React DOM)
-- When to use vs Server Actions
-
-## Metadata & OG Images
-
-See [metadata.md](./metadata.md) for:
-- Static and dynamic metadata
-- `generateMetadata` function
-- OG image generation with `next/og`
-- File-based metadata conventions
-
-## Image Optimization
-
-See [image.md](./image.md) for:
-- Always use `next/image` over `<img>`
-- Remote images configuration
-- Responsive `sizes` attribute
-- Blur placeholders
-- Priority loading for LCP
-
-## Font Optimization
-
-See [font.md](./font.md) for:
-- `next/font` setup
-- Google Fonts, local fonts
-- Tailwind CSS integration
-- Preloading subsets
-
-## Bundling
-
-See [bundling.md](./bundling.md) for:
-- Server-incompatible packages
-- CSS imports (not link tags)
-- Polyfills (already included)
-- ESM/CommonJS issues
-- Bundle analysis
-
-## Scripts
-
-See [scripts.md](./scripts.md) for:
-- `next/script` vs native script tags
-- Inline scripts need `id`
-- Loading strategies
-- Google Analytics with `@next/third-parties`
-
-## Hydration Errors
-
-See [hydration-error.md](./hydration-error.md) for:
-- Common causes (browser APIs, dates, invalid HTML)
-- Debugging with error overlay
-- Fixes for each cause
-
-## Suspense Boundaries
-
-See [suspense-boundaries.md](./suspense-boundaries.md) for:
-- CSR bailout with `useSearchParams` and `usePathname`
-- Which hooks require Suspense boundaries
-
-## Parallel & Intercepting Routes
-
-See [parallel-routes.md](./parallel-routes.md) for:
-- Modal patterns with `@slot` and `(.)` interceptors
-- `default.tsx` for fallbacks
-- Closing modals correctly with `router.back()`
-
-## Self-Hosting
-
-See [self-hosting.md](./self-hosting.md) for:
-- `output: 'standalone'` for Docker
-- Cache handlers for multi-instance ISR
-- What works vs needs extra setup
-
-## Debug Tricks
-
-See [debug-tricks.md](./debug-tricks.md) for:
-- MCP endpoint for AI-assisted debugging
-- Rebuild specific routes with `--debug-build-paths`
-
diff --git a/skills/nextjs/overlay.yaml b/skills/nextjs/overlay.yaml
deleted file mode 100644
index a049e11..0000000
--- a/skills/nextjs/overlay.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-name: nextjs
-description: Next.js App Router expert guidance. Use when building, debugging, or architecting Next.js applications — routing, Server Components, Server Actions, Cache Components, layouts, middleware/proxy, data fetching, rendering strategies, and deployment on Vercel.
-metadata:
-  priority: 5
-  docs:
-    - "https://nextjs.org/docs"
-    - "https://nextjs.org/docs/app"
-  sitemap: "https://nextjs.org/sitemap.xml"
-  pathPatterns:
-    - 'next.config.*'
-    - 'next-env.d.ts'
-    - 'app/**'
-    - 'pages/**'
-    - 'src/app/**'
-    - 'src/pages/**'
-    - 'tailwind.config.*'
-    - 'postcss.config.*'
-    - 'tsconfig.json'
-    - 'tsconfig.*.json'
-    - 'apps/*/app/**'
-    - 'apps/*/pages/**'
-    - 'apps/*/src/app/**'
-    - 'apps/*/src/pages/**'
-    - 'apps/*/next.config.*'
-  bashPatterns:
-    - '\bnext\s+(dev|build|start|lint)\b'
-    - '\bnext\s+experimental-analyze\b'
-    - '\bnpx\s+create-next-app\b'
-    - '\bbunx\s+create-next-app\b'
-    - '\bnpm\s+run\s+(dev|build|start)\b'
-    - '\bpnpm\s+(dev|build)\b'
-    - '\bbun\s+run\s+(dev|build)\b'
-  promptSignals:
-    phrases:
-      - "next.js"
-      - "nextjs"
-      - "app router"
-      - "server component"
-      - "server action"
-    allOf:
-      - [middleware, next]
-      - [layout, route]
-    anyOf:
-      - "pages router"
-      - "getserversideprops"
-      - "use server"
-    noneOf: []
-    minScore: 6
-validate:
-  -
-    pattern: export.*getServerSideProps
-    message: 'getServerSideProps is removed in App Router — use server components or route handlers'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from Pages Router getServerSideProps to App Router server components with async data fetching.'
-  -
-    pattern: getServerSideProps
-    message: 'getServerSideProps is a Pages Router pattern — migrate to App Router server components'
-    severity: warn
-  -
-    pattern: export.*getStaticProps
-    message: 'getStaticProps is removed in App Router — use generateStaticParams + server components instead'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from Pages Router getStaticProps to App Router generateStaticParams with server components.'
-  -
-    pattern: getStaticProps
-    message: 'getStaticProps is a Pages Router pattern — migrate to App Router generateStaticParams + server components'
-    severity: warn
-  -
-    pattern: from\s+['"]next/router['"]
-    message: 'next/router is Pages Router only — use next/navigation for App Router'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next/router to next/navigation with useRouter, usePathname, useSearchParams hooks.'
-  -
-    pattern: (useState|useEffect)
-    message: 'React hooks require "use client" directive — add it at the top of client components'
-    severity: warn
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: from\s+['"]next/head['"]
-    message: 'next/head is Pages Router — use export const metadata or generateMetadata() in App Router. Run Skill(nextjs) for metadata API guidance.'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next/head to the App Router metadata API (export const metadata / generateMetadata()).'
-    skipIfFileContains: export\s+(const\s+)?metadata|generateMetadata
-  -
-    pattern: export\s+(default\s+)?function\s+middleware
-    message: 'middleware() is renamed to proxy() in Next.js 16 — rename the function and the file to proxy.ts. Run Skill(routing-middleware) for proxy.ts migration guidance.'
-    severity: recommended
-    upgradeToSkill: routing-middleware
-    upgradeWhy: 'Guides migration from middleware.ts to proxy.ts with correct file placement, runtime config, and request interception patterns.'
-  -
-    pattern: revalidateTag\(\s*['"][^'"]+['"]\s*\)
-    message: 'Single-arg revalidateTag(tag) is deprecated in Next.js 16 — pass a cacheLife profile: revalidateTag(tag, "max")'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from single-arg revalidateTag to the Next.js 16 two-arg API with cacheLife profiles.'
-  -
-    pattern: '\bcacheHandler\s*:'
-    message: 'Singular cacheHandler is deprecated in Next.js 16 — use cacheHandlers (plural) with per-type handlers'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from singular cacheHandler to Next.js 16 cacheHandlers (plural) with per-type handler config.'
-  -
-    pattern: useRef\(\s*\)
-    message: 'useRef() requires an initial value in React 19 — use useRef(null) or useRef(0)'
-    severity: error
-  -
-    pattern: next\s+export
-    message: 'next export was removed — use output: "export" in next.config.js for static export'
-    severity: error
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from next export CLI command to output: "export" in next.config for static site generation.'
-  -
-    pattern: (?<!await )\bcookies\(\s*\)
-    message: 'cookies() is async in Next.js 16 — add await: const cookieStore = await cookies()'
-    severity: error
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: (?<!await )\bheaders\(\s*\)
-    message: 'headers() is async in Next.js 16 — add await: const headersList = await headers()'
-    severity: error
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: =\s*(?!await\b)params\b
-    message: 'params is async in Next.js 16 — add await: const { slug } = await params'
-    severity: recommended
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: =\s*(?!await\b)searchParams\b
-    message: 'searchParams is async in Next.js 16 — add await: const { query } = await searchParams'
-    severity: recommended
-    skipIfFileContains: "^['\"]use client['\"]"
-  -
-    pattern: 'from\s+[''""](next-auth|@auth/core)[''""]|NextAuth\(|getServerSession\('
-    message: 'Legacy auth pattern detected. Modern Vercel apps should use Clerk, Descope, or Auth0 for managed authentication.'
-    severity: recommended
-    upgradeToSkill: auth
-    upgradeWhy: 'Migrate from next-auth/manual JWT to a managed auth provider (Clerk, Descope, Auth0) for better Vercel integration.'
-    skipIfFileContains: '@clerk/|@descope/|@auth0/'
-  -
-    pattern: 'NextApiRequest|NextApiResponse|export\s+default\s+function\s+handler'
-    message: 'Pages Router API handler detected. Use App Router route handlers with named HTTP exports instead.'
-    severity: recommended
-    upgradeToSkill: vercel-functions
-    upgradeWhy: 'Migrate from Pages Router API routes to App Router route handlers with Web Request/Response API.'
-    skipIfFileContains: 'export\s+(async\s+)?function\s+(GET|POST|PUT|PATCH|DELETE)'
-  -
-    pattern: 'from\s+[''""](lru-cache|node-cache|memory-cache)[''""]|new\s+(LRUCache|NodeCache)\('
-    message: 'In-process cache detected. Serverless deployments lose process memory between invocations.'
-    severity: recommended
-    upgradeToSkill: runtime-cache
-    upgradeWhy: 'Replace process-memory caches with Vercel Runtime Cache for shared, region-aware caching.'
-  -
-    pattern: 'from\s+[''""](express|fastify|koa|hapi)[''""]|require\s*\(\s*[''""](express|fastify|koa|hapi)[''""]'
-    message: 'Express/Fastify/Koa/Hapi server framework detected in a Next.js project. Use Next.js route handlers or proxy.ts for request handling instead.'
-    severity: recommended
-    upgradeToSkill: routing-middleware
-    upgradeWhy: 'Replace custom server frameworks with Next.js proxy.ts for request interception and route handlers for API endpoints.'
-    skipIfFileContains: 'proxy\.ts|from\s+[''""](next/server)[''""]|@vercel/functions'
-  -
-    pattern: 'from\s+[''""](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''""]|require\s*\(\s*[''""](typeorm|sequelize|mikro-orm|objection|bookshelf|knex)[''""]'
-    message: 'Heavy ORM detected. Consider using lightweight serverless-native alternatives like Drizzle, Prisma, or direct Neon for better cold start performance.'
-    severity: recommended
-    upgradeToSkill: vercel-storage
-    upgradeWhy: 'Migrate from heavy ORMs to serverless-native database clients (Drizzle + Neon, Prisma, or @neondatabase/serverless) for faster cold starts.'
-    skipIfFileContains: 'from\s+[''""](drizzle-orm|@neondatabase|@prisma/client|prisma)[''""]'
-  -
-    pattern: 'fonts\.googleapis\.com|from\s+[''""](fontsource|@fontsource)[''""]|<link[^>]*fonts\.googleapis'
-    message: 'External font loader detected. Use next/font for zero-CLS, self-hosted font loading with automatic optimization.'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from external font loaders to next/font with Geist Sans/Mono for zero-CLS font optimization.'
-    skipIfFileContains: 'next/font'
-chainTo:
-  -
-    pattern: 'export\s+(default\s+)?function\s+middleware'
-    targetSkill: routing-middleware
-    message: 'middleware() is renamed to proxy() in Next.js 16 — loading Routing Middleware guidance for proxy.ts migration.'
-  -
-    pattern: "from\\s+['\"]@vercel/(postgres|kv)['\"]"
-    targetSkill: vercel-storage
-    message: 'Sunset storage package detected — loading Vercel Storage guidance for Neon/Upstash migration.'
-  -
-    pattern: "from\\s+['\"]@ai-sdk/(anthropic|openai)['\"]"
-    targetSkill: ai-gateway
-    message: 'Direct AI provider SDK import — loading AI Gateway guidance for unified model routing with failover and cost tracking.'
-  -
-    pattern: 'from\s+[''""](next-auth|@auth/core)[''""]|NextAuth\(|getServerSession\('
-    targetSkill: auth
-    message: 'Legacy auth pattern detected — loading managed authentication guidance (Clerk, Descope, Auth0).'
-  -
-    pattern: 'NextApiRequest|NextApiResponse|export\s+default\s+function\s+handler'
-    targetSkill: vercel-functions
-    message: 'Pages Router API handler detected — loading Vercel Functions guidance for App Router migration.'
-  -
-    pattern: 'from\s+[''""](lru-cache|node-cache|memory-cache)[''""]|new\s+(LRUCache|NodeCache)\('
-    targetSkill: runtime-cache
-    message: 'In-process cache detected — loading Runtime Cache guidance for serverless-compatible caching.'
-  -
-    pattern: 'fetch\s*\(\s*[''""](https?://)?(api\.openai\.com|api\.anthropic\.com|api\.cohere\.ai)'
-    targetSkill: ai-gateway
-    message: 'Raw AI provider fetch URL detected — loading AI Gateway guidance for unified routing, failover, and OIDC auth.'
-    skipIfFileContains: '@ai-sdk/|from\s+[''""](ai)[''""]|ai-gateway|gateway\('
-  -
-    pattern: 'jwt\.(sign|verify|decode)\(|from\s+[''""](jsonwebtoken)[''""]|new\s+SignJWT\(|jwtVerify\('
-    targetSkill: auth
-    message: 'Manual JWT token handling detected — loading Auth guidance for managed authentication (Clerk, Descope, Auth0).'
-    skipIfFileContains: 'clerkMiddleware|@clerk/|@auth0/|@descope/|from\s+[''""](next-auth)[''""]'
-  -
-    pattern: 'from\s+[''"]@/components/ui/|from\s+[''"]@/components/ui[''""]'
-    targetSkill: shadcn
-    message: 'shadcn/ui component imports detected — loading shadcn guidance for component composition, theming, and registry patterns.'
-    skipIfFileContains: 'shadcn|components\.json'
-  -
-    pattern: 'from\s+[''""](styled-components|@emotion/(react|styled)|@mui/material)[''""]'
-    targetSkill: shadcn
-    message: 'CSS-in-JS library detected — loading shadcn/ui guidance for Tailwind CSS + Radix UI component patterns (Vercel recommended).'
-    skipIfFileContains: '@/components/ui|shadcn'
-  -
-    pattern: 'getInitialProps'
-    targetSkill: nextjs
-    message: 'getInitialProps is a legacy Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.'
-    skipIfFileContains: 'app/.*page\.|generateStaticParams|use cache'
-  -
-    pattern: 'export.*getServerSideProps|getServerSideProps\s*\('
-    targetSkill: nextjs
-    message: 'getServerSideProps is a Pages Router pattern — loading Next.js guidance for App Router migration with server components and async data fetching.'
-    skipIfFileContains: 'generateStaticParams|use cache|app/.*page\.'
-  -
-    pattern: 'export.*getStaticProps|getStaticProps\s*\('
-    targetSkill: nextjs
-    message: 'getStaticProps is a Pages Router pattern — loading Next.js guidance for App Router migration with generateStaticParams and server components.'
-    skipIfFileContains: 'generateStaticParams|use cache|app/.*page\.'
-  -
-    pattern: '_app\.(tsx?|jsx?)'
-    targetSkill: nextjs
-    message: '_app.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx migration.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: '_document\.(tsx?|jsx?)'
-    targetSkill: nextjs
-    message: '_document.tsx is a Pages Router pattern — loading Next.js guidance for App Router layout.tsx with metadata API migration.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: "from\\s+['\"]next/document['\"]"
-    targetSkill: nextjs
-    message: 'next/document is Pages Router only — loading Next.js guidance for App Router layout.tsx with html/body structure.'
-    skipIfFileContains: 'app/layout\.|app/.*layout\.'
-  -
-    pattern: 'pages/api/'
-    targetSkill: vercel-functions
-    message: 'Pages Router API route (pages/api/) detected — loading Vercel Functions guidance for App Router route handlers with named HTTP exports.'
-    skipIfFileContains: 'export\s+(async\s+)?function\s+(GET|POST|PUT|PATCH|DELETE)'
-retrieval:
-  aliases:
-    - next.js
-    - nextjs app
-    - react framework
-    - app router
-  intents:
-    - set up routing and layouts in a Next.js app
-    - choose between server and client components for a feature
-    - configure data fetching or caching in App Router
-    - add middleware or proxy logic to handle requests
-    - set up server rendering for React pages
-    - add a new page with dynamic route segments
-  entities:
-    - App Router
-    - Server Components
-    - Server Actions
-    - generateMetadata
-    - layout
-    - proxy
-    - next.config
-  examples:
-    - add a new page with dynamic routing
-    - should this be a server or client component
-    - set up middleware for auth redirects
-    - configure caching for this data fetch
-    - set up server rendering for my pages
-
diff --git a/skills/nextjs/references/app-router-files.md b/skills/nextjs/references/app-router-files.md
deleted file mode 100644
index 0061932..0000000
--- a/skills/nextjs/references/app-router-files.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Next.js App Router — File Convention Reference
-
-## Special Files
-
-| File | Purpose | Server/Client |
-|------|---------|---------------|
-| `layout.tsx` | Shared UI wrapper, preserves state | Server (default) |
-| `page.tsx` | Unique route UI | Server (default) |
-| `loading.tsx` | Suspense fallback | Server (default) |
-| `error.tsx` | Error boundary | Client (required) |
-| `not-found.tsx` | 404 UI | Server (default) |
-| `route.ts` | API endpoint (Route Handler) | Server only |
-| `template.tsx` | Layout that remounts on navigation | Server (default) |
-| `default.tsx` | Parallel route fallback | Server (default) |
-| `proxy.ts` | Network proxy (replaces middleware) | Server (Node.js) |
-| `opengraph-image.tsx` | Auto-generated OG image for route | Server (Edge) |
-| `twitter-image.tsx` | Auto-generated Twitter card image | Server (Edge) |
-
-## Route Segments
-
-| Pattern | Example | Matches |
-|---------|---------|---------|
-| `[id]` | `app/users/[id]/page.tsx` | `/users/123` |
-| `[...slug]` | `app/docs/[...slug]/page.tsx` | `/docs/a/b/c` |
-| `[[...slug]]` | `app/shop/[[...slug]]/page.tsx` | `/shop` or `/shop/a/b` |
-| `(group)` | `app/(marketing)/page.tsx` | `/` (group ignored in URL) |
-| `@slot` | `app/@sidebar/page.tsx` | Parallel route slot |
-
-## Data Fetching Patterns
-
-### Server Component (Default)
-```tsx
-export default async function Page() {
-  const data = await fetch('https://api.example.com/data')
-  return <div>{data}</div>
-}
-```
-
-### With Params (Async in Next.js 16)
-```tsx
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params
-  const user = await getUser(id)
-  return <UserProfile user={user} />
-}
-```
-
-### With Search Params (Async in Next.js 16)
-```tsx
-export default async function Page({
-  searchParams,
-}: {
-  searchParams: Promise<{ q?: string }>
-}) {
-  const { q } = await searchParams
-  const results = await search(q)
-  return <SearchResults results={results} />
-}
-```
-
-### generateStaticParams (SSG)
-```tsx
-export async function generateStaticParams() {
-  const posts = await getPosts()
-  return posts.map((post) => ({ slug: post.slug }))
-}
-
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ slug: string }>
-}) {
-  const { slug } = await params
-  const post = await getPost(slug)
-  return <Post post={post} />
-}
-```
-
-### generateMetadata
-```tsx
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params
-  const product = await getProduct(id)
-  return { title: product.name, description: product.description }
-}
-```
diff --git a/skills/nextjs/references/async-patterns.md b/skills/nextjs/references/async-patterns.md
deleted file mode 100644
index dce8d8c..0000000
--- a/skills/nextjs/references/async-patterns.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Async Patterns
-
-In Next.js 15+, `params`, `searchParams`, `cookies()`, and `headers()` are asynchronous.
-
-## Async Params and SearchParams
-
-Always type them as `Promise<...>` and await them.
-
-### Pages and Layouts
-
-```tsx
-type Props = { params: Promise<{ slug: string }> }
-
-export default async function Page({ params }: Props) {
-  const { slug } = await params
-}
-```
-
-### Route Handlers
-
-```tsx
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const { id } = await params
-}
-```
-
-### SearchParams
-
-```tsx
-type Props = {
-  params: Promise<{ slug: string }>
-  searchParams: Promise<{ query?: string }>
-}
-
-export default async function Page({ params, searchParams }: Props) {
-  const { slug } = await params
-  const { query } = await searchParams
-}
-```
-
-### Synchronous Components
-
-Use `React.use()` for non-async components:
-
-```tsx
-import { use } from 'react'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export default function Page({ params }: Props) {
-  const { slug } = use(params)
-}
-```
-
-### generateMetadata
-
-```tsx
-type Props = { params: Promise<{ slug: string }> }
-
-export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params
-  return { title: slug }
-}
-```
-
-## Async Cookies and Headers
-
-```tsx
-import { cookies, headers } from 'next/headers'
-
-export default async function Page() {
-  const cookieStore = await cookies()
-  const headersList = await headers()
-
-  const theme = cookieStore.get('theme')
-  const userAgent = headersList.get('user-agent')
-}
-```
-
-## Migration Codemod
-
-```bash
-npx @next/codemod@latest next-async-request-api .
-```
diff --git a/skills/nextjs/references/bundling.md b/skills/nextjs/references/bundling.md
deleted file mode 100644
index ac5e814..0000000
--- a/skills/nextjs/references/bundling.md
+++ /dev/null
@@ -1,180 +0,0 @@
-# Bundling
-
-Fix common bundling issues with third-party packages.
-
-## Server-Incompatible Packages
-
-Some packages use browser APIs (`window`, `document`, `localStorage`) and fail in Server Components.
-
-### Error Signs
-
-```
-ReferenceError: window is not defined
-ReferenceError: document is not defined
-ReferenceError: localStorage is not defined
-Module not found: Can't resolve 'fs'
-```
-
-### Solution 1: Mark as Client-Only
-
-If the package is only needed on client:
-
-```tsx
-// Bad: Fails - package uses window
-import SomeChart from 'some-chart-library'
-
-export default function Page() {
-  return <SomeChart />
-}
-
-// Good: Use dynamic import with ssr: false
-import dynamic from 'next/dynamic'
-
-const SomeChart = dynamic(() => import('some-chart-library'), {
-  ssr: false,
-})
-
-export default function Page() {
-  return <SomeChart />
-}
-```
-
-### Solution 2: Externalize from Server Bundle
-
-For packages that should run on server but have bundling issues:
-
-```js
-// next.config.js
-module.exports = {
-  serverExternalPackages: ['problematic-package'],
-}
-```
-
-Use this for:
-- Packages with native bindings (sharp, bcrypt)
-- Packages that don't bundle well (some ORMs)
-- Packages with circular dependencies
-
-### Solution 3: Client Component Wrapper
-
-Wrap the entire usage in a client component:
-
-```tsx
-// components/ChartWrapper.tsx
-'use client'
-
-import { Chart } from 'chart-library'
-
-export function ChartWrapper(props) {
-  return <Chart {...props} />
-}
-
-// app/page.tsx (server component)
-import { ChartWrapper } from '@/components/ChartWrapper'
-
-export default function Page() {
-  return <ChartWrapper data={data} />
-}
-```
-
-## CSS Imports
-
-Import CSS files instead of using `<link>` tags. Next.js handles bundling and optimization.
-
-```tsx
-// Bad: Manual link tag
-<link rel="stylesheet" href="/styles.css" />
-
-// Good: Import CSS
-import './styles.css'
-
-// Good: CSS Modules
-import styles from './Button.module.css'
-```
-
-## Polyfills
-
-Next.js includes common polyfills automatically. Don't load redundant ones from polyfill.io or similar CDNs.
-
-Already included: `Array.from`, `Object.assign`, `Promise`, `fetch`, `Map`, `Set`, `Symbol`, `URLSearchParams`, and 50+ others.
-
-```tsx
-// Bad: Redundant polyfills
-<script src="https://polyfill.io/v3/polyfill.min.js?features=fetch,Promise,Array.from" />
-
-// Good: Next.js includes these automatically
-```
-
-## ESM/CommonJS Issues
-
-### Error Signs
-
-```
-SyntaxError: Cannot use import statement outside a module
-Error: require() of ES Module
-Module not found: ESM packages need to be imported
-```
-
-### Solution: Transpile Package
-
-```js
-// next.config.js
-module.exports = {
-  transpilePackages: ['some-esm-package', 'another-package'],
-}
-```
-
-## Common Problematic Packages
-
-| Package | Issue | Solution |
-|---------|-------|----------|
-| `sharp` | Native bindings | `serverExternalPackages: ['sharp']` |
-| `bcrypt` | Native bindings | `serverExternalPackages: ['bcrypt']` or use `bcryptjs` |
-| `canvas` | Native bindings | `serverExternalPackages: ['canvas']` |
-| `recharts` | Uses window | `dynamic(() => import('recharts'), { ssr: false })` |
-| `react-quill` | Uses document | `dynamic(() => import('react-quill'), { ssr: false })` |
-| `mapbox-gl` | Uses window | `dynamic(() => import('mapbox-gl'), { ssr: false })` |
-| `monaco-editor` | Uses window | `dynamic(() => import('@monaco-editor/react'), { ssr: false })` |
-| `lottie-web` | Uses document | `dynamic(() => import('lottie-react'), { ssr: false })` |
-
-## Bundle Analysis
-
-Analyze bundle size with the built-in analyzer (Next.js 16.1+):
-
-```bash
-next experimental-analyze
-```
-
-This opens an interactive UI to:
-- Filter by route, environment (client/server), and type
-- Inspect module sizes and import chains
-- View treemap visualization
-
-Save output for comparison:
-
-```bash
-next experimental-analyze --output
-# Output saved to .next/diagnostics/analyze
-```
-
-Reference: https://nextjs.org/docs/app/guides/package-bundling
-
-## Migrating from Webpack to Turbopack
-
-Turbopack is the default bundler in Next.js 15+. If you have custom webpack config, migrate to Turbopack-compatible alternatives:
-
-```js
-// next.config.js
-module.exports = {
-  // Good: Works with Turbopack
-  serverExternalPackages: ['package'],
-  transpilePackages: ['package'],
-
-  // Bad: Webpack-only - migrate away from this
-  webpack: (config) => {
-    // custom webpack config
-  },
-}
-```
-
-Reference: https://nextjs.org/docs/app/building-your-application/upgrading/from-webpack-to-turbopack
diff --git a/skills/nextjs/references/data-patterns.md b/skills/nextjs/references/data-patterns.md
deleted file mode 100644
index 8fc17f1..0000000
--- a/skills/nextjs/references/data-patterns.md
+++ /dev/null
@@ -1,297 +0,0 @@
-# Data Patterns
-
-Choose the right data fetching pattern for each use case.
-
-## Decision Tree
-
-```
-Need to fetch data?
-├── From a Server Component?
-│   └── Use: Fetch directly (no API needed)
-│
-├── From a Client Component?
-│   ├── Is it a mutation (POST/PUT/DELETE)?
-│   │   └── Use: Server Action
-│   └── Is it a read (GET)?
-│       └── Use: Route Handler OR pass from Server Component
-│
-├── Need external API access (webhooks, third parties)?
-│   └── Use: Route Handler
-│
-└── Need REST API for mobile app / external clients?
-    └── Use: Route Handler
-```
-
-## Pattern 1: Server Components (Preferred for Reads)
-
-Fetch data directly in Server Components - no API layer needed.
-
-```tsx
-// app/users/page.tsx
-async function UsersPage() {
-  // Direct database access - no API round-trip
-  const users = await db.user.findMany();
-
-  // Or fetch from external API
-  const posts = await fetch('https://api.example.com/posts').then(r => r.json());
-
-  return (
-    <ul>
-      {users.map(user => <li key={user.id}>{user.name}</li>)}
-    </ul>
-  );
-}
-```
-
-**Benefits**:
-- No API to maintain
-- No client-server waterfall
-- Secrets stay on server
-- Direct database access
-
-## Pattern 2: Server Actions (Preferred for Mutations)
-
-Server Actions are the recommended way to handle mutations.
-
-```tsx
-// app/actions.ts
-'use server';
-
-import { revalidatePath } from 'next/cache';
-
-export async function createPost(formData: FormData) {
-  const title = formData.get('title') as string;
-
-  await db.post.create({ data: { title } });
-
-  revalidatePath('/posts');
-}
-
-export async function deletePost(id: string) {
-  await db.post.delete({ where: { id } });
-
-  revalidateTag('posts');
-}
-```
-
-```tsx
-// app/posts/new/page.tsx
-import { createPost } from '@/app/actions';
-
-export default function NewPost() {
-  return (
-    <form action={createPost}>
-      <input name="title" required />
-      <button type="submit">Create</button>
-    </form>
-  );
-}
-```
-
-**Benefits**:
-- End-to-end type safety
-- Progressive enhancement (works without JS)
-- Automatic request handling
-- Integrated with React transitions
-
-**Constraints**:
-- POST only (no GET caching semantics)
-- Internal use only (no external access)
-- Cannot return non-serializable data
-
-## Pattern 3: Route Handlers (APIs)
-
-Use Route Handlers when you need a REST API.
-
-```tsx
-// app/api/posts/route.ts
-import { NextRequest, NextResponse } from 'next/server';
-
-// GET is cacheable
-export async function GET(request: NextRequest) {
-  const posts = await db.post.findMany();
-  return NextResponse.json(posts);
-}
-
-// POST for mutations
-export async function POST(request: NextRequest) {
-  const body = await request.json();
-  const post = await db.post.create({ data: body });
-  return NextResponse.json(post, { status: 201 });
-}
-```
-
-**When to use**:
-- External API access (mobile apps, third parties)
-- Webhooks from external services
-- GET endpoints that need HTTP caching
-- OpenAPI/Swagger documentation needed
-
-**When NOT to use**:
-- Internal data fetching (use Server Components)
-- Mutations from your UI (use Server Actions)
-
-## Avoiding Data Waterfalls
-
-### Problem: Sequential Fetches
-
-```tsx
-// Bad: Sequential waterfalls
-async function Dashboard() {
-  const user = await getUser();        // Wait...
-  const posts = await getPosts();      // Then wait...
-  const comments = await getComments(); // Then wait...
-
-  return <div>...</div>;
-}
-```
-
-### Solution 1: Parallel Fetching with Promise.all
-
-```tsx
-// Good: Parallel fetching
-async function Dashboard() {
-  const [user, posts, comments] = await Promise.all([
-    getUser(),
-    getPosts(),
-    getComments(),
-  ]);
-
-  return <div>...</div>;
-}
-```
-
-### Solution 2: Streaming with Suspense
-
-```tsx
-// Good: Show content progressively
-import { Suspense } from 'react';
-
-async function Dashboard() {
-  return (
-    <div>
-      <Suspense fallback={<UserSkeleton />}>
-        <UserSection />
-      </Suspense>
-      <Suspense fallback={<PostsSkeleton />}>
-        <PostsSection />
-      </Suspense>
-    </div>
-  );
-}
-
-async function UserSection() {
-  const user = await getUser(); // Fetches independently
-  return <div>{user.name}</div>;
-}
-
-async function PostsSection() {
-  const posts = await getPosts(); // Fetches independently
-  return <PostList posts={posts} />;
-}
-```
-
-### Solution 3: Preload Pattern
-
-```tsx
-// lib/data.ts
-import { cache } from 'react';
-
-export const getUser = cache(async (id: string) => {
-  return db.user.findUnique({ where: { id } });
-});
-
-export const preloadUser = (id: string) => {
-  void getUser(id); // Fire and forget
-};
-```
-
-```tsx
-// app/user/[id]/page.tsx
-import { getUser, preloadUser } from '@/lib/data';
-
-export default async function UserPage({ params }) {
-  const { id } = await params;
-
-  // Start fetching early
-  preloadUser(id);
-
-  // Do other work...
-
-  // Data likely ready by now
-  const user = await getUser(id);
-  return <div>{user.name}</div>;
-}
-```
-
-## Client Component Data Fetching
-
-When Client Components need data:
-
-### Option 1: Pass from Server Component (Preferred)
-
-```tsx
-// Server Component
-async function Page() {
-  const data = await fetchData();
-  return <ClientComponent initialData={data} />;
-}
-
-// Client Component
-'use client';
-function ClientComponent({ initialData }) {
-  const [data, setData] = useState(initialData);
-  // ...
-}
-```
-
-### Option 2: Fetch on Mount (When Necessary)
-
-```tsx
-'use client';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    fetch('/api/data')
-      .then(r => r.json())
-      .then(setData);
-  }, []);
-
-  if (!data) return <Loading />;
-  return <div>{data.value}</div>;
-}
-```
-
-### Option 3: Server Action for Reads (Works But Not Ideal)
-
-Server Actions can be called from Client Components for reads, but this is not their intended purpose:
-
-```tsx
-'use client';
-import { getData } from './actions';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    getData().then(setData);
-  }, []);
-
-  return <div>{data?.value}</div>;
-}
-```
-
-**Note**: Server Actions always use POST, so no HTTP caching. Prefer Route Handlers for cacheable reads.
-
-## Quick Reference
-
-| Pattern | Use Case | HTTP Method | Caching |
-|---------|----------|-------------|---------|
-| Server Component fetch | Internal reads | Any | Full Next.js caching |
-| Server Action | Mutations, form submissions | POST only | No |
-| Route Handler | External APIs, webhooks | Any | GET can be cached |
-| Client fetch to API | Client-side reads | Any | HTTP cache headers |
diff --git a/skills/nextjs/references/debug-tricks.md b/skills/nextjs/references/debug-tricks.md
deleted file mode 100644
index 9151ce6..0000000
--- a/skills/nextjs/references/debug-tricks.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Debug Tricks
-
-Tricks to speed up debugging Next.js applications.
-
-## MCP Endpoint (Dev Server)
-
-Next.js exposes a `/_next/mcp` endpoint in development for AI-assisted debugging via MCP (Model Context Protocol).
-
-- **Next.js 16+**: Enabled by default, use `next-devtools-mcp`
-- **Next.js < 16**: Requires `experimental.mcpServer: true` in next.config.js
-
-Reference: https://nextjs.org/docs/app/guides/mcp
-
-**Important**: Find the actual port of the running Next.js dev server (check terminal output or `package.json` scripts). Don't assume port 3000.
-
-### Request Format
-
-The endpoint uses JSON-RPC 2.0 over HTTP POST:
-
-```bash
-curl -X POST http://localhost:<port>/_next/mcp \
-  -H "Content-Type: application/json" \
-  -H "Accept: application/json, text/event-stream" \
-  -d '{
-    "jsonrpc": "2.0",
-    "id": "1",
-    "method": "tools/call",
-    "params": {
-      "name": "<tool-name>",
-      "arguments": {}
-    }
-  }'
-```
-
-### Available Tools
-
-#### `get_errors`
-Get current errors from dev server (build errors, runtime errors with source-mapped stacks):
-```json
-{ "name": "get_errors", "arguments": {} }
-```
-
-#### `get_routes`
-Discover all routes by scanning filesystem:
-```json
-{ "name": "get_routes", "arguments": {} }
-// Optional: { "name": "get_routes", "arguments": { "routerType": "app" } }
-```
-Returns: `{ "appRouter": ["/", "/api/users/[id]", ...], "pagesRouter": [...] }`
-
-#### `get_project_metadata`
-Get project path and dev server URL:
-```json
-{ "name": "get_project_metadata", "arguments": {} }
-```
-Returns: `{ "projectPath": "/path/to/project", "devServerUrl": "http://localhost:3000" }`
-
-#### `get_page_metadata`
-Get runtime metadata about current page render (requires active browser session):
-```json
-{ "name": "get_page_metadata", "arguments": {} }
-```
-Returns segment trie data showing layouts, boundaries, and page components.
-
-#### `get_logs`
-Get path to Next.js development log file:
-```json
-{ "name": "get_logs", "arguments": {} }
-```
-Returns path to `<distDir>/logs/next-development.log`
-
-#### `get_server_action_by_id`
-Locate a Server Action by ID:
-```json
-{ "name": "get_server_action_by_id", "arguments": { "actionId": "<action-id>" } }
-```
-
-### Example: Get Errors
-
-```bash
-curl -X POST http://localhost:<port>/_next/mcp \
-  -H "Content-Type: application/json" \
-  -H "Accept: application/json, text/event-stream" \
-  -d '{"jsonrpc":"2.0","id":"1","method":"tools/call","params":{"name":"get_errors","arguments":{}}}'
-```
-
-## Rebuild Specific Routes (Next.js 16+)
-
-Use `--debug-build-paths` to rebuild only specific routes instead of the entire app:
-
-```bash
-# Rebuild a specific route
-next build --debug-build-paths "/dashboard"
-
-# Rebuild routes matching a glob
-next build --debug-build-paths "/api/*"
-
-# Dynamic routes
-next build --debug-build-paths "/blog/[slug]"
-```
-
-Use this to:
-- Quickly verify a build fix without full rebuild
-- Debug static generation issues for specific pages
-- Iterate faster on build errors
diff --git a/skills/nextjs/references/directives.md b/skills/nextjs/references/directives.md
deleted file mode 100644
index 1ea1637..0000000
--- a/skills/nextjs/references/directives.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Directives
-
-## React Directives
-
-These are React directives, not Next.js specific.
-
-### `'use client'`
-
-Marks a component as a Client Component. Required for:
-- React hooks (`useState`, `useEffect`, etc.)
-- Event handlers (`onClick`, `onChange`)
-- Browser APIs (`window`, `localStorage`)
-
-```tsx
-'use client'
-
-import { useState } from 'react'
-
-export function Counter() {
-  const [count, setCount] = useState(0)
-  return <button onClick={() => setCount(count + 1)}>{count}</button>
-}
-```
-
-Reference: https://react.dev/reference/rsc/use-client
-
-### `'use server'`
-
-Marks a function as a Server Action. Can be passed to Client Components.
-
-```tsx
-'use server'
-
-export async function submitForm(formData: FormData) {
-  // Runs on server
-}
-```
-
-Or inline within a Server Component:
-
-```tsx
-export default function Page() {
-  async function submit() {
-    'use server'
-    // Runs on server
-  }
-  return <form action={submit}>...</form>
-}
-```
-
-Reference: https://react.dev/reference/rsc/use-server
-
----
-
-## Next.js Directive
-
-### `'use cache'`
-
-Marks a function or component for caching. Part of Next.js Cache Components.
-
-```tsx
-'use cache'
-
-export async function getCachedData() {
-  return await fetchData()
-}
-```
-
-Requires `cacheComponents: true` in `next.config.ts`.
-
-For detailed usage including cache profiles, `cacheLife()`, `cacheTag()`, and `updateTag()`, see the `next-cache-components` skill.
-
-Reference: https://nextjs.org/docs/app/api-reference/directives/use-cache
diff --git a/skills/nextjs/references/error-handling.md b/skills/nextjs/references/error-handling.md
deleted file mode 100644
index 663e37b..0000000
--- a/skills/nextjs/references/error-handling.md
+++ /dev/null
@@ -1,227 +0,0 @@
-# Error Handling
-
-Handle errors gracefully in Next.js applications.
-
-Reference: https://nextjs.org/docs/app/getting-started/error-handling
-
-## Error Boundaries
-
-### `error.tsx`
-
-Catches errors in a route segment and its children:
-
-```tsx
-'use client'
-
-export default function Error({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <div>
-      <h2>Something went wrong!</h2>
-      <button onClick={() => reset()}>Try again</button>
-    </div>
-  )
-}
-```
-
-**Important:** `error.tsx` must be a Client Component.
-
-### `global-error.tsx`
-
-Catches errors in root layout:
-
-```tsx
-'use client'
-
-export default function GlobalError({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <html>
-      <body>
-        <h2>Something went wrong!</h2>
-        <button onClick={() => reset()}>Try again</button>
-      </body>
-    </html>
-  )
-}
-```
-
-**Important:** Must include `<html>` and `<body>` tags.
-
-## Server Actions: Navigation API Gotcha
-
-**Do NOT wrap navigation APIs in try-catch.** They throw special errors that Next.js handles internally.
-
-Reference: https://nextjs.org/docs/app/api-reference/functions/redirect#behavior
-
-```tsx
-'use server'
-
-import { redirect } from 'next/navigation'
-import { notFound } from 'next/navigation'
-
-// Bad: try-catch catches the navigation "error"
-async function createPost(formData: FormData) {
-  try {
-    const post = await db.post.create({ ... })
-    redirect(`/posts/${post.id}`)  // This throws!
-  } catch (error) {
-    // redirect() throw is caught here - navigation fails!
-    return { error: 'Failed to create post' }
-  }
-}
-
-// Good: Call navigation APIs outside try-catch
-async function createPost(formData: FormData) {
-  let post
-  try {
-    post = await db.post.create({ ... })
-  } catch (error) {
-    return { error: 'Failed to create post' }
-  }
-  redirect(`/posts/${post.id}`)  // Outside try-catch
-}
-
-// Good: Re-throw navigation errors
-async function createPost(formData: FormData) {
-  try {
-    const post = await db.post.create({ ... })
-    redirect(`/posts/${post.id}`)
-  } catch (error) {
-    if (error instanceof Error && error.message === 'NEXT_REDIRECT') {
-      throw error  // Re-throw navigation errors
-    }
-    return { error: 'Failed to create post' }
-  }
-}
-```
-
-Same applies to:
-- `redirect()` - 307 temporary redirect
-- `permanentRedirect()` - 308 permanent redirect
-- `notFound()` - 404 not found
-- `forbidden()` - 403 forbidden
-- `unauthorized()` - 401 unauthorized
-
-Use `unstable_rethrow()` to re-throw these errors in catch blocks:
-
-```tsx
-import { unstable_rethrow } from 'next/navigation'
-
-async function action() {
-  try {
-    // ...
-    redirect('/success')
-  } catch (error) {
-    unstable_rethrow(error) // Re-throws Next.js internal errors
-    return { error: 'Something went wrong' }
-  }
-}
-```
-
-## Redirects
-
-```tsx
-import { redirect, permanentRedirect } from 'next/navigation'
-
-// 307 Temporary - use for most cases
-redirect('/new-path')
-
-// 308 Permanent - use for URL migrations (cached by browsers)
-permanentRedirect('/new-url')
-```
-
-## Auth Errors
-
-Trigger auth-related error pages:
-
-```tsx
-import { forbidden, unauthorized } from 'next/navigation'
-
-async function Page() {
-  const session = await getSession()
-
-  if (!session) {
-    unauthorized() // Renders unauthorized.tsx (401)
-  }
-
-  if (!session.hasAccess) {
-    forbidden() // Renders forbidden.tsx (403)
-  }
-
-  return <Dashboard />
-}
-```
-
-Create corresponding error pages:
-
-```tsx
-// app/forbidden.tsx
-export default function Forbidden() {
-  return <div>You don't have access to this resource</div>
-}
-
-// app/unauthorized.tsx
-export default function Unauthorized() {
-  return <div>Please log in to continue</div>
-}
-```
-
-## Not Found
-
-### `not-found.tsx`
-
-Custom 404 page for a route segment:
-
-```tsx
-export default function NotFound() {
-  return (
-    <div>
-      <h2>Not Found</h2>
-      <p>Could not find the requested resource</p>
-    </div>
-  )
-}
-```
-
-### Triggering Not Found
-
-```tsx
-import { notFound } from 'next/navigation'
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const post = await getPost(id)
-
-  if (!post) {
-    notFound()  // Renders closest not-found.tsx
-  }
-
-  return <div>{post.title}</div>
-}
-```
-
-## Error Hierarchy
-
-Errors bubble up to the nearest error boundary:
-
-```
-app/
-├── error.tsx           # Catches errors from all children
-├── blog/
-│   ├── error.tsx       # Catches errors in /blog/*
-│   └── [slug]/
-│       ├── error.tsx   # Catches errors in /blog/[slug]
-│       └── page.tsx
-└── layout.tsx          # Errors here go to global-error.tsx
-```
diff --git a/skills/nextjs/references/file-conventions.md b/skills/nextjs/references/file-conventions.md
deleted file mode 100644
index c2b3b40..0000000
--- a/skills/nextjs/references/file-conventions.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# File Conventions
-
-Next.js App Router uses file-based routing with special file conventions.
-
-## Project Structure
-
-Reference: https://nextjs.org/docs/app/getting-started/project-structure
-
-```
-app/
-├── layout.tsx          # Root layout (required)
-├── page.tsx            # Home page (/)
-├── loading.tsx         # Loading UI
-├── error.tsx           # Error UI
-├── not-found.tsx       # 404 UI
-├── global-error.tsx    # Global error UI
-├── route.ts            # API endpoint
-├── template.tsx        # Re-rendered layout
-├── default.tsx         # Parallel route fallback
-├── blog/
-│   ├── page.tsx        # /blog
-│   └── [slug]/
-│       └── page.tsx    # /blog/:slug
-└── (group)/            # Route group (no URL impact)
-    └── page.tsx
-```
-
-## Special Files
-
-| File | Purpose |
-|------|---------|
-| `page.tsx` | UI for a route segment |
-| `layout.tsx` | Shared UI for segment and children |
-| `loading.tsx` | Loading UI (Suspense boundary) |
-| `error.tsx` | Error UI (Error boundary) |
-| `not-found.tsx` | 404 UI |
-| `route.ts` | API endpoint |
-| `template.tsx` | Like layout but re-renders on navigation |
-| `default.tsx` | Fallback for parallel routes |
-
-## Route Segments
-
-```
-app/
-├── blog/               # Static segment: /blog
-├── [slug]/             # Dynamic segment: /:slug
-├── [...slug]/          # Catch-all: /a/b/c
-├── [[...slug]]/        # Optional catch-all: / or /a/b/c
-└── (marketing)/        # Route group (ignored in URL)
-```
-
-## Parallel Routes
-
-```
-app/
-├── @analytics/
-│   └── page.tsx
-├── @sidebar/
-│   └── page.tsx
-└── layout.tsx          # Receives { analytics, sidebar } as props
-```
-
-## Intercepting Routes
-
-```
-app/
-├── feed/
-│   └── page.tsx
-├── @modal/
-│   └── (.)photo/[id]/  # Intercepts /photo/[id] from /feed
-│       └── page.tsx
-└── photo/[id]/
-    └── page.tsx
-```
-
-Conventions:
-- `(.)` - same level
-- `(..)` - one level up
-- `(..)(..)` - two levels up
-- `(...)` - from root
-
-## Private Folders
-
-```
-app/
-├── _components/        # Private folder (not a route)
-│   └── Button.tsx
-└── page.tsx
-```
-
-Prefix with `_` to exclude from routing.
-
-## Middleware / Proxy
-
-### Next.js 14-15: `middleware.ts`
-
-```ts
-// middleware.ts (root of project)
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
-
-export function middleware(request: NextRequest) {
-  // Auth, redirects, rewrites, etc.
-  return NextResponse.next();
-}
-
-export const config = {
-  matcher: ['/dashboard/:path*', '/api/:path*'],
-};
-```
-
-### Next.js 16+: `proxy.ts`
-
-Renamed for clarity - same capabilities, different names:
-
-```ts
-// proxy.ts (root of project)
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
-
-export function proxy(request: NextRequest) {
-  // Same logic as middleware
-  return NextResponse.next();
-}
-
-export const proxyConfig = {
-  matcher: ['/dashboard/:path*', '/api/:path*'],
-};
-```
-
-| Version | File | Export | Config |
-|---------|------|--------|--------|
-| v14-15 | `middleware.ts` | `middleware()` | `config` |
-| v16+ | `proxy.ts` | `proxy()` | `proxyConfig` |
-
-**Migration**: Run `npx @next/codemod@latest upgrade` to auto-rename.
-
-## File Conventions Reference
-
-Reference: https://nextjs.org/docs/app/api-reference/file-conventions
diff --git a/skills/nextjs/references/font.md b/skills/nextjs/references/font.md
deleted file mode 100644
index 7e52685..0000000
--- a/skills/nextjs/references/font.md
+++ /dev/null
@@ -1,245 +0,0 @@
-# Font Optimization
-
-Use `next/font` for automatic font optimization with zero layout shift.
-
-## Google Fonts
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={inter.className}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-## Multiple Fonts
-
-```tsx
-import { Inter, Roboto_Mono } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-const robotoMono = Roboto_Mono({
-  subsets: ['latin'],
-  variable: '--font-roboto-mono',
-})
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={`${inter.variable} ${robotoMono.variable}`}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-Use in CSS:
-```css
-body {
-  font-family: var(--font-inter);
-}
-
-code {
-  font-family: var(--font-roboto-mono);
-}
-```
-
-## Font Weights and Styles
-
-```tsx
-// Single weight
-const inter = Inter({
-  subsets: ['latin'],
-  weight: '400',
-})
-
-// Multiple weights
-const inter = Inter({
-  subsets: ['latin'],
-  weight: ['400', '500', '700'],
-})
-
-// Variable font (recommended) - includes all weights
-const inter = Inter({
-  subsets: ['latin'],
-  // No weight needed - variable fonts support all weights
-})
-
-// With italic
-const inter = Inter({
-  subsets: ['latin'],
-  style: ['normal', 'italic'],
-})
-```
-
-## Local Fonts
-
-```tsx
-import localFont from 'next/font/local'
-
-const myFont = localFont({
-  src: './fonts/MyFont.woff2',
-})
-
-// Multiple files for different weights
-const myFont = localFont({
-  src: [
-    {
-      path: './fonts/MyFont-Regular.woff2',
-      weight: '400',
-      style: 'normal',
-    },
-    {
-      path: './fonts/MyFont-Bold.woff2',
-      weight: '700',
-      style: 'normal',
-    },
-  ],
-})
-
-// Variable font
-const myFont = localFont({
-  src: './fonts/MyFont-Variable.woff2',
-  variable: '--font-my-font',
-})
-```
-
-## Tailwind CSS Integration
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-export default function RootLayout({ children }) {
-  return (
-    <html lang="en" className={inter.variable}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-```js
-// tailwind.config.js
-module.exports = {
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: ['var(--font-inter)'],
-      },
-    },
-  },
-}
-```
-
-## Preloading Subsets
-
-Only load needed character subsets:
-
-```tsx
-// Latin only (most common)
-const inter = Inter({ subsets: ['latin'] })
-
-// Multiple subsets
-const inter = Inter({ subsets: ['latin', 'latin-ext', 'cyrillic'] })
-```
-
-## Display Strategy
-
-Control font loading behavior:
-
-```tsx
-const inter = Inter({
-  subsets: ['latin'],
-  display: 'swap', // Default - shows fallback, swaps when loaded
-})
-
-// Options:
-// 'auto' - browser decides
-// 'block' - short block period, then swap
-// 'swap' - immediate fallback, swap when ready (recommended)
-// 'fallback' - short block, short swap, then fallback
-// 'optional' - short block, no swap (use if font is optional)
-```
-
-## Don't Use Manual Font Links
-
-Always use `next/font` instead of `<link>` tags for Google Fonts.
-
-```tsx
-// Bad: Manual link tag (blocks rendering, no optimization)
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Bad: Missing display and preconnect
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Good: Use next/font (self-hosted, zero layout shift)
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Importing font in every component
-// components/Button.tsx
-import { Inter } from 'next/font/google'
-const inter = Inter({ subsets: ['latin'] }) // Creates new instance each time!
-
-// Good: Import once in layout, use CSS variable
-// app/layout.tsx
-const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-
-// Bad: Using @import in CSS (blocks rendering)
-/* globals.css */
-@import url('https://fonts.googleapis.com/css2?family=Inter');
-
-// Good: Use next/font (self-hosted, no network request)
-import { Inter } from 'next/font/google'
-
-// Bad: Loading all weights when only using a few
-const inter = Inter({ subsets: ['latin'] }) // Loads all weights
-
-// Good: Specify only needed weights (for non-variable fonts)
-const inter = Inter({ subsets: ['latin'], weight: ['400', '700'] })
-
-// Bad: Missing subset - loads all characters
-const inter = Inter({})
-
-// Good: Always specify subset
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Font in Specific Components
-
-```tsx
-// For component-specific fonts, export from a shared file
-// lib/fonts.ts
-import { Inter, Playfair_Display } from 'next/font/google'
-
-export const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-export const playfair = Playfair_Display({ subsets: ['latin'], variable: '--font-playfair' })
-
-// components/Heading.tsx
-import { playfair } from '@/lib/fonts'
-
-export function Heading({ children }) {
-  return <h1 className={playfair.className}>{children}</h1>
-}
-```
diff --git a/skills/nextjs/references/functions.md b/skills/nextjs/references/functions.md
deleted file mode 100644
index 8f28a8b..0000000
--- a/skills/nextjs/references/functions.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Functions
-
-Next.js function APIs.
-
-Reference: https://nextjs.org/docs/app/api-reference/functions
-
-## Navigation Hooks (Client)
-
-| Hook | Purpose | Reference |
-|------|---------|-----------|
-| `useRouter` | Programmatic navigation (`push`, `replace`, `back`, `refresh`) | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-router) |
-| `usePathname` | Get current pathname | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-pathname) |
-| `useSearchParams` | Read URL search parameters | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-search-params) |
-| `useParams` | Access dynamic route parameters | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-params) |
-| `useSelectedLayoutSegment` | Active child segment (one level) | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-selected-layout-segment) |
-| `useSelectedLayoutSegments` | All active segments below layout | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-selected-layout-segments) |
-| `useLinkStatus` | Check link prefetch status | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-link-status) |
-| `useReportWebVitals` | Report Core Web Vitals metrics | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-report-web-vitals) |
-
-## Server Functions
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `cookies` | Read/write cookies | [Docs](https://nextjs.org/docs/app/api-reference/functions/cookies) |
-| `headers` | Read request headers | [Docs](https://nextjs.org/docs/app/api-reference/functions/headers) |
-| `draftMode` | Enable preview of unpublished CMS content | [Docs](https://nextjs.org/docs/app/api-reference/functions/draft-mode) |
-| `after` | Run code after response finishes streaming | [Docs](https://nextjs.org/docs/app/api-reference/functions/after) |
-| `connection` | Wait for connection before dynamic rendering | [Docs](https://nextjs.org/docs/app/api-reference/functions/connection) |
-| `userAgent` | Parse User-Agent header | [Docs](https://nextjs.org/docs/app/api-reference/functions/userAgent) |
-
-## Generate Functions
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `generateStaticParams` | Pre-render dynamic routes at build time | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-static-params) |
-| `generateMetadata` | Dynamic metadata | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-metadata) |
-| `generateViewport` | Dynamic viewport config | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-viewport) |
-| `generateSitemaps` | Multiple sitemaps for large sites | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-sitemaps) |
-| `generateImageMetadata` | Multiple OG images per route | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-image-metadata) |
-
-## Request/Response
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `NextRequest` | Extended Request with helpers | [Docs](https://nextjs.org/docs/app/api-reference/functions/next-request) |
-| `NextResponse` | Extended Response with helpers | [Docs](https://nextjs.org/docs/app/api-reference/functions/next-response) |
-| `ImageResponse` | Generate OG images | [Docs](https://nextjs.org/docs/app/api-reference/functions/image-response) |
-
-## Common Examples
-
-### Navigation
-
-Use `next/link` for internal navigation instead of `<a>` tags.
-
-```tsx
-// Bad: Plain anchor tag
-<a href="/about">About</a>
-
-// Good: Next.js Link
-import Link from 'next/link'
-
-<Link href="/about">About</Link>
-```
-
-Active link styling:
-
-```tsx
-'use client'
-
-import Link from 'next/link'
-import { usePathname } from 'next/navigation'
-
-export function NavLink({ href, children }) {
-  const pathname = usePathname()
-
-  return (
-    <Link href={href} className={pathname === href ? 'active' : ''}>
-      {children}
-    </Link>
-  )
-}
-```
-
-### Static Generation
-
-```tsx
-// app/blog/[slug]/page.tsx
-export async function generateStaticParams() {
-  const posts = await getPosts()
-  return posts.map((post) => ({ slug: post.slug }))
-}
-```
-
-### After Response
-
-```tsx
-import { after } from 'next/server'
-
-export async function POST(request: Request) {
-  const data = await processRequest(request)
-
-  after(async () => {
-    await logAnalytics(data)
-  })
-
-  return Response.json({ success: true })
-}
-```
diff --git a/skills/nextjs/references/hydration-error.md b/skills/nextjs/references/hydration-error.md
deleted file mode 100644
index 36d4829..0000000
--- a/skills/nextjs/references/hydration-error.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Hydration Errors
-
-Diagnose and fix React hydration mismatch errors.
-
-## Error Signs
-
-- "Hydration failed because the initial UI does not match"
-- "Text content does not match server-rendered HTML"
-
-## Debugging
-
-In development, click the hydration error to see the server/client diff.
-
-## Common Causes and Fixes
-
-### Browser-only APIs
-
-```tsx
-// Bad: Causes mismatch - window doesn't exist on server
-<div>{window.innerWidth}</div>
-
-// Good: Use client component with mounted check
-'use client'
-import { useState, useEffect } from 'react'
-
-export function ClientOnly({ children }: { children: React.ReactNode }) {
-  const [mounted, setMounted] = useState(false)
-  useEffect(() => setMounted(true), [])
-  return mounted ? children : null
-}
-```
-
-### Date/Time Rendering
-
-Server and client may be in different timezones:
-
-```tsx
-// Bad: Causes mismatch
-<span>{new Date().toLocaleString()}</span>
-
-// Good: Render on client only
-'use client'
-const [time, setTime] = useState<string>()
-useEffect(() => setTime(new Date().toLocaleString()), [])
-```
-
-### Random Values or IDs
-
-```tsx
-// Bad: Random values differ between server and client
-<div id={Math.random().toString()}>
-
-// Good: Use useId hook
-import { useId } from 'react'
-
-function Input() {
-  const id = useId()
-  return <input id={id} />
-}
-```
-
-### Invalid HTML Nesting
-
-```tsx
-// Bad: Invalid - div inside p
-<p><div>Content</div></p>
-
-// Bad: Invalid - p inside p
-<p><p>Nested</p></p>
-
-// Good: Valid nesting
-<div><p>Content</p></div>
-```
-
-### Third-party Scripts
-
-Scripts that modify DOM during hydration.
-
-```tsx
-// Good: Use next/script with afterInteractive
-import Script from 'next/script'
-
-export default function Page() {
-  return (
-    <Script
-      src="https://example.com/script.js"
-      strategy="afterInteractive"
-    />
-  )
-}
-```
diff --git a/skills/nextjs/references/image.md b/skills/nextjs/references/image.md
deleted file mode 100644
index aa9d28d..0000000
--- a/skills/nextjs/references/image.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Image Optimization
-
-Use `next/image` for automatic image optimization.
-
-## Always Use next/image
-
-```tsx
-// Bad: Avoid native img
-<img src="/hero.png" alt="Hero" />
-
-// Good: Use next/image
-import Image from 'next/image'
-<Image src="/hero.png" alt="Hero" width={800} height={400} />
-```
-
-## Required Props
-
-Images need explicit dimensions to prevent layout shift:
-
-```tsx
-// Local images - dimensions inferred automatically
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" />
-
-// Remote images - must specify width/height
-<Image src="https://example.com/image.jpg" alt="Hero" width={800} height={400} />
-
-// Or use fill for parent-relative sizing
-<div style={{ position: 'relative', width: '100%', height: 400 }}>
-  <Image src="/hero.png" alt="Hero" fill style={{ objectFit: 'cover' }} />
-</div>
-```
-
-## Remote Images Configuration
-
-Remote domains must be configured in `next.config.js`:
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    remotePatterns: [
-      {
-        protocol: 'https',
-        hostname: 'example.com',
-        pathname: '/images/**',
-      },
-      {
-        protocol: 'https',
-        hostname: '*.cdn.com', // Wildcard subdomain
-      },
-    ],
-  },
-}
-```
-
-## Responsive Images
-
-Use `sizes` to tell the browser which size to download:
-
-```tsx
-// Full-width hero
-<Image
-  src="/hero.png"
-  alt="Hero"
-  fill
-  sizes="100vw"
-/>
-
-// Responsive grid (3 columns on desktop, 1 on mobile)
-<Image
-  src="/card.png"
-  alt="Card"
-  fill
-  sizes="(max-width: 768px) 100vw, 33vw"
-/>
-
-// Fixed sidebar image
-<Image
-  src="/avatar.png"
-  alt="Avatar"
-  width={200}
-  height={200}
-  sizes="200px"
-/>
-```
-
-## Blur Placeholder
-
-Prevent layout shift with placeholders:
-
-```tsx
-// Local images - automatic blur hash
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" placeholder="blur" />
-
-// Remote images - provide blurDataURL
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="blur"
-  blurDataURL="data:image/jpeg;base64,/9j/4AAQSkZJRg..."
-/>
-
-// Or use color placeholder
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="empty"
-  style={{ backgroundColor: '#e0e0e0' }}
-/>
-```
-
-## Priority Loading
-
-Use `priority` for above-the-fold images (LCP):
-
-```tsx
-// Hero image - loads immediately
-<Image src="/hero.png" alt="Hero" fill priority />
-
-// Below-fold images - lazy loaded by default (no priority needed)
-<Image src="/card.png" alt="Card" width={400} height={300} />
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Missing sizes with fill - downloads largest image
-<Image src="/hero.png" alt="Hero" fill />
-
-// Good: Add sizes for proper responsive behavior
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" />
-
-// Bad: Using width/height for aspect ratio only
-<Image src="/hero.png" alt="Hero" width={16} height={9} />
-
-// Good: Use actual display dimensions or fill with sizes
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" style={{ objectFit: 'cover' }} />
-
-// Bad: Remote image without config
-<Image src="https://untrusted.com/image.jpg" alt="Image" width={400} height={300} />
-// Error: Invalid src prop, hostname not configured
-
-// Good: Add hostname to next.config.js remotePatterns
-```
-
-## Static Export
-
-When using `output: 'export'`, use `unoptimized` or custom loader:
-
-```tsx
-// Option 1: Disable optimization
-<Image src="/hero.png" alt="Hero" width={800} height={400} unoptimized />
-
-// Option 2: Global config
-// next.config.js
-module.exports = {
-  output: 'export',
-  images: { unoptimized: true },
-}
-
-// Option 3: Custom loader (Cloudinary, Imgix, etc.)
-const cloudinaryLoader = ({ src, width, quality }) => {
-  return `https://res.cloudinary.com/demo/image/upload/w_${width},q_${quality || 75}/${src}`
-}
-
-<Image loader={cloudinaryLoader} src="sample.jpg" alt="Sample" width={800} height={400} />
-```
diff --git a/skills/nextjs/references/metadata.md b/skills/nextjs/references/metadata.md
deleted file mode 100644
index 5a0f655..0000000
--- a/skills/nextjs/references/metadata.md
+++ /dev/null
@@ -1,301 +0,0 @@
-# Metadata
-
-Add SEO metadata to Next.js pages using the Metadata API.
-
-## Important: Server Components Only
-
-The `metadata` object and `generateMetadata` function are **only supported in Server Components**. They cannot be used in Client Components.
-
-If the target page has `'use client'`:
-1. Remove `'use client'` if possible, move client logic to child components
-2. Or extract metadata to a parent Server Component layout
-3. Or split the file: Server Component with metadata imports Client Components
-
-## Static Metadata
-
-```tsx
-import type { Metadata } from 'next'
-
-export const metadata: Metadata = {
-  title: 'Page Title',
-  description: 'Page description for search engines',
-}
-```
-
-## Dynamic Metadata
-
-```tsx
-import type { Metadata } from 'next'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params
-  const post = await getPost(slug)
-  return { title: post.title, description: post.description }
-}
-```
-
-## Avoid Duplicate Fetches
-
-Use React `cache()` when the same data is needed for both metadata and page:
-
-```tsx
-import { cache } from 'react'
-
-export const getPost = cache(async (slug: string) => {
-  return await db.posts.findFirst({ where: { slug } })
-})
-```
-
-## Viewport
-
-Separate from metadata for streaming support:
-
-```tsx
-import type { Viewport } from 'next'
-
-export const viewport: Viewport = {
-  width: 'device-width',
-  initialScale: 1,
-  themeColor: '#000000',
-}
-
-// Or dynamic
-export function generateViewport({ params }): Viewport {
-  return { themeColor: getThemeColor(params) }
-}
-```
-
-## Title Templates
-
-In root layout for consistent naming:
-
-```tsx
-export const metadata: Metadata = {
-  title: { default: 'Site Name', template: '%s | Site Name' },
-}
-```
-
-## Metadata File Conventions
-
-Reference: https://nextjs.org/docs/app/getting-started/project-structure#metadata-file-conventions
-
-Place these files in `app/` directory (or route segments):
-
-| File | Purpose |
-|------|---------|
-| `favicon.ico` | Favicon |
-| `icon.png` / `icon.svg` | App icon |
-| `apple-icon.png` | Apple app icon |
-| `opengraph-image.png` | OG image |
-| `twitter-image.png` | Twitter card image |
-| `sitemap.ts` / `sitemap.xml` | Sitemap (use `generateSitemaps` for multiple) |
-| `robots.ts` / `robots.txt` | Robots directives |
-| `manifest.ts` / `manifest.json` | Web app manifest |
-
-## SEO Best Practice: Static Files Are Often Enough
-
-For most sites, **static metadata files provide excellent SEO coverage**:
-
-```
-app/
-├── favicon.ico
-├── opengraph-image.png     # Works for both OG and Twitter
-├── sitemap.ts
-├── robots.ts
-└── layout.tsx              # With title/description metadata
-```
-
-**Tips:**
-- A single `opengraph-image.png` covers both Open Graph and Twitter (Twitter falls back to OG)
-- Static `title` and `description` in layout metadata is sufficient for most pages
-- Only use dynamic `generateMetadata` when content varies per page
-
----
-
-# OG Image Generation
-
-Generate dynamic Open Graph images using `next/og`.
-
-## Important Rules
-
-1. **Use `next/og`** - not `@vercel/og` (it's built into Next.js)
-2. **No searchParams** - OG images can't access search params, use route params instead
-3. **Avoid Edge runtime** - Use default Node.js runtime
-
-```tsx
-// Good
-import { ImageResponse } from 'next/og'
-
-// Bad
-// import { ImageResponse } from '@vercel/og'
-// export const runtime = 'edge'
-```
-
-## Basic OG Image
-
-```tsx
-// app/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export const alt = 'Site Name'
-export const size = { width: 1200, height: 630 }
-export const contentType = 'image/png'
-
-export default function Image() {
-  return new ImageResponse(
-    (
-      <div
-        style={{
-          fontSize: 128,
-          background: 'white',
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-        }}
-      >
-        Hello World
-      </div>
-    ),
-    { ...size }
-  )
-}
-```
-
-## Dynamic OG Image
-
-```tsx
-// app/blog/[slug]/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export const alt = 'Blog Post'
-export const size = { width: 1200, height: 630 }
-export const contentType = 'image/png'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export default async function Image({ params }: Props) {
-  const { slug } = await params
-  const post = await getPost(slug)
-
-  return new ImageResponse(
-    (
-      <div
-        style={{
-          fontSize: 48,
-          background: 'linear-gradient(to bottom, #1a1a1a, #333)',
-          color: 'white',
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          justifyContent: 'center',
-          padding: 48,
-        }}
-      >
-        <div style={{ fontSize: 64, fontWeight: 'bold' }}>{post.title}</div>
-        <div style={{ marginTop: 24, opacity: 0.8 }}>{post.description}</div>
-      </div>
-    ),
-    { ...size }
-  )
-}
-```
-
-## Custom Fonts
-
-```tsx
-import { ImageResponse } from 'next/og'
-import { join } from 'path'
-import { readFile } from 'fs/promises'
-
-export default async function Image() {
-  const fontPath = join(process.cwd(), 'assets/fonts/Inter-Bold.ttf')
-  const fontData = await readFile(fontPath)
-
-  return new ImageResponse(
-    (
-      <div style={{ fontFamily: 'Inter', fontSize: 64 }}>
-        Custom Font Text
-      </div>
-    ),
-    {
-      width: 1200,
-      height: 630,
-      fonts: [{ name: 'Inter', data: fontData, style: 'normal' }],
-    }
-  )
-}
-```
-
-## File Naming
-
-- `opengraph-image.tsx` - Open Graph (Facebook, LinkedIn)
-- `twitter-image.tsx` - Twitter/X cards (optional, falls back to OG)
-
-## Styling Notes
-
-ImageResponse uses Flexbox layout:
-- Use `display: 'flex'`
-- No CSS Grid support
-- Styles must be inline objects
-
-## Multiple OG Images
-
-Use `generateImageMetadata` for multiple images per route:
-
-```tsx
-// app/blog/[slug]/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export async function generateImageMetadata({ params }) {
-  const images = await getPostImages(params.slug)
-  return images.map((img, idx) => ({
-    id: idx,
-    alt: img.alt,
-    size: { width: 1200, height: 630 },
-    contentType: 'image/png',
-  }))
-}
-
-export default async function Image({ params, id }) {
-  const images = await getPostImages(params.slug)
-  const image = images[id]
-  return new ImageResponse(/* ... */)
-}
-```
-
-## Multiple Sitemaps
-
-Use `generateSitemaps` for large sites:
-
-```tsx
-// app/sitemap.ts
-import type { MetadataRoute } from 'next'
-
-export async function generateSitemaps() {
-  // Return array of sitemap IDs
-  return [{ id: 0 }, { id: 1 }, { id: 2 }]
-}
-
-export default async function sitemap({
-  id,
-}: {
-  id: number
-}): Promise<MetadataRoute.Sitemap> {
-  const start = id * 50000
-  const end = start + 50000
-  const products = await getProducts(start, end)
-
-  return products.map((product) => ({
-    url: `https://example.com/product/${product.id}`,
-    lastModified: product.updatedAt,
-  }))
-}
-```
-
-Generates `/sitemap/0.xml`, `/sitemap/1.xml`, etc.
diff --git a/skills/nextjs/references/parallel-routes.md b/skills/nextjs/references/parallel-routes.md
deleted file mode 100644
index 51e270d..0000000
--- a/skills/nextjs/references/parallel-routes.md
+++ /dev/null
@@ -1,287 +0,0 @@
-# Parallel & Intercepting Routes
-
-Parallel routes render multiple pages in the same layout. Intercepting routes show a different UI when navigating from within your app vs direct URL access. Together they enable modal patterns.
-
-## File Structure
-
-```
-app/
-├── @modal/                    # Parallel route slot
-│   ├── default.tsx            # Required! Returns null
-│   ├── (.)photos/             # Intercepts /photos/*
-│   │   └── [id]/
-│   │       └── page.tsx       # Modal content
-│   └── [...]catchall/         # Optional: catch unmatched
-│       └── page.tsx
-├── photos/
-│   └── [id]/
-│       └── page.tsx           # Full page (direct access)
-├── layout.tsx                 # Renders both children and @modal
-└── page.tsx
-```
-
-## Step 1: Root Layout with Slot
-
-```tsx
-// app/layout.tsx
-export default function RootLayout({
-  children,
-  modal,
-}: {
-  children: React.ReactNode;
-  modal: React.ReactNode;
-}) {
-  return (
-    <html>
-      <body>
-        {children}
-        {modal}
-      </body>
-    </html>
-  );
-}
-```
-
-## Step 2: Default File (Critical!)
-
-**Every parallel route slot MUST have a `default.tsx`** to prevent 404s on hard navigation.
-
-```tsx
-// app/@modal/default.tsx
-export default function Default() {
-  return null;
-}
-```
-
-Without this file, refreshing any page will 404 because Next.js can't determine what to render in the `@modal` slot.
-
-## Step 3: Intercepting Route (Modal)
-
-The `(.)` prefix intercepts routes at the same level.
-
-```tsx
-// app/@modal/(.)photos/[id]/page.tsx
-import { Modal } from '@/components/modal';
-
-export default async function PhotoModal({
-  params
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  return (
-    <Modal>
-      <img src={photo.url} alt={photo.title} />
-    </Modal>
-  );
-}
-```
-
-## Step 4: Full Page (Direct Access)
-
-```tsx
-// app/photos/[id]/page.tsx
-export default async function PhotoPage({
-  params
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  return (
-    <div className="full-page">
-      <img src={photo.url} alt={photo.title} />
-      <h1>{photo.title}</h1>
-    </div>
-  );
-}
-```
-
-## Step 5: Modal Component with Correct Closing
-
-**Critical: Use `router.back()` to close modals, NOT `router.push()` or `<Link>`.**
-
-```tsx
-// components/modal.tsx
-'use client';
-
-import { useRouter } from 'next/navigation';
-import { useCallback, useEffect, useRef } from 'react';
-
-export function Modal({ children }: { children: React.ReactNode }) {
-  const router = useRouter();
-  const overlayRef = useRef<HTMLDivElement>(null);
-
-  // Close on escape key
-  useEffect(() => {
-    function onKeyDown(e: KeyboardEvent) {
-      if (e.key === 'Escape') {
-        router.back(); // Correct
-      }
-    }
-    document.addEventListener('keydown', onKeyDown);
-    return () => document.removeEventListener('keydown', onKeyDown);
-  }, [router]);
-
-  // Close on overlay click
-  const handleOverlayClick = useCallback((e: React.MouseEvent) => {
-    if (e.target === overlayRef.current) {
-      router.back(); // Correct
-    }
-  }, [router]);
-
-  return (
-    <div
-      ref={overlayRef}
-      onClick={handleOverlayClick}
-      className="fixed inset-0 bg-black/50 flex items-center justify-center z-50"
-    >
-      <div className="bg-white rounded-lg p-6 max-w-2xl w-full mx-4">
-        <button
-          onClick={() => router.back()} // Correct!
-          className="absolute top-4 right-4"
-        >
-          Close
-        </button>
-        {children}
-      </div>
-    </div>
-  );
-}
-```
-
-### Why NOT `router.push('/')` or `<Link href="/">`?
-
-Using `push` or `Link` to "close" a modal:
-1. Adds a new history entry (back button shows modal again)
-2. Doesn't properly clear the intercepted route
-3. Can cause the modal to flash or persist unexpectedly
-
-`router.back()` correctly:
-1. Removes the intercepted route from history
-2. Returns to the previous page
-3. Properly unmounts the modal
-
-## Route Matcher Reference
-
-Matchers match **route segments**, not filesystem paths:
-
-| Matcher | Matches | Example |
-|---------|---------|---------|
-| `(.)` | Same level | `@modal/(.)photos` intercepts `/photos` |
-| `(..)` | One level up | `@modal/(..)settings` from `/dashboard/@modal` intercepts `/settings` |
-| `(..)(..)` | Two levels up | Rarely used |
-| `(...)` | From root | `@modal/(...)photos` intercepts `/photos` from anywhere |
-
-**Common mistake**: Thinking `(..)` means "parent folder" - it means "parent route segment".
-
-## Handling Hard Navigation
-
-When users directly visit `/photos/123` (bookmark, refresh, shared link):
-- The intercepting route is bypassed
-- The full `photos/[id]/page.tsx` renders
-- Modal doesn't appear (expected behavior)
-
-If you want the modal to appear on direct access too, you need additional logic:
-
-```tsx
-// app/photos/[id]/page.tsx
-import { Modal } from '@/components/modal';
-
-export default async function PhotoPage({ params }) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  // Option: Render as modal on direct access too
-  return (
-    <Modal>
-      <img src={photo.url} alt={photo.title} />
-    </Modal>
-  );
-}
-```
-
-## Common Gotchas
-
-### 1. Missing `default.tsx` → 404 on Refresh
-
-Every `@slot` folder needs a `default.tsx` that returns `null` (or appropriate content).
-
-### 2. Modal Persists After Navigation
-
-You're using `router.push()` instead of `router.back()`.
-
-### 3. Nested Parallel Routes Need Defaults Too
-
-If you have `@modal` inside a route group, each level needs its own `default.tsx`:
-
-```
-app/
-├── (marketing)/
-│   ├── @modal/
-│   │   └── default.tsx     # Needed!
-│   └── layout.tsx
-└── layout.tsx
-```
-
-### 4. Intercepted Route Shows Wrong Content
-
-Check your matcher:
-- `(.)photos` intercepts `/photos` from the same route level
-- If your `@modal` is in `app/dashboard/@modal`, use `(.)photos` to intercept `/dashboard/photos`, not `/photos`
-
-### 5. TypeScript Errors with `params`
-
-In Next.js 15+, `params` is a Promise:
-
-```tsx
-// Correct
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params;
-}
-```
-
-## Complete Example: Photo Gallery Modal
-
-```
-app/
-├── @modal/
-│   ├── default.tsx
-│   └── (.)photos/
-│       └── [id]/
-│           └── page.tsx
-├── photos/
-│   ├── page.tsx           # Gallery grid
-│   └── [id]/
-│       └── page.tsx       # Full photo page
-├── layout.tsx
-└── page.tsx
-```
-
-Links in the gallery:
-
-```tsx
-// app/photos/page.tsx
-import Link from 'next/link';
-
-export default async function Gallery() {
-  const photos = await getPhotos();
-
-  return (
-    <div className="grid grid-cols-3 gap-4">
-      {photos.map(photo => (
-        <Link key={photo.id} href={`/photos/${photo.id}`}>
-          <img src={photo.thumbnail} alt={photo.title} />
-        </Link>
-      ))}
-    </div>
-  );
-}
-```
-
-Clicking a photo → Modal opens (intercepted)
-Direct URL → Full page renders
-Refresh while modal open → Full page renders
diff --git a/skills/nextjs/references/route-handlers.md b/skills/nextjs/references/route-handlers.md
deleted file mode 100644
index 25e6f4d..0000000
--- a/skills/nextjs/references/route-handlers.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Route Handlers
-
-Create API endpoints with `route.ts` files.
-
-## Basic Usage
-
-```tsx
-// app/api/users/route.ts
-export async function GET() {
-  const users = await getUsers()
-  return Response.json(users)
-}
-
-export async function POST(request: Request) {
-  const body = await request.json()
-  const user = await createUser(body)
-  return Response.json(user, { status: 201 })
-}
-```
-
-## Supported Methods
-
-`GET`, `POST`, `PUT`, `PATCH`, `DELETE`, `HEAD`, `OPTIONS`
-
-## GET Handler Conflicts with page.tsx
-
-**A `route.ts` and `page.tsx` cannot coexist in the same folder.**
-
-```
-app/
-├── api/
-│   └── users/
-│       └── route.ts    # /api/users
-└── users/
-    ├── page.tsx        # /users (page)
-    └── route.ts        # Warning: Conflicts with page.tsx!
-```
-
-If you need both a page and an API at the same path, use different paths:
-
-```
-app/
-├── users/
-│   └── page.tsx        # /users (page)
-└── api/
-    └── users/
-        └── route.ts    # /api/users (API)
-```
-
-## Environment Behavior
-
-Route handlers run in a **Server Component-like environment**:
-
-- Yes: Can use `async/await`
-- Yes: Can access `cookies()`, `headers()`
-- Yes: Can use Node.js APIs
-- No: Cannot use React hooks
-- No: Cannot use React DOM APIs
-- No: Cannot use browser APIs
-
-```tsx
-// Bad: This won't work - no React DOM in route handlers
-import { renderToString } from 'react-dom/server'
-
-export async function GET() {
-  const html = renderToString(<Component />)  // Error!
-  return new Response(html)
-}
-```
-
-## Dynamic Route Handlers
-
-```tsx
-// app/api/users/[id]/route.ts
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const { id } = await params
-  const user = await getUser(id)
-
-  if (!user) {
-    return Response.json({ error: 'Not found' }, { status: 404 })
-  }
-
-  return Response.json(user)
-}
-```
-
-## Request Helpers
-
-```tsx
-export async function GET(request: Request) {
-  // URL and search params
-  const { searchParams } = new URL(request.url)
-  const query = searchParams.get('q')
-
-  // Headers
-  const authHeader = request.headers.get('authorization')
-
-  // Cookies (Next.js helper)
-  const cookieStore = await cookies()
-  const token = cookieStore.get('token')
-
-  return Response.json({ query, token })
-}
-```
-
-## Response Helpers
-
-```tsx
-// JSON response
-return Response.json({ data })
-
-// With status
-return Response.json({ error: 'Not found' }, { status: 404 })
-
-// With headers
-return Response.json(data, {
-  headers: {
-    'Cache-Control': 'max-age=3600',
-  },
-})
-
-// Redirect
-return Response.redirect(new URL('/login', request.url))
-
-// Stream
-return new Response(stream, {
-  headers: { 'Content-Type': 'text/event-stream' },
-})
-```
-
-## When to Use Route Handlers vs Server Actions
-
-| Use Case | Route Handlers | Server Actions |
-|----------|----------------|----------------|
-| Form submissions | No | Yes |
-| Data mutations from UI | No | Yes |
-| Third-party webhooks | Yes | No |
-| External API consumption | Yes | No |
-| Public REST API | Yes | No |
-| File uploads | Both work | Both work |
-
-**Prefer Server Actions** for mutations triggered from your UI.
-**Use Route Handlers** for external integrations and public APIs.
diff --git a/skills/nextjs/references/rsc-boundaries.md b/skills/nextjs/references/rsc-boundaries.md
deleted file mode 100644
index 0c2208d..0000000
--- a/skills/nextjs/references/rsc-boundaries.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# RSC Boundaries
-
-Detect and prevent invalid patterns when crossing Server/Client component boundaries.
-
-## Detection Rules
-
-### 1. Async Client Components Are Invalid
-
-Client components **cannot** be async functions. Only Server Components can be async.
-
-**Detect:** File has `'use client'` AND component is `async function` or returns `Promise`
-
-```tsx
-// Bad: async client component
-'use client'
-export default async function UserProfile() {
-  const user = await getUser() // Cannot await in client component
-  return <div>{user.name}</div>
-}
-
-// Good: Remove async, fetch data in parent server component
-// page.tsx (server component - no 'use client')
-export default async function Page() {
-  const user = await getUser()
-  return <UserProfile user={user} />
-}
-
-// UserProfile.tsx (client component)
-'use client'
-export function UserProfile({ user }: { user: User }) {
-  return <div>{user.name}</div>
-}
-```
-
-```tsx
-// Bad: async arrow function client component
-'use client'
-const Dashboard = async () => {
-  const data = await fetchDashboard()
-  return <div>{data}</div>
-}
-
-// Good: Fetch in server component, pass data down
-```
-
-### 2. Non-Serializable Props to Client Components
-
-Props passed from Server → Client must be JSON-serializable.
-
-**Detect:** Server component passes these to a client component:
-- Functions (except Server Actions with `'use server'`)
-- `Date` objects
-- `Map`, `Set`, `WeakMap`, `WeakSet`
-- Class instances
-- `Symbol` (unless globally registered)
-- Circular references
-
-```tsx
-// Bad: Function prop
-// page.tsx (server)
-export default function Page() {
-  const handleClick = () => console.log('clicked')
-  return <ClientButton onClick={handleClick} />
-}
-
-// Good: Define function inside client component
-// ClientButton.tsx
-'use client'
-export function ClientButton() {
-  const handleClick = () => console.log('clicked')
-  return <button onClick={handleClick}>Click</button>
-}
-```
-
-```tsx
-// Bad: Date object (silently becomes string, then crashes)
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt} /> // Date object
-}
-
-// PostCard.tsx (client) - will crash on .getFullYear()
-'use client'
-export function PostCard({ createdAt }: { createdAt: Date }) {
-  return <span>{createdAt.getFullYear()}</span> // Runtime error!
-}
-
-// Good: Serialize to string on server
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt.toISOString()} />
-}
-
-// PostCard.tsx (client)
-'use client'
-export function PostCard({ createdAt }: { createdAt: string }) {
-  const date = new Date(createdAt)
-  return <span>{date.getFullYear()}</span>
-}
-```
-
-```tsx
-// Bad: Class instance
-const user = new UserModel(data)
-<ClientProfile user={user} /> // Methods will be stripped
-
-// Good: Pass plain object
-const user = await getUser()
-<ClientProfile user={{ id: user.id, name: user.name }} />
-```
-
-```tsx
-// Bad: Map/Set
-<ClientComponent items={new Map([['a', 1]])} />
-
-// Good: Convert to array/object
-<ClientComponent items={Object.fromEntries(map)} />
-<ClientComponent items={Array.from(set)} />
-```
-
-### 3. Server Actions Are the Exception
-
-Functions marked with `'use server'` CAN be passed to client components.
-
-```tsx
-// Valid: Server Action can be passed
-// actions.ts
-'use server'
-export async function submitForm(formData: FormData) {
-  // server-side logic
-}
-
-// page.tsx (server)
-import { submitForm } from './actions'
-export default function Page() {
-  return <ClientForm onSubmit={submitForm} /> // OK!
-}
-
-// ClientForm.tsx (client)
-'use client'
-export function ClientForm({ onSubmit }: { onSubmit: (data: FormData) => Promise<void> }) {
-  return <form action={onSubmit}>...</form>
-}
-```
-
-## Quick Reference
-
-| Pattern | Valid? | Fix |
-|---------|--------|-----|
-| `'use client'` + `async function` | No | Fetch in server parent, pass data |
-| Pass `() => {}` to client | No | Define in client or use server action |
-| Pass `new Date()` to client | No | Use `.toISOString()` |
-| Pass `new Map()` to client | No | Convert to object/array |
-| Pass class instance to client | No | Pass plain object |
-| Pass server action to client | Yes | - |
-| Pass `string/number/boolean` | Yes | - |
-| Pass plain object/array | Yes | - |
diff --git a/skills/nextjs/references/runtime-selection.md b/skills/nextjs/references/runtime-selection.md
deleted file mode 100644
index cec960d..0000000
--- a/skills/nextjs/references/runtime-selection.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Runtime Selection
-
-## Use Node.js Runtime by Default
-
-Use the default Node.js runtime for new routes and pages. Only use Edge runtime if the project already uses it or there's a specific requirement.
-
-```tsx
-// Good: Default - no runtime config needed (uses Node.js)
-export default function Page() { ... }
-
-// Caution: Only if already used in project or specifically required
-export const runtime = 'edge'
-```
-
-## When to Use Each
-
-### Node.js Runtime (Default)
-
-- Full Node.js API support
-- File system access (`fs`)
-- Full `crypto` support
-- Database connections
-- Most npm packages work
-
-### Edge Runtime
-
-- Only for specific edge-location latency requirements
-- Limited API (no `fs`, limited `crypto`)
-- Smaller cold start
-- Geographic distribution needs
-
-## Detection
-
-**Before adding `runtime = 'edge'`**, check:
-1. Does the project already use Edge runtime?
-2. Is there a specific latency requirement?
-3. Are all dependencies Edge-compatible?
-
-If unsure, use Node.js runtime.
diff --git a/skills/nextjs/references/scripts.md b/skills/nextjs/references/scripts.md
deleted file mode 100644
index 4eeb744..0000000
--- a/skills/nextjs/references/scripts.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Scripts
-
-Loading third-party scripts in Next.js.
-
-## Use next/script
-
-Always use `next/script` instead of native `<script>` tags for better performance.
-
-```tsx
-// Bad: Native script tag
-<script src="https://example.com/script.js"></script>
-
-// Good: Next.js Script component
-import Script from 'next/script'
-
-<Script src="https://example.com/script.js" />
-```
-
-## Inline Scripts Need ID
-
-Inline scripts require an `id` attribute for Next.js to track them.
-
-```tsx
-// Bad: Missing id
-<Script dangerouslySetInnerHTML={{ __html: 'console.log("hi")' }} />
-
-// Good: Has id
-<Script id="my-script" dangerouslySetInnerHTML={{ __html: 'console.log("hi")' }} />
-
-// Good: Inline with id
-<Script id="show-banner">
-  {`document.getElementById('banner').classList.remove('hidden')`}
-</Script>
-```
-
-## Don't Put Script in Head
-
-`next/script` should not be placed inside `next/head`. It handles its own positioning.
-
-```tsx
-// Bad: Script inside Head
-import Head from 'next/head'
-import Script from 'next/script'
-
-<Head>
-  <Script src="/analytics.js" />
-</Head>
-
-// Good: Script outside Head
-<Head>
-  <title>Page</title>
-</Head>
-<Script src="/analytics.js" />
-```
-
-## Loading Strategies
-
-```tsx
-// afterInteractive (default) - Load after page is interactive
-<Script src="/analytics.js" strategy="afterInteractive" />
-
-// lazyOnload - Load during idle time
-<Script src="/widget.js" strategy="lazyOnload" />
-
-// beforeInteractive - Load before page is interactive (use sparingly)
-// Only works in app/layout.tsx or pages/_document.js
-<Script src="/critical.js" strategy="beforeInteractive" />
-
-// worker - Load in web worker (experimental)
-<Script src="/heavy.js" strategy="worker" />
-```
-
-## Google Analytics
-
-Use `@next/third-parties` instead of inline GA scripts.
-
-```tsx
-// Bad: Inline GA script
-<Script src="https://www.googletagmanager.com/gtag/js?id=G-XXXXX" />
-<Script id="ga-init">
-  {`window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-    gtag('config', 'G-XXXXX');`}
-</Script>
-
-// Good: Next.js component
-import { GoogleAnalytics } from '@next/third-parties/google'
-
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-      <GoogleAnalytics gaId="G-XXXXX" />
-    </html>
-  )
-}
-```
-
-## Google Tag Manager
-
-```tsx
-import { GoogleTagManager } from '@next/third-parties/google'
-
-export default function Layout({ children }) {
-  return (
-    <html>
-      <GoogleTagManager gtmId="GTM-XXXXX" />
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-## Other Third-Party Scripts
-
-```tsx
-// YouTube embed
-import { YouTubeEmbed } from '@next/third-parties/google'
-
-<YouTubeEmbed videoid="dQw4w9WgXcQ" />
-
-// Google Maps
-import { GoogleMapsEmbed } from '@next/third-parties/google'
-
-<GoogleMapsEmbed
-  apiKey="YOUR_API_KEY"
-  mode="place"
-  q="Brooklyn+Bridge,New+York,NY"
-/>
-```
-
-## Quick Reference
-
-| Pattern | Issue | Fix |
-|---------|-------|-----|
-| `<script src="...">` | No optimization | Use `next/script` |
-| `<Script>` without id | Can't track inline scripts | Add `id` attribute |
-| `<Script>` inside `<Head>` | Wrong placement | Move outside Head |
-| Inline GA/GTM scripts | No optimization | Use `@next/third-parties` |
-| `strategy="beforeInteractive"` outside layout | Won't work | Only use in root layout |
diff --git a/skills/nextjs/references/self-hosting.md b/skills/nextjs/references/self-hosting.md
deleted file mode 100644
index 4b3966a..0000000
--- a/skills/nextjs/references/self-hosting.md
+++ /dev/null
@@ -1,371 +0,0 @@
-# Self-Hosting Next.js
-
-Deploy Next.js outside of Vercel with confidence.
-
-## Quick Start: Standalone Output
-
-For Docker or any containerized deployment, use standalone output:
-
-```js
-// next.config.js
-module.exports = {
-  output: 'standalone',
-};
-```
-
-This creates a minimal `standalone` folder with only production dependencies:
-
-```
-.next/
-├── standalone/
-│   ├── server.js          # Entry point
-│   ├── node_modules/      # Only production deps
-│   └── .next/             # Build output
-└── static/                # Must be copied separately
-```
-
-## Docker Deployment
-
-### Dockerfile
-
-```dockerfile
-FROM node:20-alpine AS base
-
-# Install dependencies
-FROM base AS deps
-WORKDIR /app
-COPY package.json package-lock.json* ./
-RUN npm ci
-
-# Build
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-RUN npm run build
-
-# Production
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV=production
-
-# Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-# Copy standalone output
-COPY --from=builder /app/.next/standalone ./
-COPY --from=builder /app/.next/static ./.next/static
-COPY --from=builder /app/public ./public
-
-USER nextjs
-
-EXPOSE 3000
-ENV PORT=3000
-ENV HOSTNAME="0.0.0.0"
-
-CMD ["node", "server.js"]
-```
-
-### Docker Compose
-
-```yaml
-version: '3.8'
-
-services:
-  web:
-    build: .
-    ports:
-      - "3000:3000"
-    environment:
-      - NODE_ENV=production
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget", "-q", "--spider", "http://localhost:3000/api/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-```
-
-## PM2 Deployment
-
-For traditional server deployments:
-
-```js
-// ecosystem.config.js
-module.exports = {
-  apps: [{
-    name: 'nextjs',
-    script: '.next/standalone/server.js',
-    instances: 'max',
-    exec_mode: 'cluster',
-    env: {
-      NODE_ENV: 'production',
-      PORT: 3000,
-    },
-  }],
-};
-```
-
-```bash
-npm run build
-pm2 start ecosystem.config.js
-```
-
-## ISR and Cache Handlers
-
-### The Problem
-
-ISR (Incremental Static Regeneration) uses filesystem caching by default. This **breaks with multiple instances**:
-
-- Instance A regenerates page → saves to its local disk
-- Instance B serves stale page → doesn't see Instance A's cache
-- Load balancer sends users to random instances → inconsistent content
-
-### Solution: Custom Cache Handler
-
-Next.js 14+ supports custom cache handlers for shared storage:
-
-```js
-// next.config.js
-module.exports = {
-  cacheHandler: require.resolve('./cache-handler.js'),
-  cacheMaxMemorySize: 0, // Disable in-memory cache
-};
-```
-
-#### Redis Cache Handler Example
-
-```js
-// cache-handler.js
-const Redis = require('ioredis');
-
-const redis = new Redis(process.env.REDIS_URL);
-const CACHE_PREFIX = 'nextjs:';
-
-module.exports = class CacheHandler {
-  constructor(options) {
-    this.options = options;
-  }
-
-  async get(key) {
-    const data = await redis.get(CACHE_PREFIX + key);
-    if (!data) return null;
-
-    const parsed = JSON.parse(data);
-    return {
-      value: parsed.value,
-      lastModified: parsed.lastModified,
-    };
-  }
-
-  async set(key, data, ctx) {
-    const cacheData = {
-      value: data,
-      lastModified: Date.now(),
-    };
-
-    // Set TTL based on revalidate option
-    if (ctx?.revalidate) {
-      await redis.setex(
-        CACHE_PREFIX + key,
-        ctx.revalidate,
-        JSON.stringify(cacheData)
-      );
-    } else {
-      await redis.set(CACHE_PREFIX + key, JSON.stringify(cacheData));
-    }
-  }
-
-  async revalidateTag(tags) {
-    // Implement tag-based invalidation
-    // This requires tracking which keys have which tags
-  }
-};
-```
-
-#### S3 Cache Handler Example
-
-```js
-// cache-handler.js
-const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3');
-
-const s3 = new S3Client({ region: process.env.AWS_REGION });
-const BUCKET = process.env.CACHE_BUCKET;
-
-module.exports = class CacheHandler {
-  async get(key) {
-    try {
-      const response = await s3.send(new GetObjectCommand({
-        Bucket: BUCKET,
-        Key: `cache/${key}`,
-      }));
-      const body = await response.Body.transformToString();
-      return JSON.parse(body);
-    } catch (err) {
-      if (err.name === 'NoSuchKey') return null;
-      throw err;
-    }
-  }
-
-  async set(key, data, ctx) {
-    await s3.send(new PutObjectCommand({
-      Bucket: BUCKET,
-      Key: `cache/${key}`,
-      Body: JSON.stringify({
-        value: data,
-        lastModified: Date.now(),
-      }),
-      ContentType: 'application/json',
-    }));
-  }
-};
-```
-
-## What Works vs What Needs Setup
-
-| Feature | Single Instance | Multi-Instance | Notes |
-|---------|----------------|----------------|-------|
-| SSR | Yes | Yes | No special setup |
-| SSG | Yes | Yes | Built at deploy time |
-| ISR | Yes | Needs cache handler | Filesystem cache breaks |
-| Image Optimization | Yes | Yes | CPU-intensive, consider CDN |
-| Middleware | Yes | Yes | Runs on Node.js |
-| Edge Runtime | Limited | Limited | Some features Node-only |
-| `revalidatePath/Tag` | Yes | Needs cache handler | Must share cache |
-| `next/font` | Yes | Yes | Fonts bundled at build |
-| Draft Mode | Yes | Yes | Cookie-based |
-
-## Image Optimization
-
-Next.js Image Optimization works out of the box but is CPU-intensive.
-
-### Option 1: Built-in (Simple)
-
-Works automatically, but consider:
-- Set `deviceSizes` and `imageSizes` in config to limit variants
-- Use `minimumCacheTTL` to reduce regeneration
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    minimumCacheTTL: 60 * 60 * 24, // 24 hours
-    deviceSizes: [640, 750, 1080, 1920], // Limit sizes
-  },
-};
-```
-
-### Option 2: External Loader (Recommended for Scale)
-
-Offload to Cloudinary, Imgix, or similar:
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    loader: 'custom',
-    loaderFile: './lib/image-loader.js',
-  },
-};
-```
-
-```js
-// lib/image-loader.js
-export default function cloudinaryLoader({ src, width, quality }) {
-  const params = ['f_auto', 'c_limit', `w_${width}`, `q_${quality || 'auto'}`];
-  return `https://res.cloudinary.com/demo/image/upload/${params.join(',')}${src}`;
-}
-```
-
-## Environment Variables
-
-### Build-time vs Runtime
-
-```js
-// Available at build time only (baked into bundle)
-NEXT_PUBLIC_API_URL=https://api.example.com
-
-// Available at runtime (server-side only)
-DATABASE_URL=postgresql://...
-API_SECRET=...
-```
-
-### Runtime Configuration
-
-For truly dynamic config, don't use `NEXT_PUBLIC_*`. Instead:
-
-```tsx
-// app/api/config/route.ts
-export async function GET() {
-  return Response.json({
-    apiUrl: process.env.API_URL,
-    features: process.env.FEATURES?.split(','),
-  });
-}
-```
-
-## OpenNext: Serverless Without Vercel
-
-[OpenNext](https://open-next.js.org/) adapts Next.js for AWS Lambda, Cloudflare Workers, etc.
-
-```bash
-npx create-sst@latest
-# or
-npx @opennextjs/aws build
-```
-
-Supports:
-- AWS Lambda + CloudFront
-- Cloudflare Workers
-- Netlify Functions
-- Deno Deploy
-
-## Health Check Endpoint
-
-Always include a health check for load balancers:
-
-```tsx
-// app/api/health/route.ts
-export async function GET() {
-  try {
-    // Optional: check database connection
-    // await db.$queryRaw`SELECT 1`;
-
-    return Response.json({ status: 'healthy' }, { status: 200 });
-  } catch (error) {
-    return Response.json({ status: 'unhealthy' }, { status: 503 });
-  }
-}
-```
-
-## Pre-Deployment Checklist
-
-1. **Build locally first**: `npm run build` - catch errors before deploy
-2. **Test standalone output**: `node .next/standalone/server.js`
-3. **Set `output: 'standalone'`** for Docker
-4. **Configure cache handler** for multi-instance ISR
-5. **Set `HOSTNAME="0.0.0.0"`** for containers
-6. **Copy `public/` and `.next/static/`** - not included in standalone
-7. **Add health check endpoint**
-8. **Test ISR revalidation** after deployment
-9. **Monitor memory usage** - Node.js defaults may need tuning
-
-## Testing Cache Handler
-
-**Critical**: Test your cache handler on every Next.js upgrade:
-
-```bash
-# Start multiple instances
-PORT=3001 node .next/standalone/server.js &
-PORT=3002 node .next/standalone/server.js &
-
-# Trigger ISR revalidation
-curl http://localhost:3001/api/revalidate?path=/posts
-
-# Verify both instances see the update
-curl http://localhost:3001/posts
-curl http://localhost:3002/posts
-# Should return identical content
-```
diff --git a/skills/nextjs/references/suspense-boundaries.md b/skills/nextjs/references/suspense-boundaries.md
deleted file mode 100644
index 5134fa4..0000000
--- a/skills/nextjs/references/suspense-boundaries.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Suspense Boundaries
-
-Client hooks that cause CSR bailout without Suspense boundaries.
-
-## useSearchParams
-
-Always requires Suspense boundary in static routes. Without it, the entire page becomes client-side rendered.
-
-```tsx
-// Bad: Entire page becomes CSR
-'use client'
-
-import { useSearchParams } from 'next/navigation'
-
-export default function SearchBar() {
-  const searchParams = useSearchParams()
-  return <div>Query: {searchParams.get('q')}</div>
-}
-```
-
-```tsx
-// Good: Wrap in Suspense
-import { Suspense } from 'react'
-import SearchBar from './search-bar'
-
-export default function Page() {
-  return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <SearchBar />
-    </Suspense>
-  )
-}
-```
-
-## usePathname
-
-Requires Suspense boundary when route has dynamic parameters.
-
-```tsx
-// In dynamic route [slug]
-// Bad: No Suspense
-'use client'
-import { usePathname } from 'next/navigation'
-
-export function Breadcrumb() {
-  const pathname = usePathname()
-  return <nav>{pathname}</nav>
-}
-```
-
-```tsx
-// Good: Wrap in Suspense
-<Suspense fallback={<BreadcrumbSkeleton />}>
-  <Breadcrumb />
-</Suspense>
-```
-
-If you use `generateStaticParams`, Suspense is optional.
-
-## Quick Reference
-
-| Hook | Suspense Required |
-|------|-------------------|
-| `useSearchParams()` | Yes |
-| `usePathname()` | Yes (dynamic routes) |
-| `useParams()` | No |
-| `useRouter()` | No |
diff --git a/skills/nextjs/upstream/SKILL.md b/skills/nextjs/upstream/SKILL.md
deleted file mode 100644
index 437896b..0000000
--- a/skills/nextjs/upstream/SKILL.md
+++ /dev/null
@@ -1,153 +0,0 @@
----
-name: next-best-practices
-description: Next.js best practices - file conventions, RSC boundaries, data patterns, async APIs, metadata, error handling, route handlers, image/font optimization, bundling
-user-invocable: false
----
-
-# Next.js Best Practices
-
-Apply these rules when writing or reviewing Next.js code.
-
-## File Conventions
-
-See [file-conventions.md](./file-conventions.md) for:
-- Project structure and special files
-- Route segments (dynamic, catch-all, groups)
-- Parallel and intercepting routes
-- Middleware rename in v16 (middleware → proxy)
-
-## RSC Boundaries
-
-Detect invalid React Server Component patterns.
-
-See [rsc-boundaries.md](./rsc-boundaries.md) for:
-- Async client component detection (invalid)
-- Non-serializable props detection
-- Server Action exceptions
-
-## Async Patterns
-
-Next.js 15+ async API changes.
-
-See [async-patterns.md](./async-patterns.md) for:
-- Async `params` and `searchParams`
-- Async `cookies()` and `headers()`
-- Migration codemod
-
-## Runtime Selection
-
-See [runtime-selection.md](./runtime-selection.md) for:
-- Default to Node.js runtime
-- When Edge runtime is appropriate
-
-## Directives
-
-See [directives.md](./directives.md) for:
-- `'use client'`, `'use server'` (React)
-- `'use cache'` (Next.js)
-
-## Functions
-
-See [functions.md](./functions.md) for:
-- Navigation hooks: `useRouter`, `usePathname`, `useSearchParams`, `useParams`
-- Server functions: `cookies`, `headers`, `draftMode`, `after`
-- Generate functions: `generateStaticParams`, `generateMetadata`
-
-## Error Handling
-
-See [error-handling.md](./error-handling.md) for:
-- `error.tsx`, `global-error.tsx`, `not-found.tsx`
-- `redirect`, `permanentRedirect`, `notFound`
-- `forbidden`, `unauthorized` (auth errors)
-- `unstable_rethrow` for catch blocks
-
-## Data Patterns
-
-See [data-patterns.md](./data-patterns.md) for:
-- Server Components vs Server Actions vs Route Handlers
-- Avoiding data waterfalls (`Promise.all`, Suspense, preload)
-- Client component data fetching
-
-## Route Handlers
-
-See [route-handlers.md](./route-handlers.md) for:
-- `route.ts` basics
-- GET handler conflicts with `page.tsx`
-- Environment behavior (no React DOM)
-- When to use vs Server Actions
-
-## Metadata & OG Images
-
-See [metadata.md](./metadata.md) for:
-- Static and dynamic metadata
-- `generateMetadata` function
-- OG image generation with `next/og`
-- File-based metadata conventions
-
-## Image Optimization
-
-See [image.md](./image.md) for:
-- Always use `next/image` over `<img>`
-- Remote images configuration
-- Responsive `sizes` attribute
-- Blur placeholders
-- Priority loading for LCP
-
-## Font Optimization
-
-See [font.md](./font.md) for:
-- `next/font` setup
-- Google Fonts, local fonts
-- Tailwind CSS integration
-- Preloading subsets
-
-## Bundling
-
-See [bundling.md](./bundling.md) for:
-- Server-incompatible packages
-- CSS imports (not link tags)
-- Polyfills (already included)
-- ESM/CommonJS issues
-- Bundle analysis
-
-## Scripts
-
-See [scripts.md](./scripts.md) for:
-- `next/script` vs native script tags
-- Inline scripts need `id`
-- Loading strategies
-- Google Analytics with `@next/third-parties`
-
-## Hydration Errors
-
-See [hydration-error.md](./hydration-error.md) for:
-- Common causes (browser APIs, dates, invalid HTML)
-- Debugging with error overlay
-- Fixes for each cause
-
-## Suspense Boundaries
-
-See [suspense-boundaries.md](./suspense-boundaries.md) for:
-- CSR bailout with `useSearchParams` and `usePathname`
-- Which hooks require Suspense boundaries
-
-## Parallel & Intercepting Routes
-
-See [parallel-routes.md](./parallel-routes.md) for:
-- Modal patterns with `@slot` and `(.)` interceptors
-- `default.tsx` for fallbacks
-- Closing modals correctly with `router.back()`
-
-## Self-Hosting
-
-See [self-hosting.md](./self-hosting.md) for:
-- `output: 'standalone'` for Docker
-- Cache handlers for multi-instance ISR
-- What works vs needs extra setup
-
-## Debug Tricks
-
-See [debug-tricks.md](./debug-tricks.md) for:
-- MCP endpoint for AI-assisted debugging
-- Rebuild specific routes with `--debug-build-paths`
-
diff --git a/skills/nextjs/upstream/references/app-router-files.md b/skills/nextjs/upstream/references/app-router-files.md
deleted file mode 100644
index 0061932..0000000
--- a/skills/nextjs/upstream/references/app-router-files.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Next.js App Router — File Convention Reference
-
-## Special Files
-
-| File | Purpose | Server/Client |
-|------|---------|---------------|
-| `layout.tsx` | Shared UI wrapper, preserves state | Server (default) |
-| `page.tsx` | Unique route UI | Server (default) |
-| `loading.tsx` | Suspense fallback | Server (default) |
-| `error.tsx` | Error boundary | Client (required) |
-| `not-found.tsx` | 404 UI | Server (default) |
-| `route.ts` | API endpoint (Route Handler) | Server only |
-| `template.tsx` | Layout that remounts on navigation | Server (default) |
-| `default.tsx` | Parallel route fallback | Server (default) |
-| `proxy.ts` | Network proxy (replaces middleware) | Server (Node.js) |
-| `opengraph-image.tsx` | Auto-generated OG image for route | Server (Edge) |
-| `twitter-image.tsx` | Auto-generated Twitter card image | Server (Edge) |
-
-## Route Segments
-
-| Pattern | Example | Matches |
-|---------|---------|---------|
-| `[id]` | `app/users/[id]/page.tsx` | `/users/123` |
-| `[...slug]` | `app/docs/[...slug]/page.tsx` | `/docs/a/b/c` |
-| `[[...slug]]` | `app/shop/[[...slug]]/page.tsx` | `/shop` or `/shop/a/b` |
-| `(group)` | `app/(marketing)/page.tsx` | `/` (group ignored in URL) |
-| `@slot` | `app/@sidebar/page.tsx` | Parallel route slot |
-
-## Data Fetching Patterns
-
-### Server Component (Default)
-```tsx
-export default async function Page() {
-  const data = await fetch('https://api.example.com/data')
-  return <div>{data}</div>
-}
-```
-
-### With Params (Async in Next.js 16)
-```tsx
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params
-  const user = await getUser(id)
-  return <UserProfile user={user} />
-}
-```
-
-### With Search Params (Async in Next.js 16)
-```tsx
-export default async function Page({
-  searchParams,
-}: {
-  searchParams: Promise<{ q?: string }>
-}) {
-  const { q } = await searchParams
-  const results = await search(q)
-  return <SearchResults results={results} />
-}
-```
-
-### generateStaticParams (SSG)
-```tsx
-export async function generateStaticParams() {
-  const posts = await getPosts()
-  return posts.map((post) => ({ slug: post.slug }))
-}
-
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ slug: string }>
-}) {
-  const { slug } = await params
-  const post = await getPost(slug)
-  return <Post post={post} />
-}
-```
-
-### generateMetadata
-```tsx
-export async function generateMetadata({
-  params,
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params
-  const product = await getProduct(id)
-  return { title: product.name, description: product.description }
-}
-```
diff --git a/skills/nextjs/upstream/references/async-patterns.md b/skills/nextjs/upstream/references/async-patterns.md
deleted file mode 100644
index dce8d8c..0000000
--- a/skills/nextjs/upstream/references/async-patterns.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Async Patterns
-
-In Next.js 15+, `params`, `searchParams`, `cookies()`, and `headers()` are asynchronous.
-
-## Async Params and SearchParams
-
-Always type them as `Promise<...>` and await them.
-
-### Pages and Layouts
-
-```tsx
-type Props = { params: Promise<{ slug: string }> }
-
-export default async function Page({ params }: Props) {
-  const { slug } = await params
-}
-```
-
-### Route Handlers
-
-```tsx
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const { id } = await params
-}
-```
-
-### SearchParams
-
-```tsx
-type Props = {
-  params: Promise<{ slug: string }>
-  searchParams: Promise<{ query?: string }>
-}
-
-export default async function Page({ params, searchParams }: Props) {
-  const { slug } = await params
-  const { query } = await searchParams
-}
-```
-
-### Synchronous Components
-
-Use `React.use()` for non-async components:
-
-```tsx
-import { use } from 'react'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export default function Page({ params }: Props) {
-  const { slug } = use(params)
-}
-```
-
-### generateMetadata
-
-```tsx
-type Props = { params: Promise<{ slug: string }> }
-
-export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params
-  return { title: slug }
-}
-```
-
-## Async Cookies and Headers
-
-```tsx
-import { cookies, headers } from 'next/headers'
-
-export default async function Page() {
-  const cookieStore = await cookies()
-  const headersList = await headers()
-
-  const theme = cookieStore.get('theme')
-  const userAgent = headersList.get('user-agent')
-}
-```
-
-## Migration Codemod
-
-```bash
-npx @next/codemod@latest next-async-request-api .
-```
diff --git a/skills/nextjs/upstream/references/bundling.md b/skills/nextjs/upstream/references/bundling.md
deleted file mode 100644
index ac5e814..0000000
--- a/skills/nextjs/upstream/references/bundling.md
+++ /dev/null
@@ -1,180 +0,0 @@
-# Bundling
-
-Fix common bundling issues with third-party packages.
-
-## Server-Incompatible Packages
-
-Some packages use browser APIs (`window`, `document`, `localStorage`) and fail in Server Components.
-
-### Error Signs
-
-```
-ReferenceError: window is not defined
-ReferenceError: document is not defined
-ReferenceError: localStorage is not defined
-Module not found: Can't resolve 'fs'
-```
-
-### Solution 1: Mark as Client-Only
-
-If the package is only needed on client:
-
-```tsx
-// Bad: Fails - package uses window
-import SomeChart from 'some-chart-library'
-
-export default function Page() {
-  return <SomeChart />
-}
-
-// Good: Use dynamic import with ssr: false
-import dynamic from 'next/dynamic'
-
-const SomeChart = dynamic(() => import('some-chart-library'), {
-  ssr: false,
-})
-
-export default function Page() {
-  return <SomeChart />
-}
-```
-
-### Solution 2: Externalize from Server Bundle
-
-For packages that should run on server but have bundling issues:
-
-```js
-// next.config.js
-module.exports = {
-  serverExternalPackages: ['problematic-package'],
-}
-```
-
-Use this for:
-- Packages with native bindings (sharp, bcrypt)
-- Packages that don't bundle well (some ORMs)
-- Packages with circular dependencies
-
-### Solution 3: Client Component Wrapper
-
-Wrap the entire usage in a client component:
-
-```tsx
-// components/ChartWrapper.tsx
-'use client'
-
-import { Chart } from 'chart-library'
-
-export function ChartWrapper(props) {
-  return <Chart {...props} />
-}
-
-// app/page.tsx (server component)
-import { ChartWrapper } from '@/components/ChartWrapper'
-
-export default function Page() {
-  return <ChartWrapper data={data} />
-}
-```
-
-## CSS Imports
-
-Import CSS files instead of using `<link>` tags. Next.js handles bundling and optimization.
-
-```tsx
-// Bad: Manual link tag
-<link rel="stylesheet" href="/styles.css" />
-
-// Good: Import CSS
-import './styles.css'
-
-// Good: CSS Modules
-import styles from './Button.module.css'
-```
-
-## Polyfills
-
-Next.js includes common polyfills automatically. Don't load redundant ones from polyfill.io or similar CDNs.
-
-Already included: `Array.from`, `Object.assign`, `Promise`, `fetch`, `Map`, `Set`, `Symbol`, `URLSearchParams`, and 50+ others.
-
-```tsx
-// Bad: Redundant polyfills
-<script src="https://polyfill.io/v3/polyfill.min.js?features=fetch,Promise,Array.from" />
-
-// Good: Next.js includes these automatically
-```
-
-## ESM/CommonJS Issues
-
-### Error Signs
-
-```
-SyntaxError: Cannot use import statement outside a module
-Error: require() of ES Module
-Module not found: ESM packages need to be imported
-```
-
-### Solution: Transpile Package
-
-```js
-// next.config.js
-module.exports = {
-  transpilePackages: ['some-esm-package', 'another-package'],
-}
-```
-
-## Common Problematic Packages
-
-| Package | Issue | Solution |
-|---------|-------|----------|
-| `sharp` | Native bindings | `serverExternalPackages: ['sharp']` |
-| `bcrypt` | Native bindings | `serverExternalPackages: ['bcrypt']` or use `bcryptjs` |
-| `canvas` | Native bindings | `serverExternalPackages: ['canvas']` |
-| `recharts` | Uses window | `dynamic(() => import('recharts'), { ssr: false })` |
-| `react-quill` | Uses document | `dynamic(() => import('react-quill'), { ssr: false })` |
-| `mapbox-gl` | Uses window | `dynamic(() => import('mapbox-gl'), { ssr: false })` |
-| `monaco-editor` | Uses window | `dynamic(() => import('@monaco-editor/react'), { ssr: false })` |
-| `lottie-web` | Uses document | `dynamic(() => import('lottie-react'), { ssr: false })` |
-
-## Bundle Analysis
-
-Analyze bundle size with the built-in analyzer (Next.js 16.1+):
-
-```bash
-next experimental-analyze
-```
-
-This opens an interactive UI to:
-- Filter by route, environment (client/server), and type
-- Inspect module sizes and import chains
-- View treemap visualization
-
-Save output for comparison:
-
-```bash
-next experimental-analyze --output
-# Output saved to .next/diagnostics/analyze
-```
-
-Reference: https://nextjs.org/docs/app/guides/package-bundling
-
-## Migrating from Webpack to Turbopack
-
-Turbopack is the default bundler in Next.js 15+. If you have custom webpack config, migrate to Turbopack-compatible alternatives:
-
-```js
-// next.config.js
-module.exports = {
-  // Good: Works with Turbopack
-  serverExternalPackages: ['package'],
-  transpilePackages: ['package'],
-
-  // Bad: Webpack-only - migrate away from this
-  webpack: (config) => {
-    // custom webpack config
-  },
-}
-```
-
-Reference: https://nextjs.org/docs/app/building-your-application/upgrading/from-webpack-to-turbopack
diff --git a/skills/nextjs/upstream/references/data-patterns.md b/skills/nextjs/upstream/references/data-patterns.md
deleted file mode 100644
index 8fc17f1..0000000
--- a/skills/nextjs/upstream/references/data-patterns.md
+++ /dev/null
@@ -1,297 +0,0 @@
-# Data Patterns
-
-Choose the right data fetching pattern for each use case.
-
-## Decision Tree
-
-```
-Need to fetch data?
-├── From a Server Component?
-│   └── Use: Fetch directly (no API needed)
-│
-├── From a Client Component?
-│   ├── Is it a mutation (POST/PUT/DELETE)?
-│   │   └── Use: Server Action
-│   └── Is it a read (GET)?
-│       └── Use: Route Handler OR pass from Server Component
-│
-├── Need external API access (webhooks, third parties)?
-│   └── Use: Route Handler
-│
-└── Need REST API for mobile app / external clients?
-    └── Use: Route Handler
-```
-
-## Pattern 1: Server Components (Preferred for Reads)
-
-Fetch data directly in Server Components - no API layer needed.
-
-```tsx
-// app/users/page.tsx
-async function UsersPage() {
-  // Direct database access - no API round-trip
-  const users = await db.user.findMany();
-
-  // Or fetch from external API
-  const posts = await fetch('https://api.example.com/posts').then(r => r.json());
-
-  return (
-    <ul>
-      {users.map(user => <li key={user.id}>{user.name}</li>)}
-    </ul>
-  );
-}
-```
-
-**Benefits**:
-- No API to maintain
-- No client-server waterfall
-- Secrets stay on server
-- Direct database access
-
-## Pattern 2: Server Actions (Preferred for Mutations)
-
-Server Actions are the recommended way to handle mutations.
-
-```tsx
-// app/actions.ts
-'use server';
-
-import { revalidatePath } from 'next/cache';
-
-export async function createPost(formData: FormData) {
-  const title = formData.get('title') as string;
-
-  await db.post.create({ data: { title } });
-
-  revalidatePath('/posts');
-}
-
-export async function deletePost(id: string) {
-  await db.post.delete({ where: { id } });
-
-  revalidateTag('posts');
-}
-```
-
-```tsx
-// app/posts/new/page.tsx
-import { createPost } from '@/app/actions';
-
-export default function NewPost() {
-  return (
-    <form action={createPost}>
-      <input name="title" required />
-      <button type="submit">Create</button>
-    </form>
-  );
-}
-```
-
-**Benefits**:
-- End-to-end type safety
-- Progressive enhancement (works without JS)
-- Automatic request handling
-- Integrated with React transitions
-
-**Constraints**:
-- POST only (no GET caching semantics)
-- Internal use only (no external access)
-- Cannot return non-serializable data
-
-## Pattern 3: Route Handlers (APIs)
-
-Use Route Handlers when you need a REST API.
-
-```tsx
-// app/api/posts/route.ts
-import { NextRequest, NextResponse } from 'next/server';
-
-// GET is cacheable
-export async function GET(request: NextRequest) {
-  const posts = await db.post.findMany();
-  return NextResponse.json(posts);
-}
-
-// POST for mutations
-export async function POST(request: NextRequest) {
-  const body = await request.json();
-  const post = await db.post.create({ data: body });
-  return NextResponse.json(post, { status: 201 });
-}
-```
-
-**When to use**:
-- External API access (mobile apps, third parties)
-- Webhooks from external services
-- GET endpoints that need HTTP caching
-- OpenAPI/Swagger documentation needed
-
-**When NOT to use**:
-- Internal data fetching (use Server Components)
-- Mutations from your UI (use Server Actions)
-
-## Avoiding Data Waterfalls
-
-### Problem: Sequential Fetches
-
-```tsx
-// Bad: Sequential waterfalls
-async function Dashboard() {
-  const user = await getUser();        // Wait...
-  const posts = await getPosts();      // Then wait...
-  const comments = await getComments(); // Then wait...
-
-  return <div>...</div>;
-}
-```
-
-### Solution 1: Parallel Fetching with Promise.all
-
-```tsx
-// Good: Parallel fetching
-async function Dashboard() {
-  const [user, posts, comments] = await Promise.all([
-    getUser(),
-    getPosts(),
-    getComments(),
-  ]);
-
-  return <div>...</div>;
-}
-```
-
-### Solution 2: Streaming with Suspense
-
-```tsx
-// Good: Show content progressively
-import { Suspense } from 'react';
-
-async function Dashboard() {
-  return (
-    <div>
-      <Suspense fallback={<UserSkeleton />}>
-        <UserSection />
-      </Suspense>
-      <Suspense fallback={<PostsSkeleton />}>
-        <PostsSection />
-      </Suspense>
-    </div>
-  );
-}
-
-async function UserSection() {
-  const user = await getUser(); // Fetches independently
-  return <div>{user.name}</div>;
-}
-
-async function PostsSection() {
-  const posts = await getPosts(); // Fetches independently
-  return <PostList posts={posts} />;
-}
-```
-
-### Solution 3: Preload Pattern
-
-```tsx
-// lib/data.ts
-import { cache } from 'react';
-
-export const getUser = cache(async (id: string) => {
-  return db.user.findUnique({ where: { id } });
-});
-
-export const preloadUser = (id: string) => {
-  void getUser(id); // Fire and forget
-};
-```
-
-```tsx
-// app/user/[id]/page.tsx
-import { getUser, preloadUser } from '@/lib/data';
-
-export default async function UserPage({ params }) {
-  const { id } = await params;
-
-  // Start fetching early
-  preloadUser(id);
-
-  // Do other work...
-
-  // Data likely ready by now
-  const user = await getUser(id);
-  return <div>{user.name}</div>;
-}
-```
-
-## Client Component Data Fetching
-
-When Client Components need data:
-
-### Option 1: Pass from Server Component (Preferred)
-
-```tsx
-// Server Component
-async function Page() {
-  const data = await fetchData();
-  return <ClientComponent initialData={data} />;
-}
-
-// Client Component
-'use client';
-function ClientComponent({ initialData }) {
-  const [data, setData] = useState(initialData);
-  // ...
-}
-```
-
-### Option 2: Fetch on Mount (When Necessary)
-
-```tsx
-'use client';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    fetch('/api/data')
-      .then(r => r.json())
-      .then(setData);
-  }, []);
-
-  if (!data) return <Loading />;
-  return <div>{data.value}</div>;
-}
-```
-
-### Option 3: Server Action for Reads (Works But Not Ideal)
-
-Server Actions can be called from Client Components for reads, but this is not their intended purpose:
-
-```tsx
-'use client';
-import { getData } from './actions';
-import { useEffect, useState } from 'react';
-
-function ClientComponent() {
-  const [data, setData] = useState(null);
-
-  useEffect(() => {
-    getData().then(setData);
-  }, []);
-
-  return <div>{data?.value}</div>;
-}
-```
-
-**Note**: Server Actions always use POST, so no HTTP caching. Prefer Route Handlers for cacheable reads.
-
-## Quick Reference
-
-| Pattern | Use Case | HTTP Method | Caching |
-|---------|----------|-------------|---------|
-| Server Component fetch | Internal reads | Any | Full Next.js caching |
-| Server Action | Mutations, form submissions | POST only | No |
-| Route Handler | External APIs, webhooks | Any | GET can be cached |
-| Client fetch to API | Client-side reads | Any | HTTP cache headers |
diff --git a/skills/nextjs/upstream/references/debug-tricks.md b/skills/nextjs/upstream/references/debug-tricks.md
deleted file mode 100644
index 9151ce6..0000000
--- a/skills/nextjs/upstream/references/debug-tricks.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Debug Tricks
-
-Tricks to speed up debugging Next.js applications.
-
-## MCP Endpoint (Dev Server)
-
-Next.js exposes a `/_next/mcp` endpoint in development for AI-assisted debugging via MCP (Model Context Protocol).
-
-- **Next.js 16+**: Enabled by default, use `next-devtools-mcp`
-- **Next.js < 16**: Requires `experimental.mcpServer: true` in next.config.js
-
-Reference: https://nextjs.org/docs/app/guides/mcp
-
-**Important**: Find the actual port of the running Next.js dev server (check terminal output or `package.json` scripts). Don't assume port 3000.
-
-### Request Format
-
-The endpoint uses JSON-RPC 2.0 over HTTP POST:
-
-```bash
-curl -X POST http://localhost:<port>/_next/mcp \
-  -H "Content-Type: application/json" \
-  -H "Accept: application/json, text/event-stream" \
-  -d '{
-    "jsonrpc": "2.0",
-    "id": "1",
-    "method": "tools/call",
-    "params": {
-      "name": "<tool-name>",
-      "arguments": {}
-    }
-  }'
-```
-
-### Available Tools
-
-#### `get_errors`
-Get current errors from dev server (build errors, runtime errors with source-mapped stacks):
-```json
-{ "name": "get_errors", "arguments": {} }
-```
-
-#### `get_routes`
-Discover all routes by scanning filesystem:
-```json
-{ "name": "get_routes", "arguments": {} }
-// Optional: { "name": "get_routes", "arguments": { "routerType": "app" } }
-```
-Returns: `{ "appRouter": ["/", "/api/users/[id]", ...], "pagesRouter": [...] }`
-
-#### `get_project_metadata`
-Get project path and dev server URL:
-```json
-{ "name": "get_project_metadata", "arguments": {} }
-```
-Returns: `{ "projectPath": "/path/to/project", "devServerUrl": "http://localhost:3000" }`
-
-#### `get_page_metadata`
-Get runtime metadata about current page render (requires active browser session):
-```json
-{ "name": "get_page_metadata", "arguments": {} }
-```
-Returns segment trie data showing layouts, boundaries, and page components.
-
-#### `get_logs`
-Get path to Next.js development log file:
-```json
-{ "name": "get_logs", "arguments": {} }
-```
-Returns path to `<distDir>/logs/next-development.log`
-
-#### `get_server_action_by_id`
-Locate a Server Action by ID:
-```json
-{ "name": "get_server_action_by_id", "arguments": { "actionId": "<action-id>" } }
-```
-
-### Example: Get Errors
-
-```bash
-curl -X POST http://localhost:<port>/_next/mcp \
-  -H "Content-Type: application/json" \
-  -H "Accept: application/json, text/event-stream" \
-  -d '{"jsonrpc":"2.0","id":"1","method":"tools/call","params":{"name":"get_errors","arguments":{}}}'
-```
-
-## Rebuild Specific Routes (Next.js 16+)
-
-Use `--debug-build-paths` to rebuild only specific routes instead of the entire app:
-
-```bash
-# Rebuild a specific route
-next build --debug-build-paths "/dashboard"
-
-# Rebuild routes matching a glob
-next build --debug-build-paths "/api/*"
-
-# Dynamic routes
-next build --debug-build-paths "/blog/[slug]"
-```
-
-Use this to:
-- Quickly verify a build fix without full rebuild
-- Debug static generation issues for specific pages
-- Iterate faster on build errors
diff --git a/skills/nextjs/upstream/references/directives.md b/skills/nextjs/upstream/references/directives.md
deleted file mode 100644
index 1ea1637..0000000
--- a/skills/nextjs/upstream/references/directives.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Directives
-
-## React Directives
-
-These are React directives, not Next.js specific.
-
-### `'use client'`
-
-Marks a component as a Client Component. Required for:
-- React hooks (`useState`, `useEffect`, etc.)
-- Event handlers (`onClick`, `onChange`)
-- Browser APIs (`window`, `localStorage`)
-
-```tsx
-'use client'
-
-import { useState } from 'react'
-
-export function Counter() {
-  const [count, setCount] = useState(0)
-  return <button onClick={() => setCount(count + 1)}>{count}</button>
-}
-```
-
-Reference: https://react.dev/reference/rsc/use-client
-
-### `'use server'`
-
-Marks a function as a Server Action. Can be passed to Client Components.
-
-```tsx
-'use server'
-
-export async function submitForm(formData: FormData) {
-  // Runs on server
-}
-```
-
-Or inline within a Server Component:
-
-```tsx
-export default function Page() {
-  async function submit() {
-    'use server'
-    // Runs on server
-  }
-  return <form action={submit}>...</form>
-}
-```
-
-Reference: https://react.dev/reference/rsc/use-server
-
----
-
-## Next.js Directive
-
-### `'use cache'`
-
-Marks a function or component for caching. Part of Next.js Cache Components.
-
-```tsx
-'use cache'
-
-export async function getCachedData() {
-  return await fetchData()
-}
-```
-
-Requires `cacheComponents: true` in `next.config.ts`.
-
-For detailed usage including cache profiles, `cacheLife()`, `cacheTag()`, and `updateTag()`, see the `next-cache-components` skill.
-
-Reference: https://nextjs.org/docs/app/api-reference/directives/use-cache
diff --git a/skills/nextjs/upstream/references/error-handling.md b/skills/nextjs/upstream/references/error-handling.md
deleted file mode 100644
index 663e37b..0000000
--- a/skills/nextjs/upstream/references/error-handling.md
+++ /dev/null
@@ -1,227 +0,0 @@
-# Error Handling
-
-Handle errors gracefully in Next.js applications.
-
-Reference: https://nextjs.org/docs/app/getting-started/error-handling
-
-## Error Boundaries
-
-### `error.tsx`
-
-Catches errors in a route segment and its children:
-
-```tsx
-'use client'
-
-export default function Error({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <div>
-      <h2>Something went wrong!</h2>
-      <button onClick={() => reset()}>Try again</button>
-    </div>
-  )
-}
-```
-
-**Important:** `error.tsx` must be a Client Component.
-
-### `global-error.tsx`
-
-Catches errors in root layout:
-
-```tsx
-'use client'
-
-export default function GlobalError({
-  error,
-  reset,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <html>
-      <body>
-        <h2>Something went wrong!</h2>
-        <button onClick={() => reset()}>Try again</button>
-      </body>
-    </html>
-  )
-}
-```
-
-**Important:** Must include `<html>` and `<body>` tags.
-
-## Server Actions: Navigation API Gotcha
-
-**Do NOT wrap navigation APIs in try-catch.** They throw special errors that Next.js handles internally.
-
-Reference: https://nextjs.org/docs/app/api-reference/functions/redirect#behavior
-
-```tsx
-'use server'
-
-import { redirect } from 'next/navigation'
-import { notFound } from 'next/navigation'
-
-// Bad: try-catch catches the navigation "error"
-async function createPost(formData: FormData) {
-  try {
-    const post = await db.post.create({ ... })
-    redirect(`/posts/${post.id}`)  // This throws!
-  } catch (error) {
-    // redirect() throw is caught here - navigation fails!
-    return { error: 'Failed to create post' }
-  }
-}
-
-// Good: Call navigation APIs outside try-catch
-async function createPost(formData: FormData) {
-  let post
-  try {
-    post = await db.post.create({ ... })
-  } catch (error) {
-    return { error: 'Failed to create post' }
-  }
-  redirect(`/posts/${post.id}`)  // Outside try-catch
-}
-
-// Good: Re-throw navigation errors
-async function createPost(formData: FormData) {
-  try {
-    const post = await db.post.create({ ... })
-    redirect(`/posts/${post.id}`)
-  } catch (error) {
-    if (error instanceof Error && error.message === 'NEXT_REDIRECT') {
-      throw error  // Re-throw navigation errors
-    }
-    return { error: 'Failed to create post' }
-  }
-}
-```
-
-Same applies to:
-- `redirect()` - 307 temporary redirect
-- `permanentRedirect()` - 308 permanent redirect
-- `notFound()` - 404 not found
-- `forbidden()` - 403 forbidden
-- `unauthorized()` - 401 unauthorized
-
-Use `unstable_rethrow()` to re-throw these errors in catch blocks:
-
-```tsx
-import { unstable_rethrow } from 'next/navigation'
-
-async function action() {
-  try {
-    // ...
-    redirect('/success')
-  } catch (error) {
-    unstable_rethrow(error) // Re-throws Next.js internal errors
-    return { error: 'Something went wrong' }
-  }
-}
-```
-
-## Redirects
-
-```tsx
-import { redirect, permanentRedirect } from 'next/navigation'
-
-// 307 Temporary - use for most cases
-redirect('/new-path')
-
-// 308 Permanent - use for URL migrations (cached by browsers)
-permanentRedirect('/new-url')
-```
-
-## Auth Errors
-
-Trigger auth-related error pages:
-
-```tsx
-import { forbidden, unauthorized } from 'next/navigation'
-
-async function Page() {
-  const session = await getSession()
-
-  if (!session) {
-    unauthorized() // Renders unauthorized.tsx (401)
-  }
-
-  if (!session.hasAccess) {
-    forbidden() // Renders forbidden.tsx (403)
-  }
-
-  return <Dashboard />
-}
-```
-
-Create corresponding error pages:
-
-```tsx
-// app/forbidden.tsx
-export default function Forbidden() {
-  return <div>You don't have access to this resource</div>
-}
-
-// app/unauthorized.tsx
-export default function Unauthorized() {
-  return <div>Please log in to continue</div>
-}
-```
-
-## Not Found
-
-### `not-found.tsx`
-
-Custom 404 page for a route segment:
-
-```tsx
-export default function NotFound() {
-  return (
-    <div>
-      <h2>Not Found</h2>
-      <p>Could not find the requested resource</p>
-    </div>
-  )
-}
-```
-
-### Triggering Not Found
-
-```tsx
-import { notFound } from 'next/navigation'
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params
-  const post = await getPost(id)
-
-  if (!post) {
-    notFound()  // Renders closest not-found.tsx
-  }
-
-  return <div>{post.title}</div>
-}
-```
-
-## Error Hierarchy
-
-Errors bubble up to the nearest error boundary:
-
-```
-app/
-├── error.tsx           # Catches errors from all children
-├── blog/
-│   ├── error.tsx       # Catches errors in /blog/*
-│   └── [slug]/
-│       ├── error.tsx   # Catches errors in /blog/[slug]
-│       └── page.tsx
-└── layout.tsx          # Errors here go to global-error.tsx
-```
diff --git a/skills/nextjs/upstream/references/file-conventions.md b/skills/nextjs/upstream/references/file-conventions.md
deleted file mode 100644
index c2b3b40..0000000
--- a/skills/nextjs/upstream/references/file-conventions.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# File Conventions
-
-Next.js App Router uses file-based routing with special file conventions.
-
-## Project Structure
-
-Reference: https://nextjs.org/docs/app/getting-started/project-structure
-
-```
-app/
-├── layout.tsx          # Root layout (required)
-├── page.tsx            # Home page (/)
-├── loading.tsx         # Loading UI
-├── error.tsx           # Error UI
-├── not-found.tsx       # 404 UI
-├── global-error.tsx    # Global error UI
-├── route.ts            # API endpoint
-├── template.tsx        # Re-rendered layout
-├── default.tsx         # Parallel route fallback
-├── blog/
-│   ├── page.tsx        # /blog
-│   └── [slug]/
-│       └── page.tsx    # /blog/:slug
-└── (group)/            # Route group (no URL impact)
-    └── page.tsx
-```
-
-## Special Files
-
-| File | Purpose |
-|------|---------|
-| `page.tsx` | UI for a route segment |
-| `layout.tsx` | Shared UI for segment and children |
-| `loading.tsx` | Loading UI (Suspense boundary) |
-| `error.tsx` | Error UI (Error boundary) |
-| `not-found.tsx` | 404 UI |
-| `route.ts` | API endpoint |
-| `template.tsx` | Like layout but re-renders on navigation |
-| `default.tsx` | Fallback for parallel routes |
-
-## Route Segments
-
-```
-app/
-├── blog/               # Static segment: /blog
-├── [slug]/             # Dynamic segment: /:slug
-├── [...slug]/          # Catch-all: /a/b/c
-├── [[...slug]]/        # Optional catch-all: / or /a/b/c
-└── (marketing)/        # Route group (ignored in URL)
-```
-
-## Parallel Routes
-
-```
-app/
-├── @analytics/
-│   └── page.tsx
-├── @sidebar/
-│   └── page.tsx
-└── layout.tsx          # Receives { analytics, sidebar } as props
-```
-
-## Intercepting Routes
-
-```
-app/
-├── feed/
-│   └── page.tsx
-├── @modal/
-│   └── (.)photo/[id]/  # Intercepts /photo/[id] from /feed
-│       └── page.tsx
-└── photo/[id]/
-    └── page.tsx
-```
-
-Conventions:
-- `(.)` - same level
-- `(..)` - one level up
-- `(..)(..)` - two levels up
-- `(...)` - from root
-
-## Private Folders
-
-```
-app/
-├── _components/        # Private folder (not a route)
-│   └── Button.tsx
-└── page.tsx
-```
-
-Prefix with `_` to exclude from routing.
-
-## Middleware / Proxy
-
-### Next.js 14-15: `middleware.ts`
-
-```ts
-// middleware.ts (root of project)
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
-
-export function middleware(request: NextRequest) {
-  // Auth, redirects, rewrites, etc.
-  return NextResponse.next();
-}
-
-export const config = {
-  matcher: ['/dashboard/:path*', '/api/:path*'],
-};
-```
-
-### Next.js 16+: `proxy.ts`
-
-Renamed for clarity - same capabilities, different names:
-
-```ts
-// proxy.ts (root of project)
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
-
-export function proxy(request: NextRequest) {
-  // Same logic as middleware
-  return NextResponse.next();
-}
-
-export const proxyConfig = {
-  matcher: ['/dashboard/:path*', '/api/:path*'],
-};
-```
-
-| Version | File | Export | Config |
-|---------|------|--------|--------|
-| v14-15 | `middleware.ts` | `middleware()` | `config` |
-| v16+ | `proxy.ts` | `proxy()` | `proxyConfig` |
-
-**Migration**: Run `npx @next/codemod@latest upgrade` to auto-rename.
-
-## File Conventions Reference
-
-Reference: https://nextjs.org/docs/app/api-reference/file-conventions
diff --git a/skills/nextjs/upstream/references/font.md b/skills/nextjs/upstream/references/font.md
deleted file mode 100644
index 7e52685..0000000
--- a/skills/nextjs/upstream/references/font.md
+++ /dev/null
@@ -1,245 +0,0 @@
-# Font Optimization
-
-Use `next/font` for automatic font optimization with zero layout shift.
-
-## Google Fonts
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={inter.className}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-## Multiple Fonts
-
-```tsx
-import { Inter, Roboto_Mono } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-const robotoMono = Roboto_Mono({
-  subsets: ['latin'],
-  variable: '--font-roboto-mono',
-})
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en" className={`${inter.variable} ${robotoMono.variable}`}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-Use in CSS:
-```css
-body {
-  font-family: var(--font-inter);
-}
-
-code {
-  font-family: var(--font-roboto-mono);
-}
-```
-
-## Font Weights and Styles
-
-```tsx
-// Single weight
-const inter = Inter({
-  subsets: ['latin'],
-  weight: '400',
-})
-
-// Multiple weights
-const inter = Inter({
-  subsets: ['latin'],
-  weight: ['400', '500', '700'],
-})
-
-// Variable font (recommended) - includes all weights
-const inter = Inter({
-  subsets: ['latin'],
-  // No weight needed - variable fonts support all weights
-})
-
-// With italic
-const inter = Inter({
-  subsets: ['latin'],
-  style: ['normal', 'italic'],
-})
-```
-
-## Local Fonts
-
-```tsx
-import localFont from 'next/font/local'
-
-const myFont = localFont({
-  src: './fonts/MyFont.woff2',
-})
-
-// Multiple files for different weights
-const myFont = localFont({
-  src: [
-    {
-      path: './fonts/MyFont-Regular.woff2',
-      weight: '400',
-      style: 'normal',
-    },
-    {
-      path: './fonts/MyFont-Bold.woff2',
-      weight: '700',
-      style: 'normal',
-    },
-  ],
-})
-
-// Variable font
-const myFont = localFont({
-  src: './fonts/MyFont-Variable.woff2',
-  variable: '--font-my-font',
-})
-```
-
-## Tailwind CSS Integration
-
-```tsx
-// app/layout.tsx
-import { Inter } from 'next/font/google'
-
-const inter = Inter({
-  subsets: ['latin'],
-  variable: '--font-inter',
-})
-
-export default function RootLayout({ children }) {
-  return (
-    <html lang="en" className={inter.variable}>
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-```js
-// tailwind.config.js
-module.exports = {
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: ['var(--font-inter)'],
-      },
-    },
-  },
-}
-```
-
-## Preloading Subsets
-
-Only load needed character subsets:
-
-```tsx
-// Latin only (most common)
-const inter = Inter({ subsets: ['latin'] })
-
-// Multiple subsets
-const inter = Inter({ subsets: ['latin', 'latin-ext', 'cyrillic'] })
-```
-
-## Display Strategy
-
-Control font loading behavior:
-
-```tsx
-const inter = Inter({
-  subsets: ['latin'],
-  display: 'swap', // Default - shows fallback, swaps when loaded
-})
-
-// Options:
-// 'auto' - browser decides
-// 'block' - short block period, then swap
-// 'swap' - immediate fallback, swap when ready (recommended)
-// 'fallback' - short block, short swap, then fallback
-// 'optional' - short block, no swap (use if font is optional)
-```
-
-## Don't Use Manual Font Links
-
-Always use `next/font` instead of `<link>` tags for Google Fonts.
-
-```tsx
-// Bad: Manual link tag (blocks rendering, no optimization)
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Bad: Missing display and preconnect
-<link href="https://fonts.googleapis.com/css2?family=Inter" rel="stylesheet" />
-
-// Good: Use next/font (self-hosted, zero layout shift)
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Importing font in every component
-// components/Button.tsx
-import { Inter } from 'next/font/google'
-const inter = Inter({ subsets: ['latin'] }) // Creates new instance each time!
-
-// Good: Import once in layout, use CSS variable
-// app/layout.tsx
-const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-
-// Bad: Using @import in CSS (blocks rendering)
-/* globals.css */
-@import url('https://fonts.googleapis.com/css2?family=Inter');
-
-// Good: Use next/font (self-hosted, no network request)
-import { Inter } from 'next/font/google'
-
-// Bad: Loading all weights when only using a few
-const inter = Inter({ subsets: ['latin'] }) // Loads all weights
-
-// Good: Specify only needed weights (for non-variable fonts)
-const inter = Inter({ subsets: ['latin'], weight: ['400', '700'] })
-
-// Bad: Missing subset - loads all characters
-const inter = Inter({})
-
-// Good: Always specify subset
-const inter = Inter({ subsets: ['latin'] })
-```
-
-## Font in Specific Components
-
-```tsx
-// For component-specific fonts, export from a shared file
-// lib/fonts.ts
-import { Inter, Playfair_Display } from 'next/font/google'
-
-export const inter = Inter({ subsets: ['latin'], variable: '--font-inter' })
-export const playfair = Playfair_Display({ subsets: ['latin'], variable: '--font-playfair' })
-
-// components/Heading.tsx
-import { playfair } from '@/lib/fonts'
-
-export function Heading({ children }) {
-  return <h1 className={playfair.className}>{children}</h1>
-}
-```
diff --git a/skills/nextjs/upstream/references/functions.md b/skills/nextjs/upstream/references/functions.md
deleted file mode 100644
index 8f28a8b..0000000
--- a/skills/nextjs/upstream/references/functions.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Functions
-
-Next.js function APIs.
-
-Reference: https://nextjs.org/docs/app/api-reference/functions
-
-## Navigation Hooks (Client)
-
-| Hook | Purpose | Reference |
-|------|---------|-----------|
-| `useRouter` | Programmatic navigation (`push`, `replace`, `back`, `refresh`) | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-router) |
-| `usePathname` | Get current pathname | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-pathname) |
-| `useSearchParams` | Read URL search parameters | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-search-params) |
-| `useParams` | Access dynamic route parameters | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-params) |
-| `useSelectedLayoutSegment` | Active child segment (one level) | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-selected-layout-segment) |
-| `useSelectedLayoutSegments` | All active segments below layout | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-selected-layout-segments) |
-| `useLinkStatus` | Check link prefetch status | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-link-status) |
-| `useReportWebVitals` | Report Core Web Vitals metrics | [Docs](https://nextjs.org/docs/app/api-reference/functions/use-report-web-vitals) |
-
-## Server Functions
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `cookies` | Read/write cookies | [Docs](https://nextjs.org/docs/app/api-reference/functions/cookies) |
-| `headers` | Read request headers | [Docs](https://nextjs.org/docs/app/api-reference/functions/headers) |
-| `draftMode` | Enable preview of unpublished CMS content | [Docs](https://nextjs.org/docs/app/api-reference/functions/draft-mode) |
-| `after` | Run code after response finishes streaming | [Docs](https://nextjs.org/docs/app/api-reference/functions/after) |
-| `connection` | Wait for connection before dynamic rendering | [Docs](https://nextjs.org/docs/app/api-reference/functions/connection) |
-| `userAgent` | Parse User-Agent header | [Docs](https://nextjs.org/docs/app/api-reference/functions/userAgent) |
-
-## Generate Functions
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `generateStaticParams` | Pre-render dynamic routes at build time | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-static-params) |
-| `generateMetadata` | Dynamic metadata | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-metadata) |
-| `generateViewport` | Dynamic viewport config | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-viewport) |
-| `generateSitemaps` | Multiple sitemaps for large sites | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-sitemaps) |
-| `generateImageMetadata` | Multiple OG images per route | [Docs](https://nextjs.org/docs/app/api-reference/functions/generate-image-metadata) |
-
-## Request/Response
-
-| Function | Purpose | Reference |
-|----------|---------|-----------|
-| `NextRequest` | Extended Request with helpers | [Docs](https://nextjs.org/docs/app/api-reference/functions/next-request) |
-| `NextResponse` | Extended Response with helpers | [Docs](https://nextjs.org/docs/app/api-reference/functions/next-response) |
-| `ImageResponse` | Generate OG images | [Docs](https://nextjs.org/docs/app/api-reference/functions/image-response) |
-
-## Common Examples
-
-### Navigation
-
-Use `next/link` for internal navigation instead of `<a>` tags.
-
-```tsx
-// Bad: Plain anchor tag
-<a href="/about">About</a>
-
-// Good: Next.js Link
-import Link from 'next/link'
-
-<Link href="/about">About</Link>
-```
-
-Active link styling:
-
-```tsx
-'use client'
-
-import Link from 'next/link'
-import { usePathname } from 'next/navigation'
-
-export function NavLink({ href, children }) {
-  const pathname = usePathname()
-
-  return (
-    <Link href={href} className={pathname === href ? 'active' : ''}>
-      {children}
-    </Link>
-  )
-}
-```
-
-### Static Generation
-
-```tsx
-// app/blog/[slug]/page.tsx
-export async function generateStaticParams() {
-  const posts = await getPosts()
-  return posts.map((post) => ({ slug: post.slug }))
-}
-```
-
-### After Response
-
-```tsx
-import { after } from 'next/server'
-
-export async function POST(request: Request) {
-  const data = await processRequest(request)
-
-  after(async () => {
-    await logAnalytics(data)
-  })
-
-  return Response.json({ success: true })
-}
-```
diff --git a/skills/nextjs/upstream/references/hydration-error.md b/skills/nextjs/upstream/references/hydration-error.md
deleted file mode 100644
index 36d4829..0000000
--- a/skills/nextjs/upstream/references/hydration-error.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Hydration Errors
-
-Diagnose and fix React hydration mismatch errors.
-
-## Error Signs
-
-- "Hydration failed because the initial UI does not match"
-- "Text content does not match server-rendered HTML"
-
-## Debugging
-
-In development, click the hydration error to see the server/client diff.
-
-## Common Causes and Fixes
-
-### Browser-only APIs
-
-```tsx
-// Bad: Causes mismatch - window doesn't exist on server
-<div>{window.innerWidth}</div>
-
-// Good: Use client component with mounted check
-'use client'
-import { useState, useEffect } from 'react'
-
-export function ClientOnly({ children }: { children: React.ReactNode }) {
-  const [mounted, setMounted] = useState(false)
-  useEffect(() => setMounted(true), [])
-  return mounted ? children : null
-}
-```
-
-### Date/Time Rendering
-
-Server and client may be in different timezones:
-
-```tsx
-// Bad: Causes mismatch
-<span>{new Date().toLocaleString()}</span>
-
-// Good: Render on client only
-'use client'
-const [time, setTime] = useState<string>()
-useEffect(() => setTime(new Date().toLocaleString()), [])
-```
-
-### Random Values or IDs
-
-```tsx
-// Bad: Random values differ between server and client
-<div id={Math.random().toString()}>
-
-// Good: Use useId hook
-import { useId } from 'react'
-
-function Input() {
-  const id = useId()
-  return <input id={id} />
-}
-```
-
-### Invalid HTML Nesting
-
-```tsx
-// Bad: Invalid - div inside p
-<p><div>Content</div></p>
-
-// Bad: Invalid - p inside p
-<p><p>Nested</p></p>
-
-// Good: Valid nesting
-<div><p>Content</p></div>
-```
-
-### Third-party Scripts
-
-Scripts that modify DOM during hydration.
-
-```tsx
-// Good: Use next/script with afterInteractive
-import Script from 'next/script'
-
-export default function Page() {
-  return (
-    <Script
-      src="https://example.com/script.js"
-      strategy="afterInteractive"
-    />
-  )
-}
-```
diff --git a/skills/nextjs/upstream/references/image.md b/skills/nextjs/upstream/references/image.md
deleted file mode 100644
index aa9d28d..0000000
--- a/skills/nextjs/upstream/references/image.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Image Optimization
-
-Use `next/image` for automatic image optimization.
-
-## Always Use next/image
-
-```tsx
-// Bad: Avoid native img
-<img src="/hero.png" alt="Hero" />
-
-// Good: Use next/image
-import Image from 'next/image'
-<Image src="/hero.png" alt="Hero" width={800} height={400} />
-```
-
-## Required Props
-
-Images need explicit dimensions to prevent layout shift:
-
-```tsx
-// Local images - dimensions inferred automatically
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" />
-
-// Remote images - must specify width/height
-<Image src="https://example.com/image.jpg" alt="Hero" width={800} height={400} />
-
-// Or use fill for parent-relative sizing
-<div style={{ position: 'relative', width: '100%', height: 400 }}>
-  <Image src="/hero.png" alt="Hero" fill style={{ objectFit: 'cover' }} />
-</div>
-```
-
-## Remote Images Configuration
-
-Remote domains must be configured in `next.config.js`:
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    remotePatterns: [
-      {
-        protocol: 'https',
-        hostname: 'example.com',
-        pathname: '/images/**',
-      },
-      {
-        protocol: 'https',
-        hostname: '*.cdn.com', // Wildcard subdomain
-      },
-    ],
-  },
-}
-```
-
-## Responsive Images
-
-Use `sizes` to tell the browser which size to download:
-
-```tsx
-// Full-width hero
-<Image
-  src="/hero.png"
-  alt="Hero"
-  fill
-  sizes="100vw"
-/>
-
-// Responsive grid (3 columns on desktop, 1 on mobile)
-<Image
-  src="/card.png"
-  alt="Card"
-  fill
-  sizes="(max-width: 768px) 100vw, 33vw"
-/>
-
-// Fixed sidebar image
-<Image
-  src="/avatar.png"
-  alt="Avatar"
-  width={200}
-  height={200}
-  sizes="200px"
-/>
-```
-
-## Blur Placeholder
-
-Prevent layout shift with placeholders:
-
-```tsx
-// Local images - automatic blur hash
-import heroImage from './hero.png'
-<Image src={heroImage} alt="Hero" placeholder="blur" />
-
-// Remote images - provide blurDataURL
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="blur"
-  blurDataURL="data:image/jpeg;base64,/9j/4AAQSkZJRg..."
-/>
-
-// Or use color placeholder
-<Image
-  src="https://example.com/image.jpg"
-  alt="Hero"
-  width={800}
-  height={400}
-  placeholder="empty"
-  style={{ backgroundColor: '#e0e0e0' }}
-/>
-```
-
-## Priority Loading
-
-Use `priority` for above-the-fold images (LCP):
-
-```tsx
-// Hero image - loads immediately
-<Image src="/hero.png" alt="Hero" fill priority />
-
-// Below-fold images - lazy loaded by default (no priority needed)
-<Image src="/card.png" alt="Card" width={400} height={300} />
-```
-
-## Common Mistakes
-
-```tsx
-// Bad: Missing sizes with fill - downloads largest image
-<Image src="/hero.png" alt="Hero" fill />
-
-// Good: Add sizes for proper responsive behavior
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" />
-
-// Bad: Using width/height for aspect ratio only
-<Image src="/hero.png" alt="Hero" width={16} height={9} />
-
-// Good: Use actual display dimensions or fill with sizes
-<Image src="/hero.png" alt="Hero" fill sizes="100vw" style={{ objectFit: 'cover' }} />
-
-// Bad: Remote image without config
-<Image src="https://untrusted.com/image.jpg" alt="Image" width={400} height={300} />
-// Error: Invalid src prop, hostname not configured
-
-// Good: Add hostname to next.config.js remotePatterns
-```
-
-## Static Export
-
-When using `output: 'export'`, use `unoptimized` or custom loader:
-
-```tsx
-// Option 1: Disable optimization
-<Image src="/hero.png" alt="Hero" width={800} height={400} unoptimized />
-
-// Option 2: Global config
-// next.config.js
-module.exports = {
-  output: 'export',
-  images: { unoptimized: true },
-}
-
-// Option 3: Custom loader (Cloudinary, Imgix, etc.)
-const cloudinaryLoader = ({ src, width, quality }) => {
-  return `https://res.cloudinary.com/demo/image/upload/w_${width},q_${quality || 75}/${src}`
-}
-
-<Image loader={cloudinaryLoader} src="sample.jpg" alt="Sample" width={800} height={400} />
-```
diff --git a/skills/nextjs/upstream/references/metadata.md b/skills/nextjs/upstream/references/metadata.md
deleted file mode 100644
index 5a0f655..0000000
--- a/skills/nextjs/upstream/references/metadata.md
+++ /dev/null
@@ -1,301 +0,0 @@
-# Metadata
-
-Add SEO metadata to Next.js pages using the Metadata API.
-
-## Important: Server Components Only
-
-The `metadata` object and `generateMetadata` function are **only supported in Server Components**. They cannot be used in Client Components.
-
-If the target page has `'use client'`:
-1. Remove `'use client'` if possible, move client logic to child components
-2. Or extract metadata to a parent Server Component layout
-3. Or split the file: Server Component with metadata imports Client Components
-
-## Static Metadata
-
-```tsx
-import type { Metadata } from 'next'
-
-export const metadata: Metadata = {
-  title: 'Page Title',
-  description: 'Page description for search engines',
-}
-```
-
-## Dynamic Metadata
-
-```tsx
-import type { Metadata } from 'next'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export async function generateMetadata({ params }: Props): Promise<Metadata> {
-  const { slug } = await params
-  const post = await getPost(slug)
-  return { title: post.title, description: post.description }
-}
-```
-
-## Avoid Duplicate Fetches
-
-Use React `cache()` when the same data is needed for both metadata and page:
-
-```tsx
-import { cache } from 'react'
-
-export const getPost = cache(async (slug: string) => {
-  return await db.posts.findFirst({ where: { slug } })
-})
-```
-
-## Viewport
-
-Separate from metadata for streaming support:
-
-```tsx
-import type { Viewport } from 'next'
-
-export const viewport: Viewport = {
-  width: 'device-width',
-  initialScale: 1,
-  themeColor: '#000000',
-}
-
-// Or dynamic
-export function generateViewport({ params }): Viewport {
-  return { themeColor: getThemeColor(params) }
-}
-```
-
-## Title Templates
-
-In root layout for consistent naming:
-
-```tsx
-export const metadata: Metadata = {
-  title: { default: 'Site Name', template: '%s | Site Name' },
-}
-```
-
-## Metadata File Conventions
-
-Reference: https://nextjs.org/docs/app/getting-started/project-structure#metadata-file-conventions
-
-Place these files in `app/` directory (or route segments):
-
-| File | Purpose |
-|------|---------|
-| `favicon.ico` | Favicon |
-| `icon.png` / `icon.svg` | App icon |
-| `apple-icon.png` | Apple app icon |
-| `opengraph-image.png` | OG image |
-| `twitter-image.png` | Twitter card image |
-| `sitemap.ts` / `sitemap.xml` | Sitemap (use `generateSitemaps` for multiple) |
-| `robots.ts` / `robots.txt` | Robots directives |
-| `manifest.ts` / `manifest.json` | Web app manifest |
-
-## SEO Best Practice: Static Files Are Often Enough
-
-For most sites, **static metadata files provide excellent SEO coverage**:
-
-```
-app/
-├── favicon.ico
-├── opengraph-image.png     # Works for both OG and Twitter
-├── sitemap.ts
-├── robots.ts
-└── layout.tsx              # With title/description metadata
-```
-
-**Tips:**
-- A single `opengraph-image.png` covers both Open Graph and Twitter (Twitter falls back to OG)
-- Static `title` and `description` in layout metadata is sufficient for most pages
-- Only use dynamic `generateMetadata` when content varies per page
-
----
-
-# OG Image Generation
-
-Generate dynamic Open Graph images using `next/og`.
-
-## Important Rules
-
-1. **Use `next/og`** - not `@vercel/og` (it's built into Next.js)
-2. **No searchParams** - OG images can't access search params, use route params instead
-3. **Avoid Edge runtime** - Use default Node.js runtime
-
-```tsx
-// Good
-import { ImageResponse } from 'next/og'
-
-// Bad
-// import { ImageResponse } from '@vercel/og'
-// export const runtime = 'edge'
-```
-
-## Basic OG Image
-
-```tsx
-// app/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export const alt = 'Site Name'
-export const size = { width: 1200, height: 630 }
-export const contentType = 'image/png'
-
-export default function Image() {
-  return new ImageResponse(
-    (
-      <div
-        style={{
-          fontSize: 128,
-          background: 'white',
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-        }}
-      >
-        Hello World
-      </div>
-    ),
-    { ...size }
-  )
-}
-```
-
-## Dynamic OG Image
-
-```tsx
-// app/blog/[slug]/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export const alt = 'Blog Post'
-export const size = { width: 1200, height: 630 }
-export const contentType = 'image/png'
-
-type Props = { params: Promise<{ slug: string }> }
-
-export default async function Image({ params }: Props) {
-  const { slug } = await params
-  const post = await getPost(slug)
-
-  return new ImageResponse(
-    (
-      <div
-        style={{
-          fontSize: 48,
-          background: 'linear-gradient(to bottom, #1a1a1a, #333)',
-          color: 'white',
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          justifyContent: 'center',
-          padding: 48,
-        }}
-      >
-        <div style={{ fontSize: 64, fontWeight: 'bold' }}>{post.title}</div>
-        <div style={{ marginTop: 24, opacity: 0.8 }}>{post.description}</div>
-      </div>
-    ),
-    { ...size }
-  )
-}
-```
-
-## Custom Fonts
-
-```tsx
-import { ImageResponse } from 'next/og'
-import { join } from 'path'
-import { readFile } from 'fs/promises'
-
-export default async function Image() {
-  const fontPath = join(process.cwd(), 'assets/fonts/Inter-Bold.ttf')
-  const fontData = await readFile(fontPath)
-
-  return new ImageResponse(
-    (
-      <div style={{ fontFamily: 'Inter', fontSize: 64 }}>
-        Custom Font Text
-      </div>
-    ),
-    {
-      width: 1200,
-      height: 630,
-      fonts: [{ name: 'Inter', data: fontData, style: 'normal' }],
-    }
-  )
-}
-```
-
-## File Naming
-
-- `opengraph-image.tsx` - Open Graph (Facebook, LinkedIn)
-- `twitter-image.tsx` - Twitter/X cards (optional, falls back to OG)
-
-## Styling Notes
-
-ImageResponse uses Flexbox layout:
-- Use `display: 'flex'`
-- No CSS Grid support
-- Styles must be inline objects
-
-## Multiple OG Images
-
-Use `generateImageMetadata` for multiple images per route:
-
-```tsx
-// app/blog/[slug]/opengraph-image.tsx
-import { ImageResponse } from 'next/og'
-
-export async function generateImageMetadata({ params }) {
-  const images = await getPostImages(params.slug)
-  return images.map((img, idx) => ({
-    id: idx,
-    alt: img.alt,
-    size: { width: 1200, height: 630 },
-    contentType: 'image/png',
-  }))
-}
-
-export default async function Image({ params, id }) {
-  const images = await getPostImages(params.slug)
-  const image = images[id]
-  return new ImageResponse(/* ... */)
-}
-```
-
-## Multiple Sitemaps
-
-Use `generateSitemaps` for large sites:
-
-```tsx
-// app/sitemap.ts
-import type { MetadataRoute } from 'next'
-
-export async function generateSitemaps() {
-  // Return array of sitemap IDs
-  return [{ id: 0 }, { id: 1 }, { id: 2 }]
-}
-
-export default async function sitemap({
-  id,
-}: {
-  id: number
-}): Promise<MetadataRoute.Sitemap> {
-  const start = id * 50000
-  const end = start + 50000
-  const products = await getProducts(start, end)
-
-  return products.map((product) => ({
-    url: `https://example.com/product/${product.id}`,
-    lastModified: product.updatedAt,
-  }))
-}
-```
-
-Generates `/sitemap/0.xml`, `/sitemap/1.xml`, etc.
diff --git a/skills/nextjs/upstream/references/parallel-routes.md b/skills/nextjs/upstream/references/parallel-routes.md
deleted file mode 100644
index 51e270d..0000000
--- a/skills/nextjs/upstream/references/parallel-routes.md
+++ /dev/null
@@ -1,287 +0,0 @@
-# Parallel & Intercepting Routes
-
-Parallel routes render multiple pages in the same layout. Intercepting routes show a different UI when navigating from within your app vs direct URL access. Together they enable modal patterns.
-
-## File Structure
-
-```
-app/
-├── @modal/                    # Parallel route slot
-│   ├── default.tsx            # Required! Returns null
-│   ├── (.)photos/             # Intercepts /photos/*
-│   │   └── [id]/
-│   │       └── page.tsx       # Modal content
-│   └── [...]catchall/         # Optional: catch unmatched
-│       └── page.tsx
-├── photos/
-│   └── [id]/
-│       └── page.tsx           # Full page (direct access)
-├── layout.tsx                 # Renders both children and @modal
-└── page.tsx
-```
-
-## Step 1: Root Layout with Slot
-
-```tsx
-// app/layout.tsx
-export default function RootLayout({
-  children,
-  modal,
-}: {
-  children: React.ReactNode;
-  modal: React.ReactNode;
-}) {
-  return (
-    <html>
-      <body>
-        {children}
-        {modal}
-      </body>
-    </html>
-  );
-}
-```
-
-## Step 2: Default File (Critical!)
-
-**Every parallel route slot MUST have a `default.tsx`** to prevent 404s on hard navigation.
-
-```tsx
-// app/@modal/default.tsx
-export default function Default() {
-  return null;
-}
-```
-
-Without this file, refreshing any page will 404 because Next.js can't determine what to render in the `@modal` slot.
-
-## Step 3: Intercepting Route (Modal)
-
-The `(.)` prefix intercepts routes at the same level.
-
-```tsx
-// app/@modal/(.)photos/[id]/page.tsx
-import { Modal } from '@/components/modal';
-
-export default async function PhotoModal({
-  params
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  return (
-    <Modal>
-      <img src={photo.url} alt={photo.title} />
-    </Modal>
-  );
-}
-```
-
-## Step 4: Full Page (Direct Access)
-
-```tsx
-// app/photos/[id]/page.tsx
-export default async function PhotoPage({
-  params
-}: {
-  params: Promise<{ id: string }>
-}) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  return (
-    <div className="full-page">
-      <img src={photo.url} alt={photo.title} />
-      <h1>{photo.title}</h1>
-    </div>
-  );
-}
-```
-
-## Step 5: Modal Component with Correct Closing
-
-**Critical: Use `router.back()` to close modals, NOT `router.push()` or `<Link>`.**
-
-```tsx
-// components/modal.tsx
-'use client';
-
-import { useRouter } from 'next/navigation';
-import { useCallback, useEffect, useRef } from 'react';
-
-export function Modal({ children }: { children: React.ReactNode }) {
-  const router = useRouter();
-  const overlayRef = useRef<HTMLDivElement>(null);
-
-  // Close on escape key
-  useEffect(() => {
-    function onKeyDown(e: KeyboardEvent) {
-      if (e.key === 'Escape') {
-        router.back(); // Correct
-      }
-    }
-    document.addEventListener('keydown', onKeyDown);
-    return () => document.removeEventListener('keydown', onKeyDown);
-  }, [router]);
-
-  // Close on overlay click
-  const handleOverlayClick = useCallback((e: React.MouseEvent) => {
-    if (e.target === overlayRef.current) {
-      router.back(); // Correct
-    }
-  }, [router]);
-
-  return (
-    <div
-      ref={overlayRef}
-      onClick={handleOverlayClick}
-      className="fixed inset-0 bg-black/50 flex items-center justify-center z-50"
-    >
-      <div className="bg-white rounded-lg p-6 max-w-2xl w-full mx-4">
-        <button
-          onClick={() => router.back()} // Correct!
-          className="absolute top-4 right-4"
-        >
-          Close
-        </button>
-        {children}
-      </div>
-    </div>
-  );
-}
-```
-
-### Why NOT `router.push('/')` or `<Link href="/">`?
-
-Using `push` or `Link` to "close" a modal:
-1. Adds a new history entry (back button shows modal again)
-2. Doesn't properly clear the intercepted route
-3. Can cause the modal to flash or persist unexpectedly
-
-`router.back()` correctly:
-1. Removes the intercepted route from history
-2. Returns to the previous page
-3. Properly unmounts the modal
-
-## Route Matcher Reference
-
-Matchers match **route segments**, not filesystem paths:
-
-| Matcher | Matches | Example |
-|---------|---------|---------|
-| `(.)` | Same level | `@modal/(.)photos` intercepts `/photos` |
-| `(..)` | One level up | `@modal/(..)settings` from `/dashboard/@modal` intercepts `/settings` |
-| `(..)(..)` | Two levels up | Rarely used |
-| `(...)` | From root | `@modal/(...)photos` intercepts `/photos` from anywhere |
-
-**Common mistake**: Thinking `(..)` means "parent folder" - it means "parent route segment".
-
-## Handling Hard Navigation
-
-When users directly visit `/photos/123` (bookmark, refresh, shared link):
-- The intercepting route is bypassed
-- The full `photos/[id]/page.tsx` renders
-- Modal doesn't appear (expected behavior)
-
-If you want the modal to appear on direct access too, you need additional logic:
-
-```tsx
-// app/photos/[id]/page.tsx
-import { Modal } from '@/components/modal';
-
-export default async function PhotoPage({ params }) {
-  const { id } = await params;
-  const photo = await getPhoto(id);
-
-  // Option: Render as modal on direct access too
-  return (
-    <Modal>
-      <img src={photo.url} alt={photo.title} />
-    </Modal>
-  );
-}
-```
-
-## Common Gotchas
-
-### 1. Missing `default.tsx` → 404 on Refresh
-
-Every `@slot` folder needs a `default.tsx` that returns `null` (or appropriate content).
-
-### 2. Modal Persists After Navigation
-
-You're using `router.push()` instead of `router.back()`.
-
-### 3. Nested Parallel Routes Need Defaults Too
-
-If you have `@modal` inside a route group, each level needs its own `default.tsx`:
-
-```
-app/
-├── (marketing)/
-│   ├── @modal/
-│   │   └── default.tsx     # Needed!
-│   └── layout.tsx
-└── layout.tsx
-```
-
-### 4. Intercepted Route Shows Wrong Content
-
-Check your matcher:
-- `(.)photos` intercepts `/photos` from the same route level
-- If your `@modal` is in `app/dashboard/@modal`, use `(.)photos` to intercept `/dashboard/photos`, not `/photos`
-
-### 5. TypeScript Errors with `params`
-
-In Next.js 15+, `params` is a Promise:
-
-```tsx
-// Correct
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params;
-}
-```
-
-## Complete Example: Photo Gallery Modal
-
-```
-app/
-├── @modal/
-│   ├── default.tsx
-│   └── (.)photos/
-│       └── [id]/
-│           └── page.tsx
-├── photos/
-│   ├── page.tsx           # Gallery grid
-│   └── [id]/
-│       └── page.tsx       # Full photo page
-├── layout.tsx
-└── page.tsx
-```
-
-Links in the gallery:
-
-```tsx
-// app/photos/page.tsx
-import Link from 'next/link';
-
-export default async function Gallery() {
-  const photos = await getPhotos();
-
-  return (
-    <div className="grid grid-cols-3 gap-4">
-      {photos.map(photo => (
-        <Link key={photo.id} href={`/photos/${photo.id}`}>
-          <img src={photo.thumbnail} alt={photo.title} />
-        </Link>
-      ))}
-    </div>
-  );
-}
-```
-
-Clicking a photo → Modal opens (intercepted)
-Direct URL → Full page renders
-Refresh while modal open → Full page renders
diff --git a/skills/nextjs/upstream/references/route-handlers.md b/skills/nextjs/upstream/references/route-handlers.md
deleted file mode 100644
index 25e6f4d..0000000
--- a/skills/nextjs/upstream/references/route-handlers.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Route Handlers
-
-Create API endpoints with `route.ts` files.
-
-## Basic Usage
-
-```tsx
-// app/api/users/route.ts
-export async function GET() {
-  const users = await getUsers()
-  return Response.json(users)
-}
-
-export async function POST(request: Request) {
-  const body = await request.json()
-  const user = await createUser(body)
-  return Response.json(user, { status: 201 })
-}
-```
-
-## Supported Methods
-
-`GET`, `POST`, `PUT`, `PATCH`, `DELETE`, `HEAD`, `OPTIONS`
-
-## GET Handler Conflicts with page.tsx
-
-**A `route.ts` and `page.tsx` cannot coexist in the same folder.**
-
-```
-app/
-├── api/
-│   └── users/
-│       └── route.ts    # /api/users
-└── users/
-    ├── page.tsx        # /users (page)
-    └── route.ts        # Warning: Conflicts with page.tsx!
-```
-
-If you need both a page and an API at the same path, use different paths:
-
-```
-app/
-├── users/
-│   └── page.tsx        # /users (page)
-└── api/
-    └── users/
-        └── route.ts    # /api/users (API)
-```
-
-## Environment Behavior
-
-Route handlers run in a **Server Component-like environment**:
-
-- Yes: Can use `async/await`
-- Yes: Can access `cookies()`, `headers()`
-- Yes: Can use Node.js APIs
-- No: Cannot use React hooks
-- No: Cannot use React DOM APIs
-- No: Cannot use browser APIs
-
-```tsx
-// Bad: This won't work - no React DOM in route handlers
-import { renderToString } from 'react-dom/server'
-
-export async function GET() {
-  const html = renderToString(<Component />)  // Error!
-  return new Response(html)
-}
-```
-
-## Dynamic Route Handlers
-
-```tsx
-// app/api/users/[id]/route.ts
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> }
-) {
-  const { id } = await params
-  const user = await getUser(id)
-
-  if (!user) {
-    return Response.json({ error: 'Not found' }, { status: 404 })
-  }
-
-  return Response.json(user)
-}
-```
-
-## Request Helpers
-
-```tsx
-export async function GET(request: Request) {
-  // URL and search params
-  const { searchParams } = new URL(request.url)
-  const query = searchParams.get('q')
-
-  // Headers
-  const authHeader = request.headers.get('authorization')
-
-  // Cookies (Next.js helper)
-  const cookieStore = await cookies()
-  const token = cookieStore.get('token')
-
-  return Response.json({ query, token })
-}
-```
-
-## Response Helpers
-
-```tsx
-// JSON response
-return Response.json({ data })
-
-// With status
-return Response.json({ error: 'Not found' }, { status: 404 })
-
-// With headers
-return Response.json(data, {
-  headers: {
-    'Cache-Control': 'max-age=3600',
-  },
-})
-
-// Redirect
-return Response.redirect(new URL('/login', request.url))
-
-// Stream
-return new Response(stream, {
-  headers: { 'Content-Type': 'text/event-stream' },
-})
-```
-
-## When to Use Route Handlers vs Server Actions
-
-| Use Case | Route Handlers | Server Actions |
-|----------|----------------|----------------|
-| Form submissions | No | Yes |
-| Data mutations from UI | No | Yes |
-| Third-party webhooks | Yes | No |
-| External API consumption | Yes | No |
-| Public REST API | Yes | No |
-| File uploads | Both work | Both work |
-
-**Prefer Server Actions** for mutations triggered from your UI.
-**Use Route Handlers** for external integrations and public APIs.
diff --git a/skills/nextjs/upstream/references/rsc-boundaries.md b/skills/nextjs/upstream/references/rsc-boundaries.md
deleted file mode 100644
index 0c2208d..0000000
--- a/skills/nextjs/upstream/references/rsc-boundaries.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# RSC Boundaries
-
-Detect and prevent invalid patterns when crossing Server/Client component boundaries.
-
-## Detection Rules
-
-### 1. Async Client Components Are Invalid
-
-Client components **cannot** be async functions. Only Server Components can be async.
-
-**Detect:** File has `'use client'` AND component is `async function` or returns `Promise`
-
-```tsx
-// Bad: async client component
-'use client'
-export default async function UserProfile() {
-  const user = await getUser() // Cannot await in client component
-  return <div>{user.name}</div>
-}
-
-// Good: Remove async, fetch data in parent server component
-// page.tsx (server component - no 'use client')
-export default async function Page() {
-  const user = await getUser()
-  return <UserProfile user={user} />
-}
-
-// UserProfile.tsx (client component)
-'use client'
-export function UserProfile({ user }: { user: User }) {
-  return <div>{user.name}</div>
-}
-```
-
-```tsx
-// Bad: async arrow function client component
-'use client'
-const Dashboard = async () => {
-  const data = await fetchDashboard()
-  return <div>{data}</div>
-}
-
-// Good: Fetch in server component, pass data down
-```
-
-### 2. Non-Serializable Props to Client Components
-
-Props passed from Server → Client must be JSON-serializable.
-
-**Detect:** Server component passes these to a client component:
-- Functions (except Server Actions with `'use server'`)
-- `Date` objects
-- `Map`, `Set`, `WeakMap`, `WeakSet`
-- Class instances
-- `Symbol` (unless globally registered)
-- Circular references
-
-```tsx
-// Bad: Function prop
-// page.tsx (server)
-export default function Page() {
-  const handleClick = () => console.log('clicked')
-  return <ClientButton onClick={handleClick} />
-}
-
-// Good: Define function inside client component
-// ClientButton.tsx
-'use client'
-export function ClientButton() {
-  const handleClick = () => console.log('clicked')
-  return <button onClick={handleClick}>Click</button>
-}
-```
-
-```tsx
-// Bad: Date object (silently becomes string, then crashes)
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt} /> // Date object
-}
-
-// PostCard.tsx (client) - will crash on .getFullYear()
-'use client'
-export function PostCard({ createdAt }: { createdAt: Date }) {
-  return <span>{createdAt.getFullYear()}</span> // Runtime error!
-}
-
-// Good: Serialize to string on server
-// page.tsx (server)
-export default async function Page() {
-  const post = await getPost()
-  return <PostCard createdAt={post.createdAt.toISOString()} />
-}
-
-// PostCard.tsx (client)
-'use client'
-export function PostCard({ createdAt }: { createdAt: string }) {
-  const date = new Date(createdAt)
-  return <span>{date.getFullYear()}</span>
-}
-```
-
-```tsx
-// Bad: Class instance
-const user = new UserModel(data)
-<ClientProfile user={user} /> // Methods will be stripped
-
-// Good: Pass plain object
-const user = await getUser()
-<ClientProfile user={{ id: user.id, name: user.name }} />
-```
-
-```tsx
-// Bad: Map/Set
-<ClientComponent items={new Map([['a', 1]])} />
-
-// Good: Convert to array/object
-<ClientComponent items={Object.fromEntries(map)} />
-<ClientComponent items={Array.from(set)} />
-```
-
-### 3. Server Actions Are the Exception
-
-Functions marked with `'use server'` CAN be passed to client components.
-
-```tsx
-// Valid: Server Action can be passed
-// actions.ts
-'use server'
-export async function submitForm(formData: FormData) {
-  // server-side logic
-}
-
-// page.tsx (server)
-import { submitForm } from './actions'
-export default function Page() {
-  return <ClientForm onSubmit={submitForm} /> // OK!
-}
-
-// ClientForm.tsx (client)
-'use client'
-export function ClientForm({ onSubmit }: { onSubmit: (data: FormData) => Promise<void> }) {
-  return <form action={onSubmit}>...</form>
-}
-```
-
-## Quick Reference
-
-| Pattern | Valid? | Fix |
-|---------|--------|-----|
-| `'use client'` + `async function` | No | Fetch in server parent, pass data |
-| Pass `() => {}` to client | No | Define in client or use server action |
-| Pass `new Date()` to client | No | Use `.toISOString()` |
-| Pass `new Map()` to client | No | Convert to object/array |
-| Pass class instance to client | No | Pass plain object |
-| Pass server action to client | Yes | - |
-| Pass `string/number/boolean` | Yes | - |
-| Pass plain object/array | Yes | - |
diff --git a/skills/nextjs/upstream/references/runtime-selection.md b/skills/nextjs/upstream/references/runtime-selection.md
deleted file mode 100644
index cec960d..0000000
--- a/skills/nextjs/upstream/references/runtime-selection.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Runtime Selection
-
-## Use Node.js Runtime by Default
-
-Use the default Node.js runtime for new routes and pages. Only use Edge runtime if the project already uses it or there's a specific requirement.
-
-```tsx
-// Good: Default - no runtime config needed (uses Node.js)
-export default function Page() { ... }
-
-// Caution: Only if already used in project or specifically required
-export const runtime = 'edge'
-```
-
-## When to Use Each
-
-### Node.js Runtime (Default)
-
-- Full Node.js API support
-- File system access (`fs`)
-- Full `crypto` support
-- Database connections
-- Most npm packages work
-
-### Edge Runtime
-
-- Only for specific edge-location latency requirements
-- Limited API (no `fs`, limited `crypto`)
-- Smaller cold start
-- Geographic distribution needs
-
-## Detection
-
-**Before adding `runtime = 'edge'`**, check:
-1. Does the project already use Edge runtime?
-2. Is there a specific latency requirement?
-3. Are all dependencies Edge-compatible?
-
-If unsure, use Node.js runtime.
diff --git a/skills/nextjs/upstream/references/scripts.md b/skills/nextjs/upstream/references/scripts.md
deleted file mode 100644
index 4eeb744..0000000
--- a/skills/nextjs/upstream/references/scripts.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Scripts
-
-Loading third-party scripts in Next.js.
-
-## Use next/script
-
-Always use `next/script` instead of native `<script>` tags for better performance.
-
-```tsx
-// Bad: Native script tag
-<script src="https://example.com/script.js"></script>
-
-// Good: Next.js Script component
-import Script from 'next/script'
-
-<Script src="https://example.com/script.js" />
-```
-
-## Inline Scripts Need ID
-
-Inline scripts require an `id` attribute for Next.js to track them.
-
-```tsx
-// Bad: Missing id
-<Script dangerouslySetInnerHTML={{ __html: 'console.log("hi")' }} />
-
-// Good: Has id
-<Script id="my-script" dangerouslySetInnerHTML={{ __html: 'console.log("hi")' }} />
-
-// Good: Inline with id
-<Script id="show-banner">
-  {`document.getElementById('banner').classList.remove('hidden')`}
-</Script>
-```
-
-## Don't Put Script in Head
-
-`next/script` should not be placed inside `next/head`. It handles its own positioning.
-
-```tsx
-// Bad: Script inside Head
-import Head from 'next/head'
-import Script from 'next/script'
-
-<Head>
-  <Script src="/analytics.js" />
-</Head>
-
-// Good: Script outside Head
-<Head>
-  <title>Page</title>
-</Head>
-<Script src="/analytics.js" />
-```
-
-## Loading Strategies
-
-```tsx
-// afterInteractive (default) - Load after page is interactive
-<Script src="/analytics.js" strategy="afterInteractive" />
-
-// lazyOnload - Load during idle time
-<Script src="/widget.js" strategy="lazyOnload" />
-
-// beforeInteractive - Load before page is interactive (use sparingly)
-// Only works in app/layout.tsx or pages/_document.js
-<Script src="/critical.js" strategy="beforeInteractive" />
-
-// worker - Load in web worker (experimental)
-<Script src="/heavy.js" strategy="worker" />
-```
-
-## Google Analytics
-
-Use `@next/third-parties` instead of inline GA scripts.
-
-```tsx
-// Bad: Inline GA script
-<Script src="https://www.googletagmanager.com/gtag/js?id=G-XXXXX" />
-<Script id="ga-init">
-  {`window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-    gtag('config', 'G-XXXXX');`}
-</Script>
-
-// Good: Next.js component
-import { GoogleAnalytics } from '@next/third-parties/google'
-
-export default function Layout({ children }) {
-  return (
-    <html>
-      <body>{children}</body>
-      <GoogleAnalytics gaId="G-XXXXX" />
-    </html>
-  )
-}
-```
-
-## Google Tag Manager
-
-```tsx
-import { GoogleTagManager } from '@next/third-parties/google'
-
-export default function Layout({ children }) {
-  return (
-    <html>
-      <GoogleTagManager gtmId="GTM-XXXXX" />
-      <body>{children}</body>
-    </html>
-  )
-}
-```
-
-## Other Third-Party Scripts
-
-```tsx
-// YouTube embed
-import { YouTubeEmbed } from '@next/third-parties/google'
-
-<YouTubeEmbed videoid="dQw4w9WgXcQ" />
-
-// Google Maps
-import { GoogleMapsEmbed } from '@next/third-parties/google'
-
-<GoogleMapsEmbed
-  apiKey="YOUR_API_KEY"
-  mode="place"
-  q="Brooklyn+Bridge,New+York,NY"
-/>
-```
-
-## Quick Reference
-
-| Pattern | Issue | Fix |
-|---------|-------|-----|
-| `<script src="...">` | No optimization | Use `next/script` |
-| `<Script>` without id | Can't track inline scripts | Add `id` attribute |
-| `<Script>` inside `<Head>` | Wrong placement | Move outside Head |
-| Inline GA/GTM scripts | No optimization | Use `@next/third-parties` |
-| `strategy="beforeInteractive"` outside layout | Won't work | Only use in root layout |
diff --git a/skills/nextjs/upstream/references/self-hosting.md b/skills/nextjs/upstream/references/self-hosting.md
deleted file mode 100644
index 4b3966a..0000000
--- a/skills/nextjs/upstream/references/self-hosting.md
+++ /dev/null
@@ -1,371 +0,0 @@
-# Self-Hosting Next.js
-
-Deploy Next.js outside of Vercel with confidence.
-
-## Quick Start: Standalone Output
-
-For Docker or any containerized deployment, use standalone output:
-
-```js
-// next.config.js
-module.exports = {
-  output: 'standalone',
-};
-```
-
-This creates a minimal `standalone` folder with only production dependencies:
-
-```
-.next/
-├── standalone/
-│   ├── server.js          # Entry point
-│   ├── node_modules/      # Only production deps
-│   └── .next/             # Build output
-└── static/                # Must be copied separately
-```
-
-## Docker Deployment
-
-### Dockerfile
-
-```dockerfile
-FROM node:20-alpine AS base
-
-# Install dependencies
-FROM base AS deps
-WORKDIR /app
-COPY package.json package-lock.json* ./
-RUN npm ci
-
-# Build
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-RUN npm run build
-
-# Production
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV=production
-
-# Create non-root user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-# Copy standalone output
-COPY --from=builder /app/.next/standalone ./
-COPY --from=builder /app/.next/static ./.next/static
-COPY --from=builder /app/public ./public
-
-USER nextjs
-
-EXPOSE 3000
-ENV PORT=3000
-ENV HOSTNAME="0.0.0.0"
-
-CMD ["node", "server.js"]
-```
-
-### Docker Compose
-
-```yaml
-version: '3.8'
-
-services:
-  web:
-    build: .
-    ports:
-      - "3000:3000"
-    environment:
-      - NODE_ENV=production
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "wget", "-q", "--spider", "http://localhost:3000/api/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-```
-
-## PM2 Deployment
-
-For traditional server deployments:
-
-```js
-// ecosystem.config.js
-module.exports = {
-  apps: [{
-    name: 'nextjs',
-    script: '.next/standalone/server.js',
-    instances: 'max',
-    exec_mode: 'cluster',
-    env: {
-      NODE_ENV: 'production',
-      PORT: 3000,
-    },
-  }],
-};
-```
-
-```bash
-npm run build
-pm2 start ecosystem.config.js
-```
-
-## ISR and Cache Handlers
-
-### The Problem
-
-ISR (Incremental Static Regeneration) uses filesystem caching by default. This **breaks with multiple instances**:
-
-- Instance A regenerates page → saves to its local disk
-- Instance B serves stale page → doesn't see Instance A's cache
-- Load balancer sends users to random instances → inconsistent content
-
-### Solution: Custom Cache Handler
-
-Next.js 14+ supports custom cache handlers for shared storage:
-
-```js
-// next.config.js
-module.exports = {
-  cacheHandler: require.resolve('./cache-handler.js'),
-  cacheMaxMemorySize: 0, // Disable in-memory cache
-};
-```
-
-#### Redis Cache Handler Example
-
-```js
-// cache-handler.js
-const Redis = require('ioredis');
-
-const redis = new Redis(process.env.REDIS_URL);
-const CACHE_PREFIX = 'nextjs:';
-
-module.exports = class CacheHandler {
-  constructor(options) {
-    this.options = options;
-  }
-
-  async get(key) {
-    const data = await redis.get(CACHE_PREFIX + key);
-    if (!data) return null;
-
-    const parsed = JSON.parse(data);
-    return {
-      value: parsed.value,
-      lastModified: parsed.lastModified,
-    };
-  }
-
-  async set(key, data, ctx) {
-    const cacheData = {
-      value: data,
-      lastModified: Date.now(),
-    };
-
-    // Set TTL based on revalidate option
-    if (ctx?.revalidate) {
-      await redis.setex(
-        CACHE_PREFIX + key,
-        ctx.revalidate,
-        JSON.stringify(cacheData)
-      );
-    } else {
-      await redis.set(CACHE_PREFIX + key, JSON.stringify(cacheData));
-    }
-  }
-
-  async revalidateTag(tags) {
-    // Implement tag-based invalidation
-    // This requires tracking which keys have which tags
-  }
-};
-```
-
-#### S3 Cache Handler Example
-
-```js
-// cache-handler.js
-const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3');
-
-const s3 = new S3Client({ region: process.env.AWS_REGION });
-const BUCKET = process.env.CACHE_BUCKET;
-
-module.exports = class CacheHandler {
-  async get(key) {
-    try {
-      const response = await s3.send(new GetObjectCommand({
-        Bucket: BUCKET,
-        Key: `cache/${key}`,
-      }));
-      const body = await response.Body.transformToString();
-      return JSON.parse(body);
-    } catch (err) {
-      if (err.name === 'NoSuchKey') return null;
-      throw err;
-    }
-  }
-
-  async set(key, data, ctx) {
-    await s3.send(new PutObjectCommand({
-      Bucket: BUCKET,
-      Key: `cache/${key}`,
-      Body: JSON.stringify({
-        value: data,
-        lastModified: Date.now(),
-      }),
-      ContentType: 'application/json',
-    }));
-  }
-};
-```
-
-## What Works vs What Needs Setup
-
-| Feature | Single Instance | Multi-Instance | Notes |
-|---------|----------------|----------------|-------|
-| SSR | Yes | Yes | No special setup |
-| SSG | Yes | Yes | Built at deploy time |
-| ISR | Yes | Needs cache handler | Filesystem cache breaks |
-| Image Optimization | Yes | Yes | CPU-intensive, consider CDN |
-| Middleware | Yes | Yes | Runs on Node.js |
-| Edge Runtime | Limited | Limited | Some features Node-only |
-| `revalidatePath/Tag` | Yes | Needs cache handler | Must share cache |
-| `next/font` | Yes | Yes | Fonts bundled at build |
-| Draft Mode | Yes | Yes | Cookie-based |
-
-## Image Optimization
-
-Next.js Image Optimization works out of the box but is CPU-intensive.
-
-### Option 1: Built-in (Simple)
-
-Works automatically, but consider:
-- Set `deviceSizes` and `imageSizes` in config to limit variants
-- Use `minimumCacheTTL` to reduce regeneration
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    minimumCacheTTL: 60 * 60 * 24, // 24 hours
-    deviceSizes: [640, 750, 1080, 1920], // Limit sizes
-  },
-};
-```
-
-### Option 2: External Loader (Recommended for Scale)
-
-Offload to Cloudinary, Imgix, or similar:
-
-```js
-// next.config.js
-module.exports = {
-  images: {
-    loader: 'custom',
-    loaderFile: './lib/image-loader.js',
-  },
-};
-```
-
-```js
-// lib/image-loader.js
-export default function cloudinaryLoader({ src, width, quality }) {
-  const params = ['f_auto', 'c_limit', `w_${width}`, `q_${quality || 'auto'}`];
-  return `https://res.cloudinary.com/demo/image/upload/${params.join(',')}${src}`;
-}
-```
-
-## Environment Variables
-
-### Build-time vs Runtime
-
-```js
-// Available at build time only (baked into bundle)
-NEXT_PUBLIC_API_URL=https://api.example.com
-
-// Available at runtime (server-side only)
-DATABASE_URL=postgresql://...
-API_SECRET=...
-```
-
-### Runtime Configuration
-
-For truly dynamic config, don't use `NEXT_PUBLIC_*`. Instead:
-
-```tsx
-// app/api/config/route.ts
-export async function GET() {
-  return Response.json({
-    apiUrl: process.env.API_URL,
-    features: process.env.FEATURES?.split(','),
-  });
-}
-```
-
-## OpenNext: Serverless Without Vercel
-
-[OpenNext](https://open-next.js.org/) adapts Next.js for AWS Lambda, Cloudflare Workers, etc.
-
-```bash
-npx create-sst@latest
-# or
-npx @opennextjs/aws build
-```
-
-Supports:
-- AWS Lambda + CloudFront
-- Cloudflare Workers
-- Netlify Functions
-- Deno Deploy
-
-## Health Check Endpoint
-
-Always include a health check for load balancers:
-
-```tsx
-// app/api/health/route.ts
-export async function GET() {
-  try {
-    // Optional: check database connection
-    // await db.$queryRaw`SELECT 1`;
-
-    return Response.json({ status: 'healthy' }, { status: 200 });
-  } catch (error) {
-    return Response.json({ status: 'unhealthy' }, { status: 503 });
-  }
-}
-```
-
-## Pre-Deployment Checklist
-
-1. **Build locally first**: `npm run build` - catch errors before deploy
-2. **Test standalone output**: `node .next/standalone/server.js`
-3. **Set `output: 'standalone'`** for Docker
-4. **Configure cache handler** for multi-instance ISR
-5. **Set `HOSTNAME="0.0.0.0"`** for containers
-6. **Copy `public/` and `.next/static/`** - not included in standalone
-7. **Add health check endpoint**
-8. **Test ISR revalidation** after deployment
-9. **Monitor memory usage** - Node.js defaults may need tuning
-
-## Testing Cache Handler
-
-**Critical**: Test your cache handler on every Next.js upgrade:
-
-```bash
-# Start multiple instances
-PORT=3001 node .next/standalone/server.js &
-PORT=3002 node .next/standalone/server.js &
-
-# Trigger ISR revalidation
-curl http://localhost:3001/api/revalidate?path=/posts
-
-# Verify both instances see the update
-curl http://localhost:3001/posts
-curl http://localhost:3002/posts
-# Should return identical content
-```
diff --git a/skills/nextjs/upstream/references/suspense-boundaries.md b/skills/nextjs/upstream/references/suspense-boundaries.md
deleted file mode 100644
index 5134fa4..0000000
--- a/skills/nextjs/upstream/references/suspense-boundaries.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Suspense Boundaries
-
-Client hooks that cause CSR bailout without Suspense boundaries.
-
-## useSearchParams
-
-Always requires Suspense boundary in static routes. Without it, the entire page becomes client-side rendered.
-
-```tsx
-// Bad: Entire page becomes CSR
-'use client'
-
-import { useSearchParams } from 'next/navigation'
-
-export default function SearchBar() {
-  const searchParams = useSearchParams()
-  return <div>Query: {searchParams.get('q')}</div>
-}
-```
-
-```tsx
-// Good: Wrap in Suspense
-import { Suspense } from 'react'
-import SearchBar from './search-bar'
-
-export default function Page() {
-  return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <SearchBar />
-    </Suspense>
-  )
-}
-```
-
-## usePathname
-
-Requires Suspense boundary when route has dynamic parameters.
-
-```tsx
-// In dynamic route [slug]
-// Bad: No Suspense
-'use client'
-import { usePathname } from 'next/navigation'
-
-export function Breadcrumb() {
-  const pathname = usePathname()
-  return <nav>{pathname}</nav>
-}
-```
-
-```tsx
-// Good: Wrap in Suspense
-<Suspense fallback={<BreadcrumbSkeleton />}>
-  <Breadcrumb />
-</Suspense>
-```
-
-If you use `generateStaticParams`, Suspense is optional.
-
-## Quick Reference
-
-| Hook | Suspense Required |
-|------|-------------------|
-| `useSearchParams()` | Yes |
-| `usePathname()` | Yes (dynamic routes) |
-| `useParams()` | No |
-| `useRouter()` | No |
diff --git a/skills/routing-middleware/SKILL.md b/skills/routing-middleware/SKILL.md
index f5210f4..00deb48 100644
--- a/skills/routing-middleware/SKILL.md
+++ b/skills/routing-middleware/SKILL.md
@@ -30,14 +30,6 @@ metadata:
     - 'vercel.mts'
   bashPatterns:
     - '\bnpx\s+@vercel/config\b'
-validate:
-  -
-    pattern: 'NextResponse.*from\s+[''"]next/server[''"]|from\s+[''"]next/server[''"].*NextResponse'
-    message: 'Next.js middleware.ts is renamed to proxy.ts in Next.js 16 — rename the file and use the Node.js runtime. Run Skill(nextjs) for proxy.ts migration guidance.'
-    severity: recommended
-    upgradeToSkill: nextjs
-    upgradeWhy: 'Guides migration from middleware.ts to proxy.ts with correct file placement, Node.js runtime, and Next.js 16 patterns.'
-    skipIfFileContains: 'proxy\.ts|runtime.*nodejs'
 retrieval:
   aliases:
     - request interceptor
@@ -60,11 +52,6 @@ chainTo:
     pattern: 'from\s+[''""]next-auth[''""]'
     targetSkill: auth
     message: 'Auth logic in middleware — loading Auth guidance for Clerk/Auth0 integration patterns.'
-  -
-    pattern: 'NextResponse.*from\s+[''"]next/server[''"]|from\s+[''"]next/server[''"].*NextResponse'
-    targetSkill: nextjs
-    message: 'middleware.ts with next/server imports detected — loading Next.js guidance for proxy.ts migration (Next.js 16 renames middleware.ts to proxy.ts with Node.js runtime).'
-    skipIfFileContains: 'proxy\.ts|runtime.*nodejs'
   -
     pattern: 'from\s+[''""](jsonwebtoken)[''""]|jwt\.(verify|decode)\('
     targetSkill: auth
diff --git a/skills/turbopack/SKILL.md b/skills/turbopack/SKILL.md
deleted file mode 100644
index 0cad1fd..0000000
--- a/skills/turbopack/SKILL.md
+++ /dev/null
@@ -1,343 +0,0 @@
----
-name: turbopack
-description: Turbopack expert guidance. Use when configuring the Next.js bundler, optimizing HMR, debugging build issues, or understanding the Turbopack vs Webpack differences.
-metadata:
-  priority: 4
-  docs:
-    - "https://turbo.build/pack/docs"
-    - "https://nextjs.org/docs/architecture/turbopack"
-  sitemap: "https://turbo.build/sitemap.xml"
-  pathPatterns: 
-    - 'next.config.*'
-  bashPatterns: 
-    - '\bnext\s+dev\s+--turbo\b'
-    - '\bnext\s+dev\s+--turbopack\b'
-retrieval:
-  aliases:
-    - next bundler
-    - turbopack
-    - fast bundler
-    - hmr
-  intents:
-    - enable turbopack
-    - fix build issue
-    - speed up dev server
-    - configure bundler
-  entities:
-    - Turbopack
-    - HMR
-    - bundler
-    - next dev --turbopack
-chainTo:
-  -
-    pattern: 'webpack\s*:\s*\(|webpack\s*\(config'
-    targetSkill: nextjs
-    message: 'Webpack config detected — loading Next.js guidance for migrating webpack customizations to Turbopack top-level config in Next.js 16.'
-  -
-    pattern: 'turbopack\s*:\s*\{|experimental\.turbopack'
-    targetSkill: nextjs
-    message: 'Turbopack configuration detected — loading Next.js guidance for top-level turbopack config syntax in Next.js 16 (moved from experimental.turbopack).'
-
----
-
-# Turbopack
-
-You are an expert in Turbopack — the Rust-powered JavaScript/TypeScript bundler built by Vercel. It is the default bundler in Next.js 16.
-
-## Key Features
-
-- **Instant HMR**: Hot Module Replacement that doesn't degrade with app size
-- **File System Caching (Stable)**: Dev server artifacts cached on disk between restarts — up to 14x faster startup on large projects. Enabled by default in Next.js 16.1+, no config needed. Build caching planned next.
-- **Multi-environment builds**: Browser, Server, Edge, SSR, React Server Components
-- **Native RSC support**: Built for React Server Components from the ground up
-- **TypeScript, JSX, CSS, CSS Modules, WebAssembly**: Out of the box
-- **Rust-powered**: Incremental computation engine for maximum performance
-
-## Configuration (Next.js 16)
-
-In Next.js 16, Turbopack config is top-level (moved from `experimental.turbopack`):
-
-```js
-// next.config.ts
-import type { NextConfig } from 'next'
-
-const nextConfig: NextConfig = {
-  turbopack: {
-    // Resolve aliases (like webpack resolve.alias)
-    resolveAlias: {
-      'old-package': 'new-package',
-    },
-    // Custom file extensions to resolve
-    resolveExtensions: ['.ts', '.tsx', '.js', '.jsx', '.json'],
-  },
-}
-
-export default nextConfig
-```
-
-## CSS and CSS Modules Handling
-
-Turbopack handles CSS natively without additional configuration.
-
-### Global CSS
-
-Import global CSS in your root layout:
-
-```tsx
-// app/layout.tsx
-import './globals.css'
-```
-
-### CSS Modules
-
-CSS Modules work out of the box with `.module.css` files:
-
-```tsx
-// components/Button.tsx
-import styles from './Button.module.css'
-
-export function Button({ children }) {
-  return <button className={styles.primary}>{children}</button>
-}
-```
-
-### PostCSS
-
-Turbopack reads your `postcss.config.js` automatically. Tailwind CSS v4 works with zero config:
-
-```js
-// postcss.config.js
-module.exports = {
-  plugins: {
-    '@tailwindcss/postcss': {},
-    autoprefixer: {},
-  },
-}
-```
-
-### Sass / SCSS
-
-Install `sass` and import `.scss` files directly — Turbopack compiles them natively:
-
-```bash
-npm install sass
-```
-
-```tsx
-import styles from './Component.module.scss'
-```
-
-### Common CSS pitfalls
-
-- **CSS ordering differs from webpack**: Turbopack may load CSS chunks in a different order. Avoid relying on source-order specificity across files — use more specific selectors or CSS Modules.
-- **`@import` in global CSS**: Use standard CSS `@import` — Turbopack resolves them, but circular imports cause build failures.
-- **CSS-in-JS libraries**: `styled-components` and `emotion` work but require their SWC plugins configured under `compiler` in next.config.
-
-## Tree Shaking
-
-Turbopack performs tree shaking at the module level in production builds. Key behaviors:
-
-- **ES module exports**: Only used exports are included — write `export` on each function/constant rather than barrel `export *`
-- **Side-effect-free packages**: Mark packages as side-effect-free in `package.json` to enable aggressive tree shaking:
-
-```json
-{
-  "name": "my-ui-lib",
-  "sideEffects": false
-}
-```
-
-- **Barrel file optimization**: Turbopack can skip unused re-exports from barrel files (`index.ts`) when the package declares `"sideEffects": false`
-- **Dynamic imports**: `import()` expressions create async chunk boundaries — Turbopack splits these into separate chunks automatically
-
-### Diagnosing large bundles
-
-**Built-in analyzer (Next.js 16.1+, experimental)**: Works natively with Turbopack. Offers route-specific filtering, import tracing, and RSC boundary analysis:
-
-```ts
-// next.config.ts
-const nextConfig: NextConfig = {
-  experimental: {
-    bundleAnalyzer: true,
-  },
-}
-```
-
-**Legacy `@next/bundle-analyzer`**: Still works as a fallback:
-
-```bash
-ANALYZE=true next build
-```
-
-```ts
-// next.config.ts
-import withBundleAnalyzer from '@next/bundle-analyzer'
-
-const nextConfig = withBundleAnalyzer({
-  enabled: process.env.ANALYZE === 'true',
-})({
-  // your config
-})
-```
-
-## Custom Loader Migration from Webpack
-
-Turbopack does not support webpack loaders directly. Here is how to migrate common patterns:
-
-| Webpack Loader | Turbopack Equivalent |
-|----------------|---------------------|
-| `css-loader` + `style-loader` | Built-in CSS support — remove loaders |
-| `sass-loader` | Built-in — install `sass` package |
-| `postcss-loader` | Built-in — reads `postcss.config.js` |
-| `file-loader` / `url-loader` | Built-in static asset handling |
-| `svgr` / `@svgr/webpack` | Use `@svgr/webpack` via `turbopack.rules` |
-| `raw-loader` | Use `import x from './file?raw'` |
-| `graphql-tag/loader` | Use a build-time codegen step instead |
-| `worker-loader` | Use native `new Worker(new URL(...))` syntax |
-
-### Configuring custom rules (loader replacement)
-
-For loaders that have no built-in equivalent, use `turbopack.rules`:
-
-```js
-// next.config.ts
-const nextConfig: NextConfig = {
-  turbopack: {
-    rules: {
-      '*.svg': {
-        loaders: ['@svgr/webpack'],
-        as: '*.js',
-      },
-    },
-  },
-}
-```
-
-### When migration isn't possible
-
-If a webpack loader has no Turbopack equivalent and no workaround, fall back to webpack:
-
-```js
-const nextConfig: NextConfig = {
-  bundler: 'webpack',
-}
-```
-
-File an issue at [github.com/vercel/next.js](https://github.com/vercel/next.js) — the Turbopack team tracks loader parity requests.
-
-## Production Build Diagnostics
-
-### Build failing with Turbopack
-
-1. **Check for unsupported config**: Remove any `webpack()` function from next.config — it's ignored by Turbopack and may mask the real config
-2. **Verify `turbopack.rules`**: Ensure custom rules reference valid loaders that are installed
-3. **Check for Node.js built-in usage in edge/client**: Turbopack enforces environment boundaries — `fs`, `path`, etc. cannot be imported in client or edge bundles
-4. **Module not found errors**: Ensure `turbopack.resolveAlias` covers any custom resolution that was previously in webpack config
-
-### Build output too large
-
-- Audit `"use client"` directives — each client component boundary creates a new chunk
-- Check for accidentally bundled server-only packages in client components
-- Use `server-only` package to enforce server/client boundaries at import time:
-
-```bash
-npm install server-only
-```
-
-```ts
-// lib/db.ts
-import 'server-only' // Build fails if imported in a client component
-```
-
-### Comparing webpack vs Turbopack output
-
-Run both bundlers and compare:
-
-```bash
-# Turbopack build (default in Next.js 16)
-next build
-
-# Webpack build
-BUNDLER=webpack next build
-```
-
-Compare `.next/` output sizes and page-level chunks.
-
-## Performance Profiling
-
-### HMR profiling
-
-Enable verbose HMR timing in development:
-
-```bash
-NEXT_TURBOPACK_TRACING=1 next dev
-```
-
-This writes a `trace.json` to the project root — open it in `chrome://tracing` or [Perfetto](https://ui.perfetto.dev/) to see module-level timing.
-
-### Build profiling
-
-Profile production builds:
-
-```bash
-NEXT_TURBOPACK_TRACING=1 next build
-```
-
-Look for:
-- **Long-running transforms**: Indicates a slow SWC plugin or heavy PostCSS config
-- **Large module graphs**: Reduce barrel file re-exports
-- **Cache misses**: If incremental builds aren't hitting cache, check for files that change every build (e.g., generated timestamps)
-
-### Memory usage
-
-Turbopack's Rust core manages its own memory. If builds OOM:
-- Increase Node.js heap: `NODE_OPTIONS='--max-old-space-size=8192' next build`
-- Reduce concurrent tasks if running inside Turborepo: `turbo build --concurrency=2`
-
-## Turbopack vs Webpack
-
-| Feature | Turbopack | Webpack |
-|---------|-----------|---------|
-| Language | Rust | JavaScript |
-| HMR speed | Constant (O(1)) | Degrades with app size |
-| RSC support | Native | Plugin-based |
-| Cold start | Fast | Slower |
-| Ecosystem | Growing | Massive (loaders, plugins) |
-| Status in Next.js 16 | Default | Still supported |
-| Tree shaking | Module-level | Module-level |
-| CSS handling | Built-in | Requires loaders |
-| Production builds | Supported | Supported |
-
-## When You Might Need Webpack
-
-- Custom webpack loaders with no Turbopack equivalent
-- Complex webpack plugin configurations (e.g., `ModuleFederationPlugin`)
-- Specific webpack features not yet in Turbopack (e.g., custom `externals` functions)
-
-To use webpack instead:
-```js
-// next.config.ts
-const nextConfig: NextConfig = {
-  bundler: 'webpack', // Opt out of Turbopack
-}
-```
-
-## Development vs Production
-
-- **Development**: Turbopack provides instant HMR and fast refresh
-- **Production**: Turbopack handles the production build (replaces webpack in Next.js 16)
-
-## Common Issues
-
-1. **Missing loader equivalent**: Some webpack loaders don't have Turbopack equivalents yet. Check Turbopack docs for supported transformations.
-2. **Config migration**: Move `experimental.turbopack` to top-level `turbopack` in next.config.
-3. **Custom aliases**: Use `turbopack.resolveAlias` instead of `webpack.resolve.alias`.
-4. **CSS ordering changes**: Test visual regressions when migrating — CSS chunk order may differ.
-5. **Environment boundary errors**: Server-only modules imported in client components fail at build time — use `server-only` package.
-
-## Official Documentation
-
-- [Turbopack](https://turborepo.dev/pack)
-- [Turbopack Documentation](https://turborepo.dev/pack/docs)
-- [Next.js Turbopack Config](https://nextjs.org/docs/app/api-reference/config/next-config-js/turbopack)
-- [GitHub: Turbopack](https://github.com/vercel/turborepo)
diff --git a/skills/vercel-cli/SKILL.md b/skills/vercel-cli/SKILL.md
index 1ec0290..1df3fd8 100644
--- a/skills/vercel-cli/SKILL.md
+++ b/skills/vercel-cli/SKILL.md
@@ -84,7 +84,6 @@ chainTo:
     pattern: '"redirects"\s*:\s*\[|"rewrites"\s*:\s*\[|"headers"\s*:\s*\['
     targetSkill: routing-middleware
     message: 'Routing rules in vercel.json — loading Routing Middleware guidance for platform-level request interception patterns.'
-
 ---
 
 # Vercel CLI Skill
diff --git a/skills/vercel-storage/SKILL.md b/skills/vercel-storage/SKILL.md
index 507e05f..09bd23b 100644
--- a/skills/vercel-storage/SKILL.md
+++ b/skills/vercel-storage/SKILL.md
@@ -96,19 +96,11 @@ validate:
     upgradeWhy: 'Reload storage guidance for @vercel/postgres → @neondatabase/serverless migration steps, Marketplace provisioning, and drizzle-orm setup.'
     skipIfFileContains: '@neondatabase/serverless'
 chainTo:
-  -
-    pattern: "from\\s+['\"]@vercel/postgres['\"]"
-    targetSkill: nextjs
-    message: '@vercel/postgres is sunset — loading Next.js guidance for integrating @neondatabase/serverless with App Router.'
   -
     pattern: "@vercel/postgres"
     targetSkill: vercel-storage
     message: '@vercel/postgres is sunset — migrate to @neondatabase/serverless. Run `vercel integration add neon` for one-click Marketplace provisioning with unified billing.'
     skipIfFileContains: "@neondatabase/serverless|from\\s+['\"]@neondatabase"
-  -
-    pattern: "from\\s+['\"]@vercel/kv['\"]"
-    targetSkill: nextjs
-    message: '@vercel/kv is sunset — loading Next.js guidance for integrating @upstash/redis with App Router.'
   -
     pattern: "createPool\\s*\\(|from\\s+['\"]@vercel/postgres/pool['\"]"
     targetSkill: vercel-storage
diff --git a/skills/workflow/SKILL.md b/skills/workflow/SKILL.md
index 1af247a..6164c43 100644
--- a/skills/workflow/SKILL.md
+++ b/skills/workflow/SKILL.md
@@ -14,6 +14,18 @@ metadata:
     - 'src/lib/workflow.*'
     - 'workflow.*'
     - '*workflow*'
+    # Chain / pipeline / orchestration engine files
+    - '**/chain-engine*'
+    - '**/chain_engine*'
+    - '**/chainEngine*'
+    - '**/pipeline-engine*'
+    - '**/pipeline_engine*'
+    - '**/pipelineEngine*'
+    - '**/state-machine*'
+    - '**/state_machine*'
+    - '**/stateMachine*'
+    - '**/orchestrat*'
+    - '**/escalation*'
   importPatterns:
     - '@vercel/workflow'
     - 'workflow'
diff --git a/tests/__snapshots__/build-from-skills-integration.test.ts.snap b/tests/__snapshots__/build-from-skills-integration.test.ts.snap
index 3205a08..73853c8 100644
--- a/tests/__snapshots__/build-from-skills-integration.test.ts.snap
+++ b/tests/__snapshots__/build-from-skills-integration.test.ts.snap
@@ -18,11 +18,8 @@ exports[`dependency manifest manifest dependency snapshot 1`] = `
     "template": "agents/deployment-expert.md.tmpl",
   },
   {
-    "dependencies": [
-      "next-cache-components",
-      "nextjs",
-    ],
-    "includeCount": 8,
+    "dependencies": [],
+    "includeCount": 0,
     "template": "agents/performance-optimizer.md.tmpl",
   },
   {
@@ -76,9 +73,9 @@ exports[`CLI --json output shape --json output shape snapshot 1`] = `
     "template": "agents/deployment-expert.md",
   },
   {
-    "dependencyCount": 2,
+    "dependencyCount": 0,
     "diagnosticCount": 0,
-    "resolvedCount": 8,
+    "resolvedCount": 0,
     "status": "unchanged",
     "template": "agents/performance-optimizer.md",
   },
diff --git a/tests/build-skill-map.test.ts b/tests/build-skill-map.test.ts
index 9225066..9c0310d 100644
--- a/tests/build-skill-map.test.ts
+++ b/tests/build-skill-map.test.ts
@@ -121,19 +121,11 @@ describe("build-manifest.ts", () => {
     const manifest = readManifest();
     const slugs = Object.keys(manifest.skills);
     // These skills should always exist
-    expect(slugs).toContain("nextjs");
+    expect(slugs).toContain("vercel-functions");
     expect(slugs).toContain("vercel-cli");
     expect(slugs).toContain("ai-sdk");
   });
 
-  test("nextjs skill has expected path patterns", () => {
-    const manifest = readManifest();
-    const nextjs = manifest.skills["nextjs"];
-    expect(nextjs).toBeDefined();
-    const patterns = nextjs.pathPatterns;
-    // Should match next.config files
-    expect(patterns.some((p: string) => p.includes("next.config"))).toBe(true);
-  });
 });
 
 describe("manifest-backed hook loading", () => {
@@ -143,7 +135,7 @@ describe("manifest-backed hook loading", () => {
 
     const { code, stdout } = await runHook({
       tool_name: "Read",
-      tool_input: { file_path: "next.config.ts" },
+      tool_input: { file_path: "app/api/hello/route.ts" },
     });
     expect(code).toBe(0);
 
@@ -154,7 +146,7 @@ describe("manifest-backed hook loading", () => {
     const siMatch = ctx.match(/<!-- skillInjection: (\{.*?\}) -->/);
     expect(siMatch).not.toBeNull();
     const si = JSON.parse(siMatch![1]);
-    expect(si.injectedSkills).toContain("nextjs");
+    expect(si.injectedSkills).toContain("vercel-functions");
   });
 
   test("hook produces same matches with and without manifest", async () => {
diff --git a/tests/fixtures/pattern-fixtures.json b/tests/fixtures/pattern-fixtures.json
index 2bfb5b7..2355663 100644
--- a/tests/fixtures/pattern-fixtures.json
+++ b/tests/fixtures/pattern-fixtures.json
@@ -5,115 +5,162 @@
       "description": "vercel.json triggers multiple skills (routing, deploy, cli, functions)",
       "type": "path",
       "input": "vercel.json",
-      "expectedSkills": ["routing-middleware", "deployments-cicd", "vercel-cli", "vercel-functions"]
+      "expectedSkills": [
+        "routing-middleware",
+        "deployments-cicd",
+        "vercel-cli",
+        "vercel-functions"
+      ]
     },
     {
-      "description": "next.config.ts triggers nextjs, turbopack, next-cache-components, and next-upgrade",
+      "description": "next.config.ts triggers no direct skill matches (Next.js skills moved to the Next.js repo)",
       "type": "path",
       "input": "next.config.ts",
-      "expectedSkills": ["nextjs", "turbopack", "next-cache-components", "next-upgrade"]
+      "expectedSkills": []
     },
     {
       "description": "middleware.ts triggers routing-middleware and auth",
       "type": "path",
       "input": "middleware.ts",
-      "expectedSkills": ["routing-middleware", "auth"]
+      "expectedSkills": [
+        "routing-middleware",
+        "auth"
+      ]
     },
     {
       "description": ".env.local triggers env-vars",
       "type": "path",
       "input": ".env.local",
-      "expectedSkills": ["env-vars"]
+      "expectedSkills": [
+        "env-vars"
+      ]
     },
     {
-      "description": "app/api/chat/route.ts triggers ai-sdk, nextjs, vercel-functions, chat-sdk, and next-cache-components",
+      "description": "app/api/chat/route.ts triggers ai-sdk, vercel-functions, and chat-sdk",
       "type": "path",
       "input": "app/api/chat/route.ts",
-      "expectedSkills": ["ai-sdk", "nextjs", "vercel-functions", "chat-sdk", "next-cache-components"]
+      "expectedSkills": [
+        "ai-sdk",
+        "vercel-functions",
+        "chat-sdk"
+      ]
     },
     {
       "description": "components.json triggers shadcn",
       "type": "path",
       "input": "components.json",
-      "expectedSkills": ["shadcn"]
+      "expectedSkills": [
+        "shadcn"
+      ]
     },
     {
       "description": "prisma/schema.prisma triggers vercel-storage and bootstrap",
       "type": "path",
       "input": "prisma/schema.prisma",
-      "expectedSkills": ["vercel-storage", "bootstrap"]
+      "expectedSkills": [
+        "vercel-storage",
+        "bootstrap"
+      ]
     },
     {
       "description": ".github/workflows/deploy.yml triggers deployments-cicd and vercel-agent, not workflow",
       "type": "path",
       "input": ".github/workflows/deploy.yml",
-      "expectedSkills": ["deployments-cicd", "vercel-agent"]
+      "expectedSkills": [
+        "deployments-cicd",
+        "vercel-agent"
+      ]
     },
     {
       "description": "vercel deploy command triggers deployments-cicd and vercel-cli",
       "type": "bash",
       "input": "vercel deploy --prod",
-      "expectedSkills": ["deployments-cicd", "vercel-cli"]
+      "expectedSkills": [
+        "deployments-cicd",
+        "vercel-cli"
+      ]
     },
     {
       "description": "npx shadcn add triggers shadcn",
       "type": "bash",
       "input": "npx shadcn@latest add button",
-      "expectedSkills": ["shadcn"]
+      "expectedSkills": [
+        "shadcn"
+      ]
     },
     {
-      "description": "next dev --turbo triggers turbopack, nextjs, verification, and next-cache-components",
+      "description": "next dev --turbo triggers verification",
       "type": "bash",
       "input": "next dev --turbo",
-      "expectedSkills": ["turbopack", "nextjs", "verification", "next-cache-components"]
+      "expectedSkills": [
+        "verification"
+      ]
     },
     {
       "description": "vercel env pull triggers env-vars, ai-gateway, and vercel-cli",
       "type": "bash",
       "input": "vercel env pull .env.local",
-      "expectedSkills": ["env-vars", "ai-gateway", "vercel-cli"]
+      "expectedSkills": [
+        "env-vars",
+        "ai-gateway",
+        "vercel-cli"
+      ]
     },
     {
       "description": "src/components/Button.tsx triggers react-best-practices",
       "type": "path",
       "input": "src/components/Button.tsx",
-      "expectedSkills": ["react-best-practices"]
+      "expectedSkills": [
+        "react-best-practices"
+      ]
     },
     {
       "description": "components/Card.jsx triggers react-best-practices",
       "type": "path",
       "input": "components/Card.jsx",
-      "expectedSkills": ["react-best-practices"]
+      "expectedSkills": [
+        "react-best-practices"
+      ]
     },
     {
-      "description": "app/components/Modal.tsx triggers react-best-practices, nextjs, and next-cache-components",
+      "description": "app/components/Modal.tsx triggers react-best-practices",
       "type": "path",
       "input": "app/components/Modal.tsx",
-      "expectedSkills": ["react-best-practices", "nextjs", "next-cache-components"]
+      "expectedSkills": [
+        "react-best-practices"
+      ]
     },
     {
-      "description": "npm run dev triggers nextjs and verification",
+      "description": "npm run dev triggers verification",
       "type": "bash",
       "input": "npm run dev",
-      "expectedSkills": ["nextjs", "verification"]
+      "expectedSkills": [
+        "verification"
+      ]
     },
     {
-      "description": "pnpm dev triggers nextjs and verification",
+      "description": "pnpm dev triggers verification",
       "type": "bash",
       "input": "pnpm dev",
-      "expectedSkills": ["nextjs", "verification"]
+      "expectedSkills": [
+        "verification"
+      ]
     },
     {
-      "description": "bun run dev triggers nextjs and verification",
+      "description": "bun run dev triggers verification",
       "type": "bash",
       "input": "bun run dev",
-      "expectedSkills": ["nextjs", "verification"]
+      "expectedSkills": [
+        "verification"
+      ]
     },
     {
       "description": "vite triggers verification",
       "type": "bash",
       "input": "vite",
-      "expectedSkills": ["verification"]
+      "expectedSkills": [
+        "verification"
+      ]
     },
     {
       "description": "npm install prisma currently triggers no direct skill matches",
@@ -137,13 +184,17 @@
       "description": "npm install @clerk/nextjs triggers auth",
       "type": "bash",
       "input": "npm install @clerk/nextjs",
-      "expectedSkills": ["auth"]
+      "expectedSkills": [
+        "auth"
+      ]
     },
     {
       "description": "yarn add @clerk/nextjs triggers auth",
       "type": "bash",
       "input": "yarn add @clerk/nextjs",
-      "expectedSkills": ["auth"]
+      "expectedSkills": [
+        "auth"
+      ]
     },
     {
       "description": "pnpm add prisma langchain currently triggers no direct skill matches",
diff --git a/tests/notion-clone-patterns.test.ts b/tests/notion-clone-patterns.test.ts
index 9e30860..2769853 100644
--- a/tests/notion-clone-patterns.test.ts
+++ b/tests/notion-clone-patterns.test.ts
@@ -48,10 +48,9 @@ async function matchFile(filePath: string): Promise<string[]> {
 }
 
 describe("notion clone patterns", () => {
-  test("notion-clone app/layout.tsx injects current Next.js skills", async () => {
+  test("notion-clone app/layout.tsx no longer injects Next.js skills (moved to the Next.js repo)", async () => {
     const injectedSkills = await matchFile("/Users/me/notion-clone/app/layout.tsx");
-    expect(injectedSkills).toContain("next-cache-components");
-    expect(injectedSkills).toContain("nextjs");
+    expect(injectedSkills).toEqual([]);
   });
 
   test("notion-clone middleware.ts injects routing-middleware", async () => {
@@ -66,15 +65,15 @@ describe("notion clone patterns", () => {
     expect(injectedSkills).toEqual(["shadcn", "react-best-practices"]);
   });
 
-  test("notion-clone app/(marketing)/(routes)/page.tsx injects nextjs", async () => {
+  test("notion-clone app/(marketing)/(routes)/page.tsx no longer injects Next.js skills (moved to the Next.js repo)", async () => {
     const injectedSkills = await matchFile(
       "/Users/me/notion-clone/app/(marketing)/(routes)/page.tsx",
     );
-    expect(injectedSkills).toContain("nextjs");
+    expect(injectedSkills).toEqual([]);
   });
 
-  test("notion-clone next.config.ts injects current Next.js config skills", async () => {
+  test("notion-clone next.config.ts no longer injects Next.js skills (moved to the Next.js repo)", async () => {
     const injectedSkills = await matchFile("/Users/me/notion-clone/next.config.ts");
-    expect(injectedSkills).toContain("nextjs");
+    expect(injectedSkills).toEqual([]);
   });
 });
diff --git a/tests/session-start-activation.test.ts b/tests/session-start-activation.test.ts
index d0cde09..7a2af6e 100644
--- a/tests/session-start-activation.test.ts
+++ b/tests/session-start-activation.test.ts
@@ -58,7 +58,7 @@ describe("session-start activation", () => {
     expect(result.code).toBe(0);
     expect(result.stdout).toContain("greenfield project");
     expect(readSessionFile(testSessionId, "greenfield")).toBe("true");
-    expect(readSessionFile(testSessionId, "likely-skills")).toContain("nextjs");
+    expect(readSessionFile(testSessionId, "likely-skills")).toContain("ai-sdk");
   });
 
   test("non-empty unrelated directories skip activation", async () => {
@@ -76,14 +76,14 @@ describe("session-start activation", () => {
   });
 
   test("detected vercel projects still activate", async () => {
-    const projectDir = join(tempDir, "next-project");
+    const projectDir = join(tempDir, "vercel-project");
     mkdirSync(projectDir);
-    writeFileSync(join(projectDir, "next.config.ts"), "export default {};");
+    writeFileSync(join(projectDir, "vercel.json"), "{}");
 
     const result = await runProfiler(projectDir);
 
     expect(result.code).toBe(0);
-    expect(readSessionFile(testSessionId, "likely-skills")).toContain("nextjs");
+    expect(readSessionFile(testSessionId, "likely-skills")).toContain("vercel-cli");
   });
 
   test("package.json vercel signals are enough to activate", async () => {
diff --git a/tests/session-timeline-subagent.test.ts b/tests/session-timeline-subagent.test.ts
index 3b483a8..753bad8 100644
--- a/tests/session-timeline-subagent.test.ts
+++ b/tests/session-timeline-subagent.test.ts
@@ -102,7 +102,7 @@ describe("session timeline subagent integration", () => {
     }
   });
 
-  test("lead scaffold timeline dedups in the lead session but a fresh subagent gets its own nextjs injection", async () => {
+  test("lead read timeline dedups in the lead session but a fresh subagent gets its own vercel-functions injection", async () => {
     const tempDir = mkdtempSync(join(tmpdir(), "session-timeline-subagent-"));
     const leadEnvPath = join(tempDir, "lead.env");
     const subagentEnvPath = join(tempDir, "subagent.env");
@@ -115,33 +115,33 @@ describe("session timeline subagent integration", () => {
       expect(leadSessionStart.code).toBe(0);
 
       const leadScaffold = await runHookEnv(
-        { tool_name: "Bash", tool_input: { command: "npx create-next-app@latest notion-clone --ts --app" } },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
         { VERCEL_PLUGIN_SEEN_SKILLS: "", VERCEL_PLUGIN_HOOK_DEBUG: "1" },
       );
 
       expect(leadScaffold.code).toBe(0);
-      expect(parseInjectedSkills(leadScaffold.stdout)).toContain("nextjs");
+      expect(parseInjectedSkills(leadScaffold.stdout)).toContain("vercel-functions");
 
       const leadRead = await runHookEnv(
-        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/page.tsx" } },
-        { VERCEL_PLUGIN_SEEN_SKILLS: "nextjs" },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
+        { VERCEL_PLUGIN_SEEN_SKILLS: "vercel-functions" },
       );
 
       expect(leadRead.code).toBe(0);
-      expect(parseInjectedSkills(leadRead.stdout)).not.toContain("nextjs");
+      expect(parseInjectedSkills(leadRead.stdout)).not.toContain("vercel-functions");
 
       const subagentSessionStart = await runSessionStart(subagentEnvPath);
       expect(subagentSessionStart.code).toBe(0);
 
       const subagentSession = `timeline-subagent-${Date.now()}-${Math.random().toString(36).slice(2)}`;
       const subagentRead = await runHookEnv(
-        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/page.tsx" } },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
         { VERCEL_PLUGIN_SEEN_SKILLS: "", VERCEL_PLUGIN_HOOK_DEBUG: "1" },
         { sessionId: subagentSession },
       );
 
       expect(subagentRead.code).toBe(0);
-      expect(parseInjectedSkills(subagentRead.stdout)).toContain("nextjs");
+      expect(parseInjectedSkills(subagentRead.stdout)).toContain("vercel-functions");
 
       const debugLines = parseDebugLines(subagentRead.stderr);
       const dedupStrategyLine = debugLines.find((line) => line.event === "dedup-strategy");
@@ -165,18 +165,18 @@ describe("session timeline subagent integration", () => {
       const leadSessionStart = await runSessionStart(leadEnvPath);
       expect(leadSessionStart.code).toBe(0);
 
-      // Lead injects nextjs via page.tsx read
+      // Lead injects vercel-functions via api route read
       const leadRead = await runHookEnv(
-        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/page.tsx" } },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
         { VERCEL_PLUGIN_SEEN_SKILLS: "", VERCEL_PLUGIN_HOOK_DEBUG: "1" },
       );
       expect(leadRead.code).toBe(0);
       const leadInjected = parseInjectedSkills(leadRead.stdout);
-      expect(leadInjected).toContain("nextjs");
+      expect(leadInjected).toContain("vercel-functions");
 
       // Lead second read — deduped
       const leadSecond = await runHookEnv(
-        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/page.tsx" } },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
         { VERCEL_PLUGIN_SEEN_SKILLS: leadInjected.join(",") },
       );
       expect(leadSecond.code).toBe(0);
@@ -186,16 +186,16 @@ describe("session timeline subagent integration", () => {
       const subagentSessionStart = await runSessionStart(subagentEnvPath);
       expect(subagentSessionStart.code).toBe(0);
 
-      // Subagent with different session ID — scope isolation means nextjs re-injects
+      // Subagent with different session ID — scope isolation means vercel-functions re-injects
       const subagentSession = `timeline-scope-sub-${Date.now()}-${Math.random().toString(36).slice(2)}`;
       const subagentRead = await runHookEnv(
-        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/page.tsx" } },
+        { tool_name: "Read", tool_input: { file_path: "/Users/me/notion-clone/app/api/hello/route.ts" } },
         { VERCEL_PLUGIN_SEEN_SKILLS: "", VERCEL_PLUGIN_HOOK_DEBUG: "1" },
         { sessionId: subagentSession },
       );
       expect(subagentRead.code).toBe(0);
       const subInjected = parseInjectedSkills(subagentRead.stdout);
-      expect(subInjected).toContain("nextjs");
+      expect(subInjected).toContain("vercel-functions");
 
       // Verify it's a fresh file-based dedup scope
       const subDebug = parseDebugLines(subagentRead.stderr);
diff --git a/tests/skill-map-frontmatter.test.ts b/tests/skill-map-frontmatter.test.ts
index ad73e89..719bf08 100644
--- a/tests/skill-map-frontmatter.test.ts
+++ b/tests/skill-map-frontmatter.test.ts
@@ -269,7 +269,7 @@ describe("scanSkillsDir", () => {
     expect(skills.length).toBe(expected);
     // Assert on directory-based identity (canonical key), not frontmatter name
     const dirs = skills.map((s) => s.dir);
-    expect(dirs).toContain("nextjs");
+    expect(dirs).toContain("routing-middleware");
     expect(dirs).toContain("vercel-storage");
     expect(dirs).toContain("ai-sdk");
   });
@@ -411,14 +411,14 @@ describe("buildSkillMap", () => {
     }
   });
 
-  test("nextjs skill matches expected values from frontmatter", () => {
+  test("routing-middleware skill matches expected values from frontmatter", () => {
     const map = buildSkillMap(SKILLS_DIR);
-    const nextjs = map.skills["nextjs"];
-    expect(nextjs).toBeDefined();
-    expect(nextjs.priority).toBe(5);
-    expect(nextjs.pathPatterns).toContain("next.config.*");
-    expect(nextjs.pathPatterns).toContain("app/**");
-    expect(nextjs.bashPatterns.length).toBeGreaterThan(0);
+    const routingMiddleware = map.skills["routing-middleware"];
+    expect(routingMiddleware).toBeDefined();
+    expect(routingMiddleware.priority).toBe(6);
+    expect(routingMiddleware.pathPatterns).toContain("middleware.ts");
+    expect(routingMiddleware.pathPatterns).toContain("vercel.json");
+    expect(routingMiddleware.bashPatterns.length).toBeGreaterThan(0);
   });
 
   test("skill count matches number of SKILL.md directories", () => {
@@ -431,14 +431,14 @@ describe("buildSkillMap", () => {
   test("invariant: expected representative skills present with correct patterns", () => {
     const map = buildSkillMap(SKILLS_DIR);
     // Spot-check key skills
-    expect(map.skills["nextjs"]).toBeDefined();
+    expect(map.skills["routing-middleware"]).toBeDefined();
     expect(map.skills["vercel-cli"]).toBeDefined();
     expect(map.skills["ai-sdk"]).toBeDefined();
     expect(map.skills["vercel-storage"]).toBeDefined();
 
-    // nextjs should have app/** and next.config.* patterns
-    expect(map.skills["nextjs"].pathPatterns).toContain("app/**");
-    expect(map.skills["nextjs"].pathPatterns).toContain("next.config.*");
+    // routing-middleware should have middleware.ts and vercel.json patterns
+    expect(map.skills["routing-middleware"].pathPatterns).toContain("middleware.ts");
+    expect(map.skills["routing-middleware"].pathPatterns).toContain("vercel.json");
 
     // vercel-cli should have a bash pattern for vercel commands
     expect(map.skills["vercel-cli"].bashPatterns.length).toBeGreaterThan(0);
@@ -446,9 +446,9 @@ describe("buildSkillMap", () => {
 
   test("backslash sequences preserved in bash patterns", () => {
     const map = buildSkillMap(SKILLS_DIR);
-    const nextjs = map.skills["nextjs"];
+    const routingMiddleware = map.skills["routing-middleware"];
     // Should contain literal \b not a backspace character
-    const hasWordBoundary = nextjs.bashPatterns.some((p: string) => p.includes("\\b"));
+    const hasWordBoundary = routingMiddleware.bashPatterns.some((p: string) => p.includes("\\b"));
     expect(hasWordBoundary).toBe(true);
   });
 
diff --git a/tests/slack-clone-patterns.test.ts b/tests/slack-clone-patterns.test.ts
index 08bdf7f..0fc0e7d 100644
--- a/tests/slack-clone-patterns.test.ts
+++ b/tests/slack-clone-patterns.test.ts
@@ -40,22 +40,22 @@ async function matchFile(filePath: string): Promise<string[]> {
   return si.injectedSkills ?? [];
 }
 
-const EXPECTED_SLACK_ROUTE_SKILLS = ["chat-sdk", "vercel-functions", "next-cache-components"] as const;
+const EXPECTED_SLACK_ROUTE_SKILLS = ["chat-sdk", "vercel-functions"] as const;
 
 describe("slack clone patterns", () => {
-  test("slack-clone app/api/slack/route.ts injects chat-sdk, vercel-functions, next-cache-components", async () => {
+  test("slack-clone app/api/slack/route.ts injects chat-sdk, vercel-functions", async () => {
     expect(await matchFile("/Users/me/slack-clone/app/api/slack/route.ts")).toEqual(
       EXPECTED_SLACK_ROUTE_SKILLS,
     );
   });
 
-  test("slack-clone src/app/api/slack/route.ts injects chat-sdk, vercel-functions, next-cache-components", async () => {
+  test("slack-clone src/app/api/slack/route.ts injects chat-sdk, vercel-functions", async () => {
     expect(await matchFile("/Users/me/slack-clone/src/app/api/slack/route.ts")).toEqual(
       EXPECTED_SLACK_ROUTE_SKILLS,
     );
   });
 
-  test("slack-clone app/api/webhooks/slack/route.ts injects chat-sdk, vercel-functions, next-cache-components", async () => {
+  test("slack-clone app/api/webhooks/slack/route.ts injects chat-sdk, vercel-functions", async () => {
     expect(await matchFile("/Users/me/slack-clone/app/api/webhooks/slack/route.ts")).toEqual(
       EXPECTED_SLACK_ROUTE_SKILLS,
     );
diff --git a/tests/subagent-fresh-env.test.ts b/tests/subagent-fresh-env.test.ts
index 112100d..662dad1 100644
--- a/tests/subagent-fresh-env.test.ts
+++ b/tests/subagent-fresh-env.test.ts
@@ -8,7 +8,7 @@ const HOOK_SCRIPT = join(ROOT, "hooks", "pretooluse-skill-inject.mjs");
 const UNLIMITED_BUDGET = "999999";
 let testSession: string;
 
-const EXPECTED_SLACK_ROUTE_SKILLS = ["chat-sdk", "vercel-functions", "next-cache-components"] as const;
+const EXPECTED_SLACK_ROUTE_SKILLS = ["chat-sdk", "vercel-functions"] as const;
 
 function seedSeenSkills(skills: string[], session?: string): void {
   const sid = session ?? testSession;
@@ -94,7 +94,7 @@ describe("subagent fresh env dedup behavior", () => {
     expect(leadInjected).toEqual(EXPECTED_SLACK_ROUTE_SKILLS);
 
     // Second call with file-based dedup — should be deduped
-    seedSeenSkills(["nextjs", ...leadInjected]);
+    seedSeenSkills([...leadInjected]);
     const { code: leadSecondCode, stdout: leadSecondStdout } = await runHookEnv(
       { tool_name: "Read", tool_input: { file_path: slackRoutePath } },
       {},
@@ -143,7 +143,7 @@ describe("subagent fresh env dedup behavior", () => {
   });
 
   test("subagent that inherits the lead seen-skills via file dedup is deduped", async () => {
-    seedSeenSkills(["nextjs", ...EXPECTED_SLACK_ROUTE_SKILLS]);
+    seedSeenSkills([...EXPECTED_SLACK_ROUTE_SKILLS]);
     const { code, stdout } = await runHookEnv(
       { tool_name: "Read", tool_input: { file_path: slackRoutePath } },
       {},
diff --git a/tests/subagent-scope-dedup.test.ts b/tests/subagent-scope-dedup.test.ts
index 0c0b723..fcab003 100644
--- a/tests/subagent-scope-dedup.test.ts
+++ b/tests/subagent-scope-dedup.test.ts
@@ -72,29 +72,29 @@ function parseInjectedSkills(stdout: string): string[] {
 // ---------------------------------------------------------------------------
 
 describe("subagent-scope-dedup: isolated dedup scopes", () => {
-  const nextjsPagePath = "/Users/me/my-app/app/page.tsx";
+  const helloRoutePath = "/Users/me/my-app/app/api/hello/route.ts";
 
   test("parent injection does not suppress the same skill in a subagent", async () => {
-    // Step 1: Lead agent injects nextjs
+    // Step 1: Lead agent injects vercel-functions
     const leadResult = await runPreToolUse(
-      { tool_name: "Read", tool_input: { file_path: nextjsPagePath } },
+      { tool_name: "Read", tool_input: { file_path: helloRoutePath } },
       { VERCEL_PLUGIN_SEEN_SKILLS: "" },
     );
     expect(leadResult.code).toBe(0);
     const leadInjected = parseInjectedSkills(leadResult.stdout);
-    expect(leadInjected).toContain("nextjs");
+    expect(leadInjected).toContain("vercel-functions");
 
     // Step 2: Lead's second call should be deduped
     const leadSeen = leadInjected.join(",");
     const leadSecond = await runPreToolUse(
-      { tool_name: "Read", tool_input: { file_path: nextjsPagePath } },
+      { tool_name: "Read", tool_input: { file_path: helloRoutePath } },
       { VERCEL_PLUGIN_SEEN_SKILLS: leadSeen },
     );
     expect(leadSecond.code).toBe(0);
     expect(JSON.parse(leadSecond.stdout)).toEqual({});
 
     // Step 3: Subagent with its own agent_id and NO inherited seen-skills
-    // should still get nextjs injected (isolated scope)
+    // should still get vercel-functions injected (isolated scope)
     const subSession = `scope-dedup-sub-${Date.now()}-${Math.random().toString(36).slice(2)}`;
     const origSession = testSession;
     testSession = subSession;
@@ -102,13 +102,13 @@ describe("subagent-scope-dedup: isolated dedup scopes", () => {
       const subResult = await runPreToolUse(
         {
           tool_name: "Read",
-          tool_input: { file_path: nextjsPagePath },
+          tool_input: { file_path: helloRoutePath },
           agent_id: "subagent-explore-1",
         },
         { VERCEL_PLUGIN_SEEN_SKILLS: "" },
       );
       expect(subResult.code).toBe(0);
-      expect(parseInjectedSkills(subResult.stdout)).toContain("nextjs");
+      expect(parseInjectedSkills(subResult.stdout)).toContain("vercel-functions");
     } finally {
       testSession = origSession;
     }
@@ -124,47 +124,47 @@ describe("subagent-scope-dedup: isolated dedup scopes", () => {
       const subResult = await runPreToolUse(
         {
           tool_name: "Read",
-          tool_input: { file_path: nextjsPagePath },
+          tool_input: { file_path: helloRoutePath },
           agent_id: "subagent-plan-1",
         },
         { VERCEL_PLUGIN_SEEN_SKILLS: "" },
       );
       expect(subResult.code).toBe(0);
-      expect(parseInjectedSkills(subResult.stdout)).toContain("nextjs");
+      expect(parseInjectedSkills(subResult.stdout)).toContain("vercel-functions");
     } finally {
       testSession = origSession;
     }
 
-    // Parent should still be able to inject nextjs independently
+    // Parent should still be able to inject vercel-functions independently
     const parentResult = await runPreToolUse(
-      { tool_name: "Read", tool_input: { file_path: nextjsPagePath } },
+      { tool_name: "Read", tool_input: { file_path: helloRoutePath } },
       { VERCEL_PLUGIN_SEEN_SKILLS: "" },
     );
     expect(parentResult.code).toBe(0);
-    expect(parseInjectedSkills(parentResult.stdout)).toContain("nextjs");
+    expect(parseInjectedSkills(parentResult.stdout)).toContain("vercel-functions");
   });
 
   test("resumed agent reuses its existing scope (dedup works across invocations)", async () => {
     const agentId = "subagent-gp-resume-1";
 
-    // First invocation: inject nextjs
+    // First invocation: inject vercel-functions
     const first = await runPreToolUse(
       {
         tool_name: "Read",
-        tool_input: { file_path: nextjsPagePath },
+        tool_input: { file_path: helloRoutePath },
         agent_id: agentId,
       },
       { VERCEL_PLUGIN_SEEN_SKILLS: "" },
     );
     expect(first.code).toBe(0);
     const firstInjected = parseInjectedSkills(first.stdout);
-    expect(firstInjected).toContain("nextjs");
+    expect(firstInjected).toContain("vercel-functions");
 
     // Second invocation with same agent_id and session: should be deduped
     const second = await runPreToolUse(
       {
         tool_name: "Read",
-        tool_input: { file_path: nextjsPagePath },
+        tool_input: { file_path: helloRoutePath },
         agent_id: agentId,
       },
       { VERCEL_PLUGIN_SEEN_SKILLS: firstInjected.join(",") },
diff --git a/tests/vercel-context.test.ts b/tests/vercel-context.test.ts
index 2408b56..2d625e7 100644
--- a/tests/vercel-context.test.ts
+++ b/tests/vercel-context.test.ts
@@ -72,8 +72,8 @@ function createTestSession(): string {
 }
 
 describe("managed vercel context chunks", () => {
-  test("extracts a small nextjs chunk from vercel.md", () => {
-    const chunk = getManagedContextChunkForSkill("nextjs", { pluginRoot: ROOT });
+  test("extracts a small nextjs-platform chunk from vercel.md via next-forge", () => {
+    const chunk = getManagedContextChunkForSkill("next-forge", { pluginRoot: ROOT });
     expect(chunk).not.toBeNull();
     expect(chunk?.chunkId).toBe("nextjs-platform");
     expect(chunk?.wrapped).toContain("Default to Next.js App Router");
@@ -86,11 +86,11 @@ describe("managed vercel context chunks", () => {
 
   test("deduplicates chunk claims per session", () => {
     const testSession = createTestSession();
-    const first = selectManagedContextChunk(["nextjs"], {
+    const first = selectManagedContextChunk(["next-forge"], {
       pluginRoot: ROOT,
       sessionId: testSession,
     });
-    const second = selectManagedContextChunk(["nextjs"], {
+    const second = selectManagedContextChunk(["next-forge"], {
       pluginRoot: ROOT,
       sessionId: testSession,
     });
@@ -102,20 +102,20 @@ describe("managed vercel context chunks", () => {
 });
 
 describe("on-demand context injection", () => {
-  test("pretooluse appends a nextjs chunk after skill injection", async () => {
+  test("pretooluse appends an ai-stack chunk after skill injection", async () => {
     const testSession = createTestSession();
     try {
       const { code, stdout } = await runPretoolHook({
         tool_name: "Read",
-        tool_input: { file_path: "/Users/me/project/next.config.ts" },
+        tool_input: { file_path: "/Users/me/project/app/api/chat/route.ts" },
       }, testSession);
 
       expect(code).toBe(0);
       const parsed = JSON.parse(stdout);
       const ctx = parsed.hookSpecificOutput.additionalContext as string;
       expect(ctx).toContain("Skill(");
-      expect(ctx).toContain("<!-- vercel-context-chunk:nextjs-platform -->");
-      expect(ctx).toContain("Default to Next.js App Router");
+      expect(ctx).toContain("<!-- vercel-context-chunk:ai-stack -->");
+      expect(ctx).toContain("Default to AI SDK v6");
     } finally {
       cleanupSessionArtifacts(testSession);
     }
diff --git a/vercel.md b/vercel.md
index fd6cbb3..1789c6f 100644
--- a/vercel.md
+++ b/vercel.md
@@ -101,14 +101,14 @@ VERCEL PLATFORM                            📖 docs: https://vercel.com/docs
 ## 2. Frameworks
 
 ```
-NEXT.JS (v16+)                           ⤳ skill: nextjs  📖 docs: https://nextjs.org/docs
+NEXT.JS (v16+)  📖 docs: https://nextjs.org/docs
 ├── App Router (file-system routing)
 │   ⊃ Server Components (default, zero client JS)
 │   ⊃ Client Components ('use client')
 │   ⊃ Server Actions / Server Functions ('use server')
 │   ⊃ Route Handlers (API endpoints)
 │   ⊃ Middleware → renamed to Proxy in v16
-│   ⊃ Cache Components ('use cache')              ⤳ skill: next-cache-components
+│   ⊃ Cache Components ('use cache')
 │   ⊃ Layouts, Loading, Error boundaries
 │   ⊃ Parallel & Intercepting Routes
 │   ⊃ Dynamic Segments ([id], [...slug], [[...slug]])
@@ -120,7 +120,7 @@ NEXT.JS (v16+)                           ⤳ skill: nextjs  📖 docs: https://n
 │   ⊃ PPR (Partial Prerendering) → evolving to Cache Components
 │   ⊃ Streaming (React Suspense boundaries)
 │
-├── Upgrading                                    ⤳ skill: next-upgrade
+├── Upgrading
 │
 ├── Build System
 │   → Turbopack (default bundler in v16)
@@ -129,8 +129,8 @@ NEXT.JS (v16+)                           ⤳ skill: nextjs  📖 docs: https://n
 ├── Key Integrations
 │   ↔ Vercel AI SDK (chat UIs, streaming, tool calling)
 │   ↔ Vercel Analytics / Speed Insights
-│   ↔ Vercel Image Optimization (next/image)      ⤳ skill: nextjs
-│   ↔ Satori / @vercel/og (dynamic OG images)     ⤳ skill: nextjs
+│   ↔ Vercel Image Optimization (next/image)
+│   ↔ Satori / @vercel/og (dynamic OG images)
 │   ↔ Vercel Font Optimization (next/font)
 │   ↔ Vercel Functions (automatic from route handlers / server actions)
 │
@@ -368,7 +368,7 @@ VERCEL AGENT                               ⤳ skill: vercel-agent  📖 docs: h
 ## 4. Build Tools
 
 ```
-TURBOPACK                                  ⤳ skill: turbopack  📖 docs: https://turbo.build/pack/docs
+TURBOPACK  📖 docs: https://turbo.build/pack/docs
 ├── Purpose: JavaScript/TypeScript bundler
 │   ⊃ Instant HMR (doesn't degrade with app size)
 │   ⊃ Multi-environment builds (Browser, Server, Edge, SSR, RSC)
@@ -649,7 +649,6 @@ Choose based on **where** the interception happens and **what** you need to do.
 
 ⤳ skill: routing-middleware — Platform-level request interception
 ⤳ skill: vercel-functions — Edge Functions and Serverless Functions
-⤳ skill: nextjs — `proxy.ts` in Next.js 16
 
 ### Disambiguation: Caching Layers
 
@@ -664,7 +663,6 @@ Three distinct caching systems serve different purposes. They can be used indepe
 > **Layering pattern**: A typical Next.js app uses all three — Next.js Cache for component/route-level freshness, Runtime Cache for shared cross-request data (e.g., product catalog), and CDN Cache for static assets and ISR pages. Each layer has its own invalidation strategy; tag-based invalidation can cascade across layers when configured.
 
 ⤳ skill: runtime-cache — Per-region key-value caching with tag-based invalidation
-⤳ skill: nextjs — `'use cache'`, `revalidatePath`, `revalidateTag`
 
 ---