diff --git a/.changeset/config.json b/.changeset/config.json
index 38ef3eed45..fba4642bd1 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -7,6 +7,6 @@
 	"access": "public",
 	"baseBranch": "main",
 	"updateInternalDependencies": "patch",
-	"ignore": ["@maple/landing", "@maple/clickhouse-cli", "@effect-router/core"],
+	"ignore": ["@maple/landing", "@maple/clickhouse-cli"],
 	"privatePackages": { "version": true, "tag": false }
 }
diff --git a/.github/workflows/deploy-pr-preview.yml b/.github/workflows/deploy-pr-preview.yml
index 4fe075703a..b1acf16ad9 100644
--- a/.github/workflows/deploy-pr-preview.yml
+++ b/.github/workflows/deploy-pr-preview.yml
@@ -353,18 +353,6 @@ jobs:
                   export-type: "env"
                   secret-name: PREVIEW_SIGNIN_KEY
 
-            # Optional: agent.* tests register only when it is set, and a missing name throws.
-            - name: Load the agent test key from Infisical
-              continue-on-error: true
-              uses: Infisical/secrets-action@d2e351f16c6ca20d17c85e6c992e04bdeb64e87d # v1.0.18
-              with:
-                  method: "oidc"
-                  identity-id: ${{ secrets.INFISICAL_MACHINE_IDENTITY_ID }}
-                  project-slug: ${{ vars.INFISICAL_PROJECT_SLUG }}
-                  env-slug: ${{ vars.PREVIEW_INFISICAL_ENV_SLUG || 'dev' }}
-                  export-type: "env"
-                  secret-name: ANTHROPIC_API_KEY
-
             - name: Run the e2e suite
               run: bunx e2e run --reporter list,junit
 
diff --git a/apps/landing/package.json b/apps/landing/package.json
index 87af0413fd..8b1ec96989 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -41,8 +41,6 @@
 		"d3-scale": "^4.0.2",
 		"effect": "catalog:effect",
 		"fuse.js": "^7.5.0",
-		"motion": "^14.0.0",
-		"ogl": "^1.0.11",
 		"react": "catalog:react",
 		"react-dom": "catalog:react",
 		"tailwindcss": "catalog:tailwind",
diff --git a/apps/landing/src/components/compare/ComparePair.astro b/apps/landing/src/components/compare/ComparePair.astro
index 5b894f5f64..c932c96687 100644
--- a/apps/landing/src/components/compare/ComparePair.astro
+++ b/apps/landing/src/components/compare/ComparePair.astro
@@ -7,14 +7,12 @@
  * who is being compared. Two hairline cells, each mark in its own brand
  * color (a vs-pairing is the one place two brand colors belong together),
  * the name, and the vendor's domain as a literal: no claim, no tagline.
