diff --git a/apps/website/src/app/error.tsx b/apps/website/src/app/error.tsx
new file mode 100644
index 000000000..aeef6bf86
--- /dev/null
+++ b/apps/website/src/app/error.tsx
@@ -0,0 +1,87 @@
+'use client';
+
+import { useEffect } from 'react';
+import { tokens } from '@ngaf/design-tokens';
+import { Container } from '../components/ui/Container';
+import { Section } from '../components/ui/Section';
+import { Eyebrow } from '../components/ui/Eyebrow';
+import { Button } from '../components/ui/Button';
+
+interface ErrorBoundaryProps {
+  error: Error & { digest?: string };
+  reset: () => void;
+}
+
+/**
+ * App-router error boundary. Next.js renders this when a server or
+ * client component throws an uncaught error within this route segment.
+ * `reset` re-mounts the segment without a full reload.
+ */
+export default function ErrorBoundary({ error, reset }: ErrorBoundaryProps) {
+  useEffect(() => {
+    // Surface errors to whatever observability the app already wires up.
+    // Logging via console.error so it lands in browser devtools and any
+    // existing PostHog console-bridge or similar.
+    console.error('Unhandled error in app router:', error);
+  }, [error]);
+
+  return (
+    <Section surface="canvas" ariaLabelledBy="error-heading">
+      <Container>
+        <div style={{ maxWidth: 640, margin: '0 auto', textAlign: 'center' }}>
+          <Eyebrow tone="angular" style={{ marginBottom: 16 }}>Error</Eyebrow>
+          <h1
+            id="error-heading"
+            style={{
+              fontFamily: tokens.typography.h1.family,
+              fontSize: tokens.typography.h1.size,
+              lineHeight: tokens.typography.h1.line,
+              fontWeight: 700,
+              color: tokens.colors.textPrimary,
+              margin: 0,
+              marginBottom: 16,
+              letterSpacing: '-0.02em',
+            }}
+          >
+            Something went wrong.
+          </h1>
+          <p
+            style={{
+              fontFamily: tokens.typography.bodyLg.family,
+              fontSize: tokens.typography.bodyLg.size,
+              lineHeight: tokens.typography.bodyLg.line,
+              color: tokens.colors.textSecondary,
+              margin: '0 auto 12px',
+              maxWidth: 480,
+            }}
+          >
+            An unexpected error stopped this page from rendering. The team has been
+            notified. You can try again, or head back home.
+          </p>
+          {error.digest ? (
+            <p
+              style={{
+                fontFamily: tokens.typography.fontMono,
+                fontSize: 12,
+                color: tokens.colors.textMuted,
+                margin: '0 0 28px',
+              }}
+            >
+              Error ID: {error.digest}
+            </p>
+          ) : (
+            <div style={{ height: 28 }} />
+          )}
+          <div style={{ display: 'flex', justifyContent: 'center', gap: 12, flexWrap: 'wrap' }}>
+            <Button variant="primary" size="lg" onClick={reset}>
+              Try again
+            </Button>
+            <Button variant="secondary" size="lg" href="/">
+              Back home
+            </Button>
+          </div>
+        </div>
+      </Container>
+    </Section>
+  );
+}
diff --git a/apps/website/src/app/not-found.tsx b/apps/website/src/app/not-found.tsx
new file mode 100644
index 000000000..849f79bf0
--- /dev/null
+++ b/apps/website/src/app/not-found.tsx
@@ -0,0 +1,58 @@
+import { tokens } from '@ngaf/design-tokens';
+import { Container } from '../components/ui/Container';
+import { Section } from '../components/ui/Section';
+import { Eyebrow } from '../components/ui/Eyebrow';
+import { Button } from '../components/ui/Button';
+
+export const metadata = {
+  title: 'Page not found — Angular Agent Framework',
+  description: 'The page you were looking for doesn’t exist.',
+};
+
+export default function NotFound() {
+  return (
+    <Section surface="canvas" ariaLabelledBy="not-found-heading">
+      <Container>
+        <div style={{ maxWidth: 640, margin: '0 auto', textAlign: 'center' }}>
+          <Eyebrow tone="accent" style={{ marginBottom: 16 }}>404</Eyebrow>
+          <h1
+            id="not-found-heading"
+            style={{
+              fontFamily: tokens.typography.h1.family,
+              fontSize: tokens.typography.h1.size,
+              lineHeight: tokens.typography.h1.line,
+              fontWeight: 700,
+              color: tokens.colors.textPrimary,
+              margin: 0,
+              marginBottom: 16,
+              letterSpacing: '-0.02em',
+            }}
+          >
+            Page not found.
+          </h1>
+          <p
+            style={{
+              fontFamily: tokens.typography.bodyLg.family,
+              fontSize: tokens.typography.bodyLg.size,
+              lineHeight: tokens.typography.bodyLg.line,
+              color: tokens.colors.textSecondary,
+              margin: '0 auto 32px',
+              maxWidth: 480,
+            }}
+          >
+            The page you were looking for doesn&apos;t exist. It may have moved, or the link
+            you followed might be broken.
+          </p>
+          <div style={{ display: 'flex', justifyContent: 'center', gap: 12, flexWrap: 'wrap' }}>
+            <Button variant="primary" size="lg" href="/">
+              Back home
+            </Button>
+            <Button variant="secondary" size="lg" href="/docs">
+              Browse docs
+            </Button>
+          </div>
+        </div>
+      </Container>
+    </Section>
+  );
+}