From 249b292d437d9631f730a42e9007f121cb94ef43 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:05:00 -0700
Subject: [PATCH 01/11] fix(dashboard): isolate tab routing and error
 boundaries

Render only the active dashboard query tab and use hover-intent prefetch for tab links. Add route-level reset-aware error boundaries so tab and page failures stay scoped to their own segment.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../dashboard/[teamSlug]/account/error.tsx    | 13 +++++
 .../dashboard/[teamSlug]/billing/error.tsx    | 13 +++++
 .../[teamSlug]/billing/plan/error.tsx         | 13 +++++
 .../[teamSlug]/billing/plan/select/error.tsx  | 13 +++++
 src/app/dashboard/[teamSlug]/error.tsx        | 13 +++++
 .../dashboard/[teamSlug]/general/error.tsx    | 13 +++++
 src/app/dashboard/[teamSlug]/keys/error.tsx   | 13 +++++
 src/app/dashboard/[teamSlug]/limits/error.tsx | 13 +++++
 .../dashboard/[teamSlug]/members/error.tsx    | 13 +++++
 .../sandboxes/(tabs)/@list/default.tsx        |  3 --
 .../sandboxes/(tabs)/@list/page.tsx           | 24 ---------
 .../sandboxes/(tabs)/@monitoring/default.tsx  |  3 --
 .../sandboxes/(tabs)/@monitoring/page.tsx     | 18 -------
 .../[teamSlug]/sandboxes/(tabs)/error.tsx     | 13 +++++
 .../[teamSlug]/sandboxes/(tabs)/layout.tsx    | 12 ++---
 .../[teamSlug]/sandboxes/(tabs)/page.tsx      | 53 ++++++++++++++++++-
 .../sandboxes/[sandboxId]/error.tsx           | 13 +++++
 .../[sandboxId]/filesystem/error.tsx          | 13 +++++
 .../sandboxes/[sandboxId]/logs/error.tsx      | 13 +++++
 .../[sandboxId]/monitoring/error.tsx          | 13 +++++
 .../templates/(tabs)/@builds/default.tsx      |  3 --
 .../templates/(tabs)/@builds/page.tsx         | 11 ----
 .../templates/(tabs)/@list/default.tsx        |  3 --
 .../templates/(tabs)/@list/page.tsx           | 11 ----
 .../[teamSlug]/templates/(tabs)/error.tsx     | 13 +++++
 .../[teamSlug]/templates/(tabs)/layout.tsx    | 12 ++---
 .../[teamSlug]/templates/(tabs)/page.tsx      | 33 ++++++++++++
 .../[templateId]/builds/[buildId]/error.tsx   | 13 +++++
 .../templates/[templateId]/error.tsx          | 13 +++++
 src/app/dashboard/[teamSlug]/usage/error.tsx  | 13 +++++
 .../dashboard/[teamSlug]/webhooks/error.tsx   | 13 +++++
 src/features/dashboard/shared/route-error.tsx | 37 +++++++++++++
 src/ui/dashboard-tabs.tsx                     | 40 ++++++++++----
 src/ui/error-indicator.tsx                    | 13 ++++-
 src/ui/error.tsx                              |  4 ++
 35 files changed, 422 insertions(+), 105 deletions(-)
 create mode 100644 src/app/dashboard/[teamSlug]/account/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/billing/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/billing/plan/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/billing/plan/select/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/general/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/keys/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/limits/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/members/error.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/default.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/page.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/default.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/filesystem/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/logs/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/monitoring/error.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/default.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/page.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/@list/default.tsx
 delete mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/@list/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/builds/[buildId]/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/usage/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/webhooks/error.tsx
 create mode 100644 src/features/dashboard/shared/route-error.tsx