- * Each cell is washed in its side's color: a flat tint from `.pair-cell`
- * under a grainy gradient canvas (`PairGrainient`, React Bits' Grainient) in the same
- * hue: the page's one animated moment.
+ * Each cell is washed in its side's color: a flat tint and a halftone dither
+ * from `.pair-cell`.
  */
 import { MapleMark } from "@maple/ui/components/icons/maple-mark";
 import BrandMarkIcon from "../BrandMarkIcon.astro";
 import { brandMark, markTint } from "../../lib/brand-marks";
-import { PairGrainient } from "./PairGrainient";
 import type { Competitor } from "../../lib/competitors";
 
 interface Props {
@@ -25,12 +23,10 @@ const { competitor } = Astro.props;
 // The vendor's brand color drives its cell's dither; near-black marks tint
 // with the muted foreground so the field stays visible on the dark ground.
 const vendorColor = markTint(brandMark(competitor.mark));
-const MAPLE_AMBER = "#e8872a"; // --primary on the dark theme, as hex
 ---
 
 <div class="relative grid grid-cols-2 gap-px overflow-hidden rounded-xl border border-border bg-border">
 	<div class="pair-cell flex flex-col items-center gap-4 px-6 py-10 text-center md:py-12" style="--pair: var(--primary)">
-		<PairGrainient client:only="react" color={MAPLE_AMBER} />
 		<span class="flex h-16 w-16 items-center justify-center rounded-xl border border-border bg-bg-elevated">
 			<MapleMark size={34} className="text-primary" />
 		</span>
@@ -40,7 +36,6 @@ const MAPLE_AMBER = "#e8872a"; // --primary on the dark theme, as hex
 		</div>
 	</div>
 	<div class="pair-cell flex flex-col items-center gap-4 px-6 py-10 text-center md:py-12" style={`--pair: ${vendorColor}`}>
-		<PairGrainient client:only="react" color={vendorColor} />
 		<span class="flex h-16 w-16 items-center justify-center rounded-xl border border-border bg-bg-elevated">
 			<BrandMarkIcon id={competitor.mark} class="h-8 w-8" />
 		</span>
diff --git a/apps/landing/src/components/compare/Grainient.tsx b/apps/landing/src/components/compare/Grainient.tsx
deleted file mode 100644
index fbe31bb986..0000000000
--- a/apps/landing/src/components/compare/Grainient.tsx
+++ /dev/null
@@ -1,397 +0,0 @@
-/**
- * Grainient: React Bits' grainy gradient swirl (reactbits.dev/backgrounds/grainient),
- * vendored for the /compare hero pairing.
- *
- * One full-screen triangle, one fragment shader, rendered through `ogl`
- * (~50 KB). Departures from upstream: the WebGL context is built in a
- * `useMountEffect` (the repo's escape hatch for one-time external sync) and
- * props reach the uniforms from the render loop through a ref, so there is
- * no second, dependency-tracked effect; no CSS file (the host positions the
- * container); and `paused` freezes the clock for reduced motion.
- */
-import { useMountEffect } from "@maple/ui/hooks/use-mount-effect"
-import { Mesh, Program, Renderer, Triangle } from "ogl"
-import { useRef } from "react"
-
-export interface GrainientProps {
-	timeSpeed?: number
-	colorBalance?: number
-	warpStrength?: number
-	warpFrequency?: number
-	warpSpeed?: number
-	warpAmplitude?: number
-	blendAngle?: number
-	blendSoftness?: number
-	rotationAmount?: number
-	noiseScale?: number
-	grainAmount?: number
-	grainScale?: number
-	grainAnimated?: boolean
-	contrast?: number
-	gamma?: number
-	saturation?: number
-	centerX?: number
-	centerY?: number
-	zoom?: number
-	color1?: string
-	color2?: string
-	color3?: string
-	lightMode?: boolean
-	/** Stop advancing time (the frame still renders once). */
-	paused?: boolean
-	className?: string
-}
-
-const hexToRgb = (hex: string): [number, number, number] => {
-	const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)
-	if (!result) return [1, 1, 1]
-	return [parseInt(result[1], 16) / 255, parseInt(result[2], 16) / 255, parseInt(result[3], 16) / 255]
-}
-
-const vertex = `#version 300 es
-in vec2 position;
-void main() {
-  gl_Position = vec4(position, 0.0, 1.0);
-}
-`
-
-const fragment = `#version 300 es
-precision highp float;
-uniform vec2 iResolution;
-uniform float iTime;
-uniform float uTimeSpeed;
-uniform float uColorBalance;
-uniform float uWarpStrength;
-uniform float uWarpFrequency;
-uniform float uWarpSpeed;
-uniform float uWarpAmplitude;
-uniform float uBlendAngle;
-uniform float uBlendSoftness;
-uniform float uRotationAmount;
-uniform float uNoiseScale;
-uniform float uGrainAmount;
-uniform float uGrainScale;
-uniform float uGrainAnimated;
-uniform float uContrast;
-uniform float uGamma;
-uniform float uSaturation;
-uniform vec2 uCenterOffset;
-uniform float uZoom;
-uniform vec3 uColor1;
-uniform vec3 uColor2;
-uniform vec3 uColor3;
-uniform float uLightMode;
-out vec4 fragColor;
-#define S(a,b,t) smoothstep(a,b,t)
-mat2 Rot(float a){float s=sin(a),c=cos(a);return mat2(c,-s,s,c);}
-vec2 hash(vec2 p){p=vec2(dot(p,vec2(2127.1,81.17)),dot(p,vec2(1269.5,283.37)));return fract(sin(p)*43758.5453);}
-float noise(vec2 p){vec2 i=floor(p),f=fract(p),u=f*f*(3.0-2.0*f);float n=mix(mix(dot(-1.0+2.0*hash(i+vec2(0.0,0.0)),f-vec2(0.0,0.0)),dot(-1.0+2.0*hash(i+vec2(1.0,0.0)),f-vec2(1.0,0.0)),u.x),mix(dot(-1.0+2.0*hash(i+vec2(0.0,1.0)),f-vec2(0.0,1.0)),dot(-1.0+2.0*hash(i+vec2(1.0,1.0)),f-vec2(1.0,1.0)),u.x),u.y);return 0.5+0.5*n;}
-void mainImage(out vec4 o, vec2 C){
-  float t=iTime*uTimeSpeed;
-  vec2 uv=C/iResolution.xy;
-  float ratio=iResolution.x/iResolution.y;
-  vec2 tuv=uv-0.5+uCenterOffset;
-  tuv/=max(uZoom,0.001);
-
-  float degree=noise(vec2(t*0.1,tuv.x*tuv.y)*uNoiseScale);
-  tuv.y*=1.0/ratio;
-  tuv*=Rot(radians((degree-0.5)*uRotationAmount+180.0));
-  tuv.y*=ratio;
-
-  float frequency=uWarpFrequency;
-  float ws=max(uWarpStrength,0.001);
-  float amplitude=uWarpAmplitude/ws;
-  float warpTime=t*uWarpSpeed;
-  tuv.x+=sin(tuv.y*frequency+warpTime)/amplitude;
-  tuv.y+=sin(tuv.x*(frequency*1.5)+warpTime)/(amplitude*0.5);
-
-  vec3 colLav=uColor1;
-  vec3 colOrg=uColor2;
-  vec3 colDark=uColor3;
-  float b=uColorBalance;
-  float s=max(uBlendSoftness,0.0);
-  mat2 blendRot=Rot(radians(uBlendAngle));
-  float blendX=(tuv*blendRot).x;
-  float edge0=-0.3-b-s;
-  float edge1=0.2-b+s;
-  float v0=0.5-b+s;
-  float v1=-0.3-b-s;
-  vec3 layer1=mix(colDark,colOrg,S(edge0,edge1,blendX));
-  vec3 layer2=mix(colOrg,colLav,S(edge0,edge1,blendX));
-  vec3 col=mix(layer1,layer2,S(v0,v1,tuv.y));
-
-  vec2 grainUv=uv*max(uGrainScale,0.001);
-  if(uGrainAnimated>0.5){grainUv+=vec2(iTime*0.05);}
-  float grain=fract(sin(dot(grainUv,vec2(12.9898,78.233)))*43758.5453);
-  col+=(grain-0.5)*uGrainAmount;
-
-  col=(col-0.5)*uContrast+0.5;
-  float luma=dot(col,vec3(0.2126,0.7152,0.0722));
-  col=mix(vec3(luma),col,uSaturation);
-  col=pow(max(col,0.0),vec3(1.0/max(uGamma,0.001)));
-  col=clamp(col,0.0,1.0);
-  if(uLightMode>0.5){
-    float energy=max(max(col.r,col.g),col.b);
-    vec3 hue=col/max(energy,0.001);
-    float chroma=length(col-vec3(dot(col,vec3(0.333333))));
-    float coverage=clamp(0.12+chroma*1.15+energy*0.18,0.0,0.88);
-    col=mix(vec3(1.0),clamp(hue*0.58+col*0.18,0.0,1.0),coverage);
-  }
-
-  o=vec4(col,1.0);
-}
-void main(){
-  vec4 o=vec4(0.0);
-  mainImage(o,gl_FragCoord.xy);
-  fragColor=o;
-}
-`
-
-interface Uniform<T> {
-	value: T
-}
-
-export default function Grainient({
-	timeSpeed = 0.25,
-	colorBalance = 0.0,
-	warpStrength = 1.0,
-	warpFrequency = 5.0,
-	warpSpeed = 2.0,
-	warpAmplitude = 50.0,
-	blendAngle = 0.0,
-	blendSoftness = 0.05,
-	rotationAmount = 500.0,
-	noiseScale = 2.0,
-	grainAmount = 0.1,
-	grainScale = 2.0,
-	grainAnimated = false,
-	contrast = 1.5,
-	gamma = 1.0,
-	saturation = 1.0,
-	centerX = 0.0,
-	centerY = 0.0,
-	zoom = 0.9,
-	color1 = "#FF9FFC",
-	color2 = "#5227FF",
-	color3 = "#B497CF",
-	lightMode = false,
-	paused = false,
-	className = "",
-}: GrainientProps) {
-	const containerRef = useRef<HTMLDivElement | null>(null)
-
-	// The latest props, read by the render loop each frame. Assigning a few
-	// floats per frame is far cheaper than a dependency-tracked effect, and it
-	// keeps the component to one mount-scoped effect.
-	const propsRef = useRef<Required<Omit<GrainientProps, "className">>>({
-		timeSpeed,
-		colorBalance,
-		warpStrength,
-		warpFrequency,
-		warpSpeed,
-		warpAmplitude,
-		blendAngle,
-		blendSoftness,
-		rotationAmount,
-		noiseScale,
-		grainAmount,
-		grainScale,
-		grainAnimated,
-		contrast,
-		gamma,
-		saturation,
-		centerX,
-		centerY,
-		zoom,
-		color1,
-		color2,
-		color3,
-		lightMode,
-		paused,
-	})
-	propsRef.current = {
-		timeSpeed,
-		colorBalance,
-		warpStrength,
-		warpFrequency,
-		warpSpeed,
-		warpAmplitude,
-		blendAngle,
-		blendSoftness,
-		rotationAmount,
-		noiseScale,
-		grainAmount,
-		grainScale,
-		grainAnimated,
-		contrast,
-		gamma,
-		saturation,
-		centerX,
-		centerY,
-		zoom,
-		color1,
-		color2,
-		color3,
-		lightMode,
-		paused,
-	}
-
-	useMountEffect(() => {
-		const container = containerRef.current
-		if (!container) return
-		// ogl's Renderer throws when the browser has no WebGL (hardware acceleration off,
-		// context limit, headless), and the shaders are GLSL 300 es, so WebGL1 cannot run them
-		// either. Keep the flat tint underneath instead.
-		const probe = document.createElement("canvas")
-		const probeGl = probe.getContext("webgl2")
-		if (!probeGl) return
-		probeGl.getExtension("WEBGL_lose_context")?.loseContext()
-
-		const renderer = new Renderer({
-			webgl: 2,
-			alpha: true,
-			antialias: false,
-			dpr: Math.min(window.devicePixelRatio || 1, 2),
-		})
-
-		const gl = renderer.gl
-		const canvas = gl.canvas as HTMLCanvasElement
-		canvas.style.width = "100%"
-		canvas.style.height = "100%"
-		canvas.style.display = "block"
-		container.appendChild(canvas)
-
-		const geometry = new Triangle(gl)
-		const program = new Program(gl, {
-			vertex,
-			fragment,
-			uniforms: {
-				iTime: { value: 0 },
-				iResolution: { value: new Float32Array([1, 1]) },
-				uTimeSpeed: { value: 0 },
-				uColorBalance: { value: 0 },
-				uWarpStrength: { value: 0 },
-				uWarpFrequency: { value: 0 },
-				uWarpSpeed: { value: 0 },
-				uWarpAmplitude: { value: 0 },
-				uBlendAngle: { value: 0 },
-				uBlendSoftness: { value: 0 },
-				uRotationAmount: { value: 0 },
-				uNoiseScale: { value: 0 },
-				uGrainAmount: { value: 0 },
-				uGrainScale: { value: 0 },
-				uGrainAnimated: { value: 0 },
-				uContrast: { value: 0 },
-				uGamma: { value: 0 },
-				uSaturation: { value: 0 },
-				uCenterOffset: { value: new Float32Array([0, 0]) },
-				uZoom: { value: 1 },
-				uColor1: { value: new Float32Array([1, 1, 1]) },
-				uColor2: { value: new Float32Array([1, 1, 1]) },
-				uColor3: { value: new Float32Array([1, 1, 1]) },
-				uLightMode: { value: 0 },
-			},
-		})
-		const u = program.uniforms as Record<string, Uniform<number | Float32Array>>
-		const mesh = new Mesh(gl, { geometry, program })
-
-		const setVec = (name: string, values: number[]) => {
-			const arr = u[name].value as Float32Array
-			for (let i = 0; i < values.length; i++) arr[i] = values[i]
-		}
-		const syncProps = () => {
-			const p = propsRef.current
-			u.uTimeSpeed.value = p.timeSpeed
-			u.uColorBalance.value = p.colorBalance
-			u.uWarpStrength.value = p.warpStrength
-			u.uWarpFrequency.value = p.warpFrequency
-			u.uWarpSpeed.value = p.warpSpeed
-			u.uWarpAmplitude.value = p.warpAmplitude
-			u.uBlendAngle.value = p.blendAngle
-			u.uBlendSoftness.value = p.blendSoftness
-			u.uRotationAmount.value = p.rotationAmount
-			u.uNoiseScale.value = p.noiseScale
-			u.uGrainAmount.value = p.grainAmount
-			u.uGrainScale.value = p.grainScale
-			u.uGrainAnimated.value = p.grainAnimated ? 1 : 0
-			u.uContrast.value = p.contrast
-			u.uGamma.value = p.gamma
-			u.uSaturation.value = p.saturation
-			setVec("uCenterOffset", [p.centerX, p.centerY])
-			u.uZoom.value = p.zoom
-			setVec("uColor1", hexToRgb(p.color1))
-			setVec("uColor2", hexToRgb(p.color2))
-			setVec("uColor3", hexToRgb(p.color3))
-			u.uLightMode.value = p.lightMode ? 1 : 0
-		}
-
-		const setSize = () => {
-			const rect = container.getBoundingClientRect()
-			const w = Math.max(1, Math.floor(rect.width))
-			const h = Math.max(1, Math.floor(rect.height))
-			renderer.setSize(w, h)
-			const res = u.iResolution.value as Float32Array
-			res[0] = gl.drawingBufferWidth
-			res[1] = gl.drawingBufferHeight
-			syncProps()
-			renderer.render({ scene: mesh })
-		}
-
-		const ro = new ResizeObserver(setSize)
-		ro.observe(container)
-		setSize()
-
-		let raf = 0
-		let isVisible = true
-		let isPageVisible = !document.hidden
-		const t0 = performance.now()
-
-		const loop = (t: number) => {
-			syncProps()
-			// Paused (reduced motion): the clock holds, the frame still renders
-			// so a color change shows.
-			if (!propsRef.current.paused) u.iTime.value = (t - t0) * 0.001
-			renderer.render({ scene: mesh })
-			raf = requestAnimationFrame(loop)
-		}
-
-		const tryStart = () => {
-			if (isVisible && isPageVisible && raf === 0) raf = requestAnimationFrame(loop)
-		}
-		const tryStop = () => {
-			if (raf !== 0) {
-				cancelAnimationFrame(raf)
-				raf = 0
-			}
-		}
-
-		const io = new IntersectionObserver(
-			([entry]) => {
-				isVisible = entry.isIntersecting
-				if (isVisible) tryStart()
-				else tryStop()
-			},
-			{ threshold: 0 },
-		)
-		io.observe(container)
-
-		const onVisibility = () => {
-			isPageVisible = !document.hidden
-			if (isPageVisible) tryStart()
-			else tryStop()
-		}
-		document.addEventListener("visibilitychange", onVisibility)
-
-		tryStart()
-
-		return () => {
-			tryStop()
-			ro.disconnect()
-			io.disconnect()
-			document.removeEventListener("visibilitychange", onVisibility)
-			canvas.remove()
-		}
-	})
-
-	return <div ref={containerRef} className={`relative h-full w-full overflow-hidden ${className}`.trim()} />
-}
diff --git a/apps/landing/src/components/compare/HubPair.astro b/apps/landing/src/components/compare/HubPair.astro
index 0d806aacd5..58df94b79c 100644
--- a/apps/landing/src/components/compare/HubPair.astro
+++ b/apps/landing/src/components/compare/HubPair.astro
@@ -7,14 +7,12 @@
 import { MapleMark } from "@maple/ui/components/icons/maple-mark";
 import BrandMarkIcon from "../BrandMarkIcon.astro";
 import { comparePath, competitors } from "../../lib/competitors";
-import { PairGrainient } from "./PairGrainient";
 
 const locale = Astro.currentLocale ?? "en";
 ---
 
 <div class="relative grid grid-cols-[1fr_1.6fr] gap-px overflow-hidden rounded-xl border border-border bg-border">
 	<div class="pair-cell flex flex-col items-center gap-4 px-6 py-10 text-center md:py-12" style="--pair: var(--primary)">
-		<PairGrainient client:only="react" color="#e8872a" />
 		<span class="flex h-16 w-16 items-center justify-center rounded-xl border border-border bg-bg-elevated">
 			<MapleMark size={34} className="text-primary" />
 		</span>
diff --git a/apps/landing/src/components/compare/PairGrainient.tsx b/apps/landing/src/components/compare/PairGrainient.tsx
deleted file mode 100644
index eaa26d1c0b..0000000000
--- a/apps/landing/src/components/compare/PairGrainient.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * PairGrainient: the grainy gradient behind one cell of the /compare logo
- * pairing, in that side's brand color.
- *
- * Wraps React Bits' `Grainient` with Maple's tokens. The three stops are the
- * brand color, the brand color pulled toward the page ground, and the
- * ground itself, so the swirl is one hue fading into the page rather than a
- * poster. Motion is slow and stops under `prefers-reduced-motion`.
- *
- * Mounted `client:only`: a WebGL canvas has no useful server render, and the
- * `.pair-cell` flat tint underneath is the ground until it appears.
- */
-import { useState } from "react"
-import Grainient from "./Grainient"
-
-/** `--background` on the dark theme. */
-const GROUND = "#1a1714"
-
-const hexToRgb = (hex: string): [number, number, number] => {
-	const n = parseInt(hex.replace("#", ""), 16)
-	return [(n >> 16) & 255, (n >> 8) & 255, n & 255]
-}
-
-const toHex = ([r, g, b]: [number, number, number]) =>
-	`#${[r, g, b]
-		.map((c) =>
-			Math.round(Math.max(0, Math.min(255, c)))
-				.toString(16)
-				.padStart(2, "0"),
-		)
-		.join("")}`
-
-/** `color` pulled `keep` of the way from the ground (0 = ground, 1 = color). */
-const towardGround = (color: string, keep: number): string => {
-	const a = hexToRgb(GROUND)
-	const b = hexToRgb(color)
-	return toHex([a[0] + (b[0] - a[0]) * keep, a[1] + (b[1] - a[1]) * keep, a[2] + (b[2] - a[2]) * keep])
-}
-
-interface Props {
-	/** Brand color as a hex literal, e.g. "#632CA6". */
-	color: string
-	/** How much of the brand color survives at the brightest stop, 0–1. */
-	strength?: number
-}
-
-export function PairGrainient({ color, strength = 0.7 }: Props) {
-	const [reduced] = useState(
-		() => typeof window !== "undefined" && window.matchMedia("(prefers-reduced-motion: reduce)").matches,
-	)
-
-	return (
-		<div className="absolute inset-0" aria-hidden="true">
-			<Grainient
-				color1={towardGround(color, strength)}
-				color2={towardGround(color, strength * 0.45)}
-				color3={GROUND}
-				timeSpeed={0.12}
-				warpStrength={1}
-				warpFrequency={3}
-				warpSpeed={1.2}
-				warpAmplitude={40}
-				blendSoftness={0.25}
-				rotationAmount={260}
-				noiseScale={1.6}
-				grainAmount={0.22}
-				grainScale={2}
-				contrast={1.15}
-				saturation={1}
-				zoom={0.85}
-				paused={reduced}
-			/>
-			{/* Vignette: the mark and names sit on a calm centre. */}
-			<div
-				className="pointer-events-none absolute inset-0"
-				style={{
-					background:
-						"radial-gradient(ellipse 58% 62% at 50% 52%, color-mix(in oklab, var(--background) 45%, transparent), transparent 100%)",
-				}}
-			/>
-		</div>
-	)
-}
diff --git a/apps/landing/src/components/live/live-waterfall.client.ts b/apps/landing/src/components/live/live-waterfall.client.ts
index c3093ca3c0..7a4687a0fa 100644
--- a/apps/landing/src/components/live/live-waterfall.client.ts
+++ b/apps/landing/src/components/live/live-waterfall.client.ts
@@ -1,23 +1,20 @@
 /**
- * Drives the live trace waterfall animation with Motion v12. Cycle structure:
+ * Drives the live trace waterfall animation with the Web Animations API. Cycle structure:
  *
  *   PLAY  (totalMs * speed)    — bars grow in sequence at 1/speed wall-speed.
  *   PAUSE (1400ms)             — all bars full; slowest-span annotation reveals.
  *   RESET (320ms)              — frame opacity fades to 0.35 (CSS transition);
  *                                bars snap back to scaleX(0); opacity returns to 1.
  *
- * Each bar is its own Motion `animate()` call with explicit delay/duration
+ * Each bar is its own `element.animate()` call with explicit delay/duration
  * matching its real wall-time window. `.is-active` is bound to each bar's
  * lifecycle (timer at start, .finished at end) so multi-active is automatic
  * and there's no per-frame index race.
  *
- * The cursor is one Motion `animate()` driving the `x` transform component, so
- * it rides the compositor — no layout work per frame.
- *
- * Uses Motion's individual transform properties (scaleX, x), not the `transform`
- * shorthand string keyframes — Motion can't interpolate opaque transform strings.
+ * The cursor is one `element.animate()` on `transform`, so it rides the
+ * compositor — no layout work per frame. Animations hold their values with
+ * `fill: "both"`, so each cycle cancels the last one's before re-arming.
  */
-import { animate, type AnimationPlaybackControls } from "motion"
 
 const PAUSE_MS = 1400
 const RESET_MS = 320
@@ -71,15 +68,11 @@ export function startWaterfall(root: HTMLElement) {
 	// Generation token: bumping it cancels any in-flight cycle. Stale callbacks
 	// (timers, .finished handlers) gate on `gen === myGen` and bail otherwise.
 	let gen = 0
-	let inflight: AnimationPlaybackControls[] = []
+	let inflight: Animation[] = []
 	let phaseTimers: number[] = []
 
 	const stopInflight = () => {
-		inflight.forEach((a) => {
-			try {
-				a.stop()
-			} catch {}
-		})
+		inflight.forEach((a) => a.cancel())
 		inflight = []
 	}
 
@@ -89,6 +82,7 @@ export function startWaterfall(root: HTMLElement) {
 	}
 
 	const armRows = () => {
+		stopInflight()
 		rows.forEach((r) => {
 			r.bar.style.transform = "scaleX(0)"
 			r.row.classList.remove("is-active", "is-slowest")
@@ -103,7 +97,7 @@ export function startWaterfall(root: HTMLElement) {
 	const playOnce = (myGen: number) => {
 		const playSec = (totalMs * speedDivisor) / 1000
 
-		const barAnims: AnimationPlaybackControls[] = []
+		const barAnims: Animation[] = []
 		rows.forEach((r) => {
 			const startSec = (r.startMs * speedDivisor) / 1000
 			const durSec = Math.max(0.01, (r.durationMs * speedDivisor) / 1000)
@@ -112,11 +106,12 @@ export function startWaterfall(root: HTMLElement) {
 				if (gen === myGen) r.row.classList.add("is-active")
 			}, startSec * 1000)
 
-			const a = animate(
-				r.bar,
-				{ scaleX: [0, 1] },
-				{ duration: durSec, delay: startSec, ease: "linear" },
-			)
+			const a = r.bar.animate([{ transform: "scaleX(0)" }, { transform: "scaleX(1)" }], {
+				duration: durSec * 1000,
+				delay: startSec * 1000,
+				easing: "linear",
+				fill: "both",
+			})
 			a.finished
 				.then(() => {
 					if (gen === myGen) r.row.classList.remove("is-active")
@@ -125,13 +120,15 @@ export function startWaterfall(root: HTMLElement) {
 			barAnims.push(a)
 		})
 
-		let cursorAnim: AnimationPlaybackControls | null = null
+		let cursorAnim: Animation | null = null
 		if (cursor) {
 			cursor.style.setProperty("--cursor-opacity", "1")
-			cursorAnim = animate(
-				cursor,
-				{ x: [trackOffsetX, trackOffsetX + trackWidth] },
-				{ duration: playSec, ease: "linear" },
+			cursorAnim = cursor.animate(
+				[
+					{ transform: `translate3d(${trackOffsetX}px, 0, 0)` },
+					{ transform: `translate3d(${trackOffsetX + trackWidth}px, 0, 0)` },
+				],
+				{ duration: playSec * 1000, easing: "linear", fill: "both" },
 			)
 		}
 
diff --git a/apps/landing/src/styles/global.css b/apps/landing/src/styles/global.css
index dd1493ca65..6634cadcab 100644
--- a/apps/landing/src/styles/global.css
+++ b/apps/landing/src/styles/global.css
@@ -416,9 +416,6 @@
 .pair-cell > :not([aria-hidden="true"]) {
 	position: relative;
 }
-.pair-cell canvas {
-	display: block;
-}
 
 /* ──────────────────────────────────────────────────────────────
    Live artifact frame.
diff --git a/apps/web/e2e/.gitignore b/apps/web/e2e/.gitignore
index 2e73892f5d..76037a174a 100644
--- a/apps/web/e2e/.gitignore
+++ b/apps/web/e2e/.gitignore
@@ -1,3 +1,2 @@
-# Run output; `cache/` holds replay recordings and is committed once agent steps run in CI.
-.e2e/*
-!.e2e/cache/
+# Run output.
+.e2e/
diff --git a/apps/web/e2e/README.md b/apps/web/e2e/README.md
index 5710054784..9df3fd7fda 100644
--- a/apps/web/e2e/README.md
+++ b/apps/web/e2e/README.md
@@ -16,8 +16,7 @@ E2E_TELEMETRY_DISABLED=1 MAPLE_E2E_APP_URL=https://app-pr-<n>.maple.dev \
   runner, so the key never reaches the page, a trace, or a model.
 - `tests/support.ts` `api()` calls the v2 API from the page with its Clerk session, for setup
   and for asserting what was saved.
-- Prefer locators and `expect`. `agent.assert` is for what selectors can't state (a chart's
-  lines); those tests register only when `ANTHROPIC_API_KEY` is set.
+- Assert with locators and `expect`. No model is configured, so `agent.*` steps are unavailable.
 - Tests create their own rules and destinations with a run-unique suffix and delete them after.
 
 CI runs this as the `e2e` job of `deploy-pr-preview.yml`, after the preview's seed and smoke test.
diff --git a/apps/web/e2e/e2e.config.ts b/apps/web/e2e/e2e.config.ts
index ef6efe4db5..b7fd9ee40d 100644
--- a/apps/web/e2e/e2e.config.ts
+++ b/apps/web/e2e/e2e.config.ts
@@ -1,9 +1,7 @@
-import { anthropic } from "@ai-sdk/anthropic"
 import { web } from "@e2e-dev/web"
 import type { E2EConfig } from "e2e"
 
 // Runs against a deployed stack: a PR preview in CI, any signed-in-able URL locally.
-// `agent.*` steps need ANTHROPIC_API_KEY; without it those tests skip themselves.
 const config: E2EConfig = {
 	projectId: "maple-web",
 	targets: [
@@ -22,8 +20,4 @@ const config: E2EConfig = {
 	assertionTimeout: 15_000,
 }
 
-if (process.env.ANTHROPIC_API_KEY) {
-	config.agents = { default: { model: anthropic("claude-sonnet-5-5") } }
-}
-
 export default config
diff --git a/apps/web/e2e/tests/alert-rules.e2e.ts b/apps/web/e2e/tests/alert-rules.e2e.ts
index 83646759d4..8a7c9d4896 100644
--- a/apps/web/e2e/tests/alert-rules.e2e.ts
+++ b/apps/web/e2e/tests/alert-rules.e2e.ts
@@ -127,22 +127,4 @@ test.describe("alert rules", () => {
 		await expect(screen.getByText(/^Breach above/)).toBeVisible({ timeout: 45_000 })
 		await expect(screen.getByText("Preview query failed")).toBeHidden()
 	})
-
-	// The agent fixture needs a model, so this one only registers when there is one.
-	if (process.env.ANTHROPIC_API_KEY) {
-		test(
-			"draws both tier lines on the chart",
-			{ session: "reviewer" },
-			async ({ agent, app, screen }) => {
-				await app.open("/alerts/create")
-				await screen.getByRole("button", /^Skip/).tap()
-				await screen.getByRole("button", "Add critical tier").tap()
-
-				await expect(screen.getByText(/^Critical above/)).toBeVisible({ timeout: 45_000 })
-				await agent.assert(
-					"The preview chart shows two dashed horizontal threshold lines: an amber one and a red one higher up",
-				)
-			},
-		)
-	}
 })
diff --git a/apps/web/package.json b/apps/web/package.json
index 9772ed449e..6bc7f28455 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -50,7 +50,6 @@
 		"uqr": "^0.1.3"
 	},
 	"devDependencies": {
-		"@ai-sdk/anthropic": "4.0.82",
 		"@e2e-dev/web": "0.15.2",
 		"@effect/language-service": "catalog:effect",
 		"@foldkit/vite-plugin": "0.28.0",
@@ -59,7 +58,6 @@
 		"@types/d3-shape": "^3.2.0",
 		"@types/node": "catalog:tooling",
 		"@types/three": "^0.186.0",
-		"ai": "7.0.143",
 		"e2e": "0.21.2",
 		"tailwindcss": "catalog:tailwind",
 		"tw-animate-css": "catalog:tailwind",
diff --git a/apps/web/src/page/preload.ts b/apps/web/src/page/preload.ts
index e9127536c3..a28abbb490 100644
--- a/apps/web/src/page/preload.ts
+++ b/apps/web/src/page/preload.ts
@@ -13,7 +13,7 @@ import type { PageMessage } from "./registry"
 
 /** TanStack's `defaultPreloadDelay`. */
 export const PRELOAD_DELAY_MS = 50
-/** `PRELOAD_HOLD_MS` in `lib/effect-router`: an unused preload is released after this. */
+/** An unused preload is released after this. */
 export const PRELOAD_HOLD_MS = 30_000
 
 export const Model = Schema.Struct({
@@ -47,12 +47,19 @@ export const intended = (model: Model, href: string): Option.Option<{ model: Mod
 	model.intents[href] !== undefined
 		? Option.none()
 		: Option.some({
-				model: { ...model, version: model.version + 1, intents: { ...model.intents, [href]: model.version + 1 } },
+				model: {
+					...model,
+					version: model.version + 1,
+					intents: { ...model.intents, [href]: model.version + 1 },
+				},
 				version: model.version + 1,
 			})
 
 /** `cancelPreload` on mouse leave or blur. */
-export const ended = (model: Model, href: string): Model => ({ ...model, intents: without(model.intents, href) })
+export const ended = (model: Model, href: string): Model => ({
+	...model,
+	intents: without(model.intents, href),
+})
 
 /** The delay elapsed: `Some` when the link is still intended (the timer was not cancelled). */
 export const elapsed = (model: Model, href: string, version: number): Option.Option<Model> =>
@@ -152,7 +159,8 @@ const pointerEntries: Stream.Stream<LinkIntent> = Stream.mergeAll(
 		Dom.streamFromEventFilterMap({
 			target: () => document,
 			type: "mousemove",
-			filterMapEvent: (event) => Option.some<PointerSample>({ x: event.clientX, y: event.clientY, href: null }),
+			filterMapEvent: (event) =>
+				Option.some<PointerSample>({ x: event.clientX, y: event.clientY, href: null }),
 		}),
 		Dom.streamFromEventFilterMap({
 			target: () => document,
@@ -170,7 +178,9 @@ const pointerEntries: Stream.Stream<LinkIntent> = Stream.mergeAll(
 		() => Option.none<Position>(),
 		(last, sample): readonly [Option.Option<Position>, ReadonlyArray<LinkIntent>] => [
 			Option.some({ x: sample.x, y: sample.y }),
-			sample.href !== null && isPointerEntry(last, sample.x, sample.y) ? [intent(sample.href, false)] : [],
+			sample.href !== null && isPointerEntry(last, sample.x, sample.y)
+				? [intent(sample.href, false)]
+				: [],
 		],
 	),
 )
@@ -191,7 +201,8 @@ export const linkIntents: Stream.Stream<LinkIntent> = Stream.mergeAll(
 		Dom.streamFromEventFilterMap({
 			target: () => document,
 			type: "focusin",
-			filterMapEvent: (event) => Option.map(internalLink(event.target), (link) => intent(link.href, false)),
+			filterMapEvent: (event) =>
+				Option.map(internalLink(event.target), (link) => intent(link.href, false)),
 		}),
 		Dom.streamFromEventFilterMap({
 			target: () => document,
@@ -201,7 +212,8 @@ export const linkIntents: Stream.Stream<LinkIntent> = Stream.mergeAll(
 		Dom.streamFromEventFilterMap({
 			target: () => document,
 			type: "touchstart",
-			filterMapEvent: (event) => Option.map(internalLink(event.target), (link) => intent(link.href, true)),
+			filterMapEvent: (event) =>
+				Option.map(internalLink(event.target), (link) => intent(link.href, true)),
 		}),
 	],
 	{ concurrency: "unbounded" },
diff --git a/bun.lock b/bun.lock
index bd4cc7dbcf..42f29fec7d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -131,7 +131,7 @@
     },
     "apps/cli": {
       "name": "@maple/cli",
-      "version": "0.0.29",
+      "version": "0.0.30",
       "bin": {
         "maple": "./src/bin.ts",
       },
@@ -204,8 +204,6 @@
         "d3-scale": "^4.0.2",
         "effect": "catalog:effect",
         "fuse.js": "^7.5.0",
-        "motion": "^14.0.0",
-        "ogl": "^1.0.11",
         "react": "catalog:react",
         "react-dom": "catalog:react",
         "tailwindcss": "catalog:tailwind",
@@ -329,7 +327,6 @@
         "uqr": "^0.1.3",
       },
       "devDependencies": {
-        "@ai-sdk/anthropic": "4.0.82",
         "@e2e-dev/web": "0.15.2",
         "@effect/language-service": "catalog:effect",
         "@foldkit/vite-plugin": "0.28.0",
@@ -338,7 +335,6 @@
         "@types/d3-shape": "^3.2.0",
         "@types/node": "catalog:tooling",
         "@types/three": "^0.186.0",
-        "ai": "7.0.143",
         "e2e": "0.21.2",
         "tailwindcss": "catalog:tailwind",
         "tw-animate-css": "catalog:tailwind",
@@ -361,9 +357,9 @@
     },
     "examples/effect-todo": {
       "name": "@maple-examples/effect-todo",
-      "version": "0.0.3",
+      "version": "0.0.4",
       "dependencies": {
-        "@effect/atom-react": "catalog:effect",
+        "@effect/atom-react": "4.0.5",
         "@effect/platform-bun": "catalog:effect",
         "@maple-dev/effect-sdk": "workspace:*",
         "effect": "catalog:effect",
@@ -443,26 +439,6 @@
         "typescript": "catalog:tooling",
       },
     },
-    "lib/effect-router": {
-      "name": "@effect-router/core",
-      "version": "0.2.0",
-      "devDependencies": {
-        "@effect/atom-react": "catalog:effect",
-        "@effect/language-service": "catalog:effect",
-        "@tanstack/react-router": "^1.170.41",
-        "@types/node": "catalog:tooling",
-        "@types/react": "catalog:react",
-        "effect": "catalog:effect",
-        "react": "catalog:react",
-        "typescript": "catalog:tooling",
-      },
-      "peerDependencies": {
-        "@effect/atom-react": "^4.0.0",
-        "@tanstack/react-router": ">=1.150.0",
-        "effect": "^4.0.0",
-        "react": ">=19.0.0",
-      },
-    },
     "lib/grid-engine": {
       "name": "@maple/grid-engine",
       "devDependencies": {
@@ -516,7 +492,7 @@
     },
     "packages/alchemy-maple": {
       "name": "@maple-dev/alchemy",
-      "version": "0.2.3",
+      "version": "0.2.4",
       "dependencies": {
         "@maple-dev/effect-sdk": "workspace:*",
       },
@@ -607,7 +583,7 @@
     },
     "packages/browser": {
       "name": "@maple-dev/browser",
-      "version": "0.11.1",
+      "version": "0.12.0",
       "dependencies": {
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/instrumentation": "^0.222.0",
@@ -695,7 +671,6 @@
         "@maple/domain": "workspace:*",
         "effect": "catalog:effect",
         "pg": "^8.23.1",
-        "postgres": "^3.4.9",
       },
       "devDependencies": {
         "@effect/language-service": "catalog:effect",
@@ -725,7 +700,7 @@
     },
     "packages/effect-sdk": {
       "name": "@maple-dev/effect-sdk",
-      "version": "0.11.0",
+      "version": "0.12.0",
       "dependencies": {
         "std-env": "^4.0.0",
       },
@@ -813,7 +788,6 @@
       "devDependencies": {
         "@effect/language-service": "catalog:effect",
         "@types/node": "catalog:tooling",
-        "expect-type": "^1.4.0",
         "typescript": "catalog:tooling",
         "vitest": "catalog:",
       },
@@ -963,7 +937,6 @@
     "effect": {
       "@effect/ai-openai-compat": "4.0.5",
       "@effect/ai-openrouter": "4.0.5",
-      "@effect/atom-react": "4.0.5",
       "@effect/language-service": "^0.87.4",
       "@effect/platform-bun": "4.0.5",
       "@effect/platform-node": "4.0.5",
@@ -994,13 +967,7 @@
     },
   },
   "packages": {
-    "@ai-sdk/anthropic": ["@ai-sdk/anthropic@4.0.82", "", { "dependencies": { "@ai-sdk/provider": "4.0.29", "@ai-sdk/provider-utils": "5.0.62" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-1HvCBHdBsfG/OTDOmo3R+rwKtVofnPCWKyMKqOa75yieQEC8V7leB40EaG6uQ1wKnqeXdc31s7tNyq+OnKV/mg=="],
-
-    "@ai-sdk/gateway": ["@ai-sdk/gateway@4.0.116", "", { "dependencies": { "@ai-sdk/provider": "4.0.29", "@ai-sdk/provider-utils": "5.0.62", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YK2As2GpxmyHi5w6R4FLepiLcs6MbIMxh6nyTMgHaoHKoM5aWEXvKDe/JqdMQ1ivOy3EPJiEBgRI677YTGxfHQ=="],
-
-    "@ai-sdk/provider": ["@ai-sdk/provider@4.0.29", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-nV7UpLADtKn9f0xfnxVZAeFEKuNkScJv5rOpHL7qeWe2EwEEBa3pd6P0QVK6D6coCJ0E8FyCgoM50AffTYrzDQ=="],
-
-    "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@5.0.62", "", { "dependencies": { "@ai-sdk/provider": "4.0.29", "@standard-schema/spec": "^1.1.0", "@workflow/serde": "4.1.0", "eventsource-parser": "^3.0.8", "undici": "^7.29.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-//6sHa6QNQdM2KHOg5pxp1UMFQB4U8cqdw/kSm9BMr0DLeaFgG3TXZfxhpwRZmxgBpOrzMVZ/gwLXH309+Ortw=="],
+    "@ai-sdk/provider": ["@ai-sdk/provider@4.0.26", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-BZ443uBEq6HuMA+Z4b7Hpm65GpZSo7pWqnYqpf/7tAO3C48JbtvAhOE2JnODFj+jodsZzfRHkAyQb64xuD2tZQ=="],
 
     "@alcalzone/ansi-tokenize": ["@alcalzone/ansi-tokenize@0.2.5", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^5.0.0" } }, "sha512-3NX/MpTdroi0aKz134A6RC2Gb2iXVECN4QaAXnvCIxxIm3C3AVB1mkUe8NaaiyvOpDfsrqWhYtj+Q6a62RrTsw=="],
 
@@ -1232,8 +1199,6 @@
 
     "@e2e-dev/web": ["@e2e-dev/web@0.15.2", "", { "dependencies": { "playwright-core": "1.64.0" }, "peerDependencies": { "e2e": ">=0.18.0 <1" }, "bin": { "e2e-web": "./dist/bin.js" } }, "sha512-XidBXbpiEeJQqPsXcEwMOon5KDk8PEaaXR65rDu5P1u115bW+2KK7DlWqYvLg/RpjK/pnOa5iNuD9JthqODLVQ=="],
 
-    "@effect-router/core": ["@effect-router/core@workspace:lib/effect-router"],
-
     "@effect/ai-openai-compat": ["@effect/ai-openai-compat@4.0.5", "", { "peerDependencies": { "effect": "^4.0.5" } }, "sha512-UuIXsrmMafHw9VSgER+Fql3GbUxpoiQ5tjsZmcRd+2DyjH/RXRYtamWwkXJquPwo7M7imXlq0hYbDjBwoAx2Aw=="],
 
     "@effect/ai-openrouter": ["@effect/ai-openrouter@4.0.5", "", { "peerDependencies": { "effect": "^4.0.5" } }, "sha512-kyOL7mFFuYWiU4igg2eA8ySQ5wS9wxvEYHna9UpjNKZSPCCn8RgkGuFpRQzAHpqbV8C2p2Lrh/aJOu7eskU64Q=="],
@@ -2106,22 +2071,12 @@
 
     "@tanstack/electric-db-collection": ["@tanstack/electric-db-collection@0.5.4", "", { "dependencies": { "@electric-sql/client": "^1.5.15", "@standard-schema/spec": "^1.1.0", "@tanstack/db": "0.11.3", "debug": "^4.4.3" } }, "sha512-me0CEYs3dIQpCDhlTHLftnkq1Otr9eG8x4/wNFHiufI9NwXJXnHOTt+v083+88QDiIXs/dKDmVHCOpE0FWVs0A=="],
 
-    "@tanstack/history": ["@tanstack/history@1.162.4", "", {}, "sha512-utTS5L2OkeYUzXGohL1Z8sefu1GLNOJcxe8Hd6iIdc/Xo1K1nDB2JEp4iSFhvYh33xKC9V91TxrS8qfrpoKobQ=="],
-
     "@tanstack/pacer-lite": ["@tanstack/pacer-lite@0.2.2", "", {}, "sha512-eQ1MyLKCHyXiH7NbdmB80W77OhiMgGBUb+qDx/8WMGbwg5Lf/NlfD0TfNYAqY77i8V3AxoDoYdICrQE5ADw4Yw=="],
 
     "@tanstack/query-core": ["@tanstack/query-core@5.104.1", "", {}, "sha512-TiRghcrGkUTE+M4JBxvpPSpBhxvIzQairw+cksrHYGr+2uwC77yW1SY9nYxnYRYOppvucf8rEg6b5byoz4rTpw=="],
 
     "@tanstack/react-query": ["@tanstack/react-query@5.104.1", "", { "dependencies": { "@tanstack/query-core": "5.104.1" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-Zz70EgjahNI7aCz8BZxM3vUGU44ycxEAzMuCUjLeA7SVhhOkg3ZgPjPJPvHjs6Rmky/dtmnu1WzjGHNHmhCoZQ=="],
 
-    "@tanstack/react-router": ["@tanstack/react-router@1.170.41", "", { "dependencies": { "@tanstack/history": "1.162.4", "@tanstack/react-store": "^0.11.2", "@tanstack/router-core": "1.171.34", "isbot": "^5.1.22" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-Mpvw8Wm5MGDbTqI8Yc9flLKxbOHwoWocv0H2aGKcgw2a017oK5nZWqa954P+DrUx/8fI98YNywnHP5XcD3tQ9w=="],
-
-    "@tanstack/react-store": ["@tanstack/react-store@0.11.2", "", { "dependencies": { "@tanstack/store": "0.11.2", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-oj5O5DmiMWE+ih+SioX2ayC1kbK7d3fpLx0B75fPJr9nY3zU+hoW010yr64qXsY/9fyiLVE2bn5mGNV3owm8RQ=="],
-
-    "@tanstack/router-core": ["@tanstack/router-core@1.171.34", "", { "dependencies": { "@tanstack/history": "1.162.4", "cookie-es": "^3.0.0", "seroval": "^1.6.7", "seroval-plugins": "^1.6.7" } }, "sha512-X+19pGuuLVPvvAvPYw9v/+ktRk5cCll8AtfpBpOhDRmVgUMrfqze0467xtq8YRVVs/mmo5rVtWn/7Tp32RDBKw=="],
-
-    "@tanstack/store": ["@tanstack/store@0.11.2", "", {}, "sha512-sJ4mjol8uQsHV0gOJzzjwXfh2Fwm+Sz0+8deqiTm4jGbMdjzNSW+xZCFm0kUa870uhd8yi+DpKnZb5Kc4apa0Q=="],
-
     "@tanstack/virtual-core": ["@tanstack/virtual-core@3.17.11", "", {}, "sha512-+ILjvtHup6Y2hzQ6YzwMgX1Q+oQpxEGOXCEsCNaPoIP0VxMbizIBTmYTDtkerkIQS8/CbP1BRuyt8V/8BCsy1g=="],
 
     "@tanstack/vue-virtual": ["@tanstack/vue-virtual@3.13.39", "", { "dependencies": { "@tanstack/virtual-core": "3.17.11" }, "peerDependencies": { "vue": "^2.7.0 || ^3.0.0" } }, "sha512-AG8sI+6nfrDvN6ixuHJL9LaJTf3//0V5VITZYW3UOaIuSVexnEzsbMu4LH/JhMfRTxwhUXPnLqkl1DlzkZbRtg=="],
@@ -2294,8 +2249,6 @@
 
     "@unhead/vue": ["@unhead/vue@3.4.1", "", { "dependencies": { "@unhead/bundler": "3.4.1", "hookable": "^6.1.1", "unhead": "3.4.1", "unplugin": "^3.3.0" }, "peerDependencies": { "vite": ">=6.4.2", "vue": ">=3.5.18", "webpack": ">=5.0.0" }, "optionalPeers": ["vite", "webpack"] }, "sha512-FQLTdsX1+m+a7Z5SzkQde8TR/4QK6p0+NQ6BuO9zbtc5xps2fRy7W+wQ90qn177C2X88aZAPzw29mg6T4VFSdA=="],
 
-    "@vercel/oidc": ["@vercel/oidc@3.2.0", "", {}, "sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug=="],
-
     "@vitejs/plugin-react": ["@vitejs/plugin-react@6.1.2", "", { "dependencies": { "@rolldown/pluginutils": "^1.0.1" }, "peerDependencies": { "@rolldown/plugin-babel": "^0.1.7 || ^0.2.0", "babel-plugin-react-compiler": "^1.0.0", "oxc-transform-react": "^0.152.0", "vite": "^8.0.0" }, "optionalPeers": ["@rolldown/plugin-babel", "babel-plugin-react-compiler", "oxc-transform-react"] }, "sha512-fhJNGUdscQa4HkI0xFxwonWyhnVReCPDbXI7FH7jmzpnVCrFQI7PRrhWecO263610vOrs9tr2Y4xcf8uAdFxbw=="],
 
     "@vitejs/plugin-vue": ["@vitejs/plugin-vue@6.0.9", "", { "dependencies": { "@rolldown/pluginutils": "^1.0.1" }, "peerDependencies": { "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", "vue": "^3.2.25" } }, "sha512-rD/MORlhaZMlXWW0rEn4FB4wMinWC0z/D7Ye160S5+Rs1mC8ZDAdcDp4SjKfUhG5t8q1ktcPVw4xuTkPRlzrSA=="],
@@ -2348,8 +2301,6 @@
 
     "@vueuse/shared": ["@vueuse/shared@14.4.0", "", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g=="],
 
-    "@workflow/serde": ["@workflow/serde@4.1.0", "", {}, "sha512-pav4F2BoirECWR7Nf1TKt+2eETcBj7jj4cBefQ8VXQCA6NPkaKeLfj/zMgi+3zYV5ZIBT4GuUiphsj0/b9hPQQ=="],
-
     "@xstate/fsm": ["@xstate/fsm@1.6.5", "", {}, "sha512-b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="],
 
     "@xyflow/react": ["@xyflow/react@12.12.0", "", { "dependencies": { "@xyflow/system": "0.0.83", "classcat": "^5.0.3", "zustand": "^4.4.0" }, "peerDependencies": { "@types/react": ">=17", "@types/react-dom": ">=17", "react": ">=17", "react-dom": ">=17" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-74oXI0Rgm1Eu33cHQAd74J6oVgCH9mbFyTVQbsGgp2kmWwh0HdtBr2VP04z8mbPD+M/xO69nqG5dDEt7/EN2rQ=="],
@@ -2422,8 +2373,6 @@
 
     "agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="],
 
-    "ai": ["ai@7.0.143", "", { "dependencies": { "@ai-sdk/gateway": "4.0.116", "@ai-sdk/provider": "4.0.29", "@ai-sdk/provider-utils": "5.0.62" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-y9QNgCK9QRHRCcHEUNoU2vemJ+q2zFX5M9T7xHCMZutfcWCqZPckkAfDbp+KHwqZDiJs5AqoKazj64cb20m5PA=="],
-
     "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="],
 
     "ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="],
@@ -2632,7 +2581,7 @@
 
     "cookie": ["cookie@2.0.1", "", {}, "sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w=="],
 
-    "cookie-es": ["cookie-es@3.1.1", "", {}, "sha512-UaXxwISYJPTr9hwQxMFYZ7kNhSXboMXP+Z3TRX6f1/NyaGPfuNUZOWP1pUEb75B2HjfklIYLVRfWiFZJyC6Npg=="],
+    "cookie-es": ["cookie-es@1.2.3", "", {}, "sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw=="],
 
     "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
 
@@ -2846,8 +2795,6 @@
 
     "events-universal": ["events-universal@1.0.1", "", { "dependencies": { "bare-events": "^2.7.0" } }, "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw=="],
 
-    "eventsource-parser": ["eventsource-parser@3.1.1", "", {}, "sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ=="],
-
     "execa": ["execa@9.6.1", "", { "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", "cross-spawn": "^7.0.6", "figures": "^6.1.0", "get-stream": "^9.0.0", "human-signals": "^8.0.1", "is-plain-obj": "^4.1.0", "is-stream": "^4.0.1", "npm-run-path": "^6.0.0", "pretty-ms": "^9.2.0", "signal-exit": "^4.1.0", "strip-final-newline": "^4.0.0", "yoctocolors": "^2.1.1" } }, "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA=="],
 
     "expect-type": ["expect-type@1.4.0", "", {}, "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA=="],
@@ -2920,8 +2867,6 @@
 
     "fractional-indexing": ["fractional-indexing@3.4.0", "", {}, "sha512-8J3glhz2rrpKG6KmI7wmJo3zH1VjeOpN+vTJSw1fOyO+Viqq3zX6/5NGh6oaZB2qIAYdOYuu5Dz9xp4faOO0Pg=="],
 
-    "framer-motion": ["framer-motion@14.0.0", "", { "dependencies": { "motion-dom": "14.0.0", "motion-utils": "14.0.0", "tslib": "^2.4.0" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["react", "react-dom"] }, "sha512-QAtHmybrDFSliyW1sexMtSQTQd+1jw2ajibEmzpuI4XdPVzQkn+dAzJMm2sW3pl9MJuSS4xN51djQ7huhlP/VA=="],
-
     "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
 
     "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
@@ -3110,8 +3055,6 @@
 
     "is64bit": ["is64bit@2.0.0", "", { "dependencies": { "system-architecture": "^0.1.0" } }, "sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw=="],
 
-    "isbot": ["isbot@5.2.2", "", {}, "sha512-iQcBXcd+Rv/pkubRyGh2utW2j1oPG5hZY6TUhVPpqK4G+o3IbxpJNx04hgksjc/N7GK5pEorUxDeg31cFgEk/w=="],
-
     "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
 
     "jiti": ["jiti@2.7.0", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="],
@@ -3360,12 +3303,6 @@
 
     "module-details-from-path": ["module-details-from-path@1.0.4", "", {}, "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w=="],
 
-    "motion": ["motion@14.0.0", "", { "dependencies": { "framer-motion": "14.0.0", "tslib": "^2.4.0" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["react", "react-dom"] }, "sha512-oGc2lkge2lkRZCP+J8/JsnYu4NFjqP1MtXirNdetn3QbvK2JqwM9A200EdT4C598KfzDhjLT12zF21xDM4Oilw=="],
-
-    "motion-dom": ["motion-dom@14.0.0", "", { "dependencies": { "motion-utils": "14.0.0" } }, "sha512-aU3ApXo1yTpeUi3JU+jbDk2TELjxPE3MbBMUP7nZHlARb6RweJK+ojmLjpuB0YsY6zhbBl1YWGo8LMsI1/Llqw=="],
-
-    "motion-utils": ["motion-utils@14.0.0", "", {}, "sha512-jBsyjVxTTRZNeuvd/v+btVXr90LQkYl4HhRu9T2ARc+PMnvkmjsjRVeAg4Qm10b6TlTw+kykWI8gu/6LuvpLSQ=="],
-
     "mrmime": ["mrmime@2.0.1", "", {}, "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ=="],
 
     "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
@@ -3406,8 +3343,6 @@
 
     "ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="],
 
-    "ogl": ["ogl@1.0.11", "", {}, "sha512-kUpC154AFfxi16pmZUK4jk3J+8zxwTWGPo03EoYA8QPbzikHoaC82n6pNTbd+oEaJonaE8aPWBlX7ad9zrqLsA=="],
-
     "ohash": ["ohash@2.0.12", "", {}, "sha512-65S/5gk9YSsaRjcyf7Nfa6h/d3E8/1gslpXfI4W7Dxn/oap8IKRuNT5VXkLQ1YFKIEg4apRY4Pj6aiwFzrDdmw=="],
 
     "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="],
@@ -3528,8 +3463,6 @@
 
     "postcss-value-parser": ["postcss-value-parser@4.2.0", "", {}, "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="],
 
-    "postgres": ["postgres@3.4.9", "", {}, "sha512-GD3qdB0x1z9xgFI6cdRD6xu2Sp2WCOEoe3mtnyB5Ee0XrrL5Pe+e4CCnJrRMnL1zYtRDZmQQVbvOttLnKDLnaw=="],
-
     "postgres-array": ["postgres-array@2.0.0", "", {}, "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="],
 
     "postgres-bytea": ["postgres-bytea@1.0.1", "", {}, "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ=="],
@@ -3702,10 +3635,6 @@
 
     "semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
 
-    "seroval": ["seroval@1.6.7", "", {}, "sha512-AeDcLh0yO2SFm9W71essgnSzLV9DI8ZH0x0knXn2DMnUZj728mpLbxjlbB6IqKCmqh8JA3cEqRyGoNkt584JcQ=="],
-
-    "seroval-plugins": ["seroval-plugins@1.6.7", "", { "peerDependencies": { "seroval": "^1.0" } }, "sha512-4Nk35ttD3DTDJW4hgw5StsVAPeU6qnDFnULAouw6tQ7oLTV/ICXrWpsXo2EE52eSP2joUMazbVf52mFEcADqRw=="],
-
     "sharp": ["sharp@0.35.5", "", { "dependencies": { "@img/colour": "^1.1.0", "detect-libc": "^2.1.2", "semver": "^7.8.5" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.35.5", "@img/sharp-darwin-x64": "0.35.5", "@img/sharp-freebsd-wasm32": "0.35.5", "@img/sharp-libvips-darwin-arm64": "1.3.4", "@img/sharp-libvips-darwin-x64": "1.3.4", "@img/sharp-libvips-linux-arm": "1.3.4", "@img/sharp-libvips-linux-arm64": "1.3.4", "@img/sharp-libvips-linux-ppc64": "1.3.4", "@img/sharp-libvips-linux-riscv64": "1.3.4", "@img/sharp-libvips-linux-s390x": "1.3.4", "@img/sharp-libvips-linux-x64": "1.3.4", "@img/sharp-libvips-linuxmusl-arm64": "1.3.4", "@img/sharp-libvips-linuxmusl-x64": "1.3.4", "@img/sharp-linux-arm": "0.35.5", "@img/sharp-linux-arm64": "0.35.5", "@img/sharp-linux-ppc64": "0.35.5", "@img/sharp-linux-riscv64": "0.35.5", "@img/sharp-linux-s390x": "0.35.5", "@img/sharp-linux-x64": "0.35.5", "@img/sharp-linuxmusl-arm64": "0.35.5", "@img/sharp-linuxmusl-x64": "0.35.5", "@img/sharp-webcontainers-wasm32": "0.35.5", "@img/sharp-win32-arm64": "0.35.5", "@img/sharp-win32-ia32": "0.35.5", "@img/sharp-win32-x64": "0.35.5" }, "peerDependencies": { "@types/node": "*" }, "optionalPeers": ["@types/node"] }, "sha512-Ywn4OnzGukp7CDMrp08RQ50YKmuwG47brZgIVPTvBaaAfQlRlygrRqSrxdCiL9M+LlzLBiJ68IR1QqvzHyjC7g=="],
 
     "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
@@ -4060,8 +3989,6 @@
 
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
-    "@ai-sdk/provider-utils/undici": ["undici@7.30.0", "", {}, "sha512-dkrQXeHSaoamnItlYbmzG0wFYrM0ZwDxCIg0A7aKjTyyhh9svRzCNFEzV+Vm05/yehjCzjDZ31KXfGEjYSztDQ=="],
-
     "@alchemy.run/cloudflare-runtime/magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
 
     "@astrojs/compiler-binding-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.3", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.3", "tslib": "^2.4.0" } }, "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg=="],
@@ -4250,8 +4177,6 @@
 
     "dot-prop/type-fest": ["type-fest@4.41.0", "", {}, "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA=="],
 
-    "e2e/@ai-sdk/provider": ["@ai-sdk/provider@4.0.26", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-BZ443uBEq6HuMA+Z4b7Hpm65GpZSo7pWqnYqpf/7tAO3C48JbtvAhOE2JnODFj+jodsZzfRHkAyQb64xuD2tZQ=="],
-
     "e2e/commander": ["commander@15.0.0", "", {}, "sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg=="],
 
     "e2e/oxc-parser": ["oxc-parser@0.153.0", "", { "dependencies": { "@oxc-project/types": "^0.153.0" }, "optionalDependencies": { "@oxc-parser/binding-android-arm-eabi": "0.153.0", "@oxc-parser/binding-android-arm64": "0.153.0", "@oxc-parser/binding-darwin-arm64": "0.153.0", "@oxc-parser/binding-darwin-x64": "0.153.0", "@oxc-parser/binding-freebsd-x64": "0.153.0", "@oxc-parser/binding-linux-arm-gnueabihf": "0.153.0", "@oxc-parser/binding-linux-arm-musleabihf": "0.153.0", "@oxc-parser/binding-linux-arm64-gnu": "0.153.0", "@oxc-parser/binding-linux-arm64-musl": "0.153.0", "@oxc-parser/binding-linux-ppc64-gnu": "0.153.0", "@oxc-parser/binding-linux-riscv64-gnu": "0.153.0", "@oxc-parser/binding-linux-riscv64-musl": "0.153.0", "@oxc-parser/binding-linux-s390x-gnu": "0.153.0", "@oxc-parser/binding-linux-x64-gnu": "0.153.0", "@oxc-parser/binding-linux-x64-musl": "0.153.0", "@oxc-parser/binding-openharmony-arm64": "0.153.0", "@oxc-parser/binding-win32-arm64-msvc": "0.153.0", "@oxc-parser/binding-win32-ia32-msvc": "0.153.0", "@oxc-parser/binding-win32-x64-msvc": "0.153.0" } }, "sha512-cEnpyyV1OJRXv++SFNw0z8i+2o/cr88rVLaOYJafELDoHM5yHvCAbwGRLvxuany6SNLcbblSMUyZaGzH+quSYg=="],
@@ -4274,8 +4199,6 @@
 
     "gray-matter/kind-of": ["kind-of@6.0.3", "", {}, "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="],
 
-    "h3/cookie-es": ["cookie-es@1.2.3", "", {}, "sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw=="],
-
     "hast-util-from-html/parse5": ["parse5@7.3.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw=="],
 
     "hast-util-raw/parse5": ["parse5@7.3.0", "", { "dependencies": { "entities": "^6.0.0" } }, "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw=="],
diff --git a/examples/effect-todo/package.json b/examples/effect-todo/package.json
index 548c9de88b..122de62b3c 100644
--- a/examples/effect-todo/package.json
+++ b/examples/effect-todo/package.json
@@ -12,7 +12,7 @@
 		"typecheck": "tsrs -p tsconfig.json && tsrs -p web/tsconfig.json"
 	},
 	"dependencies": {
-		"@effect/atom-react": "catalog:effect",
+		"@effect/atom-react": "4.0.5",
 		"@effect/platform-bun": "catalog:effect",
 		"@maple-dev/effect-sdk": "workspace:*",
 		"effect": "catalog:effect",
diff --git a/lib/effect-router/package.json b/lib/effect-router/package.json
deleted file mode 100644
index 4a0541b6fb..0000000000
--- a/lib/effect-router/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"name": "@effect-router/core",
-	"version": "0.2.0",
-	"type": "module",
-	"exports": {
-		".": "./src/index.ts",
-		"./react": "./src/react.ts"
-	},
-	"scripts": {
-		"typecheck": "tsrs --noEmit"
-	},
-	"devDependencies": {
-		"@effect/atom-react": "catalog:effect",
-		"@effect/language-service": "catalog:effect",
-		"@tanstack/react-router": "^1.170.41",
-		"@types/node": "catalog:tooling",
-		"@types/react": "catalog:react",
-		"effect": "catalog:effect",
-		"react": "catalog:react",
-		"typescript": "catalog:tooling"
-	},
-	"peerDependencies": {
-		"@effect/atom-react": "^4.0.0",
-		"@tanstack/react-router": ">=1.150.0",
-		"effect": "^4.0.0",
-		"react": ">=19.0.0"
-	}
-}
diff --git a/lib/effect-router/src/atoms.ts b/lib/effect-router/src/atoms.ts
deleted file mode 100644
index bab6854130..0000000000
--- a/lib/effect-router/src/atoms.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import type { Effect } from "effect"
-import type { Atom } from "effect/reactivity"
-import type * as AsyncResult from "effect/reactivity/AsyncResult"
-
-/**
- * Options for creating a route atom.
- */
-export interface RouteAtomOptions {
-	/**
-	 * How long the atom's result should be kept alive after all subscribers
-	 * unmount, in milliseconds. Prevents refetching on quick back-navigation.
-	 *
-	 * @default undefined (no TTL, garbage collected when unreferenced)
-	 */
-	readonly staleTime?: number
-}
-
-/**
- * A route atom function. Call it with params to get an atom that holds the
- * AsyncResult of the Effect execution.
- */
-export type RouteAtomFn<Params, A, E> = Atom.AtomResultFn<Params, A, E>
-
-/**
- * Creates a reactive atom powered by an Effect, designed for route-level
- * data fetching. The atom uses the shared AtomRuntime so all services
- * are available and tracing/memoization works through the same runtime.
- *
- * The returned function is parameterized - call it with route params/search
- * to get an atom instance. Atom.family semantics apply: same params = same
- * atom instance (memoized).
- *
- * @example
- * ```ts
- * const traceDataAtom = routeAtom(
- *   atomRuntime,
- *   (params: { traceId: string }) =>
- *     Effect.gen(function* () {
- *       const traceService = yield* TraceService
- *       return yield* traceService.getTrace(params.traceId)
- *     }),
- *   { staleTime: 30_000 }
- * )
- *
- * function TraceDetailPage() {
- *   const { traceId } = Route.useParams()
- *   const result = useAtomValue(traceDataAtom({ traceId }))
- *   // result: AsyncResult<TraceData, TraceError>
- * }
- * ```
- */
-export function routeAtom<Params, A, E>(
-	atomRuntime: Atom.AtomRuntime<any, any>,
-	effectFn: (params: Params) => Effect.Effect<A, E>,
-	options?: RouteAtomOptions,
-): RouteAtomFn<Params, A, E> {
-	// atomRuntime.fn returns AtomResultFn<Params, A, E | ER> where ER is the
-	// runtime's error type. Since the runtime uses `any`, the cast narrows
-	// ER back to the user's E for correct external typing.
-	const atom = atomRuntime.fn<Params>()(
-		(params, _get) => effectFn(params),
-		options?.staleTime !== undefined ? { reactivityKeys: undefined } : undefined,
-	)
-
-	return atom as RouteAtomFn<Params, A, E>
-}
-
-/**
- * Creates a route atom that derives its params from other atoms.
- * Useful when the Effect depends on reactive state beyond just route params.
- *
- * @example
- * ```ts
- * const dashboardDataAtom = routeAtomDerived(
- *   atomRuntime,
- *   (get) => {
- *     const timeRange = get(timeRangeAtom)
- *     const environment = get(environmentAtom)
- *     return { startTime: timeRange.start, endTime: timeRange.end, environment }
- *   },
- *   (params) =>
- *     Effect.gen(function* () {
- *       const dashboard = yield* DashboardService
- *       return yield* dashboard.getData(params)
- *     }),
- * )
- * ```
- */
-export function routeAtomDerived<Params, A, E>(
-	atomRuntime: Atom.AtomRuntime<any, any>,
-	deriveParams: (get: Atom.AtomContext) => Params,
-	effectFn: (params: Params) => Effect.Effect<A, E>,
-): Atom.Atom<AsyncResult.AsyncResult<A, E>> {
-	return atomRuntime.atom((get) => {
-		const params = deriveParams(get)
-		return effectFn(params)
-	})
-}
diff --git a/lib/effect-router/src/file-route.ts b/lib/effect-router/src/file-route.ts
deleted file mode 100644
index f905c7777b..0000000000
--- a/lib/effect-router/src/file-route.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { Atom } from "effect/reactivity"
-import { effectLoader, effectBeforeLoad, getEffectContext } from "./route.ts"
-
-/**
- * Context passed to a preload function.
- */
-export interface PreloadContext {
-	readonly params: Record<string, string>
-	readonly search: Record<string, unknown>
-}
-
-/**
- * A function that returns atoms to mount before the component renders.
- * Atoms are mounted (fire-and-forget) so fetches are already in-flight
- * when the component calls `useAtomValue`.
- */
-export type PreloadFn = (ctx: PreloadContext) => ReadonlyArray<Atom.Atom<any>>
-
-/**
- * Wraps a TanStack Router file route builder with Effect support.
- *
- * - `loader` accepts Effect-returning functions (auto-wrapped with tracing + abort support)
- * - `beforeLoad` accepts Effect-returning functions
- * - `validateSearch` accepts `Schema.toStandardSchemaV1(schema)`
- *
- * Pass a `preload` function as the second argument to warm atoms during
- * route transition without blocking navigation.
- *
- * @example
- * ```ts
- * import { createFileRoute } from "@tanstack/react-router"
- * import { effectRoute } from "@effect-router/core"
- * import { Schema } from "effect"
- *
- * export const Route = effectRoute(createFileRoute("/traces/$traceId"), ({ params }) => [
- *   getSpanHierarchyResultAtom({ traceId: params.traceId }),
- *   getTraceDataResultAtom({ traceId: params.traceId }),
- * ])({
- *   validateSearch: Schema.toStandardSchemaV1(SearchSchema),
- *   component: TraceDetailPage,
- * })
- * ```
- */
-/**
- * How long a preloaded atom is held mounted before it is released back to its
- * own idle TTL.
- *
- * A preload has to hold a subscription or the fetch it just started is
- * discarded before the component can read it. But holding it *forever* is the
- * trap: `mount` returns an unmount function, and dropping that pins the atom
- * for the life of the session. With preload-on-intent every hover runs the
- * loader, and keys that embed a time window roll over as the clock moves, so
- * the pinned set grows for as long as the tab is open.
- *
- * Releasing after a delay covers the hand-off both ways: if the user navigates,
- * the component has taken its own subscription long before this fires; if they
- * only hovered, the atom goes idle and expires normally.
- */
-const PRELOAD_HOLD_MS = 30_000
-
-/**
- * Start a fetch for each atom and release it once the hand-off window passes.
- */
-export function warmAtoms(
-	registry: { readonly mount: <A>(atom: Atom.Atom<A>) => () => void },
-	atoms: ReadonlyArray<Atom.Atom<any>>,
-): void {
-	for (const atom of atoms) {
-		const unmount = registry.mount(atom)
-		setTimeout(unmount, PRELOAD_HOLD_MS)
-	}
-}
-
-export function effectRoute<T extends (...args: any[]) => any>(fileRoute: T, preload?: PreloadFn): T {
-	return ((options?: any) => {
-		if (!options) return (fileRoute as any)()
-		return (fileRoute as any)(transformOptions(options, preload))
-	}) as T
-}
-
-function transformOptions(options: Record<string, any>, preload?: PreloadFn): Record<string, any> {
-	const result = { ...options }
-
-	const userLoader = typeof options.loader === "function" ? effectLoader(options.loader) : undefined
-
-	if (preload || userLoader) {
-		result.loader = (ctx: any) => {
-			if (preload) {
-				const { effectRegistry } = getEffectContext(ctx.context)
-				warmAtoms(effectRegistry, preload({ params: ctx.params, search: ctx.search ?? {} }))
-			}
-			if (userLoader) return userLoader(ctx)
-		}
-	}
-
-	if (typeof options.beforeLoad === "function") {
-		result.beforeLoad = effectBeforeLoad(options.beforeLoad)
-	}
-
-	return result
-}
diff --git a/lib/effect-router/src/index.ts b/lib/effect-router/src/index.ts
deleted file mode 100644
index 6e751c65d2..0000000000
--- a/lib/effect-router/src/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { createEffectRouter, type EffectRouterContext, type EffectRouterOptions } from "./router.ts"
-export { effectRoute, warmAtoms, type PreloadFn, type PreloadContext } from "./file-route.ts"
-export { effectLoader, effectBeforeLoad, type EffectLoaderFn, type EffectBeforeLoadFn } from "./route.ts"
-export { routeAtom, routeAtomDerived, type RouteAtomOptions, type RouteAtomFn } from "./atoms.ts"
diff --git a/lib/effect-router/src/provider.tsx b/lib/effect-router/src/provider.tsx
deleted file mode 100644
index 5fcaa60f78..0000000000
--- a/lib/effect-router/src/provider.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { RouterProvider, type AnyRouter, type RouterOptions } from "@tanstack/react-router"
-import { RegistryContext, useAtomMount, useAtomValue } from "@effect/atom-react"
-import type { AtomRegistry } from "effect/reactivity"
-import type { Atom } from "effect/reactivity"
-import type * as AsyncResult from "effect/reactivity/AsyncResult"
-
-/**
- * Props for the EffectRouterProvider component.
- */
-export interface EffectRouterProviderProps {
-	/**
-	 * The router created by `createEffectRouter`.
-	 */
-	readonly router: AnyRouter
-
-	/**
-	 * The AtomRegistry. Same one passed to `createEffectRouter`.
-	 */
-	readonly registry: AtomRegistry.AtomRegistry
-
-	/**
-	 * Additional router context passed to `RouterProvider`.
-	 * Typically used for auth state that changes at runtime.
-	 */
-	readonly context?: Partial<RouterOptions<any, any, any>["context"]>
-}
-
-/**
- * Combines TanStack Router's `RouterProvider` with Effect's `RegistryContext`.
- *
- * This ensures that both the router and all Effect atoms share the same
- * registry, and that `useRouteData` and other atom hooks work correctly
- * within route components.
- *
- * @example
- * ```tsx
- * function App() {
- *   return (
- *     <EffectRouterProvider router={router} registry={registry} />
- *   )
- * }
- * ```
- */
-export function EffectRouterProvider({ router, registry, context }: EffectRouterProviderProps) {
-	return (
-		<RegistryContext.Provider value={registry}>
-			<RouterProvider router={router} context={context} />
-		</RegistryContext.Provider>
-	)
-}
-
-/**
- * Hook to subscribe to a route's data atom. Returns the current
- * `AsyncResult` value, which can be `Initial`, `Success`, or `Failure`.
- *
- * This hook both mounts and subscribes to the atom, ensuring that async
- * Effects are triggered and properly cleaned up on unmount.
- *
- * @example
- * ```tsx
- * const traceDataAtom = routeAtom(atomRuntime, (params: { traceId: string }) =>
- *   Effect.gen(function* () {
- *     const traceService = yield* TraceService
- *     return yield* traceService.getTrace(params.traceId)
- *   })
- * )
- *
- * function TraceDetailPage() {
- *   const { traceId } = Route.useParams()
- *   const result = useRouteData(traceDataAtom({ traceId }))
- *   // result: AsyncResult<TraceData, TraceError>
- * }
- * ```
- */
-export function useRouteData<A, E>(
-	atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>,
-): AsyncResult.AsyncResult<A, E> {
-	useAtomMount(atom)
-	return useAtomValue(atom)
-}
diff --git a/lib/effect-router/src/react.ts b/lib/effect-router/src/react.ts
deleted file mode 100644
index a42cae4829..0000000000
--- a/lib/effect-router/src/react.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { EffectRouterProvider, useRouteData } from "./provider.tsx"
diff --git a/lib/effect-router/src/route.ts b/lib/effect-router/src/route.ts
deleted file mode 100644
index 06c4c3c452..0000000000
--- a/lib/effect-router/src/route.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-import type { ManagedRuntime } from "effect"
-import { Effect, Fiber } from "effect"
-import { type EffectRouterContext, getCurrentNavigationSpan } from "./router.ts"
-
-// Structural types for TanStack Router contexts
-
-/**
- * Structural type matching TanStack Router's loader context.
- * Used instead of `LoaderFnContext<any, ...>` to avoid erasing type info
- * with 10 `any` generic params while remaining assignable to any concrete
- * LoaderFnContext via function parameter contravariance.
- */
-interface RouterLoaderContext {
-	readonly params: Record<string, string>
-	readonly search?: Record<string, unknown>
-	readonly abortController: AbortController
-	readonly preload: boolean
-	readonly cause: "preload" | "enter" | "stay"
-	readonly location: {
-		readonly pathname: string
-		readonly search: Record<string, unknown>
-		readonly hash: string
-	}
-	readonly context: Record<string, unknown>
-	readonly route: { readonly fullPath: string; readonly id: string }
-}
-
-/**
- * Structural type matching TanStack Router's beforeLoad context.
- */
-interface RouterBeforeLoadContext {
-	readonly params: Record<string, string>
-	readonly search?: Record<string, unknown>
-	readonly abortController: AbortController
-	readonly cause: "preload" | "enter" | "stay"
-	readonly location: {
-		readonly pathname: string
-		readonly search: Record<string, unknown>
-		readonly hash: string
-	}
-	readonly context: Record<string, unknown>
-	readonly route?: { readonly fullPath: string; readonly id: string }
-}
-
-// Public context types
-
-interface EffectRouteContextBase {
-	readonly params: Record<string, string>
-	readonly search: Record<string, unknown>
-	readonly abortController: AbortController
-	readonly cause: "preload" | "enter" | "stay"
-	readonly location: {
-		readonly pathname: string
-		readonly search: Record<string, unknown>
-		readonly hash: string
-	}
-	readonly context: Record<string, unknown>
-}
-
-/**
- * The context passed to an effect loader function.
- */
-interface EffectLoaderContext extends EffectRouteContextBase {
-	readonly preload: boolean
-}
-
-/**
- * The context passed to an effect beforeLoad function.
- */
-type EffectBeforeLoadContext = EffectRouteContextBase
-
-/**
- * A function that receives route loader context and returns an Effect.
- */
-export type EffectLoaderFn<A, E = never> = (ctx: EffectLoaderContext) => Effect.Effect<A, E>
-
-/**
- * A function that receives route beforeLoad context and returns an Effect
- * that produces additional context to merge.
- */
-export type EffectBeforeLoadFn<A extends Record<string, unknown>, E = never> = (
-	ctx: EffectBeforeLoadContext,
-) => Effect.Effect<A, E>
-
-// effectLoader
-
-/**
- * Wraps an Effect-returning function into a TanStack Router loader.
- *
- * The Effect is executed using the shared ManagedRuntime from the router context,
- * so all services are available. Each invocation is wrapped in a tracing span.
- * If the route's AbortController signals, the Effect fiber is interrupted.
- *
- * Note: Effect failures become Promise rejections at this boundary. Use
- * `Effect.catchTag` within your loader to handle expected errors before
- * they cross the Effect→Promise boundary.
- *
- * @example
- * ```ts
- * export const Route = createFileRoute("/traces/$traceId")({
- *   loader: effectLoader(({ params }) =>
- *     Effect.gen(function* () {
- *       const traceService = yield* TraceService
- *       return yield* traceService.getTrace(params.traceId)
- *     })
- *   ),
- * })
- * ```
- */
-export function effectLoader<A, E = never>(
-	fn: EffectLoaderFn<A, E>,
-): (ctx: RouterLoaderContext) => Promise<A> {
-	return (ctx) => {
-		const effectCtx = getEffectContext(ctx.context)
-
-		const effect = fn({
-			params: ctx.params,
-			search: ctx.search ?? {},
-			abortController: ctx.abortController,
-			preload: ctx.preload,
-			cause: ctx.cause,
-			location: ctx.location,
-			context: ctx.context,
-		})
-
-		let traced = effect.pipe(
-			Effect.withSpan(`route.loader ${ctx.route.fullPath}`, {
-				attributes: {
-					"route.path": ctx.route.fullPath,
-					"route.cause": ctx.cause,
-					"route.preload": ctx.preload,
-				},
-			}),
-		)
-
-		const navSpan = getCurrentNavigationSpan()
-		if (navSpan) {
-			traced = Effect.withParentSpan(traced, navSpan)
-		}
-
-		return runWithAbort(effectCtx.effectManagedRuntime, traced, ctx.abortController.signal)
-	}
-}
-
-// effectBeforeLoad
-
-/**
- * Wraps an Effect-returning function into a TanStack Router beforeLoad hook.
- *
- * The returned context object is merged into the route context, making it
- * available to the route's loader and all child routes.
- *
- * Note: Effect failures become Promise rejections at this boundary.
- *
- * @example
- * ```ts
- * export const Route = createFileRoute("/admin")({
- *   beforeLoad: effectBeforeLoad(({ context }) =>
- *     Effect.gen(function* () {
- *       const auth = yield* AuthService
- *       const user = yield* auth.requireAdmin()
- *       return { user }
- *     })
- *   ),
- * })
- * ```
- */
-export function effectBeforeLoad<A extends Record<string, unknown>, E = never>(
-	fn: EffectBeforeLoadFn<A, E>,
-): (ctx: RouterBeforeLoadContext) => Promise<A> {
-	return (ctx) => {
-		const effectCtx = getEffectContext(ctx.context)
-		const routePath = ctx.route?.fullPath ?? "unknown"
-
-		const effect = fn({
-			params: ctx.params,
-			search: ctx.search ?? {},
-			abortController: ctx.abortController,
-			location: ctx.location,
-			context: ctx.context,
-			cause: ctx.cause,
-		})
-
-		let traced = effect.pipe(
-			Effect.withSpan(`route.beforeLoad ${routePath}`, {
-				attributes: {
-					"route.path": routePath,
-					"route.id": ctx.route?.id ?? "unknown",
-					"route.cause": ctx.cause,
-				},
-			}),
-		)
-
-		const navSpan = getCurrentNavigationSpan()
-		if (navSpan) {
-			traced = Effect.withParentSpan(traced, navSpan)
-		}
-
-		return runWithAbort(effectCtx.effectManagedRuntime, traced, ctx.abortController.signal)
-	}
-}
-
-// Internal helpers
-
-/**
- * Extracts the EffectRouterContext from the router context with a runtime
- * check, avoiding an unsafe `as` cast.
- */
-export function getEffectContext(context: Record<string, unknown>): EffectRouterContext {
-	if (
-		!("effectManagedRuntime" in context) ||
-		!("effectAtomRuntime" in context) ||
-		!("effectRegistry" in context)
-	) {
-		throw new Error(
-			"effect-router: effectLoader/effectBeforeLoad requires a router created with createEffectRouter()",
-		)
-	}
-	// SAFETY: the runtime guard above established every EffectRouterContext capability.
-	return context as typeof context & EffectRouterContext
-}
-
-/**
- * Run an Effect through a ManagedRuntime, interrupting the fiber if the
- * AbortSignal fires. Uses a single fiber fork and a single join for
- * cleanup and result retrieval.
- */
-function runWithAbort<A, E>(
-	managedRuntime: ManagedRuntime.ManagedRuntime<any, any>,
-	effect: Effect.Effect<A, E>,
-	signal: AbortSignal,
-): Promise<A> {
-	if (signal.aborted) {
-		return Promise.reject(new DOMException("Aborted", "AbortError"))
-	}
-
-	const fiber = managedRuntime.runFork(effect)
-
-	const onAbort = () => {
-		Effect.runFork(Fiber.interrupt(fiber))
-	}
-	signal.addEventListener("abort", onAbort, { once: true })
-
-	return Effect.runPromise(
-		Fiber.join(fiber).pipe(
-			Effect.onInterrupt(() =>
-				Effect.logWarning("Route fiber interrupted").pipe(
-					Effect.annotateLogs("signal.aborted", signal.aborted),
-				),
-			),
-			Effect.ensuring(Effect.sync(() => signal.removeEventListener("abort", onAbort))),
-		),
-	)
-}
diff --git a/lib/effect-router/src/router.ts b/lib/effect-router/src/router.ts
deleted file mode 100644
index b5d2b12497..0000000000
--- a/lib/effect-router/src/router.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import type {
-	AnyRoute,
-	RouterConstructorOptions,
-	RouterHistory,
-	TrailingSlashOption,
-} from "@tanstack/react-router"
-import { createRouter } from "@tanstack/react-router"
-import { Clock, Effect, Exit, type ManagedRuntime, type Tracer } from "effect"
-import type { Atom, AtomRegistry } from "effect/reactivity"
-
-// Internal type aliases (centralizes `any` for runtime types)
-
-type AnyManagedRuntime = ManagedRuntime.ManagedRuntime<any, any>
-type AnyAtomRuntime = Atom.AtomRuntime<any, any>
-
-/**
- * Context added to TanStack Router's context by the Effect integration.
- * Loaders and beforeLoad hooks access the runtime through this.
- */
-export interface EffectRouterContext {
-	readonly effectManagedRuntime: AnyManagedRuntime
-	readonly effectAtomRuntime: AnyAtomRuntime
-	readonly effectRegistry: AtomRegistry.AtomRegistry
-}
-
-/**
- * Options for createEffectRouter. Extends TanStack Router's options with
- * the Effect runtime, atom runtime, and registry.
- */
-export type EffectRouterOptions<
-	TRouteTree extends AnyRoute,
-	TTrailingSlashOption extends TrailingSlashOption = "never",
-	TDefaultStructuralSharingOption extends boolean = false,
-	TRouterHistory extends RouterHistory = RouterHistory,
-	TDehydrated extends Record<string, any> = Record<string, any>,
-> = Omit<
-	RouterConstructorOptions<
-		TRouteTree,
-		TTrailingSlashOption,
-		TDefaultStructuralSharingOption,
-		TRouterHistory,
-		TDehydrated
-	>,
-	"context"
-> & {
-	/**
-	 * The ManagedRuntime used to execute Effects in loaders and beforeLoad hooks.
-	 * Must share the same `memoMap` as the AtomRuntime for service memoization.
-	 *
-	 * @example
-	 * ```ts
-	 * const managedRuntime = ManagedRuntime.make(myLayer, { memoMap: Atom.defaultMemoMap })
-	 * ```
-	 */
-	readonly managedRuntime: AnyManagedRuntime
-
-	/**
-	 * The Effect AtomRuntime for creating reactive route data atoms.
-	 * Created via `Atom.runtime(layer)`.
-	 */
-	readonly atomRuntime: AnyAtomRuntime
-
-	/**
-	 * The AtomRegistry used for reactive state management.
-	 * Created via `AtomRegistry.make()`.
-	 */
-	readonly registry: AtomRegistry.AtomRegistry
-
-	/**
-	 * Additional router context merged with the Effect context.
-	 */
-	readonly context?: Record<string, unknown>
-}
-
-/**
- * Creates a TanStack Router with deep Effect integration.
- *
- * Stores the ManagedRuntime, AtomRuntime, and AtomRegistry in the router's
- * context so that `effectLoader` and `effectBeforeLoad` can run Effects
- * through the shared runtime, and route atoms can access services.
- *
- * The ManagedRuntime and AtomRuntime should share the same `memoMap`
- * (typically `Atom.defaultMemoMap`) so that service instances are reused
- * across imperative execution and reactive atoms.
- *
- * @example
- * ```ts
- * import { Atom, AtomRegistry } from "effect/reactivity"
- *
- * const atomRuntime = Atom.runtime(myServiceLayer)
- * const managedRuntime = ManagedRuntime.make(myServiceLayer, { memoMap: Atom.defaultMemoMap })
- * const registry = AtomRegistry.make({ scheduleTask })
- * registry.mount(atomRuntime)
- *
- * const router = createEffectRouter({
- *   routeTree,
- *   managedRuntime,
- *   atomRuntime,
- *   registry,
- *   context: { auth: undefined! },
- * })
- * ```
- */
-export function createEffectRouter<
-	TRouteTree extends AnyRoute,
-	TTrailingSlashOption extends TrailingSlashOption = "never",
-	TDefaultStructuralSharingOption extends boolean = false,
-	TRouterHistory extends RouterHistory = RouterHistory,
-	TDehydrated extends Record<string, any> = Record<string, any>,
->({
-	managedRuntime,
-	atomRuntime,
-	registry,
-	context: userContext,
-	...options
-}: EffectRouterOptions<
-	TRouteTree,
-	TTrailingSlashOption,
-	TDefaultStructuralSharingOption,
-	TRouterHistory,
-	TDehydrated
->) {
-	const effectContext: EffectRouterContext = {
-		effectManagedRuntime: managedRuntime,
-		effectAtomRuntime: atomRuntime,
-		effectRegistry: registry,
-	}
-
-	// Cast needed: we merge EffectRouterContext fields into the user's router
-	// context. Generic TRouteTree constraints don't survive the spread, and the
-	// context type is wider than what createRouter expects. The user's root route
-	// should include EffectRouterContext in its context type for full type safety.
-	const router = createRouter<
-		TRouteTree,
-		TTrailingSlashOption,
-		TDefaultStructuralSharingOption,
-		TRouterHistory,
-		TDehydrated
-	>({
-		...(options as any),
-		context: { ...userContext, ...effectContext },
-	})
-
-	// Navigation-level span tracking
-
-	// Span end timestamps are nanoseconds. Source the wall clock through the
-	// runtime's Clock (testable) rather than a raw Date.now(), then scale to ns.
-	const nowNanos = (): bigint => BigInt(managedRuntime.runSync(Clock.currentTimeMillis)) * 1_000_000n
-
-	router.subscribe("onBeforeNavigate", (event) => {
-		// End any lingering span from a previous navigation (shouldn't happen, but defensive)
-		if (_currentNavigationSpan) {
-			_currentNavigationSpan.end(nowNanos(), Exit.void)
-		}
-
-		_currentNavigationSpan = managedRuntime.runSync(
-			Effect.makeSpan("navigation", {
-				attributes: {
-					"navigation.from": event.fromLocation?.pathname ?? "",
-					"navigation.to": event.toLocation.pathname,
-					"navigation.pathChanged": event.pathChanged,
-				},
-			}),
-		)
-	})
-
-	router.subscribe("onResolved", () => {
-		if (_currentNavigationSpan) {
-			_currentNavigationSpan.end(nowNanos(), Exit.void)
-			_currentNavigationSpan = undefined
-		}
-	})
-
-	return router
-}
-
-// Navigation span access
-
-// Known SPA singleton: a single browser document has exactly one active
-// navigation at a time, so module-level mutable state is acceptable here.
-// Intentionally not a FiberRef — the router subscribe callbacks are synchronous
-// DOM-event handlers, not Effect fibers.
-let _currentNavigationSpan: Tracer.Span | undefined
-
-/**
- * Returns the active navigation span, if any. Used internally by
- * `effectLoader` and `effectBeforeLoad` to parent their spans under
- * a single navigation-level span.
- */
-export function getCurrentNavigationSpan(): Tracer.AnySpan | undefined {
-	return _currentNavigationSpan
-}
diff --git a/lib/effect-router/tsconfig.json b/lib/effect-router/tsconfig.json
deleted file mode 100644
index 6106a4df9e..0000000000
--- a/lib/effect-router/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"include": ["**/*.ts", "**/*.tsx"],
-	"compilerOptions": {
-		"target": "ES2022",
-		"module": "ESNext",
-		"lib": ["ES2022", "DOM", "DOM.Iterable"],
-		"jsx": "react-jsx",
-		"types": ["node"],
-		"moduleResolution": "bundler",
-		"allowImportingTsExtensions": true,
-		"verbatimModuleSyntax": true,
-		"noEmit": true,
-		"skipLibCheck": true,
-		"strict": true,
-		"noFallthroughCasesInSwitch": true,
-		"noUncheckedSideEffectImports": true,
-		"plugins": [
-			{
-				"name": "@effect/language-service",
-				"reportSuggestionsAsWarningsInTsc": true
-			}
-		]
-	}
-}
diff --git a/package.json b/package.json
index 33e6578824..ae1e0a18a2 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,6 @@
 		"effect": {
 			"@effect/ai-openai-compat": "4.0.5",
 			"@effect/ai-openrouter": "4.0.5",
-			"@effect/atom-react": "4.0.5",
 			"@effect/language-service": "^0.87.4",
 			"@effect/platform-bun": "4.0.5",
 			"@effect/platform-node": "4.0.5",
diff --git a/packages/backend/src/services/dashboards/DashboardPersistenceService.test.ts b/packages/backend/src/services/dashboards/DashboardPersistenceService.test.ts
index e13ec60f4b..968c587d7b 100644
--- a/packages/backend/src/services/dashboards/DashboardPersistenceService.test.ts
+++ b/packages/backend/src/services/dashboards/DashboardPersistenceService.test.ts
@@ -429,7 +429,7 @@ describe("DashboardPersistenceService", () => {
 
 			return Effect.gen(function* () {
 				const persistence = yield* DashboardPersistenceService
-				// Exactly what `backfill-dashboard-datasource-v3.ts` writes back.
+				// Exactly what the one-shot v2 -> v3 backfill wrote back.
 				yield* insertRawDashboard(
 					testDb,
 					"dash-backfilled",
diff --git a/packages/db/package.json b/packages/db/package.json
index fbfa4dff4f..6ae3b935a5 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -19,18 +19,16 @@
 		"db:status": "bun --bun effect-orm status",
 		"db:verify": "bun --bun effect-orm verify",
 		"db:audit-raw-sql": "bun scripts/audit-raw-sql.ts",
-		"db:restore-test": "bun scripts/restore-test.ts",
-		"db:backfill:dashboards-v3": "bun scripts/backfill-dashboard-datasource-v3.ts"
+		"db:restore-test": "bun scripts/restore-test.ts"
 	},
 	"dependencies": {
 		"@effect/sql-pg": "4.0.5",
 		"@effect/sql-pglite": "4.0.5",
 		"@electric-sql/pglite": "^0.5.8",
-		"@maple/domain": "workspace:*",
 		"@maple-dev/effect-orm": "0.5.0",
+		"@maple/domain": "workspace:*",
 		"effect": "catalog:effect",
-		"pg": "^8.23.1",
-		"postgres": "^3.4.9"
+		"pg": "^8.23.1"
 	},
 	"devDependencies": {
 		"@effect/language-service": "catalog:effect",
diff --git a/packages/db/scripts/audit-raw-sql.ts b/packages/db/scripts/audit-raw-sql.ts
index a08285fd20..c7cfd99bba 100644
--- a/packages/db/scripts/audit-raw-sql.ts
+++ b/packages/db/scripts/audit-raw-sql.ts
@@ -12,8 +12,11 @@
  *
  * Exits non-zero when anything would be rejected, so CI can gate on it.
  */
-import postgres from "postgres"
 import { rawSqlIssue, type RawSqlIssue } from "@maple/domain/raw-sql"
+import * as PgClient from "@effect/sql-pg/PgClient"
+import { Effect, ManagedRuntime, Redacted } from "effect"
+import * as SqlClient from "effect/sql/SqlClient"
+import type * as Statement from "effect/sql/Statement"
 import { dataSourceRawSql } from "@maple/widgets/dashboard"
 import { withBranchConnection } from "./planetscale-connection"
 
@@ -75,15 +78,27 @@ export const rawSqlWidgets = (payload: unknown): Array<FoundRawSql> => {
 }
 
 const audit = async (databaseUrl: string, asJson: boolean): Promise<number> => {
-	const sql = postgres(databaseUrl, { max: 1, connect_timeout: 15, prepare: false })
+	// The script owns its one connection; a failed connect rejects every query.
+	const db = ManagedRuntime.make(
+		PgClient.layer({
+			url: Redacted.make(databaseUrl),
+			maxConnections: 1,
+			prepare: false,
+			connectTimeout: "15 seconds",
+		}),
+	)
+	const query = <A extends object>(statement: (sql: SqlClient.SqlClient) => Statement.Statement<A>) =>
+		db.runPromise(Effect.flatMap(SqlClient.SqlClient, statement))
 	const findings: Array<Finding> = []
 
 	try {
-		const rules = await sql<Array<{ org_id: string; id: string; name: string; raw_query_sql: string }>>`
+		const rules = await query(
+			(sql) => sql<{ org_id: string; id: string; name: string; raw_query_sql: string }>`
 			SELECT org_id, id, name, raw_query_sql
 			FROM alert_rules
 			WHERE raw_query_sql IS NOT NULL AND raw_query_sql <> ''
-		`
+		`,
+		)
 		for (const rule of rules) {
 			// Alert rules are the workload with the extra $__timeFilter requirement.
 			const issue = rawSqlIssue(rule.raw_query_sql, { workload: "alert" })
@@ -99,11 +114,11 @@ const audit = async (databaseUrl: string, asJson: boolean): Promise<number> => {
 			}
 		}
 
-		const dashboards = await sql<
-			Array<{ org_id: string; id: string; name: string; payload_json: unknown }>
-		>`
+		const dashboards = await query(
+			(sql) => sql<{ org_id: string; id: string; name: string; payload_json: unknown }>`
 			SELECT org_id, id, name, payload_json FROM dashboards
-		`
+		`,
+		)
 		const sourceFormCounts = { kind: 0, route: 0 }
 		for (const dashboard of dashboards) {
 			for (const widget of rawSqlWidgets(dashboard.payload_json)) {
@@ -158,7 +173,7 @@ const audit = async (databaseUrl: string, asJson: boolean): Promise<number> => {
 			}
 		}
 	} finally {
-		await sql.end()
+		await db.dispose()
 	}
 
 	return findings.length
diff --git a/packages/db/scripts/backfill-dashboard-datasource-v3.test.ts b/packages/db/scripts/backfill-dashboard-datasource-v3.test.ts
deleted file mode 100644
index f609730573..0000000000
--- a/packages/db/scripts/backfill-dashboard-datasource-v3.test.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-// BOUNDARY: Test doubles preserve opaque values so the consuming boundary can be exercised.
-import { mkdtempSync, readFileSync, writeFileSync } from "node:fs"
-import { tmpdir } from "node:os"
-import { join } from "node:path"
-import { Array as Arr, Option } from "effect"
-import type postgres from "postgres"
-import { describe, expect, it } from "vitest"
-import {
-	backfillDashboards,
-	backfillVersionSnapshots,
-	openJournal,
-	restore,
-	type Args,
-	type JournalLine,
-	type RecoveryJournal,
-} from "./backfill-dashboard-datasource-v3"
-
-// A minimal v2 document (route data source) that `classify` upgrades and
-// decodes cleanly — mirrors the fixture in packages/widgets' upgrade tests.
-const v2Document = {
-	id: "3f1b7c62-5a1e-4d0f-9a3b-6c2e8d4f1a90",
-	schemaVersion: 2,
-	name: "Board",
-	timeRange: { type: "relative", value: "1h" },
-	widgets: [
-		{
-			id: "widget-1",
-			visualization: "chart",
-			dataSource: { endpoint: "service_overview", params: { serviceName: "api" } },
-			display: { title: "T" },
-			layout: { x: 0, y: 0, w: 6, h: 4 },
-		},
-	],
-	createdAt: "2026-01-01T00:00:00.000Z",
-	updatedAt: "2026-01-01T00:00:00.000Z",
-}
-
-const applyArgs: Args = {
-	apply: true,
-	batch: 100,
-	dump: "unused.jsonl",
-	quarantine: "unused-quarantine.jsonl",
-	skipVersions: false,
-}
-
-interface Captured {
-	readonly text: string
-	readonly values: unknown[]
-}
-
-/**
- * Fake postgres.js client: records every statement (template text with `$`
- * where a parameter goes) and an ordered event log, answers via `respond`.
- */
-const makeFakeSql = (respond: (query: Captured) => unknown[]) => {
-	const queries: Captured[] = []
-	const events: string[] = []
-	const tag = (strings: TemplateStringsArray, ...values: unknown[]) => {
-		const captured = { text: strings.join("$"), values }
-		queries.push(captured)
-		events.push(captured.text.includes("UPDATE") ? "update" : "select")
-		return Promise.resolve(respond(captured))
-	}
-	const sql = Object.assign(tag, {
-		json: (value: unknown) => value,
-		begin: async (callback: (tx: unknown) => Promise<void>) => {
-			events.push("begin")
-			await callback(sql)
-			events.push("commit")
-		},
-		end: async () => {},
-	})
-	// SAFETY: the script only uses the tagged-template call, `.json`, `.begin`
-	// and `.end` — exactly the surface this double implements.
-	return { sql: sql as unknown as postgres.Sql, queries, events }
-}
-
-const noopQuarantine = () => {}
-
-const recordingJournal = () => {
-	const lines: JournalLine[] = []
-	const journal: RecoveryJournal = {
-		append: (line) => lines.push(line),
-		flush: () => {},
-		close: () => {},
-		count: () => lines.length,
-	}
-	return { journal, lines }
-}
-
-describe("openJournal", () => {
-	it("persists appended lines on flush, before anything else runs", () => {
-		const dir = mkdtempSync(join(tmpdir(), "backfill-journal-"))
-		const path = join(dir, "dump.jsonl")
-		const journal = openJournal(path)
-		journal.append({ table: "dashboards", org_id: "o1", id: "d1", version: 3, upgraded_json: {} })
-		journal.flush()
-		// The line is on disk NOW — not at process exit.
-		const written = readFileSync(path, "utf8").trim().split("\n")
-		expect(written).toHaveLength(1)
-		const firstLine = Option.getOrThrow(Arr.head(written))
-		expect(JSON.parse(firstLine)).toMatchObject({ table: "dashboards", org_id: "o1", id: "d1" })
-		journal.close()
-	})
-})
-
-describe("backfillDashboards", () => {
-	it("flushes the journal before opening the batch transaction", async () => {
-		const row = { org_id: "o1", id: "d1", version: 4, payload_json: v2Document }
-		const { sql, events } = makeFakeSql((query) =>
-			query.text.includes("UPDATE") ? [{ id: "d1" }] : query.text.includes("SELECT") ? [row] : [],
-		)
-		// Shares the fake sql's event array so the interleaving is observable.
-		const lines: JournalLine[] = []
-		const journal: RecoveryJournal = {
-			append: (line) => {
-				lines.push(line)
-				events.push("journal-append")
-			},
-			flush: () => events.push("journal-flush"),
-			close: () => {},
-			count: () => lines.length,
-		}
-
-		const report = await backfillDashboards(sql, applyArgs, journal, noopQuarantine)
-		const merged = events
-
-		expect(report.converted).toBe(1)
-		// The preimage (and the upgraded payload restore will verify against)
-		// hit the fsynced journal BEFORE the transaction that writes the row.
-		const flushAt = merged.indexOf("journal-flush")
-		const beginAt = merged.indexOf("begin")
-		expect(flushAt).toBeGreaterThan(-1)
-		expect(beginAt).toBeGreaterThan(flushAt)
-		expect(lines[0]).toMatchObject({ table: "dashboards", org_id: "o1", id: "d1", version: 4 })
-		expect(lines[0]?.upgraded_json).toBeDefined()
-	})
-})
-
-describe("backfillVersionSnapshots", () => {
-	it("journals snapshot preimages and CASes on the original snapshot", async () => {
-		const row = { org_id: "o1", id: "v1", snapshot_json: v2Document }
-		const { sql, queries } = makeFakeSql((query) =>
-			query.text.includes("UPDATE") ? [{ id: "v1" }] : query.text.includes("SELECT") ? [row] : [],
-		)
-		const { journal, lines } = recordingJournal()
-
-		const report = await backfillVersionSnapshots(sql, applyArgs, journal, noopQuarantine)
-
-		expect(report.converted).toBe(1)
-		expect(lines[0]).toMatchObject({ table: "dashboard_versions", org_id: "o1", id: "v1" })
-		const update = queries.find((query) => query.text.includes("UPDATE dashboard_versions"))
-		// The original snapshot is the compare-and-swap condition: a coalesced
-		// save that rewrote the row between SELECT and UPDATE must miss.
-		expect(update?.text).toContain("AND snapshot_json = $::jsonb")
-		expect(update?.values).toContainEqual(row.snapshot_json)
-	})
-
-	it("reports a concurrent rewrite as a CAS miss, not a conversion", async () => {
-		const row = { org_id: "o1", id: "v1", snapshot_json: v2Document }
-		const { sql } = makeFakeSql((query) =>
-			query.text.includes("UPDATE") ? [] : query.text.includes("SELECT") ? [row] : [],
-		)
-		const { journal } = recordingJournal()
-
-		const report = await backfillVersionSnapshots(sql, applyArgs, journal, noopQuarantine)
-
-		expect(report.converted).toBe(0)
-		expect(report.casMissed).toBe(1)
-	})
-})
-
-describe("restore", () => {
-	const writeDump = (lines: ReadonlyArray<JournalLine>): string => {
-		const dir = mkdtempSync(join(tmpdir(), "backfill-restore-"))
-		const path = join(dir, "dump.jsonl")
-		writeFileSync(path, `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`)
-		return path
-	}
-
-	it("verifies the row still holds the backfill's payload and advances version", async () => {
-		const preimage = { schemaVersion: 2, widgets: [] }
-		const upgraded = { schemaVersion: 3, widgets: [] }
-		const path = writeDump([
-			{
-				table: "dashboards",
-				org_id: "o1",
-				id: "d1",
-				version: 4,
-				payload_json: preimage,
-				upgraded_json: upgraded,
-			},
-		])
-		const { sql, queries } = makeFakeSql(() => [{ id: "d1" }])
-
-		await restore(sql, path)
-
-		const update = queries[0]
-		// Version N+1 alone is NOT proof the backfill owns the row — a CAS-missed
-		// backfill leaves the user's edit at N+1. The current payload must equal
-		// the exact value the backfill wrote.
-		expect(update?.text).toContain("AND payload_json = $::jsonb")
-		expect(update?.values).toContainEqual(upgraded)
-		expect(update?.values).toContain(5)
-		// The optimistic-concurrency counter is monotonic: restore bumps it
-		// forward instead of handing back the pre-backfill value a stale tab
-		// could still CAS against.
-		expect(update?.text).toContain("version = version + 1")
-		expect(update?.text).not.toContain("version = $,")
-	})
-
-	it("restores dashboard_versions lines against the written snapshot", async () => {
-		const preimage = { schemaVersion: 2, widgets: [] }
-		const upgraded = { schemaVersion: 3, widgets: [] }
-		const path = writeDump([
-			{
-				table: "dashboard_versions",
-				org_id: "o1",
-				id: "v1",
-				snapshot_json: preimage,
-				upgraded_json: upgraded,
-			},
-		])
-		const { sql, queries } = makeFakeSql(() => [{ id: "v1" }])
-
-		await restore(sql, path)
-
-		const update = queries[0]
-		expect(update?.text).toContain("UPDATE dashboard_versions")
-		expect(update?.text).toContain("AND snapshot_json = $::jsonb")
-		expect(update?.values).toContainEqual(upgraded)
-		expect(update?.values).toContainEqual(preimage)
-	})
-})
diff --git a/packages/db/scripts/backfill-dashboard-datasource-v3.ts b/packages/db/scripts/backfill-dashboard-datasource-v3.ts
deleted file mode 100644
index 18543b9817..0000000000
--- a/packages/db/scripts/backfill-dashboard-datasource-v3.ts
+++ /dev/null
@@ -1,501 +0,0 @@
-#!/usr/bin/env bun
-// SAFETY-FILE: JSON rows here come from fixed internal formats and are validated before domain use.
-// BOUNDARY: This module owns unparsed external values and narrows them before domain use.
-/**
- * One-shot backfill: rewrite every stored dashboard document's data sources from
- * the v2 `{ endpoint, params }` bag to the v3 discriminated union.
- *
- * Runs ONCE per branch. There is no lazy read-path upgrade for v2 -> v3 — the
- * deployed code decodes v3 only — so between deploying that code and finishing
- * this run, un-backfilled dashboards fail to load. Keep the gap short.
- *
- * Usage:
- *   bun run db:backfill:dashboards-v3 --branch main            # dry run (default)
- *   bun run db:backfill:dashboards-v3 --branch main --apply
- *   bun run db:backfill:dashboards-v3 --url postgres://…       # local rehearsal
- *   bun run db:backfill:dashboards-v3 --url … --restore-from dump.jsonl
- *
- * Safety properties, each of which exists for a specific failure:
- *
- *   - DRY RUN IS THE DEFAULT. `--apply` is the only thing that writes.
- *   - "Done" is decided STRUCTURALLY (`isDocumentV3`), never by a flag or a
- *     version column, so re-running is inherently a no-op and no lost cursor can
- *     cause a double transform.
- *   - Every row is DECODED as v3 after transform. A row that fails is left byte
- *     identical and reported; writing a document we could not decode is the one
- *     irreversible mistake available here.
- *   - The pre-write JSONL journal is APPENDED AND FSYNCED before the batch it
- *     covers — for dashboards and for dashboard_versions snapshots — so a crash
- *     mid-run still leaves every already-written row recoverable. Each line
- *     carries the preimage AND the exact upgraded payload about to be written:
- *     restore only touches a row that still holds that exact payload, so a
- *     CAS-missed backfill row (whose version N+1 belongs to a concurrent user
- *     edit) is skipped instead of having the user's edit replaced by the stale
- *     preimage. Restore advances `version` rather than rolling it back — the
- *     counter is an optimistic-concurrency token and must stay monotonic, or a
- *     stale tab holding the pre-backfill version could CAS over the restore.
- *   - Writes CAS on `version`. Not bumping it would not avoid disturbing clients
- *     (the change streams over Electric either way) — it would let a stale tab
- *     win the compare-and-swap and silently overwrite the backfill with v2.
- *     Bumping turns that into the `DashboardConcurrencyError` every writer
- *     already retries.
- *   - `updated_at` is NOT touched: it is user-visible and the dashboard list's
- *     sort key (`dashboards_org_updated_idx`). A backfill that reshuffles every
- *     customer's list is a visible regression for zero benefit.
- *   - Keyset pagination on `(org_id, id)`, never OFFSET — rows move under you as
- *     you write. One small transaction per batch, not per run: a single large
- *     transaction holds locks against live writers and lands on Electric as one
- *     enormous change that forces every connected browser to resync at once.
- *
- * `dashboard_versions.snapshot_json` gets a second pass AFTER the dashboards
- * pass, so a partial run still leaves live documents correct. Those snapshots are
- * read through the same hard-failing `parsePayload`, so leaving them in v2 breaks
- * the version-history page, not merely restore. They are not Electric-streamed,
- * so they carry no open-tab risk.
- */
-import { closeSync, fsyncSync, openSync, readFileSync, writeSync } from "node:fs"
-import { Option, Schema } from "effect"
-import postgres from "postgres"
-import {
-	DashboardDocument,
-	DashboardDocumentV2,
-	isDocumentV3,
-	upgradeStoredDocument,
-} from "@maple/widgets/dashboard"
-import { fail, withBranchConnection } from "./planetscale-connection"
-
-const BATCH_DEFAULT = 100
-/** Breathing room for live traffic between batches. */
-const BATCH_PAUSE_MS = 150
-
-// `Option`, not `Either`: this only ever asks "did it decode?", and the issue
-// text comes from a second `decodeUnknownExit` on the failure path where it is
-// actually wanted.
-const decodeDocument = Schema.decodeUnknownOption(DashboardDocument)
-/**
- * The PREVIOUS schema, and the only honest way to ask "was this row already
- * broken?".
- *
- * Decoding the raw payload against the CURRENT schema cannot answer that: a v2
- * row never decodes as v3, that being the entire point of the backfill. Getting
- * this wrong made every unconvertible row look like pre-existing breakage and let
- * the run exit 0 on rows the flip actually strands.
- */
-const decodeV2Document = Schema.decodeUnknownOption(DashboardDocumentV2)
-const decodeIssue = (payload: unknown): string => {
-	const exit = Schema.decodeUnknownExit(DashboardDocument)(payload)
-	return exit._tag === "Failure" ? String(exit.cause) : ""
-}
-
-export interface Args {
-	readonly branch?: string
-	readonly url?: string
-	readonly apply: boolean
-	readonly batch: number
-	readonly dump: string
-	readonly quarantine: string
-	readonly restoreFrom?: string
-	readonly skipVersions: boolean
-}
-
-const parseArgs = (argv: ReadonlyArray<string>): Args => {
-	const value = (flag: string): string | undefined => {
-		const index = argv.indexOf(flag)
-		return index === -1 ? undefined : argv[index + 1]
-	}
-	const stamp = value("--stamp") ?? "run"
-	return {
-		branch: value("--branch"),
-		url: value("--url"),
-		apply: argv.includes("--apply"),
-		batch: Number(value("--batch") ?? BATCH_DEFAULT),
-		dump: value("--dump") ?? `dashboards-v3-backfill-${stamp}.jsonl`,
-		quarantine: value("--quarantine") ?? `dashboards-v3-quarantine-${stamp}.jsonl`,
-		restoreFrom: value("--restore-from"),
-		skipVersions: argv.includes("--skip-versions"),
-	}
-}
-
-interface Report {
-	scanned: number
-	alreadyV3: number
-	converted: number
-	brokenBefore: number
-	quarantined: number
-	casMissed: number
-}
-
-const emptyReport = (): Report => ({
-	scanned: 0,
-	alreadyV3: 0,
-	converted: 0,
-	brokenBefore: 0,
-	quarantined: 0,
-	casMissed: 0,
-})
-
-interface Row {
-	readonly org_id: string
-	readonly id: string
-	readonly version: number
-	readonly payload_json: unknown
-}
-
-const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
-
-/**
- * One line of the recovery journal. The preimage plus the exact upgraded
- * payload the backfill wrote: `upgraded_json` is what lets restore prove a row
- * still holds the backfill's write (and not a user's concurrent edit that won
- * the CAS) before reverting it.
- */
-export interface JournalLine {
-	readonly table: "dashboards" | "dashboard_versions"
-	readonly org_id: string
-	readonly id: string
-	/** dashboards only — the pre-backfill CAS token. */
-	readonly version?: number
-	/** dashboards preimage. */
-	readonly payload_json?: unknown
-	/** dashboard_versions preimage. */
-	readonly snapshot_json?: unknown
-	readonly upgraded_json: unknown
-}
-
-/**
- * Wire schema for a journal line read back at restore time. `upgraded_json` is
- * a REQUIRED key: a line without it predates payload-verified restore, and the
- * decode failure is what refuses to apply it.
- */
-const JournalLineSchema = Schema.Struct({
-	table: Schema.Literals(["dashboards", "dashboard_versions"]),
-	org_id: Schema.String,
-	id: Schema.String,
-	version: Schema.optionalKey(Schema.Number),
-	payload_json: Schema.optionalKey(Schema.Unknown),
-	snapshot_json: Schema.optionalKey(Schema.Unknown),
-	upgraded_json: Schema.Unknown,
-})
-const decodeJournalLine = Schema.decodeUnknownOption(JournalLineSchema)
-
-export interface RecoveryJournal {
-	readonly append: (line: JournalLine) => void
-	/** Persist (write + fsync) everything appended so far. */
-	readonly flush: () => void
-	readonly close: () => void
-	readonly count: () => number
-}
-
-/**
- * Append-only JSONL journal. `flush` is called before each batch's writes and
- * fsyncs, so an OOM kill, disk error, or crash mid-run cannot lose the
- * preimages of rows already committed — the previous version buffered every
- * line in memory and wrote once at exit, which is exactly the plan that fails
- * when the run does.
- */
-export const openJournal = (path: string): RecoveryJournal => {
-	let fd: number | null = null
-	let buffered: string[] = []
-	let count = 0
-	return {
-		append: (line) => {
-			buffered.push(JSON.stringify(line))
-			count += 1
-		},
-		flush: () => {
-			if (buffered.length === 0) return
-			if (fd === null) fd = openSync(path, "a")
-			writeSync(fd, `${buffered.join("\n")}\n`)
-			fsyncSync(fd)
-			buffered = []
-		},
-		close: () => {
-			if (fd !== null) closeSync(fd)
-			fd = null
-		},
-		count: () => count,
-	}
-}
-
-/**
- * Classifies a row without writing anything.
- *
- * `brokenBefore` is reported separately from `quarantined` on purpose: a row that
- * does not decode BEFORE the transform is already failing in production today
- * (`parsePayload` hard-fails, so `get`/`list` already error for that org). Mixing
- * the two would send someone hunting a regression that predates this change, and
- * the dry run's `brokenBefore` count is the sharpest available pre-flight signal
- * — it is exactly how many dashboards the flip strands.
- */
-const classify = (payload: unknown) => {
-	if (isDocumentV3(payload)) return { kind: "already_v3" as const }
-
-	const upgraded = upgradeStoredDocument(payload)
-	if (Option.isNone(decodeDocument(upgraded))) {
-		const issue = decodeIssue(upgraded)
-		// Did it decode under the OLD schema? If not, the row is already failing in
-		// production today and the flip is not what stranded it. If it did, the flip
-		// is what breaks it — that is a quarantine, and it gates the run.
-		return Option.isNone(decodeV2Document(payload))
-			? { kind: "broken_before" as const, issue }
-			: { kind: "quarantined" as const, issue }
-	}
-	return { kind: "converted" as const, upgraded }
-}
-
-export const backfillDashboards = async (
-	sql: postgres.Sql,
-	args: Args,
-	journal: RecoveryJournal,
-	quarantine: (line: unknown) => void,
-): Promise<Report> => {
-	const report = emptyReport()
-	let cursor: { org: string; id: string } | null = null
-
-	for (;;) {
-		const rows: Row[] = cursor
-			? await sql`
-					SELECT org_id, id, version, payload_json FROM dashboards
-					WHERE (org_id, id) > (${cursor.org}, ${cursor.id})
-					ORDER BY org_id, id LIMIT ${args.batch}`
-			: await sql`
-					SELECT org_id, id, version, payload_json FROM dashboards
-					ORDER BY org_id, id LIMIT ${args.batch}`
-		if (rows.length === 0) break
-
-		const writes: Array<{ row: Row; upgraded: unknown }> = []
-		for (const row of rows) {
-			report.scanned += 1
-			const outcome = classify(row.payload_json)
-			if (outcome.kind === "already_v3") {
-				report.alreadyV3 += 1
-			} else if (outcome.kind === "broken_before") {
-				report.brokenBefore += 1
-				quarantine({ ...row, reason: "broken_before", issue: outcome.issue })
-			} else if (outcome.kind === "quarantined") {
-				report.quarantined += 1
-				quarantine({ ...row, reason: "quarantined", issue: outcome.issue })
-			} else {
-				writes.push({ row, upgraded: outcome.upgraded })
-			}
-		}
-
-		if (args.apply && writes.length > 0) {
-			// Journal + fsync BEFORE the write, so a crash between the two still
-			// leaves every already-written row recoverable from the file.
-			for (const { row, upgraded } of writes) {
-				journal.append({ table: "dashboards", ...row, upgraded_json: upgraded })
-			}
-			journal.flush()
-
-			await sql.begin(async (tx) => {
-				for (const { row, upgraded } of writes) {
-					const result = await tx`
-						UPDATE dashboards
-						SET payload_json = ${tx.json(upgraded as never)}, version = version + 1
-						WHERE org_id = ${row.org_id} AND id = ${row.id} AND version = ${row.version}
-						RETURNING id`
-					if (result.length === 0) report.casMissed += 1
-					else report.converted += 1
-				}
-			})
-		} else {
-			report.converted += writes.length
-		}
-
-		const last = rows[rows.length - 1]!
-		cursor = { org: last.org_id, id: last.id }
-		if (rows.length < args.batch) break
-		await sleep(BATCH_PAUSE_MS)
-	}
-
-	return report
-}
-
-export const backfillVersionSnapshots = async (
-	sql: postgres.Sql,
-	args: Args,
-	journal: RecoveryJournal,
-	quarantine: (line: unknown) => void,
-): Promise<Report> => {
-	const report = emptyReport()
-	let cursor: { org: string; id: string } | null = null
-
-	for (;;) {
-		const rows: Array<{ org_id: string; id: string; snapshot_json: unknown }> = cursor
-			? await sql`
-					SELECT org_id, id, snapshot_json FROM dashboard_versions
-					WHERE (org_id, id) > (${cursor.org}, ${cursor.id})
-					ORDER BY org_id, id LIMIT ${args.batch}`
-			: await sql`
-					SELECT org_id, id, snapshot_json FROM dashboard_versions
-					ORDER BY org_id, id LIMIT ${args.batch}`
-		if (rows.length === 0) break
-
-		const writes: Array<{ row: (typeof rows)[number]; upgraded: unknown }> = []
-		for (const row of rows) {
-			report.scanned += 1
-			const outcome = classify(row.snapshot_json)
-			if (outcome.kind === "already_v3") {
-				report.alreadyV3 += 1
-				continue
-			}
-			if (outcome.kind !== "converted") {
-				// Downgraded to a report rather than a run-failing gate: a stranded
-				// historical snapshot degrades one entry in the version list. It does
-				// not lock anyone out of editing, which is what the live-document
-				// quarantine does.
-				report[outcome.kind === "broken_before" ? "brokenBefore" : "quarantined"] += 1
-				quarantine({ ...row, reason: `snapshot_${outcome.kind}` })
-				continue
-			}
-			writes.push({ row, upgraded: outcome.upgraded })
-		}
-
-		if (args.apply && writes.length > 0) {
-			// Snapshot preimages go in the same fsynced journal as dashboards —
-			// these mutations previously had no rollback path at all.
-			for (const { row, upgraded } of writes) {
-				journal.append({ table: "dashboard_versions", ...row, upgraded_json: upgraded })
-			}
-			journal.flush()
-			for (const { row, upgraded } of writes) {
-				// No version column here, so the preimage itself is the CAS: the
-				// persistence service coalesces a fresh save by rewriting this row
-				// in place, and an unconditioned UPDATE racing it would bury the
-				// newer user snapshot under an upgrade of the older one. A miss is
-				// reported, not converted; the re-run classifies the new snapshot
-				// on its own. `created_at` is left alone so history keeps ordering.
-				const result = await sql`
-					UPDATE dashboard_versions SET snapshot_json = ${sql.json(upgraded as never)}
-					WHERE org_id = ${row.org_id} AND id = ${row.id}
-						AND snapshot_json = ${sql.json(row.snapshot_json as never)}::jsonb
-					RETURNING id`
-				if (result.length === 0) report.casMissed += 1
-				else report.converted += 1
-			}
-		} else {
-			report.converted += writes.length
-		}
-
-		const last = rows[rows.length - 1]!
-		cursor = { org: last.org_id, id: last.id }
-		if (rows.length < args.batch) break
-		await sleep(BATCH_PAUSE_MS)
-	}
-
-	return report
-}
-
-/**
- * Restores preimages from a journal, guarded on the row still holding the
- * exact payload the backfill wrote (`upgraded_json`) — `version = N + 1` alone
- * is not proof of ownership: when the backfill's CAS missed, N + 1 belongs to
- * the user's concurrent edit, and matching on it alone replaced that edit with
- * the stale preimage.
- *
- * A row anyone has edited since the backfill fails the payload guard and is
- * reported rather than reverted. Dashboards restores bump `version` forward —
- * it is an optimistic-concurrency token, and handing back the pre-backfill
- * value would let a stale tab's CAS overwrite the restored state.
- */
-export const restore = async (sql: postgres.Sql, path: string): Promise<void> => {
-	const text = readFileSync(path, "utf8")
-	let restored = 0
-	let skipped = 0
-	for (const line of text.split("\n").filter((l) => l.trim().length > 0)) {
-		const row = Option.getOrElse(decodeJournalLine(JSON.parse(line)), () =>
-			fail(
-				"Journal line lacks upgraded_json (or is malformed) — this dump predates payload-verified restore and cannot be applied safely.",
-			),
-		)
-		if (row.table === "dashboard_versions") {
-			const result = await sql`
-				UPDATE dashboard_versions SET snapshot_json = ${sql.json(row.snapshot_json as never)}
-				WHERE org_id = ${row.org_id} AND id = ${row.id}
-					AND snapshot_json = ${sql.json(row.upgraded_json as never)}::jsonb
-				RETURNING id`
-			if (result.length === 0) skipped += 1
-			else restored += 1
-			continue
-		}
-		const result = await sql`
-			UPDATE dashboards SET payload_json = ${sql.json(row.payload_json as never)}, version = version + 1
-			WHERE org_id = ${row.org_id} AND id = ${row.id}
-				AND version = ${(row.version ?? 0) + 1}
-				AND payload_json = ${sql.json(row.upgraded_json as never)}::jsonb
-			RETURNING id`
-		if (result.length === 0) skipped += 1
-		else restored += 1
-	}
-	console.log(`\n✓ Restored ${restored} row(s); skipped ${skipped} edited since the backfill.`)
-}
-
-const printReport = (label: string, report: Report, apply: boolean): void => {
-	console.log(`\n${label}${apply ? "" : "  (DRY RUN — nothing written)"}`)
-	console.log(`  scanned         ${report.scanned}`)
-	console.log(`  already v3      ${report.alreadyV3}`)
-	console.log(`  ${apply ? "converted" : "would convert"}   ${report.converted}`)
-	console.log(`  broken before   ${report.brokenBefore}   (already failing in production today)`)
-	console.log(`  quarantined     ${report.quarantined}   (left untouched)`)
-	if (apply) console.log(`  CAS missed      ${report.casMissed}   (edited mid-run; re-run to pick up)`)
-}
-
-const run = async (connectionUrl: string, args: Args): Promise<void> => {
-	const sql = postgres(connectionUrl, { max: 1, prepare: false, onnotice: () => {} })
-	const journal = openJournal(args.dump)
-	const quarantineLines: string[] = []
-
-	try {
-		if (args.restoreFrom !== undefined) {
-			await restore(sql, args.restoreFrom)
-			return
-		}
-
-		const dashboards = await backfillDashboards(sql, args, journal, (line) =>
-			quarantineLines.push(JSON.stringify(line)),
-		)
-		printReport("dashboards", dashboards, args.apply)
-
-		let snapshots: Report | null = null
-		if (!args.skipVersions) {
-			snapshots = await backfillVersionSnapshots(sql, args, journal, (line) =>
-				quarantineLines.push(JSON.stringify(line)),
-			)
-			printReport("dashboard_versions", snapshots, args.apply)
-		}
-
-		if (args.apply && journal.count() > 0) {
-			console.log(`\n✓ Pre-write journal: ${args.dump} (${journal.count()} rows)`)
-			console.log("  Contains customer SQL and query definitions — treat as production data.")
-		}
-		if (quarantineLines.length > 0) {
-			await Bun.write(args.quarantine, `${quarantineLines.join("\n")}\n`)
-			console.log(`\n✗ Quarantine: ${args.quarantine} (${quarantineLines.length} rows)`)
-		}
-
-		// Non-zero on a live-document quarantine only. `brokenBefore` is pre-existing
-		// breakage and must not make a clean run look failed — but it is reported, and
-		// it is the number that says how many dashboards the flip strands.
-		if (dashboards.quarantined > 0) {
-			fail(`${dashboards.quarantined} live dashboard(s) quarantined — inspect ${args.quarantine}`)
-		}
-	} finally {
-		journal.close()
-		await sql.end({ timeout: 5 })
-	}
-}
-
-// CLI entry (skipped when the exports above are imported by tests).
-if (import.meta.main) {
-	const args = parseArgs(process.argv.slice(2))
-	const url = Option.fromUndefinedOr(args.url)
-	const branch = Option.fromUndefinedOr(args.branch)
-	if (Option.isSome(url)) {
-		await run(url.value, args)
-	} else if (Option.isSome(branch)) {
-		await withBranchConnection(branch.value, (connectionUrl) => run(connectionUrl, args))
-	} else {
-		fail("Pass --branch <name> (PlanetScale) or --url <dsn> (local rehearsal).")
-	}
-}
diff --git a/packages/db/scripts/restore-test.ts b/packages/db/scripts/restore-test.ts
index b8e5e3a4c3..d5d532157d 100644
--- a/packages/db/scripts/restore-test.ts
+++ b/packages/db/scripts/restore-test.ts
@@ -50,7 +50,10 @@
 import { appendFileSync, mkdirSync, writeFileSync } from "node:fs"
 import { resolve } from "node:path"
 import * as Predicate from "effect/Predicate"
-import postgres from "postgres"
+import * as PgClient from "@effect/sql-pg/PgClient"
+import { Effect, ManagedRuntime, Redacted } from "effect"
+import * as SqlClient from "effect/sql/SqlClient"
+import type * as Statement from "effect/sql/Statement"
 import { fail, resolveDatabase, runPscale, withBranchConnection } from "./planetscale-connection"
 
 const READY_TIMEOUT_MS = 25 * 60 * 1000
@@ -269,7 +272,10 @@ interface Verification {
 }
 
 const verify = async (connectionUrl: string, backup: Backup): Promise<Verification> => {
-	const sql = postgres(connectionUrl, { max: 1, fetch_types: false })
+	// The script owns its one connection; a failed connect rejects every query.
+	const db = ManagedRuntime.make(PgClient.layer({ url: Redacted.make(connectionUrl), maxConnections: 1 }))
+	const query = <A extends object>(statement: (sql: SqlClient.SqlClient) => Statement.Statement<A>) =>
+		db.runPromise(Effect.flatMap(SqlClient.SqlClient, statement))
 	const checks: Check[] = []
 	// A query that fails is a failed check with the report still written, not
 	// a crash that loses the report.
@@ -283,9 +289,11 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 	}
 	try {
 		const mig = await checked("migrations journal restored", async () => {
-			const [row] = await sql<Array<{ applied: number; latest_at: string | null }>>`
+			const [row] = await query(
+				(sql) => sql<{ applied: number; latest_at: string | null }>`
 				SELECT count(*)::int AS applied, max(created_at)::text AS latest_at
-				FROM drizzle.__drizzle_migrations`
+				FROM drizzle.__drizzle_migrations`,
+			)
 			return row
 		})
 		const migrations = {
@@ -302,19 +310,25 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 
 		const publicTables =
 			(await checked("public tables", async () => {
-				const [row] = await sql<Array<{ n: number }>>`
+				const [row] = await query(
+					(sql) => sql<{ n: number }>`
 					SELECT count(*)::int AS n FROM information_schema.tables
-					WHERE table_schema = 'public' AND table_type = 'BASE TABLE'`
+					WHERE table_schema = 'public' AND table_type = 'BASE TABLE'`,
+				)
 				return row?.n ?? 0
 			})) ?? 0
 
 		const rowCounts: Record<string, string> = {}
 		for (const { name, nonEmpty } of CRITICAL_TABLES) {
 			const n = await checked(`table ${name}`, async () => {
-				const [exists] = await sql<Array<{ present: boolean }>>`
-					SELECT to_regclass(${`public.${name}`}) IS NOT NULL AS present`
+				const [exists] = await query(
+					(sql) => sql<{ present: boolean }>`
+					SELECT to_regclass(${`public.${name}`}) IS NOT NULL AS present`,
+				)
 				if (!exists?.present) return null
-				const [row] = await sql<Array<{ n: number }>>`SELECT count(*)::int AS n FROM ${sql(name)}`
+				const [row] = await query(
+					(sql) => sql<{ n: number }>`SELECT count(*)::int AS n FROM ${sql(name)}`,
+				)
 				return row?.n ?? 0
 			})
 			if (n === undefined) continue
@@ -334,12 +348,14 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 		// backup's own window (not after it completed, not stale before it
 		// started) — this is what shows the branch holds the backup's snapshot.
 		const newestAt = await checked("newest record inside the backup window", async () => {
-			const [row] = await sql<Array<{ newest: string | null }>>`
+			const [row] = await query(
+				(sql) => sql<{ newest: string | null }>`
 				SELECT greatest(
 					(SELECT max(created_at) FROM error_issue_events),
 					(SELECT max(updated_at) FROM alert_rules),
 					(SELECT max(updated_at) FROM dashboards)
-				)::text AS newest`
+				)::text AS newest`,
+			)
 			return row?.newest ? new Date(row.newest).toISOString() : null
 		})
 		if (newestAt !== undefined) {
@@ -356,10 +372,12 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 		}
 
 		const orphans = await checked("dashboard_versions → dashboards integrity", async () => {
-			const [row] = await sql<Array<{ n: number }>>`
+			const [row] = await query(
+				(sql) => sql<{ n: number }>`
 				SELECT count(*)::int AS n FROM dashboard_versions v
 				LEFT JOIN dashboards d ON d.id = v.dashboard_id
-				WHERE d.id IS NULL`
+				WHERE d.id IS NULL`,
+			)
 			return row?.n ?? 0
 		})
 		if (orphans !== undefined) {
@@ -371,10 +389,12 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 		}
 
 		const sample = await checked("sample record readable with its history", async () => {
-			const [row] = await sql<Array<{ version_count: number }>>`
+			const [row] = await query(
+				(sql) => sql<{ version_count: number }>`
 				SELECT count(v.id)::int AS version_count
 				FROM dashboards d LEFT JOIN dashboard_versions v ON v.dashboard_id = d.id
-				GROUP BY d.id ORDER BY max(d.updated_at) DESC NULLS LAST LIMIT 1`
+				GROUP BY d.id ORDER BY max(d.updated_at) DESC NULLS LAST LIMIT 1`,
+			)
 			return row ?? null
 		})
 		if (sample !== undefined) {
@@ -395,7 +415,7 @@ const verify = async (connectionUrl: string, backup: Backup): Promise<Verificati
 			newest_record_at: newestAt ?? null,
 		}
 	} finally {
-		await sql.end()
+		await db.dispose()
 	}
 }
 
diff --git a/packages/query-engine/package.json b/packages/query-engine/package.json
index c0bed11e9a..2fd8d1324a 100644
--- a/packages/query-engine/package.json
+++ b/packages/query-engine/package.json
@@ -37,7 +37,6 @@
 	"devDependencies": {
 		"@effect/language-service": "catalog:effect",
 		"@types/node": "catalog:tooling",
-		"expect-type": "^1.4.0",
 		"typescript": "catalog:tooling",
 		"vitest": "catalog:"
 	}
diff --git a/packages/query-engine/src/ch/endpoint-types.test-d.ts b/packages/query-engine/src/ch/endpoint-types.test-d.ts
index 1840516a54..9c79903e25 100644
--- a/packages/query-engine/src/ch/endpoint-types.test-d.ts
+++ b/packages/query-engine/src/ch/endpoint-types.test-d.ts
@@ -13,7 +13,7 @@
 // typecheck error here.
 
 import type { DateTime } from "effect"
-import { expectTypeOf } from "expect-type"
+import { expectTypeOf } from "vitest"
 import type {
 	ErrorDetailTracesOutput,
 	ErrorsFacetsOutput,
diff --git a/packages/query-engine/src/query-builder/model.test-d.ts b/packages/query-engine/src/query-builder/model.test-d.ts
index 806dbd1160..7c82b020cc 100644
--- a/packages/query-engine/src/query-builder/model.test-d.ts
+++ b/packages/query-engine/src/query-builder/model.test-d.ts
@@ -1,7 +1,7 @@
 // Type-level drift guard: the runtime query-draft union must stay assignable to
 // the domain wire schema, so a draft built in memory is always a valid payload.
 
-import { expectTypeOf } from "expect-type"
+import { expectTypeOf } from "vitest"
 import type { QueryBuilderQueryDraftPayload } from "@maple/domain/http"
 import type { QueryBuilderQueryDraft } from "./model"