Merge remote-tracking branch 'origin/main' into claude/kind-margulis

# Conflicts:
#	apps/website/content/docs-v2/getting-started/introduction.mdx
#	apps/website/src/app/docs/[[...slug]]/page.tsx
#	apps/website/src/app/global.css
#	apps/website/src/components/docs/MdxRenderer.tsx
#	apps/website/src/components/docs/mdx/Callout.tsx
#	apps/website/src/lib/extract-headings.ts
#	package-lock.json
#	package.json

Author: blove

apps/website/src/app/global.css

@@ -135,7 +135,10 @@ html {
   font-weight: 400;
 }
 
+<<<<<<< HEAD
 .docs-prose { overflow-wrap: break-word; word-break: break-word; }
+=======
+>>>>>>> origin/main
 .docs-prose h1 { font-size: 1.875rem; font-weight: 700; margin-top: 0; margin-bottom: 1rem; font-family: var(--font-garamond); }
 .docs-prose h2 { font-size: 1.5rem; font-weight: 600; margin-top: 2.5rem; margin-bottom: 1rem; font-family: var(--font-garamond); }
 .docs-prose h3 { font-size: 1.25rem; font-weight: 600; margin-top: 2rem; margin-bottom: 0.75rem; font-family: var(--font-garamond); }

apps/website/src/components/docs/MdxRenderer.tsx

@@ -8,7 +8,10 @@ import { CodeGroup } from './mdx/CodeGroup';
 import { DocsBreadcrumb } from './DocsBreadcrumb';
 import { DocsPrevNext } from './DocsPrevNext';
 import rehypePrettyCode from 'rehype-pretty-code';
+<<<<<<< HEAD
 import rehypeSlug from 'rehype-slug';
+=======
+>>>>>>> origin/main
 
 const mdxComponents = {
   Callout,
@@ -35,7 +38,11 @@ interface NewProps {
 
 export function MdxRendererNew({ source, section, slug, title }: NewProps) {
   return (
+<<<<<<< HEAD
     <div className="flex-1 py-8 px-4 sm:px-6 md:px-12 md:max-w-3xl overflow-x-hidden">
+=======
+    <div className="flex-1 py-8 px-6 md:px-12 max-w-3xl">
+>>>>>>> origin/main
       <DocsBreadcrumb section={section} title={title} />
       <article className="docs-prose prose prose-slate max-w-none"
         style={{
@@ -49,7 +56,11 @@ export function MdxRendererNew({ source, section, slug, title }: NewProps) {
           components={mdxComponents}
           options={{
             mdxOptions: {
+<<<<<<< HEAD
               rehypePlugins: [rehypeSlug, [rehypePrettyCode, rehypeOptions] as any],
+=======
+              rehypePlugins: [[rehypePrettyCode, rehypeOptions] as any],
+>>>>>>> origin/main
             },
           }}
         />

apps/website/src/lib/extract-headings.ts

@@ -20,8 +20,12 @@ export function extractHeadings(source: string): DocHeading[] {
     const match = line.match(/^(#{2,3})\s+(.+)$/);
     if (match) {
       const text = match[2].replace(/`/g, '');
+<<<<<<< HEAD
       // Match rehype-slug's GitHub-style slugification
       const id = text.toLowerCase().replace(/[^\w\s-]/g, '').replace(/\s+/g, '-').replace(/^-+|-+$/g, '');
+=======
+      const id = text.toLowerCase().replace(/[^\w\s-]/g, '').replace(/\s+/g, '-');
+>>>>>>> origin/main
       headings.push({ id, text, level: match[1].length });
     }
   }

package-lock.json

@@ -77,7 +77,10 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "rehype-pretty-code": "^0.14.3",
+<<<<<<< HEAD
     "rehype-slug": "^6.0.0",
+=======
+>>>>>>> origin/main
     "rxjs": "~7.8.0",
     "shiki": "^4.0.2"
   },