diff --git a/src/app/dashboard/[teamSlug]/account/error.tsx b/src/app/dashboard/[teamSlug]/account/error.tsx
new file mode 100644
index 000000000..4d4ecd0c8
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/account/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function AccountPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/billing/error.tsx b/src/app/dashboard/[teamSlug]/billing/error.tsx
new file mode 100644
index 000000000..ed22d82be
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/billing/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function BillingPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/billing/plan/error.tsx b/src/app/dashboard/[teamSlug]/billing/plan/error.tsx
new file mode 100644
index 000000000..34f271d2c
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/billing/plan/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function BillingPlanPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/billing/plan/select/error.tsx b/src/app/dashboard/[teamSlug]/billing/plan/select/error.tsx
new file mode 100644
index 000000000..1459303c4
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/billing/plan/select/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function BillingPlanSelectPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/error.tsx b/src/app/dashboard/[teamSlug]/error.tsx
new file mode 100644
index 000000000..3d9b42590
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TeamDashboardError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/general/error.tsx b/src/app/dashboard/[teamSlug]/general/error.tsx
new file mode 100644
index 000000000..d05558725
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/general/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function GeneralPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/keys/error.tsx b/src/app/dashboard/[teamSlug]/keys/error.tsx
new file mode 100644
index 000000000..553282320
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/keys/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function KeysPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/limits/error.tsx b/src/app/dashboard/[teamSlug]/limits/error.tsx
new file mode 100644
index 000000000..7dccbca76
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/limits/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function LimitsPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/members/error.tsx b/src/app/dashboard/[teamSlug]/members/error.tsx
new file mode 100644
index 000000000..e2df67c76
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/members/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function MembersPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/default.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/default.tsx
deleted file mode 100644
index 052d11542..000000000
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function ListPage() {
-  return null
-}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/page.tsx
deleted file mode 100644
index b33a23310..000000000
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@list/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Suspense } from 'react'
-import LoadingLayout from '@/features/dashboard/loading-layout'
-import SandboxesTable from '@/features/dashboard/sandboxes/list/table'
-import { HydrateClient, prefetch, trpc } from '@/trpc/server'
-
-export default async function ListPage({
-  params,
-}: PageProps<'/dashboard/[teamSlug]/sandboxes'>) {
-  const { teamSlug } = await params
-
-  prefetch(
-    trpc.sandboxes.getSandboxes.queryOptions({
-      teamSlug,
-    })
-  )
-
-  return (
-    <HydrateClient>
-      <Suspense fallback={<LoadingLayout />}>
-        <SandboxesTable />
-      </Suspense>
-    </HydrateClient>
-  )
-}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/default.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/default.tsx
deleted file mode 100644
index f566b2cd3..000000000
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function MonitoringPage() {
-  return null
-}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/page.tsx
deleted file mode 100644
index a80be0b05..000000000
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/@monitoring/page.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { TeamMetricsCharts } from '@/features/dashboard/sandboxes/monitoring/charts/charts'
-import SandboxesMonitoringHeader from '@/features/dashboard/sandboxes/monitoring/header'
-
-export default async function MonitoringPage({
-  params,
-  searchParams,
-}: PageProps<'/dashboard/[teamSlug]/sandboxes'> & {
-  searchParams: Promise<{ start?: string; end?: string }>
-}) {
-  return (
-    <div className="flex flex-col h-full relative min-h-0 max-md:overflow-y-auto">
-      <SandboxesMonitoringHeader params={params} />
-      <div className="flex flex-col flex-1 max-md:min-h-[calc(100vh-3.5rem)] min-h-0">
-        <TeamMetricsCharts params={params} searchParams={searchParams} />
-      </div>
-    </div>
-  )
-}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/error.tsx
new file mode 100644
index 000000000..45ac9f606
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxesTabsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
index ef434b39e..2c49c2e5c 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
@@ -2,12 +2,8 @@ import { DashboardTab, DashboardTabs } from '@/ui/dashboard-tabs'
 import { ListIcon, TrendIcon } from '@/ui/primitives/icons'
 
 export default function SandboxesLayout({
-  list,
-  monitoring,
-}: LayoutProps<'/dashboard/[teamSlug]/sandboxes'> & {
-  list: React.ReactNode
-  monitoring: React.ReactNode
-}) {
+  children,
+}: LayoutProps<'/dashboard/[teamSlug]/sandboxes'>) {
   return (
     <DashboardTabs
       type="query"
@@ -19,14 +15,14 @@ export default function SandboxesLayout({
         label="Monitoring"
         icon={<TrendIcon className="size-4" />}
       >
-        {monitoring}
+        {children}
       </DashboardTab>
       <DashboardTab
         id="list"
         label="List"
         icon={<ListIcon className="size-4" />}
       >
-        {list}
+        {children}
       </DashboardTab>
     </DashboardTabs>
   )
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
index 08d7e9dc6..ad87ae566 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
@@ -1,3 +1,52 @@
-export default function SandboxesTabsPage() {
-  return null // this page is not used, it's just to satisfy the parallel routes
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import SandboxesTable from '@/features/dashboard/sandboxes/list/table'
+import { TeamMetricsCharts } from '@/features/dashboard/sandboxes/monitoring/charts/charts'
+import SandboxesMonitoringHeader from '@/features/dashboard/sandboxes/monitoring/header'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
+
+type SandboxesSearchParams = {
+  tab?: string
+  start?: string
+  end?: string
+}
+
+export default async function SandboxesTabsPage({
+  params,
+  searchParams,
+}: PageProps<'/dashboard/[teamSlug]/sandboxes'> & {
+  searchParams: Promise<SandboxesSearchParams>
+}) {
+  const { tab, start, end } = await searchParams
+  const activeTab = tab === 'list' ? 'list' : 'monitoring'
+
+  if (activeTab === 'list') {
+    const { teamSlug } = await params
+
+    prefetch(
+      trpc.sandboxes.getSandboxes.queryOptions({
+        teamSlug,
+      })
+    )
+
+    return (
+      <HydrateClient>
+        <Suspense fallback={<LoadingLayout />}>
+          <SandboxesTable />
+        </Suspense>
+      </HydrateClient>
+    )
+  }
+
+  return (
+    <div className="flex flex-col h-full relative min-h-0 max-md:overflow-y-auto">
+      <SandboxesMonitoringHeader params={params} />
+      <div className="flex flex-col flex-1 max-md:min-h-[calc(100vh-3.5rem)] min-h-0">
+        <TeamMetricsCharts
+          params={params}
+          searchParams={Promise.resolve({ start, end })}
+        />
+      </div>
+    </div>
+  )
 }
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/error.tsx
new file mode 100644
index 000000000..c3f1d88a6
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxDetailsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/filesystem/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/filesystem/error.tsx
new file mode 100644
index 000000000..2c0c439e1
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/filesystem/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxFilesystemPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/logs/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/logs/error.tsx
new file mode 100644
index 000000000..556a0c9b1
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/logs/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxLogsPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/monitoring/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/monitoring/error.tsx
new file mode 100644
index 000000000..2c76b0087
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/monitoring/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxMonitoringPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/default.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/default.tsx
deleted file mode 100644
index 86b9e9a38..000000000
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function Default() {
-  return null
-}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/page.tsx
deleted file mode 100644
index 3e280c132..000000000
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/@builds/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import BuildsHeader from '@/features/dashboard/templates/builds/header'
-import BuildsTable from '@/features/dashboard/templates/builds/table'
-
-export default function BuildsPage() {
-  return (
-    <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
-      <BuildsHeader />
-      <BuildsTable />
-    </div>
-  )
-}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/default.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/default.tsx
deleted file mode 100644
index 86b9e9a38..000000000
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function Default() {
-  return null
-}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/page.tsx
deleted file mode 100644
index a2fb9f4be..000000000
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/@list/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Suspense } from 'react'
-import LoadingLayout from '@/features/dashboard/loading-layout'
-import TemplatesTable from '@/features/dashboard/templates/list/table'
-
-export default async function ListPage() {
-  return (
-    <Suspense fallback={<LoadingLayout />}>
-      <TemplatesTable />
-    </Suspense>
-  )
-}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/error.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/error.tsx
new file mode 100644
index 000000000..2a865a89f
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TemplatesTabsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
index 292e65e25..8189c767e 100644
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
@@ -2,12 +2,8 @@ import { DashboardTab, DashboardTabs } from '@/ui/dashboard-tabs'
 import { BuildIcon, ListIcon } from '@/ui/primitives/icons'
 
 export default function TemplatesLayout({
-  list,
-  builds,
-}: LayoutProps<'/dashboard/[teamSlug]/templates'> & {
-  list: React.ReactNode
-  builds: React.ReactNode
-}) {
+  children,
+}: LayoutProps<'/dashboard/[teamSlug]/templates'>) {
   return (
     <DashboardTabs
       type="query"
@@ -19,14 +15,14 @@ export default function TemplatesLayout({
         label="List"
         icon={<ListIcon className="size-4" />}
       >
-        {list}
+        {children}
       </DashboardTab>
       <DashboardTab
         id="builds"
         label="Builds"
         icon={<BuildIcon className="size-4" />}
       >
-        {builds}
+        {children}
       </DashboardTab>
     </DashboardTabs>
   )
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
new file mode 100644
index 000000000..d93593569
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
@@ -0,0 +1,33 @@
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import BuildsHeader from '@/features/dashboard/templates/builds/header'
+import BuildsTable from '@/features/dashboard/templates/builds/table'
+import TemplatesTable from '@/features/dashboard/templates/list/table'
+
+type TemplatesSearchParams = {
+  tab?: string
+}
+
+export default async function TemplatesTabsPage({
+  searchParams,
+}: PageProps<'/dashboard/[teamSlug]/templates'> & {
+  searchParams: Promise<TemplatesSearchParams>
+}) {
+  const { tab } = await searchParams
+  const activeTab = tab === 'builds' ? 'builds' : 'list'
+
+  if (activeTab === 'builds') {
+    return (
+      <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
+        <BuildsHeader />
+        <BuildsTable />
+      </div>
+    )
+  }
+
+  return (
+    <Suspense fallback={<LoadingLayout />}>
+      <TemplatesTable />
+    </Suspense>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/builds/[buildId]/error.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/builds/[buildId]/error.tsx
new file mode 100644
index 000000000..58a9a1717
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/builds/[buildId]/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TemplateBuildDetailsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
new file mode 100644
index 000000000..de47bcc1e
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TemplateDetailsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/usage/error.tsx b/src/app/dashboard/[teamSlug]/usage/error.tsx
new file mode 100644
index 000000000..9bbb24a17
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/usage/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function UsagePageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/webhooks/error.tsx b/src/app/dashboard/[teamSlug]/webhooks/error.tsx
new file mode 100644
index 000000000..780f8e741
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/webhooks/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function WebhooksPageError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/features/dashboard/shared/route-error.tsx b/src/features/dashboard/shared/route-error.tsx
new file mode 100644
index 000000000..64996c0bb
--- /dev/null
+++ b/src/features/dashboard/shared/route-error.tsx
@@ -0,0 +1,37 @@
+'use client'
+
+import { usePathname, useSearchParams } from 'next/navigation'
+import { useEffect, useMemo, useRef } from 'react'
+import ErrorBoundary from '@/ui/error'
+
+interface DashboardRouteErrorProps {
+  error: Error & { digest?: string }
+  reset: () => void
+}
+
+export function DashboardRouteError({ error, reset }: DashboardRouteErrorProps) {
+  const pathname = usePathname()
+  const searchParams = useSearchParams()
+
+  const routeKey = useMemo(
+    () => `${pathname}?${searchParams.toString()}`,
+    [pathname, searchParams]
+  )
+
+  const previousRouteKeyRef = useRef(routeKey)
+
+  useEffect(() => {
+    if (previousRouteKeyRef.current !== routeKey) {
+      previousRouteKeyRef.current = routeKey
+      reset()
+    }
+  }, [routeKey, reset])
+
+  return (
+    <ErrorBoundary
+      description="Sorry, something went wrong with this page."
+      error={error}
+      onRetry={reset}
+    />
+  )
+}
diff --git a/src/ui/dashboard-tabs.tsx b/src/ui/dashboard-tabs.tsx
index bd1fe5db2..15e0a97e1 100644
--- a/src/ui/dashboard-tabs.tsx
+++ b/src/ui/dashboard-tabs.tsx
@@ -1,6 +1,5 @@
 'use client'
 
-import Link from 'next/link'
 import { usePathname, useSearchParams } from 'next/navigation'
 import {
   memo,
@@ -10,6 +9,7 @@ import {
   useMemo,
 } from 'react'
 import { cn } from '@/lib/utils'
+import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/ui/primitives/tabs'
 
 type DashboardTabElement = ReactElement<DashboardTabProps, typeof DashboardTab>
@@ -34,14 +34,18 @@ function DashboardTabsComponent({
   const searchParams = useSearchParams()
   const pathname = usePathname()
 
+  const tabChildren = useMemo(
+    () => (Array.isArray(children) ? children : [children]),
+    [children]
+  )
+
   const tabs = useMemo(() => {
-    const tabChildren = Array.isArray(children) ? children : [children]
     return tabChildren.map((child) => ({
       id: child.props.id,
       label: child.props.label,
       icon: child.props.icon,
     }))
-  }, [children])
+  }, [tabChildren])
 
   const basePath = useMemo(() => {
     if (type === 'query') return pathname
@@ -56,11 +60,19 @@ function DashboardTabsComponent({
   )
 
   const activeTabId = useMemo(() => {
-    if (type === 'query') {
-      const defaultTabId = tabs[0]?.id
-      return searchParams.get('tab') || defaultTabId
+    const defaultTabId = tabs[0]?.id
+    if (!defaultTabId) {
+      return undefined
     }
-    return tabs.find((tab) => pathname.endsWith(tab.id))?.id || tabs[0]?.id
+
+    const requestedTabId =
+      type === 'query'
+        ? searchParams.get('tab') || defaultTabId
+        : tabs.find((tab) => pathname.endsWith(tab.id))?.id || defaultTabId
+
+    return tabs.some((tab) => tab.id === requestedTabId)
+      ? requestedTabId
+      : defaultTabId
   }, [type, tabs, searchParams, pathname])
 
   const tabsWithHrefs = useMemo(
@@ -68,6 +80,14 @@ function DashboardTabsComponent({
     [tabs, hrefForId]
   )
 
+  const activeTab = useMemo(
+    () =>
+      tabChildren.find((child) => child.props.id === activeTabId) ||
+      tabChildren[0] ||
+      null,
+    [tabChildren, activeTabId]
+  )
+
   const tabTriggers = tabsWithHrefs.map((tab) => (
     <TabsTrigger
       key={tab.id}
@@ -76,10 +96,10 @@ function DashboardTabsComponent({
       className="w-fit flex-none"
       asChild
     >
-      <Link href={tab.href} prefetch>
+      <HoverPrefetchLink href={tab.href}>
         {tab.icon}
         {tab.label}
-      </Link>
+      </HoverPrefetchLink>
     </TabsTrigger>
   ))
 
@@ -103,7 +123,7 @@ function DashboardTabsComponent({
         </TabsList>
       )}
 
-      {children}
+      {activeTab}
     </Tabs>
   )
 }
diff --git a/src/ui/error-indicator.tsx b/src/ui/error-indicator.tsx
index cf40fc404..7312578b1 100644
--- a/src/ui/error-indicator.tsx
+++ b/src/ui/error-indicator.tsx
@@ -20,6 +20,7 @@ interface ErrorIndicatorProps {
   message?: string
   className?: string
   children?: React.ReactNode
+  onRetry?: () => void
 }
 
 export function ErrorIndicator({
@@ -28,6 +29,7 @@ export function ErrorIndicator({
   message,
   className,
   children,
+  onRetry,
 }: ErrorIndicatorProps) {
   const router = useRouter()
   const [isPending, startTransition] = useTransition()
@@ -51,7 +53,16 @@ export function ErrorIndicator({
       <CardFooter className="px-auto flex flex-col gap-4 py-4">
         <Button
           variant="secondary"
-          onClick={() => startTransition(() => router.refresh())}
+          onClick={() =>
+            startTransition(() => {
+              if (onRetry) {
+                onRetry()
+                return
+              }
+
+              router.refresh()
+            })
+          }
           className="w-full max-w-md gap-1"
         >
           <RefreshIcon
diff --git a/src/ui/error.tsx b/src/ui/error.tsx
index 46a2dd2f9..c43b66a81 100644
--- a/src/ui/error.tsx
+++ b/src/ui/error.tsx
@@ -12,11 +12,13 @@ export default function ErrorBoundary({
   description,
   className,
   hideFrame = false,
+  onRetry,
 }: {
   error: Error & { digest?: string }
   description?: string
   className?: string
   hideFrame?: boolean
+  onRetry?: () => void
 }) {
   useEffect(() => {
     l.error(
@@ -40,6 +42,7 @@ export default function ErrorBoundary({
           description={description}
           message={error.message}
           className="border-none"
+          onRetry={onRetry}
         />
       ) : (
         <Frame>
@@ -47,6 +50,7 @@ export default function ErrorBoundary({
             description={description}
             message={error.message}
             className="border-none"
+            onRetry={onRetry}
           />
         </Frame>
       )}

From 5563a1027891bf3aae422b66a2a21d83478b41c8 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:05:22 -0700
Subject: [PATCH 02/11] fix(dashboard): align root dashboard error boundary

Route the dashboard-level error file through the shared reset-aware route error component so top-level dashboard failures use the same isolated recovery behavior.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/app/dashboard/error.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/dashboard/error.tsx b/src/app/dashboard/error.tsx
index 70aeae672..de11fc110 100644
--- a/src/app/dashboard/error.tsx
+++ b/src/app/dashboard/error.tsx
@@ -1,16 +1,13 @@
 'use client'
 
-import ErrorBoundary from '@/ui/error'
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
 
 export default function DashboardError({
   error,
+  reset,
 }: {
   error: Error & { digest?: string }
+  reset: () => void
 }) {
-  return (
-    <ErrorBoundary
-      description="Sorry, something went wrong with the application."
-      error={error}
-    />
-  )
+  return <DashboardRouteError error={error} reset={reset} />
 }

From b806cd88bc1c5c90da6edee11d40cc4530da553d Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:15:39 -0700
Subject: [PATCH 03/11] style(dashboard): format route error component

Apply formatter output for the shared dashboard route error component so format CI passes.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/dashboard/shared/route-error.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/shared/route-error.tsx b/src/features/dashboard/shared/route-error.tsx
index 64996c0bb..fbda1381b 100644
--- a/src/features/dashboard/shared/route-error.tsx
+++ b/src/features/dashboard/shared/route-error.tsx
@@ -9,7 +9,10 @@ interface DashboardRouteErrorProps {
   reset: () => void
 }
 
-export function DashboardRouteError({ error, reset }: DashboardRouteErrorProps) {
+export function DashboardRouteError({
+  error,
+  reset,
+}: DashboardRouteErrorProps) {
   const pathname = usePathname()
   const searchParams = useSearchParams()
 

From 6c9db3f46e4105526ff874361d88410647e20489 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:27:22 -0700
Subject: [PATCH 04/11] refactor(dashboard): simplify shared tabs
 implementation

Streamline dashboard tab resolution and rendering while preserving active-tab-only content rendering and hover-based prefetch behavior. Include lockfile updates from local tooling to keep installs reproducible.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 bun.lock                  |   6 +-
 src/ui/dashboard-tabs.tsx | 126 ++++++++++++++++++--------------------
 2 files changed, 61 insertions(+), 71 deletions(-)

diff --git a/bun.lock b/bun.lock
index 637b811bf..a9c5ff6eb 100644
--- a/bun.lock
+++ b/bun.lock
@@ -7,7 +7,7 @@
         "@hookform/resolvers": "^5.2.2",
         "@marsidev/react-turnstile": "^1.4.1",
         "@next-safe-action/adapter-react-hook-form": "^2.0.0",
-        "@next/env": "^16.2.4",
+        "@next/env": "16.1.5",
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/auto-instrumentations-node": "^0.62.1",
         "@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
@@ -386,7 +386,7 @@
 
     "@next-safe-action/adapter-react-hook-form": ["@next-safe-action/adapter-react-hook-form@2.0.0", "", { "peerDependencies": { "@hookform/resolvers": ">= 5.0.0", "next": ">= 14.0.0", "next-safe-action": ">= 8.0.0", "react": ">= 18.2.0", "react-dom": ">= 18.2.0", "react-hook-form": ">= 7.0.0" } }, "sha512-vp3KAd5NKnBBCF/3b8kDxEYj0+BUYVjlSZOWHikz/Y2O+yLheRmtj8Vcm379itlqGUKcLV5O2o/dwKHvH8pYog=="],
 
-    "@next/env": ["@next/env@16.2.4", "", {}, "sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw=="],
+    "@next/env": ["@next/env@16.1.5", "", {}, "sha512-CRSCPJiSZoi4Pn69RYBDI9R7YK2g59vLexPQFXY0eyw+ILevIenCywzg+DqmlBik9zszEnw2HLFOUlLAcJbL7g=="],
 
     "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.1.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-eK7Wdm3Hjy/SCL7TevlH0C9chrpeOYWx2iR7guJDaz4zEQKWcS1IMVfMb9UKBFMg1XgzcPTYPIp1Vcpukkjg6Q=="],
 
@@ -2184,8 +2184,6 @@
 
     "motion/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "next/@next/env": ["@next/env@16.1.5", "", {}, "sha512-CRSCPJiSZoi4Pn69RYBDI9R7YK2g59vLexPQFXY0eyw+ILevIenCywzg+DqmlBik9zszEnw2HLFOUlLAcJbL7g=="],
-
     "next/postcss": ["postcss@8.4.31", "", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="],
 
     "parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="],
diff --git a/src/ui/dashboard-tabs.tsx b/src/ui/dashboard-tabs.tsx
index 15e0a97e1..b0d51b309 100644
--- a/src/ui/dashboard-tabs.tsx
+++ b/src/ui/dashboard-tabs.tsx
@@ -2,11 +2,11 @@
 
 import { usePathname, useSearchParams } from 'next/navigation'
 import {
+  Children,
+  isValidElement,
   memo,
   type ReactElement,
   type ReactNode,
-  useCallback,
-  useMemo,
 } from 'react'
 import { cn } from '@/lib/utils'
 import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
@@ -17,13 +17,11 @@ type DashboardTabElement = ReactElement<DashboardTabProps, typeof DashboardTab>
 export interface DashboardTabsProps {
   layoutKey: string
   type: 'query' | 'path'
-  children: Array<DashboardTabElement> | DashboardTabElement
+  children: ReactNode
   className?: string
   headerAccessory?: ReactNode
 }
 
-// COMPONENT
-
 function DashboardTabsComponent({
   layoutKey,
   type,
@@ -34,61 +32,32 @@ function DashboardTabsComponent({
   const searchParams = useSearchParams()
   const pathname = usePathname()
 
-  const tabChildren = useMemo(
-    () => (Array.isArray(children) ? children : [children]),
-    [children]
-  )
-
-  const tabs = useMemo(() => {
-    return tabChildren.map((child) => ({
+  const tabs = Children.toArray(children)
+    .filter(isDashboardTabElement)
+    .map((child) => ({
       id: child.props.id,
       label: child.props.label,
       icon: child.props.icon,
+      content: child,
     }))
-  }, [tabChildren])
-
-  const basePath = useMemo(() => {
-    if (type === 'query') return pathname
-    return inferBasePathForPathTabs(pathname, tabs)
-  }, [type, pathname, tabs])
-
-  const hrefForId = useCallback(
-    (id: string) => {
-      return type === 'query' ? `${basePath}?tab=${id}` : `${basePath}/${id}`
-    },
-    [type, basePath]
-  )
 
-  const activeTabId = useMemo(() => {
-    const defaultTabId = tabs[0]?.id
-    if (!defaultTabId) {
-      return undefined
-    }
-
-    const requestedTabId =
-      type === 'query'
-        ? searchParams.get('tab') || defaultTabId
-        : tabs.find((tab) => pathname.endsWith(tab.id))?.id || defaultTabId
-
-    return tabs.some((tab) => tab.id === requestedTabId)
-      ? requestedTabId
-      : defaultTabId
-  }, [type, tabs, searchParams, pathname])
-
-  const tabsWithHrefs = useMemo(
-    () => tabs.map((tab) => ({ ...tab, href: hrefForId(tab.id) })),
-    [tabs, hrefForId]
-  )
+  if (tabs.length === 0) {
+    return null
+  }
 
-  const activeTab = useMemo(
-    () =>
-      tabChildren.find((child) => child.props.id === activeTabId) ||
-      tabChildren[0] ||
-      null,
-    [tabChildren, activeTabId]
-  )
+  const defaultTabId = tabs[0].id
+  const tabIds = new Set(tabs.map((tab) => tab.id))
+  const requestedTabId =
+    type === 'query' ? searchParams.get('tab') : pathname.split('/').pop()
+  const activeTabId =
+    requestedTabId && tabIds.has(requestedTabId) ? requestedTabId : defaultTabId
+  const basePath =
+    type === 'query' ? pathname : trimActiveTabSegment(pathname, tabIds)
 
-  const tabTriggers = tabsWithHrefs.map((tab) => (
+  const activeTab =
+    tabs.find((tab) => tab.id === activeTabId)?.content ?? tabs[0].content
+
+  const tabTriggers = tabs.map((tab) => (
     <TabsTrigger
       key={tab.id}
       layoutkey={layoutKey}
@@ -96,7 +65,9 @@ function DashboardTabsComponent({
       className="w-fit flex-none"
       asChild
     >
-      <HoverPrefetchLink href={tab.href}>
+      <HoverPrefetchLink
+        href={getTabHref(tab.id, type, basePath, searchParams)}
+      >
         {tab.icon}
         {tab.label}
       </HoverPrefetchLink>
@@ -149,21 +120,42 @@ export function DashboardTab(props: DashboardTabProps) {
   )
 }
 
-// HELPERS
+function isDashboardTabElement(child: ReactNode): child is DashboardTabElement {
+  if (!isValidElement(child)) {
+    return false
+  }
 
-/**
- * Infers the base path for path-based tabs by checking if the current
- * pathname ends with a tab ID. If it does, removes that segment to get the base.
- */
-function inferBasePathForPathTabs(
-  pathname: string,
-  tabs: Array<{ id: string }>
-): string {
+  const props = child.props as Partial<DashboardTabProps> | null
+
+  return Boolean(
+    props && typeof props.id === 'string' && typeof props.label === 'string'
+  )
+}
+
+function trimActiveTabSegment(pathname: string, tabIds: Set<string>): string {
   const pathSegments = pathname.split('/')
-  const lastSegment = pathSegments[pathSegments.length - 1]
+  const lastSegment = pathSegments[pathSegments.length - 1] ?? ''
+  if (!tabIds.has(lastSegment)) {
+    return pathname
+  }
+
+  const basePath = pathSegments.slice(0, -1).join('/')
+  return basePath || '/'
+}
+
+function getTabHref(
+  id: string,
+  type: DashboardTabsProps['type'],
+  basePath: string,
+  searchParams: ReturnType<typeof useSearchParams>
+): string {
+  if (type === 'path') {
+    return `${basePath}/${id}`
+  }
 
-  // if last segment is a tab id, remove it to get base path
-  const isTabSegment = tabs.some((tab) => tab.id === lastSegment)
+  const nextSearchParams = new URLSearchParams(searchParams.toString())
+  nextSearchParams.set('tab', id)
+  const query = nextSearchParams.toString()
 
-  return isTabSegment ? pathSegments.slice(0, -1).join('/') : pathname
+  return query ? `${basePath}?${query}` : basePath
 }

From bcf86d2df09fbb427b05877ad69bfdb1f9ae0890 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:31:06 -0700
Subject: [PATCH 05/11] fix(dashboard): refresh router on error retry

Call router.refresh() before reset() in dashboard route error retries so server-component failures can recover instead of immediately replaying cached error state.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/features/dashboard/shared/route-error.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/shared/route-error.tsx b/src/features/dashboard/shared/route-error.tsx
index fbda1381b..998489a59 100644
--- a/src/features/dashboard/shared/route-error.tsx
+++ b/src/features/dashboard/shared/route-error.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { usePathname, useSearchParams } from 'next/navigation'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { useEffect, useMemo, useRef } from 'react'
 import ErrorBoundary from '@/ui/error'
 
@@ -13,6 +13,7 @@ export function DashboardRouteError({
   error,
   reset,
 }: DashboardRouteErrorProps) {
+  const router = useRouter()
   const pathname = usePathname()
   const searchParams = useSearchParams()
 
@@ -34,7 +35,10 @@ export function DashboardRouteError({
     <ErrorBoundary
       description="Sorry, something went wrong with this page."
       error={error}
-      onRetry={reset}
+      onRetry={() => {
+        router.refresh()
+        reset()
+      }}
     />
   )
 }

From e7dfe80be51d47af6c0cd84f85c009bada24776a Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 13:35:23 -0700
Subject: [PATCH 06/11] fix(dashboard): satisfy strict tab indexing checks

Avoid direct indexed access in dashboard tabs by guarding the first tab before use so strict TypeScript builds pass.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/ui/dashboard-tabs.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ui/dashboard-tabs.tsx b/src/ui/dashboard-tabs.tsx
index b0d51b309..3a62ac5a4 100644
--- a/src/ui/dashboard-tabs.tsx
+++ b/src/ui/dashboard-tabs.tsx
@@ -41,11 +41,12 @@ function DashboardTabsComponent({
       content: child,
     }))
 
-  if (tabs.length === 0) {
+  const firstTab = tabs[0]
+  if (!firstTab) {
     return null
   }
 
-  const defaultTabId = tabs[0].id
+  const defaultTabId = firstTab.id
   const tabIds = new Set(tabs.map((tab) => tab.id))
   const requestedTabId =
     type === 'query' ? searchParams.get('tab') : pathname.split('/').pop()
@@ -55,7 +56,7 @@ function DashboardTabsComponent({
     type === 'query' ? pathname : trimActiveTabSegment(pathname, tabIds)
 
   const activeTab =
-    tabs.find((tab) => tab.id === activeTabId)?.content ?? tabs[0].content
+    tabs.find((tab) => tab.id === activeTabId)?.content ?? firstTab.content
 
   const tabTriggers = tabs.map((tab) => (
     <TabsTrigger

From ee8464ca8216148fd0de8e48aeeefd97828fa2fc Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 14:06:32 -0700
Subject: [PATCH 07/11] refactor(dashboard): move tabs to route segments

Make dashboard tabs navigation-only and move templates and sandboxes tabs onto path segments so each tab owns its page content and error boundary.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../[teamSlug]/sandboxes/(tabs)/layout.tsx    |  48 ++++---
 .../sandboxes/(tabs)/list/error.tsx           |  13 ++
 .../[teamSlug]/sandboxes/(tabs)/list/page.tsx |  24 ++++
 .../sandboxes/(tabs)/monitoring/error.tsx     |  13 ++
 .../sandboxes/(tabs)/monitoring/page.tsx      |  28 ++++
 .../[teamSlug]/sandboxes/(tabs)/page.tsx      |  52 +-------
 .../templates/(tabs)/builds/error.tsx         |  13 ++
 .../templates/(tabs)/builds/page.tsx          |  11 ++
 .../[teamSlug]/templates/(tabs)/layout.tsx    |  48 ++++---
 .../templates/(tabs)/list/error.tsx           |  13 ++
 .../[teamSlug]/templates/(tabs)/list/page.tsx |  11 ++
 .../[teamSlug]/templates/(tabs)/page.tsx      |  35 +----
 src/configs/layout.ts                         |  16 +++
 src/configs/urls.ts                           |  14 +-
 .../dashboard/sandbox/inspect/view.tsx        |  28 +++-
 src/features/dashboard/sandbox/layout.tsx     |  77 ++++-------
 .../dashboard/templates/builds/constants.ts   |   2 -
 .../templates/builds/use-filters.tsx          |   2 +-
 src/ui/dashboard-tabs.tsx                     | 126 +++---------------
 19 files changed, 287 insertions(+), 287 deletions(-)
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/builds/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/list/error.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/(tabs)/list/page.tsx

diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
index 2c49c2e5c..ce0da2f2b 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/layout.tsx
@@ -1,29 +1,33 @@
-import { DashboardTab, DashboardTabs } from '@/ui/dashboard-tabs'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { DashboardTabsList } from '@/ui/dashboard-tabs'
 import { ListIcon, TrendIcon } from '@/ui/primitives/icons'
 
-export default function SandboxesLayout({
+export default async function SandboxesTabsLayout({
   children,
+  params,
 }: LayoutProps<'/dashboard/[teamSlug]/sandboxes'>) {
+  const { teamSlug } = await params
+
   return (
-    <DashboardTabs
-      type="query"
-      layoutKey="tabs-indicator-sandboxes"
-      className="mt-2 md:mt-3"
-    >
-      <DashboardTab
-        id="monitoring"
-        label="Monitoring"
-        icon={<TrendIcon className="size-4" />}
-      >
-        {children}
-      </DashboardTab>
-      <DashboardTab
-        id="list"
-        label="List"
-        icon={<ListIcon className="size-4" />}
-      >
-        {children}
-      </DashboardTab>
-    </DashboardTabs>
+    <div className="mt-2 md:mt-3 min-h-0 h-full flex flex-col">
+      <DashboardTabsList
+        layoutKey="tabs-indicator-sandboxes"
+        tabs={[
+          {
+            id: 'monitoring',
+            label: 'Monitoring',
+            href: PROTECTED_URLS.SANDBOXES_MONITORING(teamSlug),
+            icon: <TrendIcon className="size-4" />,
+          },
+          {
+            id: 'list',
+            label: 'List',
+            href: PROTECTED_URLS.SANDBOXES_LIST(teamSlug),
+            icon: <ListIcon className="size-4" />,
+          },
+        ]}
+      />
+      {children}
+    </div>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/error.tsx
new file mode 100644
index 000000000..29b53e454
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxesListError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/page.tsx
new file mode 100644
index 000000000..28eeef355
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/list/page.tsx
@@ -0,0 +1,24 @@
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import SandboxesTable from '@/features/dashboard/sandboxes/list/table'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
+
+export default async function SandboxesListPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/sandboxes/list'>) {
+  const { teamSlug } = await params
+
+  prefetch(
+    trpc.sandboxes.getSandboxes.queryOptions({
+      teamSlug,
+    })
+  )
+
+  return (
+    <HydrateClient>
+      <Suspense fallback={<LoadingLayout />}>
+        <SandboxesTable />
+      </Suspense>
+    </HydrateClient>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/error.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/error.tsx
new file mode 100644
index 000000000..e4b69bc39
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function SandboxesMonitoringError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/page.tsx
new file mode 100644
index 000000000..0273918be
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/monitoring/page.tsx
@@ -0,0 +1,28 @@
+import { TeamMetricsCharts } from '@/features/dashboard/sandboxes/monitoring/charts/charts'
+import SandboxesMonitoringHeader from '@/features/dashboard/sandboxes/monitoring/header'
+
+type MonitoringSearchParams = {
+  start?: string
+  end?: string
+}
+
+export default async function SandboxesMonitoringPage({
+  params,
+  searchParams,
+}: PageProps<'/dashboard/[teamSlug]/sandboxes/monitoring'> & {
+  searchParams: Promise<MonitoringSearchParams>
+}) {
+  const { start, end } = await searchParams
+
+  return (
+    <div className="flex flex-col h-full relative min-h-0 max-md:overflow-y-auto">
+      <SandboxesMonitoringHeader params={params} />
+      <div className="flex flex-col flex-1 max-md:min-h-[calc(100vh-3.5rem)] min-h-0">
+        <TeamMetricsCharts
+          params={params}
+          searchParams={Promise.resolve({ start, end })}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
index ad87ae566..8e3a22e7d 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/(tabs)/page.tsx
@@ -1,52 +1,10 @@
-import { Suspense } from 'react'
-import LoadingLayout from '@/features/dashboard/loading-layout'
-import SandboxesTable from '@/features/dashboard/sandboxes/list/table'
-import { TeamMetricsCharts } from '@/features/dashboard/sandboxes/monitoring/charts/charts'
-import SandboxesMonitoringHeader from '@/features/dashboard/sandboxes/monitoring/header'
-import { HydrateClient, prefetch, trpc } from '@/trpc/server'
-
-type SandboxesSearchParams = {
-  tab?: string
-  start?: string
-  end?: string
-}
+import { redirect } from 'next/navigation'
+import { PROTECTED_URLS } from '@/configs/urls'
 
 export default async function SandboxesTabsPage({
   params,
-  searchParams,
-}: PageProps<'/dashboard/[teamSlug]/sandboxes'> & {
-  searchParams: Promise<SandboxesSearchParams>
-}) {
-  const { tab, start, end } = await searchParams
-  const activeTab = tab === 'list' ? 'list' : 'monitoring'
-
-  if (activeTab === 'list') {
-    const { teamSlug } = await params
-
-    prefetch(
-      trpc.sandboxes.getSandboxes.queryOptions({
-        teamSlug,
-      })
-    )
-
-    return (
-      <HydrateClient>
-        <Suspense fallback={<LoadingLayout />}>
-          <SandboxesTable />
-        </Suspense>
-      </HydrateClient>
-    )
-  }
+}: PageProps<'/dashboard/[teamSlug]/sandboxes'>) {
+  const { teamSlug } = await params
 
-  return (
-    <div className="flex flex-col h-full relative min-h-0 max-md:overflow-y-auto">
-      <SandboxesMonitoringHeader params={params} />
-      <div className="flex flex-col flex-1 max-md:min-h-[calc(100vh-3.5rem)] min-h-0">
-        <TeamMetricsCharts
-          params={params}
-          searchParams={Promise.resolve({ start, end })}
-        />
-      </div>
-    </div>
-  )
+  redirect(PROTECTED_URLS.SANDBOXES_MONITORING(teamSlug))
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/error.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/error.tsx
new file mode 100644
index 000000000..0c70e8579
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TemplateBuildsError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
new file mode 100644
index 000000000..971ead502
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
@@ -0,0 +1,11 @@
+import BuildsHeader from '@/features/dashboard/templates/builds/header'
+import BuildsTable from '@/features/dashboard/templates/builds/table'
+
+export default function TemplateBuildsPage() {
+  return (
+    <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
+      <BuildsHeader />
+      <BuildsTable />
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
index 8189c767e..8a5c41660 100644
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/layout.tsx
@@ -1,29 +1,33 @@
-import { DashboardTab, DashboardTabs } from '@/ui/dashboard-tabs'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { DashboardTabsList } from '@/ui/dashboard-tabs'
 import { BuildIcon, ListIcon } from '@/ui/primitives/icons'
 
-export default function TemplatesLayout({
+export default async function TemplatesTabsLayout({
   children,
+  params,
 }: LayoutProps<'/dashboard/[teamSlug]/templates'>) {
+  const { teamSlug } = await params
+
   return (
-    <DashboardTabs
-      type="query"
-      layoutKey="tabs-indicator-templates"
-      className="pt-2 flex-1 md:pt-3"
-    >
-      <DashboardTab
-        id="list"
-        label="List"
-        icon={<ListIcon className="size-4" />}
-      >
-        {children}
-      </DashboardTab>
-      <DashboardTab
-        id="builds"
-        label="Builds"
-        icon={<BuildIcon className="size-4" />}
-      >
-        {children}
-      </DashboardTab>
-    </DashboardTabs>
+    <div className="pt-2 flex-1 md:pt-3 min-h-0 h-full flex flex-col">
+      <DashboardTabsList
+        layoutKey="tabs-indicator-templates"
+        tabs={[
+          {
+            id: 'list',
+            label: 'List',
+            href: PROTECTED_URLS.TEMPLATES_LIST(teamSlug),
+            icon: <ListIcon className="size-4" />,
+          },
+          {
+            id: 'builds',
+            label: 'Builds',
+            href: PROTECTED_URLS.TEMPLATES_BUILDS(teamSlug),
+            icon: <BuildIcon className="size-4" />,
+          },
+        ]}
+      />
+      {children}
+    </div>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/list/error.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/list/error.tsx
new file mode 100644
index 000000000..87fa5be97
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/list/error.tsx
@@ -0,0 +1,13 @@
+'use client'
+
+import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
+
+export default function TemplatesListError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return <DashboardRouteError error={error} reset={reset} />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/list/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/list/page.tsx
new file mode 100644
index 000000000..76f6b25ad
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/list/page.tsx
@@ -0,0 +1,11 @@
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import TemplatesTable from '@/features/dashboard/templates/list/table'
+
+export default function TemplatesListPage() {
+  return (
+    <Suspense fallback={<LoadingLayout />}>
+      <TemplatesTable />
+    </Suspense>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
index d93593569..ee01b0f6f 100644
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/page.tsx
@@ -1,33 +1,10 @@
-import { Suspense } from 'react'
-import LoadingLayout from '@/features/dashboard/loading-layout'
-import BuildsHeader from '@/features/dashboard/templates/builds/header'
-import BuildsTable from '@/features/dashboard/templates/builds/table'
-import TemplatesTable from '@/features/dashboard/templates/list/table'
-
-type TemplatesSearchParams = {
-  tab?: string
-}
+import { redirect } from 'next/navigation'
+import { PROTECTED_URLS } from '@/configs/urls'
 
 export default async function TemplatesTabsPage({
-  searchParams,
-}: PageProps<'/dashboard/[teamSlug]/templates'> & {
-  searchParams: Promise<TemplatesSearchParams>
-}) {
-  const { tab } = await searchParams
-  const activeTab = tab === 'builds' ? 'builds' : 'list'
-
-  if (activeTab === 'builds') {
-    return (
-      <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
-        <BuildsHeader />
-        <BuildsTable />
-      </div>
-    )
-  }
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates'>) {
+  const { teamSlug } = await params
 
-  return (
-    <Suspense fallback={<LoadingLayout />}>
-      <TemplatesTable />
-    </Suspense>
-  )
+  redirect(PROTECTED_URLS.TEMPLATES_LIST(teamSlug))
 }
diff --git a/src/configs/layout.ts b/src/configs/layout.ts
index e7a4d6e6a..0f29ab80c 100644
--- a/src/configs/layout.ts
+++ b/src/configs/layout.ts
@@ -28,6 +28,14 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
     title: 'Sandboxes',
     type: 'custom',
   }),
+  '/dashboard/*/sandboxes/monitoring': () => ({
+    title: 'Sandboxes',
+    type: 'custom',
+  }),
+  '/dashboard/*/sandboxes/list': () => ({
+    title: 'Sandboxes',
+    type: 'custom',
+  }),
   '/dashboard/*/sandboxes/*/*': (pathname) => {
     const parts = pathname.split('/')
     const teamSlug = parts[2]!
@@ -52,6 +60,14 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
     title: 'Templates',
     type: 'custom',
   }),
+  '/dashboard/*/templates/list': () => ({
+    title: 'Templates',
+    type: 'custom',
+  }),
+  '/dashboard/*/templates/builds': () => ({
+    title: 'Templates',
+    type: 'custom',
+  }),
   '/dashboard/*/templates/*/builds/*': (pathname) => {
     const parts = pathname.split('/')
     const teamSlug = parts[2]!
diff --git a/src/configs/urls.ts b/src/configs/urls.ts
index 768833627..3bc638cea 100644
--- a/src/configs/urls.ts
+++ b/src/configs/urls.ts
@@ -22,11 +22,10 @@ export const PROTECTED_URLS = {
   MEMBERS: (teamSlug: string) => `/dashboard/${teamSlug}/members`,
 
   SANDBOXES: (teamSlug: string) =>
-    `/dashboard/${teamSlug}/sandboxes?tab=monitoring`,
+    `/dashboard/${teamSlug}/sandboxes/monitoring`,
   SANDBOXES_MONITORING: (teamSlug: string) =>
-    `/dashboard/${teamSlug}/sandboxes?tab=monitoring`,
-  SANDBOXES_LIST: (teamSlug: string) =>
-    `/dashboard/${teamSlug}/sandboxes?tab=list`,
+    `/dashboard/${teamSlug}/sandboxes/monitoring`,
+  SANDBOXES_LIST: (teamSlug: string) => `/dashboard/${teamSlug}/sandboxes/list`,
 
   SANDBOX: (teamSlug: string, sandboxId: string) =>
     `/dashboard/${teamSlug}/sandboxes/${sandboxId}/monitoring`,
@@ -39,11 +38,10 @@ export const PROTECTED_URLS = {
 
   WEBHOOKS: (teamSlug: string) => `/dashboard/${teamSlug}/webhooks`,
 
-  TEMPLATES: (teamSlug: string) => `/dashboard/${teamSlug}/templates`,
-  TEMPLATES_LIST: (teamSlug: string) =>
-    `/dashboard/${teamSlug}/templates?tab=list`,
+  TEMPLATES: (teamSlug: string) => `/dashboard/${teamSlug}/templates/list`,
+  TEMPLATES_LIST: (teamSlug: string) => `/dashboard/${teamSlug}/templates/list`,
   TEMPLATES_BUILDS: (teamSlug: string) =>
-    `/dashboard/${teamSlug}/templates?tab=builds`,
+    `/dashboard/${teamSlug}/templates/builds`,
   TEMPLATE_BUILD: (teamSlug: string, templateId: string, buildId: string) =>
     `/dashboard/${teamSlug}/templates/${templateId}/builds/${buildId}`,
 
diff --git a/src/features/dashboard/sandbox/inspect/view.tsx b/src/features/dashboard/sandbox/inspect/view.tsx
index fcd805198..25095c8da 100644
--- a/src/features/dashboard/sandbox/inspect/view.tsx
+++ b/src/features/dashboard/sandbox/inspect/view.tsx
@@ -1,9 +1,13 @@
 'use client'
 
-import type { EntryInfo } from 'e2b'
+import { SANDBOX_INSPECT_MINIMUM_ENVD_VERSION } from '@/configs/versioning'
 import SandboxInspectProvider from '@/features/dashboard/sandbox/inspect/context'
 import SandboxInspectFilesystem from '@/features/dashboard/sandbox/inspect/filesystem'
 import SandboxInspectViewer from '@/features/dashboard/sandbox/inspect/viewer'
+import { useRouteParams } from '@/lib/hooks/use-route-params'
+import { isVersionCompatible } from '@/lib/utils/version'
+import { useSandboxContext } from '../context'
+import SandboxInspectIncompatible from './incompatible'
 
 interface SandboxInspectViewProps {
   rootPath: string
@@ -12,6 +16,28 @@ interface SandboxInspectViewProps {
 export default function SandboxInspectView({
   rootPath,
 }: SandboxInspectViewProps) {
+  const { teamSlug } =
+    useRouteParams<'/dashboard/[teamSlug]/sandboxes/[sandboxId]'>()
+  const { sandboxInfo } = useSandboxContext()
+
+  const shouldShowInspectIncompatible = Boolean(
+    sandboxInfo?.state !== 'killed' &&
+      sandboxInfo?.envdVersion &&
+      !isVersionCompatible(
+        sandboxInfo.envdVersion,
+        SANDBOX_INSPECT_MINIMUM_ENVD_VERSION
+      )
+  )
+
+  if (sandboxInfo && shouldShowInspectIncompatible) {
+    return (
+      <SandboxInspectIncompatible
+        templateNameOrId={sandboxInfo.alias || sandboxInfo.templateID}
+        teamSlug={teamSlug}
+      />
+    )
+  }
+
   return (
     <SandboxInspectProvider rootPath={rootPath}>
       <div className="flex min-h-0 flex-1 gap-4 overflow-hidden p-3 md:p-6">
diff --git a/src/features/dashboard/sandbox/layout.tsx b/src/features/dashboard/sandbox/layout.tsx
index 89d7523ba..8bc331081 100644
--- a/src/features/dashboard/sandbox/layout.tsx
+++ b/src/features/dashboard/sandbox/layout.tsx
@@ -1,13 +1,11 @@
 'use client'
 
 import { notFound } from 'next/navigation'
-import { SANDBOX_INSPECT_MINIMUM_ENVD_VERSION } from '@/configs/versioning'
+import { PROTECTED_URLS } from '@/configs/urls'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
-import { isVersionCompatible } from '@/lib/utils/version'
-import { DashboardTab, DashboardTabs } from '@/ui/dashboard-tabs'
+import { DashboardTabsList } from '@/ui/dashboard-tabs'
 import { ListIcon, StorageIcon, TrendIcon } from '@/ui/primitives/icons'
 import { useSandboxContext } from './context'
-import SandboxInspectIncompatible from './inspect/incompatible'
 
 interface SandboxLayoutProps {
   children: React.ReactNode
@@ -20,21 +18,12 @@ export default function SandboxLayout({
   header,
   tabsHeaderAccessory,
 }: SandboxLayoutProps) {
-  const { teamSlug } =
+  const { teamSlug, sandboxId } =
     useRouteParams<'/dashboard/[teamSlug]/sandboxes/[sandboxId]'>()
 
   const { sandboxInfo, isSandboxInfoLoading, isSandboxNotFound } =
     useSandboxContext()
 
-  const shouldShowInspectIncompatible = Boolean(
-    sandboxInfo?.state !== 'killed' &&
-      sandboxInfo?.envdVersion &&
-      !isVersionCompatible(
-        sandboxInfo.envdVersion,
-        SANDBOX_INSPECT_MINIMUM_ENVD_VERSION
-      )
-  )
-
   if (isSandboxNotFound) {
     throw notFound()
   }
@@ -49,44 +38,32 @@ export default function SandboxLayout({
     <div className="flex h-full min-h-0 flex-1 flex-col max-md:overflow-y-auto">
       {header}
 
-      <DashboardTabs
-        type="path"
+      <DashboardTabsList
         layoutKey="tabs-indicator-sandbox"
-        className="max-md:sticky max-md:top-0 max-md:z-20 max-md:h-[calc(100svh-var(--protected-navbar-height))] max-md:max-h-[calc(100svh-var(--protected-navbar-height))] max-md:min-h-[calc(100svh-var(--protected-navbar-height))]"
+        className="max-md:sticky max-md:top-0 max-md:z-20"
         headerAccessory={tabsHeaderAccessory}
-      >
-        <DashboardTab
-          id="monitoring"
-          label="Monitoring"
-          className="flex min-h-0 flex-1 flex-col"
-          icon={<TrendIcon className="size-4" />}
-        >
-          {children}
-        </DashboardTab>
-        <DashboardTab
-          id="logs"
-          label="Logs"
-          className="flex min-h-0 flex-1 flex-col"
-          icon={<ListIcon className="size-4" />}
-        >
-          {children}
-        </DashboardTab>
-        <DashboardTab
-          id="filesystem"
-          label="Filesystem"
-          className="flex min-h-0 flex-1 flex-col"
-          icon={<StorageIcon className="size-4" />}
-        >
-          {!sandboxInfo || !shouldShowInspectIncompatible ? (
-            children
-          ) : (
-            <SandboxInspectIncompatible
-              templateNameOrId={sandboxInfo.alias || sandboxInfo.templateID}
-              teamSlug={teamSlug}
-            />
-          )}
-        </DashboardTab>
-      </DashboardTabs>
+        tabs={[
+          {
+            id: 'monitoring',
+            label: 'Monitoring',
+            href: PROTECTED_URLS.SANDBOX_MONITORING(teamSlug, sandboxId),
+            icon: <TrendIcon className="size-4" />,
+          },
+          {
+            id: 'logs',
+            label: 'Logs',
+            href: PROTECTED_URLS.SANDBOX_LOGS(teamSlug, sandboxId),
+            icon: <ListIcon className="size-4" />,
+          },
+          {
+            id: 'filesystem',
+            label: 'Filesystem',
+            href: PROTECTED_URLS.SANDBOX_FILESYSTEM(teamSlug, sandboxId),
+            icon: <StorageIcon className="size-4" />,
+          },
+        ]}
+      />
+      {children}
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/builds/constants.ts b/src/features/dashboard/templates/builds/constants.ts
index 94cf4fa39..8ac5fe26b 100644
--- a/src/features/dashboard/templates/builds/constants.ts
+++ b/src/features/dashboard/templates/builds/constants.ts
@@ -1,5 +1,3 @@
 import { millisecondsInDay } from 'date-fns/constants'
 
-export { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
-
 export const LOG_RETENTION_MS = 7 * millisecondsInDay // 7 days
diff --git a/src/features/dashboard/templates/builds/use-filters.tsx b/src/features/dashboard/templates/builds/use-filters.tsx
index 1aad6b61e..03ca7b2b1 100644
--- a/src/features/dashboard/templates/builds/use-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-filters.tsx
@@ -3,8 +3,8 @@
 import { useQueryStates } from 'nuqs'
 import { useMemo } from 'react'
 import { useDebounceCallback } from 'usehooks-ts'
+import { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
 import type { BuildStatus } from '@/core/modules/builds/models'
-import { INITIAL_BUILD_STATUSES } from './constants'
 import { templateBuildsFilterParams } from './filter-params'
 
 export default function useFilters() {
diff --git a/src/ui/dashboard-tabs.tsx b/src/ui/dashboard-tabs.tsx
index 3a62ac5a4..f60145d74 100644
--- a/src/ui/dashboard-tabs.tsx
+++ b/src/ui/dashboard-tabs.tsx
@@ -1,62 +1,40 @@
 'use client'
 
-import { usePathname, useSearchParams } from 'next/navigation'
-import {
-  Children,
-  isValidElement,
-  memo,
-  type ReactElement,
-  type ReactNode,
-} from 'react'
+import { usePathname } from 'next/navigation'
+import { memo, type ReactNode } from 'react'
 import { cn } from '@/lib/utils'
 import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/ui/primitives/tabs'
+import { Tabs, TabsList, TabsTrigger } from '@/ui/primitives/tabs'
 
-type DashboardTabElement = ReactElement<DashboardTabProps, typeof DashboardTab>
-
-export interface DashboardTabsProps {
+export interface DashboardTabsListProps {
   layoutKey: string
-  type: 'query' | 'path'
-  children: ReactNode
+  tabs: DashboardTabItem[]
   className?: string
   headerAccessory?: ReactNode
 }
 
-function DashboardTabsComponent({
+export interface DashboardTabItem {
+  id: string
+  label: string
+  href: string
+  icon?: ReactNode
+}
+
+function DashboardTabsListComponent({
   layoutKey,
-  type,
-  children,
+  tabs,
   className,
   headerAccessory,
-}: DashboardTabsProps) {
-  const searchParams = useSearchParams()
+}: DashboardTabsListProps) {
   const pathname = usePathname()
 
-  const tabs = Children.toArray(children)
-    .filter(isDashboardTabElement)
-    .map((child) => ({
-      id: child.props.id,
-      label: child.props.label,
-      icon: child.props.icon,
-      content: child,
-    }))
-
   const firstTab = tabs[0]
   if (!firstTab) {
     return null
   }
 
-  const defaultTabId = firstTab.id
-  const tabIds = new Set(tabs.map((tab) => tab.id))
-  const requestedTabId =
-    type === 'query' ? searchParams.get('tab') : pathname.split('/').pop()
   const activeTabId =
-    requestedTabId && tabIds.has(requestedTabId) ? requestedTabId : defaultTabId
-  const basePath =
-    type === 'query' ? pathname : trimActiveTabSegment(pathname, tabIds)
-
-  const activeTab =
-    tabs.find((tab) => tab.id === activeTabId)?.content ?? firstTab.content
+    tabs.find((tab) => isTabActive(pathname, tab.href))?.id ?? firstTab.id
 
   const tabTriggers = tabs.map((tab) => (
     <TabsTrigger
@@ -66,9 +44,7 @@ function DashboardTabsComponent({
       className="w-fit flex-none"
       asChild
     >
-      <HoverPrefetchLink
-        href={getTabHref(tab.id, type, basePath, searchParams)}
-      >
+      <HoverPrefetchLink href={tab.href}>
         {tab.icon}
         {tab.label}
       </HoverPrefetchLink>
@@ -76,10 +52,7 @@ function DashboardTabsComponent({
   ))
 
   return (
-    <Tabs
-      value={activeTabId}
-      className={cn('min-h-0 w-full flex-1 h-full', className)}
-    >
+    <Tabs value={activeTabId} className={cn('w-full flex-none', className)}>
       {headerAccessory ? (
         <div className="bg-bg z-30 flex w-full flex-col gap-2 md:flex-row md:items-end md:justify-between md:gap-0">
           <div className="order-1 px-3 md:order-2 md:border-b md:px-6 md:flex md:items-end">
@@ -94,69 +67,12 @@ function DashboardTabsComponent({
           {tabTriggers}
         </TabsList>
       )}
-
-      {activeTab}
     </Tabs>
   )
 }
 
-export const DashboardTabs = memo(DashboardTabsComponent)
-
-export interface DashboardTabProps {
-  id: string
-  label: string
-  children: ReactNode
-  icon?: ReactNode
-  className?: string
-}
-
-export function DashboardTab(props: DashboardTabProps) {
-  return (
-    <TabsContent
-      value={props.id}
-      className={cn('flex-1 min-h-0 w-full overflow-hidden', props.className)}
-    >
-      {props.children}
-    </TabsContent>
-  )
-}
-
-function isDashboardTabElement(child: ReactNode): child is DashboardTabElement {
-  if (!isValidElement(child)) {
-    return false
-  }
-
-  const props = child.props as Partial<DashboardTabProps> | null
-
-  return Boolean(
-    props && typeof props.id === 'string' && typeof props.label === 'string'
-  )
-}
-
-function trimActiveTabSegment(pathname: string, tabIds: Set<string>): string {
-  const pathSegments = pathname.split('/')
-  const lastSegment = pathSegments[pathSegments.length - 1] ?? ''
-  if (!tabIds.has(lastSegment)) {
-    return pathname
-  }
-
-  const basePath = pathSegments.slice(0, -1).join('/')
-  return basePath || '/'
-}
-
-function getTabHref(
-  id: string,
-  type: DashboardTabsProps['type'],
-  basePath: string,
-  searchParams: ReturnType<typeof useSearchParams>
-): string {
-  if (type === 'path') {
-    return `${basePath}/${id}`
-  }
-
-  const nextSearchParams = new URLSearchParams(searchParams.toString())
-  nextSearchParams.set('tab', id)
-  const query = nextSearchParams.toString()
+export const DashboardTabsList = memo(DashboardTabsListComponent)
 
-  return query ? `${basePath}?${query}` : basePath
+function isTabActive(pathname: string, href: string): boolean {
+  return pathname === href || pathname.startsWith(`${href}/`)
 }

From 11cf9f76f2fd6ef467d4096556162f9af80cae03 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 15:18:54 -0700
Subject: [PATCH 08/11] fix(dashboard): support webpack builds with Next 16.2

Update Next.js and add browser stubs for Node built-ins pulled into the sandbox inspector client bundle so webpack builds can compile successfully.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 bun.lock                   | 82 +++++++++++++++++++-------------------
 next.config.mjs            | 37 +++++++++++++++--
 package.json               | 10 ++---
 src/app/dashboard/route.ts |  2 +-
 stubs/crypto.ts            | 13 ++++++
 stubs/path.ts              | 25 ++++++++++++
 6 files changed, 120 insertions(+), 49 deletions(-)
 create mode 100644 stubs/crypto.ts
 create mode 100644 stubs/path.ts

diff --git a/bun.lock b/bun.lock
index a9c5ff6eb..2c9788506 100644
--- a/bun.lock
+++ b/bun.lock
@@ -7,7 +7,7 @@
         "@hookform/resolvers": "^5.2.2",
         "@marsidev/react-turnstile": "^1.4.1",
         "@next-safe-action/adapter-react-hook-form": "^2.0.0",
-        "@next/env": "16.1.5",
+        "@next/env": "^16.2.6",
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/auto-instrumentations-node": "^0.62.1",
         "@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
@@ -67,7 +67,7 @@
         "micromatch": "^4.0.8",
         "motion": "^12.23.25",
         "nanoid": "^5.0.9",
-        "next": "16.1.5",
+        "next": "^16.2.6",
         "next-safe-action": "^8.0.11",
         "next-themes": "^0.4.6",
         "nuqs": "^2.7.0",
@@ -306,49 +306,53 @@
 
     "@img/colour": ["@img/colour@1.0.0", "", {}, "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw=="],
 
-    "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.3" }, "os": "darwin", "cpu": "arm64" }, "sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA=="],
+    "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="],
 
-    "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.3" }, "os": "darwin", "cpu": "x64" }, "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg=="],
+    "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="],
 
-    "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.2.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw=="],
+    "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g=="],
 
-    "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.2.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA=="],
+    "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.2.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg=="],
 
-    "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.2.3", "", { "os": "linux", "cpu": "arm" }, "sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA=="],
+    "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.2.4", "", { "os": "linux", "cpu": "arm" }, "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A=="],
 
-    "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.2.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ=="],
+    "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw=="],
 
-    "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.2.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg=="],
+    "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.2.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA=="],
 
-    "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.2.3", "", { "os": "linux", "cpu": "s390x" }, "sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w=="],
+    "@img/sharp-libvips-linux-riscv64": ["@img/sharp-libvips-linux-riscv64@1.2.4", "", { "os": "linux", "cpu": "none" }, "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA=="],
 
-    "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.2.3", "", { "os": "linux", "cpu": "x64" }, "sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg=="],
+    "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.2.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ=="],
 
-    "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.2.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw=="],
+    "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw=="],
 
-    "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.2.3", "", { "os": "linux", "cpu": "x64" }, "sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g=="],
+    "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw=="],
 
-    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.3" }, "os": "linux", "cpu": "arm" }, "sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA=="],
+    "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg=="],
 
-    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.3" }, "os": "linux", "cpu": "arm64" }, "sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ=="],
+    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.4" }, "os": "linux", "cpu": "arm" }, "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw=="],
 
-    "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.2.3" }, "os": "linux", "cpu": "ppc64" }, "sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ=="],
+    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg=="],
 
-    "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.2.3" }, "os": "linux", "cpu": "s390x" }, "sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw=="],
+    "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.2.4" }, "os": "linux", "cpu": "ppc64" }, "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA=="],
 
-    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.3" }, "os": "linux", "cpu": "x64" }, "sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A=="],
+    "@img/sharp-linux-riscv64": ["@img/sharp-linux-riscv64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-riscv64": "1.2.4" }, "os": "linux", "cpu": "none" }, "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw=="],
 
-    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.3" }, "os": "linux", "cpu": "arm64" }, "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA=="],
+    "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.2.4" }, "os": "linux", "cpu": "s390x" }, "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg=="],
 
-    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.4", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.3" }, "os": "linux", "cpu": "x64" }, "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg=="],
+    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ=="],
 
-    "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.4", "", { "dependencies": { "@emnapi/runtime": "^1.5.0" }, "cpu": "none" }, "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA=="],
+    "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg=="],
 
-    "@img/sharp-win32-arm64": ["@img/sharp-win32-arm64@0.34.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA=="],
+    "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q=="],
 
-    "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.34.4", "", { "os": "win32", "cpu": "ia32" }, "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw=="],
+    "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.5", "", { "dependencies": { "@emnapi/runtime": "^1.7.0" }, "cpu": "none" }, "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw=="],
 
-    "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.4", "", { "os": "win32", "cpu": "x64" }, "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig=="],
+    "@img/sharp-win32-arm64": ["@img/sharp-win32-arm64@0.34.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g=="],
+
+    "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.34.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg=="],
+
+    "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.5", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="],
 
     "@isaacs/balanced-match": ["@isaacs/balanced-match@4.0.1", "", {}, "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ=="],
 
@@ -386,23 +390,23 @@
 
     "@next-safe-action/adapter-react-hook-form": ["@next-safe-action/adapter-react-hook-form@2.0.0", "", { "peerDependencies": { "@hookform/resolvers": ">= 5.0.0", "next": ">= 14.0.0", "next-safe-action": ">= 8.0.0", "react": ">= 18.2.0", "react-dom": ">= 18.2.0", "react-hook-form": ">= 7.0.0" } }, "sha512-vp3KAd5NKnBBCF/3b8kDxEYj0+BUYVjlSZOWHikz/Y2O+yLheRmtj8Vcm379itlqGUKcLV5O2o/dwKHvH8pYog=="],
 
-    "@next/env": ["@next/env@16.1.5", "", {}, "sha512-CRSCPJiSZoi4Pn69RYBDI9R7YK2g59vLexPQFXY0eyw+ILevIenCywzg+DqmlBik9zszEnw2HLFOUlLAcJbL7g=="],
+    "@next/env": ["@next/env@16.2.6", "", {}, "sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw=="],
 
-    "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.1.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-eK7Wdm3Hjy/SCL7TevlH0C9chrpeOYWx2iR7guJDaz4zEQKWcS1IMVfMb9UKBFMg1XgzcPTYPIp1Vcpukkjg6Q=="],
+    "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@16.2.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg=="],
 
-    "@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.1.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-foQscSHD1dCuxBmGkbIr6ScAUF6pRoDZP6czajyvmXPAOFNnQUJu2Os1SGELODjKp/ULa4fulnBWoHV3XdPLfA=="],
+    "@next/swc-darwin-x64": ["@next/swc-darwin-x64@16.2.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ=="],
 
-    "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@16.1.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-qNIb42o3C02ccIeSeKjacF3HXotGsxh/FMk/rSRmCzOVMtoWH88odn2uZqF8RLsSUWHcAqTgYmPD3pZ03L9ZAA=="],
+    "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@16.2.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w=="],
 
-    "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@16.1.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-U+kBxGUY1xMAzDTXmuVMfhaWUZQAwzRaHJ/I6ihtR5SbTVUEaDRiEU9YMjy1obBWpdOBuk1bcm+tsmifYSygfw=="],
+    "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@16.2.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA=="],
 
-    "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@16.1.5", "", { "os": "linux", "cpu": "x64" }, "sha512-gq2UtoCpN7Ke/7tKaU7i/1L7eFLfhMbXjNghSv0MVGF1dmuoaPeEVDvkDuO/9LVa44h5gqpWeJ4mRRznjDv7LA=="],
+    "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@16.2.6", "", { "os": "linux", "cpu": "x64" }, "sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw=="],
 
-    "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@16.1.5", "", { "os": "linux", "cpu": "x64" }, "sha512-bQWSE729PbXT6mMklWLf8dotislPle2L70E9q6iwETYEOt092GDn0c+TTNj26AjmeceSsC4ndyGsK5nKqHYXjQ=="],
+    "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@16.2.6", "", { "os": "linux", "cpu": "x64" }, "sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g=="],
 
-    "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@16.1.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-LZli0anutkIllMtTAWZlDqdfvjWX/ch8AFK5WgkNTvaqwlouiD1oHM+WW8RXMiL0+vAkAJyAGEzPPjO+hnrSNQ=="],
+    "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@16.2.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg=="],
 
-    "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.1.5", "", { "os": "win32", "cpu": "x64" }, "sha512-7is37HJTNQGhjPpQbkKjKEboHYQnCgpVt/4rBrrln0D9nderNxZ8ZWs8w1fAtzUx7wEyYjQ+/13myFgFj6K2Ng=="],
+    "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.2.6", "", { "os": "win32", "cpu": "x64" }, "sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA=="],
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
@@ -1060,7 +1064,7 @@
 
     "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
 
-    "baseline-browser-mapping": ["baseline-browser-mapping@2.8.25", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA=="],
+    "baseline-browser-mapping": ["baseline-browser-mapping@2.10.28", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-Ic44hnOtFIgravCunj1ifSoQPSUrkNiJuH9Mf6jr2jjoA74icqV8wU0KuadXeOR8zuIJMOoTv0GuQjZ9ZYNMeA=="],
 
     "bidi-js": ["bidi-js@1.0.3", "", { "dependencies": { "require-from-string": "^2.0.2" } }, "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw=="],
 
@@ -1494,7 +1498,7 @@
 
     "nanoid": ["nanoid@5.1.6", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg=="],
 
-    "next": ["next@16.1.5", "", { "dependencies": { "@next/env": "16.1.5", "@swc/helpers": "0.5.15", "baseline-browser-mapping": "^2.8.3", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "16.1.5", "@next/swc-darwin-x64": "16.1.5", "@next/swc-linux-arm64-gnu": "16.1.5", "@next/swc-linux-arm64-musl": "16.1.5", "@next/swc-linux-x64-gnu": "16.1.5", "@next/swc-linux-x64-musl": "16.1.5", "@next/swc-win32-arm64-msvc": "16.1.5", "@next/swc-win32-x64-msvc": "16.1.5", "sharp": "^0.34.4" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-f+wE+NSbiQgh3DSAlTaw2FwY5yGdVViAtp8TotNQj4kk4Q8Bh1sC/aL9aH+Rg1YAVn18OYXsRDT7U/079jgP7w=="],
+    "next": ["next@16.2.6", "", { "dependencies": { "@next/env": "16.2.6", "@swc/helpers": "0.5.15", "baseline-browser-mapping": "^2.9.19", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "16.2.6", "@next/swc-darwin-x64": "16.2.6", "@next/swc-linux-arm64-gnu": "16.2.6", "@next/swc-linux-arm64-musl": "16.2.6", "@next/swc-linux-x64-gnu": "16.2.6", "@next/swc-linux-x64-musl": "16.2.6", "@next/swc-win32-arm64-msvc": "16.2.6", "@next/swc-win32-x64-msvc": "16.2.6", "sharp": "^0.34.5" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw=="],
 
     "next-safe-action": ["next-safe-action@8.0.11", "", { "peerDependencies": { "next": ">= 14.0.0", "react": ">= 18.2.0", "react-dom": ">= 18.2.0" } }, "sha512-gqJLmnQLAoFCq1kRBopN46New+vx1n9J9Y/qDQLXpv/VqU40AWxDakvshwwnWAt8R0kLvlakNYNLX5PqlXWSMg=="],
 
@@ -1676,7 +1680,7 @@
 
     "server-only": ["server-only@0.0.1", "", {}, "sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA=="],
 
-    "sharp": ["sharp@0.34.4", "", { "dependencies": { "@img/colour": "^1.0.0", "detect-libc": "^2.1.0", "semver": "^7.7.2" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.34.4", "@img/sharp-darwin-x64": "0.34.4", "@img/sharp-libvips-darwin-arm64": "1.2.3", "@img/sharp-libvips-darwin-x64": "1.2.3", "@img/sharp-libvips-linux-arm": "1.2.3", "@img/sharp-libvips-linux-arm64": "1.2.3", "@img/sharp-libvips-linux-ppc64": "1.2.3", "@img/sharp-libvips-linux-s390x": "1.2.3", "@img/sharp-libvips-linux-x64": "1.2.3", "@img/sharp-libvips-linuxmusl-arm64": "1.2.3", "@img/sharp-libvips-linuxmusl-x64": "1.2.3", "@img/sharp-linux-arm": "0.34.4", "@img/sharp-linux-arm64": "0.34.4", "@img/sharp-linux-ppc64": "0.34.4", "@img/sharp-linux-s390x": "0.34.4", "@img/sharp-linux-x64": "0.34.4", "@img/sharp-linuxmusl-arm64": "0.34.4", "@img/sharp-linuxmusl-x64": "0.34.4", "@img/sharp-wasm32": "0.34.4", "@img/sharp-win32-arm64": "0.34.4", "@img/sharp-win32-ia32": "0.34.4", "@img/sharp-win32-x64": "0.34.4" } }, "sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA=="],
+    "sharp": ["sharp@0.34.5", "", { "dependencies": { "@img/colour": "^1.0.0", "detect-libc": "^2.1.2", "semver": "^7.7.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.34.5", "@img/sharp-darwin-x64": "0.34.5", "@img/sharp-libvips-darwin-arm64": "1.2.4", "@img/sharp-libvips-darwin-x64": "1.2.4", "@img/sharp-libvips-linux-arm": "1.2.4", "@img/sharp-libvips-linux-arm64": "1.2.4", "@img/sharp-libvips-linux-ppc64": "1.2.4", "@img/sharp-libvips-linux-riscv64": "1.2.4", "@img/sharp-libvips-linux-s390x": "1.2.4", "@img/sharp-libvips-linux-x64": "1.2.4", "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", "@img/sharp-libvips-linuxmusl-x64": "1.2.4", "@img/sharp-linux-arm": "0.34.5", "@img/sharp-linux-arm64": "0.34.5", "@img/sharp-linux-ppc64": "0.34.5", "@img/sharp-linux-riscv64": "0.34.5", "@img/sharp-linux-s390x": "0.34.5", "@img/sharp-linux-x64": "0.34.5", "@img/sharp-linuxmusl-arm64": "0.34.5", "@img/sharp-linuxmusl-x64": "0.34.5", "@img/sharp-wasm32": "0.34.5", "@img/sharp-win32-arm64": "0.34.5", "@img/sharp-win32-ia32": "0.34.5", "@img/sharp-win32-x64": "0.34.5" } }, "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg=="],
 
     "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
 
@@ -1930,8 +1934,6 @@
 
     "@emnapi/wasi-threads/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@img/sharp-wasm32/@emnapi/runtime": ["@emnapi/runtime@1.7.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-oAYoQnCYaQZKVS53Fq23ceWMRxq5EhQsE0x0RdQ55jT7wagMu5k+fS39v1fiSLrtrLQlXwVINenqhLMtTrV/1Q=="],
-
     "@jest/types/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
 
     "@opentelemetry/exporter-logs-otlp-grpc/@opentelemetry/core": ["@opentelemetry/core@2.0.1", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-MaZk9SJIDgo1peKevlbhP6+IwIiNPNmswNL4AF0WaQJLbHXjr9SrZMgS12+iqr9ToV4ZVosCcc0f8Rg67LXjxw=="],
@@ -2140,6 +2142,8 @@
 
     "aria-hidden/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
+    "browserslist/baseline-browser-mapping": ["baseline-browser-mapping@2.8.25", "", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA=="],
+
     "cliui/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
 
     "cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -2248,8 +2252,6 @@
 
     "yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
 
-    "@img/sharp-wasm32/@emnapi/runtime/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
     "@jest/types/chalk/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
 
     "@jest/types/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
diff --git a/next.config.mjs b/next.config.mjs
index 060d5987b..7b2c98184 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,6 +1,20 @@
 // NOTE: related to src/configs/rewrites.ts
+import path from 'node:path'
+
 export const DOCUMENTATION_DOMAIN = 'e2b.mintlify.app'
 
+const browserStub = (file) => path.resolve(process.cwd(), 'stubs', file)
+
+const browserNodeModuleStubs = {
+  crypto: browserStub('crypto.ts'),
+  fs: browserStub('fs.ts'),
+  path: browserStub('path.ts'),
+  'node:crypto': browserStub('crypto.ts'),
+  'node:fs': browserStub('fs.ts'),
+  'node:fs/promises': browserStub('fs-promises.ts'),
+  'node:path': browserStub('path.ts'),
+}
+
 /** @type {import('next').NextConfig} */
 const config = {
   reactStrictMode: true,
@@ -15,14 +29,31 @@ const config = {
   },
   turbopack: {
     resolveAlias: {
-      // Stub Node.js modules for browser builds
-      // e2b package bundles these packages. when dealing with browser chunks,
-      // we need to stub these packages for builds.
+      crypto: { browser: './stubs/crypto.ts' },
       fs: { browser: './stubs/fs.ts' },
+      path: { browser: './stubs/path.ts' },
+      'node:crypto': { browser: './stubs/crypto.ts' },
       'node:fs': { browser: './stubs/fs.ts' },
       'node:fs/promises': { browser: './stubs/fs-promises.ts' },
+      'node:path': { browser: './stubs/path.ts' },
     },
   },
+  webpack: (webpackConfig, { isServer, webpack }) => {
+    if (!isServer) {
+      webpackConfig.resolve.alias = {
+        ...webpackConfig.resolve.alias,
+        ...browserNodeModuleStubs,
+      }
+
+      webpackConfig.plugins.push(
+        new webpack.NormalModuleReplacementPlugin(/^node:/, (resource) => {
+          resource.request = resource.request.replace(/^node:/, '')
+        })
+      )
+    }
+
+    return webpackConfig
+  },
   logging: {
     fetches: {
       fullUrl: true,
diff --git a/package.json b/package.json
index 82567ad83..5a8b7b36d 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
   "private": true,
   "scripts": {
     "<<<<<<< Next.js": "",
-    "dev": "bun scripts:check-app-env && next dev --turbopack | pino-pretty --colorize",
-    "build": "next build --turbopack",
+    "dev": "bun scripts:check-app-env && next dev | pino-pretty --colorize",
+    "build": "next build --webpack",
     "start": "next start | pino-pretty --colorize",
-    "preview": "next build --turbopack && next start | pino-pretty --colorize",
+    "preview": "next build --webpack && next start | pino-pretty --colorize",
     "lint": "biome lint .",
     "lint:fix": "biome lint --write .",
     "format": "biome check --write --linter-enabled=false --assist-enabled=true . --max-diagnostics none",
@@ -54,7 +54,7 @@
     "@hookform/resolvers": "^5.2.2",
     "@marsidev/react-turnstile": "^1.4.1",
     "@next-safe-action/adapter-react-hook-form": "^2.0.0",
-    "@next/env": "16.1.5",
+    "@next/env": "^16.2.6",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/auto-instrumentations-node": "^0.62.1",
     "@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
@@ -114,7 +114,7 @@
     "micromatch": "^4.0.8",
     "motion": "^12.23.25",
     "nanoid": "^5.0.9",
-    "next": "16.1.5",
+    "next": "^16.2.6",
     "next-safe-action": "^8.0.11",
     "next-themes": "^0.4.6",
     "nuqs": "^2.7.0",
diff --git a/src/app/dashboard/route.ts b/src/app/dashboard/route.ts
index 228a4787d..8d23572d3 100644
--- a/src/app/dashboard/route.ts
+++ b/src/app/dashboard/route.ts
@@ -6,7 +6,7 @@ import { createClient } from '@/core/shared/clients/supabase/server'
 import { encodedRedirect } from '@/lib/utils/auth'
 import { setTeamCookies } from '@/lib/utils/cookies'
 
-export const TAB_URL_MAP: Record<string, (teamSlug: string) => string> = {
+const TAB_URL_MAP: Record<string, (teamSlug: string) => string> = {
   sandboxes: (teamSlug) => PROTECTED_URLS.SANDBOXES(teamSlug),
   templates: (teamSlug) => PROTECTED_URLS.TEMPLATES(teamSlug),
   usage: (teamSlug) => PROTECTED_URLS.USAGE(teamSlug),
diff --git a/stubs/crypto.ts b/stubs/crypto.ts
new file mode 100644
index 000000000..f98786564
--- /dev/null
+++ b/stubs/crypto.ts
@@ -0,0 +1,13 @@
+const notImplemented = () => {
+  throw new Error('crypto is not available in the browser')
+}
+
+export const createHash = notImplemented
+export const randomUUID = notImplemented
+
+const crypto = {
+  createHash,
+  randomUUID,
+}
+
+export default crypto
diff --git a/stubs/path.ts b/stubs/path.ts
new file mode 100644
index 000000000..c1bf514bb
--- /dev/null
+++ b/stubs/path.ts
@@ -0,0 +1,25 @@
+const notImplemented = () => {
+  throw new Error('path is not available in the browser')
+}
+
+export const basename = notImplemented
+export const dirname = notImplemented
+export const extname = notImplemented
+export const join = notImplemented
+export const normalize = notImplemented
+export const resolve = notImplemented
+export const relative = notImplemented
+export const sep = '/'
+
+const path = {
+  basename,
+  dirname,
+  extname,
+  join,
+  normalize,
+  resolve,
+  relative,
+  sep,
+}
+
+export default path

From cabdb74f46ece2ab6f1879a1d641c84f077f2700 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 15:29:12 -0700
Subject: [PATCH 09/11] fix(dashboard): expose tab URL map outside route
 handler

Move the dashboard tab redirect map into a config module so integration tests can import it without violating Next route export constraints.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/app/dashboard/route.ts                | 18 +-----------------
 src/configs/dashboard-tab-url-map.ts      | 18 ++++++++++++++++++
 tests/integration/dashboard-route.test.ts |  3 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 src/configs/dashboard-tab-url-map.ts

diff --git a/src/app/dashboard/route.ts b/src/app/dashboard/route.ts
index 8d23572d3..b7c4c454b 100644
--- a/src/app/dashboard/route.ts
+++ b/src/app/dashboard/route.ts
@@ -1,4 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
+import { TAB_URL_MAP } from '@/configs/dashboard-tab-url-map'
 import { AUTH_URLS, PROTECTED_URLS } from '@/configs/urls'
 import { getSessionInsecure } from '@/core/server/functions/auth/get-session'
 import { resolveUserTeam } from '@/core/server/functions/team/resolve-user-team'
@@ -6,23 +7,6 @@ import { createClient } from '@/core/shared/clients/supabase/server'
 import { encodedRedirect } from '@/lib/utils/auth'
 import { setTeamCookies } from '@/lib/utils/cookies'
 
-const TAB_URL_MAP: Record<string, (teamSlug: string) => string> = {
-  sandboxes: (teamSlug) => PROTECTED_URLS.SANDBOXES(teamSlug),
-  templates: (teamSlug) => PROTECTED_URLS.TEMPLATES(teamSlug),
-  usage: (teamSlug) => PROTECTED_URLS.USAGE(teamSlug),
-  billing: (teamSlug) => PROTECTED_URLS.BILLING(teamSlug),
-  limits: (teamSlug) => PROTECTED_URLS.LIMITS(teamSlug),
-  keys: (teamSlug) => PROTECTED_URLS.KEYS(teamSlug),
-  settings: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
-  team: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
-  general: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
-  members: (teamSlug) => PROTECTED_URLS.MEMBERS(teamSlug),
-  account: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
-  personal: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
-
-  budget: (teamSlug) => PROTECTED_URLS.LIMITS(teamSlug),
-}
-
 function getTabRedirectPath(tab: string | null, teamSlug: string) {
   if (tab && Object.hasOwn(TAB_URL_MAP, tab)) {
     const urlGenerator = TAB_URL_MAP[tab]
diff --git a/src/configs/dashboard-tab-url-map.ts b/src/configs/dashboard-tab-url-map.ts
new file mode 100644
index 000000000..1cf2e06df
--- /dev/null
+++ b/src/configs/dashboard-tab-url-map.ts
@@ -0,0 +1,18 @@
+import { PROTECTED_URLS } from './urls'
+
+export const TAB_URL_MAP: Record<string, (teamSlug: string) => string> = {
+  sandboxes: (teamSlug) => PROTECTED_URLS.SANDBOXES(teamSlug),
+  templates: (teamSlug) => PROTECTED_URLS.TEMPLATES(teamSlug),
+  usage: (teamSlug) => PROTECTED_URLS.USAGE(teamSlug),
+  billing: (teamSlug) => PROTECTED_URLS.BILLING(teamSlug),
+  limits: (teamSlug) => PROTECTED_URLS.LIMITS(teamSlug),
+  keys: (teamSlug) => PROTECTED_URLS.KEYS(teamSlug),
+  settings: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
+  team: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
+  general: (teamSlug) => PROTECTED_URLS.GENERAL(teamSlug),
+  members: (teamSlug) => PROTECTED_URLS.MEMBERS(teamSlug),
+  account: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
+  personal: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
+
+  budget: (teamSlug) => PROTECTED_URLS.LIMITS(teamSlug),
+}
diff --git a/tests/integration/dashboard-route.test.ts b/tests/integration/dashboard-route.test.ts
index 0ddce2cf9..7c2b02e4e 100644
--- a/tests/integration/dashboard-route.test.ts
+++ b/tests/integration/dashboard-route.test.ts
@@ -74,7 +74,8 @@ vi.mock('@/lib/utils/cookies', () => ({
 }))
 
 // import the route after mocks are set up
-import { GET, TAB_URL_MAP } from '@/app/dashboard/route'
+import { GET } from '@/app/dashboard/route'
+import { TAB_URL_MAP } from '@/configs/dashboard-tab-url-map'
 
 describe('Dashboard Route - Team Resolution Integration Tests', () => {
   beforeEach(() => {

From 8cadc9891ca62568e56d58d396e566423d0eb554 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 15:51:11 -0700
Subject: [PATCH 10/11] fix(build): alias fs promises for webpack browser stubs

Add an explicit fs/promises browser alias so node:fs/promises requests still resolve correctly after the webpack node: scheme replacement runs.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 next.config.mjs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/next.config.mjs b/next.config.mjs
index 7b2c98184..23413aa5a 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -8,6 +8,7 @@ const browserStub = (file) => path.resolve(process.cwd(), 'stubs', file)
 const browserNodeModuleStubs = {
   crypto: browserStub('crypto.ts'),
   fs: browserStub('fs.ts'),
+  'fs/promises': browserStub('fs-promises.ts'),
   path: browserStub('path.ts'),
   'node:crypto': browserStub('crypto.ts'),
   'node:fs': browserStub('fs.ts'),
@@ -31,6 +32,7 @@ const config = {
     resolveAlias: {
       crypto: { browser: './stubs/crypto.ts' },
       fs: { browser: './stubs/fs.ts' },
+      'fs/promises': { browser: './stubs/fs-promises.ts' },
       path: { browser: './stubs/path.ts' },
       'node:crypto': { browser: './stubs/crypto.ts' },
       'node:fs': { browser: './stubs/fs.ts' },

From 1fd14c7061fb4fb7d6634725bdf487c82d6cb323 Mon Sep 17 00:00:00 2001
From: ben-fornefeld <ben.fornefeld@gmail.com>
Date: Fri, 8 May 2026 15:56:24 -0700
Subject: [PATCH 11/11] test(dashboard): cover E2B browser stubs and inspect
 SDK usage

Add integration coverage for webpack browser stub aliases and the sandbox inspector's E2B filesystem methods so build-time shims and runtime SDK usage stay aligned.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 tests/integration/e2b-browser-stubs.test.ts   |  72 ++++++++++
 .../sandbox-inspect-manager.test.ts           | 124 ++++++++++++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 tests/integration/e2b-browser-stubs.test.ts
 create mode 100644 tests/integration/sandbox-inspect-manager.test.ts

diff --git a/tests/integration/e2b-browser-stubs.test.ts b/tests/integration/e2b-browser-stubs.test.ts
new file mode 100644
index 000000000..2d141a547
--- /dev/null
+++ b/tests/integration/e2b-browser-stubs.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it } from 'vitest'
+import nextConfig from '../../next.config.mjs'
+
+class MockNormalModuleReplacementPlugin {
+  readonly pattern: RegExp
+  readonly callback: (resource: { request: string }) => void
+
+  constructor(
+    pattern: RegExp,
+    callback: (resource: { request: string }) => void
+  ) {
+    this.pattern = pattern
+    this.callback = callback
+  }
+}
+
+describe('E2B browser module stubs', () => {
+  it('aliases node built-ins after webpack strips node: scheme requests', () => {
+    const webpackConfig = {
+      resolve: { alias: {} as Record<string, string> },
+      plugins: [] as MockNormalModuleReplacementPlugin[],
+    }
+
+    nextConfig.webpack?.(webpackConfig, {
+      isServer: false,
+      webpack: {
+        NormalModuleReplacementPlugin: MockNormalModuleReplacementPlugin,
+      },
+    })
+
+    expect(webpackConfig.resolve.alias).toMatchObject({
+      crypto: expect.stringContaining('stubs/crypto.ts'),
+      fs: expect.stringContaining('stubs/fs.ts'),
+      'fs/promises': expect.stringContaining('stubs/fs-promises.ts'),
+      path: expect.stringContaining('stubs/path.ts'),
+      'node:crypto': expect.stringContaining('stubs/crypto.ts'),
+      'node:fs': expect.stringContaining('stubs/fs.ts'),
+      'node:fs/promises': expect.stringContaining('stubs/fs-promises.ts'),
+      'node:path': expect.stringContaining('stubs/path.ts'),
+    })
+
+    const plugin = webpackConfig.plugins.find((plugin) =>
+      plugin.pattern.test('node:fs/promises')
+    )
+    expect(plugin).toBeDefined()
+
+    const resource = { request: 'node:fs/promises' }
+    plugin?.callback(resource)
+
+    expect(resource.request).toBe('fs/promises')
+    expect(webpackConfig.resolve.alias[resource.request]).toContain(
+      'stubs/fs-promises.ts'
+    )
+  })
+
+  it('does not rewrite server webpack builds', () => {
+    const webpackConfig = {
+      resolve: { alias: {} as Record<string, string> },
+      plugins: [] as MockNormalModuleReplacementPlugin[],
+    }
+
+    nextConfig.webpack?.(webpackConfig, {
+      isServer: true,
+      webpack: {
+        NormalModuleReplacementPlugin: MockNormalModuleReplacementPlugin,
+      },
+    })
+
+    expect(webpackConfig.resolve.alias).toEqual({})
+    expect(webpackConfig.plugins).toEqual([])
+  })
+})
diff --git a/tests/integration/sandbox-inspect-manager.test.ts b/tests/integration/sandbox-inspect-manager.test.ts
new file mode 100644
index 000000000..720766641
--- /dev/null
+++ b/tests/integration/sandbox-inspect-manager.test.ts
@@ -0,0 +1,124 @@
+import { FilesystemEventType, type Sandbox } from 'e2b'
+import { describe, expect, it, vi } from 'vitest'
+import { createFilesystemStore } from '@/features/dashboard/sandbox/inspect/filesystem/store'
+import { SandboxManager } from '@/features/dashboard/sandbox/inspect/sandbox-manager'
+
+function waitForPendingWork() {
+  return new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+function createStore() {
+  const store = createFilesystemStore('/home/user')
+  store.getState().addNodes('/home', [
+    {
+      name: 'user',
+      path: '/home/user',
+      type: 'dir',
+      isExpanded: true,
+      children: [],
+    },
+  ])
+
+  return store
+}
+
+describe('SandboxManager E2B SDK surface', () => {
+  it('uses the E2B filesystem methods required by the dashboard inspector', async () => {
+    let watcherCallback:
+      | ((event: { type: FilesystemEventType; name: string }) => void)
+      | undefined
+
+    const watchHandle = { stop: vi.fn() }
+    const sandbox = {
+      files: {
+        watchDir: vi.fn(async (_path, callback) => {
+          watcherCallback = callback
+          return watchHandle
+        }),
+        list: vi.fn(async () => [
+          {
+            type: 'file',
+            name: 'hello.txt',
+            path: '/home/user/hello.txt',
+          },
+        ]),
+        getInfo: vi.fn(async () => ({ size: 11 })),
+        read: vi.fn(
+          async () => new Blob(['hello world'], { type: 'text/plain' })
+        ),
+      },
+      downloadUrl: vi.fn(async () => 'https://download.example/hello.txt'),
+    } as unknown as Sandbox
+
+    const store = createStore()
+    const manager = new SandboxManager(store, sandbox, '/home/user')
+
+    await waitForPendingWork()
+
+    expect(sandbox.files.watchDir).toHaveBeenCalledWith(
+      '/home/user',
+      expect.any(Function),
+      expect.objectContaining({
+        recursive: true,
+        user: 'root',
+        timeoutMs: 0,
+        requestTimeoutMs: 0,
+      })
+    )
+
+    await manager.loadDirectory('/home/user')
+
+    expect(sandbox.files.list).toHaveBeenCalledWith(
+      '/home/user',
+      expect.objectContaining({
+        user: 'root',
+        requestTimeoutMs: 20_000,
+      })
+    )
+    expect(store.getState().getNode('/home/user/hello.txt')).toMatchObject({
+      type: 'file',
+      name: 'hello.txt',
+    })
+
+    await manager.readFile('/home/user/hello.txt')
+
+    expect(sandbox.files.getInfo).toHaveBeenCalledWith(
+      '/home/user/hello.txt',
+      expect.objectContaining({
+        user: 'root',
+        requestTimeoutMs: 10_000,
+      })
+    )
+    expect(sandbox.files.read).toHaveBeenCalledWith(
+      '/home/user/hello.txt',
+      expect.objectContaining({
+        format: 'blob',
+        user: 'root',
+        requestTimeoutMs: 30_000,
+      })
+    )
+    expect(
+      store.getState().getFileContent('/home/user/hello.txt')
+    ).toMatchObject({
+      type: 'text',
+      text: 'hello world',
+    })
+
+    await expect(manager.getDownloadUrl('/home/user/hello.txt')).resolves.toBe(
+      'https://download.example/hello.txt'
+    )
+    expect(sandbox.downloadUrl).toHaveBeenCalledWith('/home/user/hello.txt', {
+      user: 'root',
+    })
+
+    watcherCallback?.({
+      type: FilesystemEventType.REMOVE,
+      name: 'hello.txt',
+    })
+
+    expect(store.getState().getNode('/home/user/hello.txt')).toBeUndefined()
+
+    manager.stopWatching()
+    expect(watchHandle.stop).toHaveBeenCalled()
+  })
+})