From 0e9f6f6bc1fd00bc15cb9fac8362b78ad19e626d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 16:38:03 +0200
Subject: [PATCH 01/90] feat(templates): v1 read-only template detail page

Add a per-template detail page reachable from the templates list at
/templates/[templateId]/{overview,builds,tags}. v1 is read-only across
all three tabs, except the visibility dropdown on the header which
reuses the existing templates.updateTemplate mutation.

Routing
- New route group [templateId]/(detail-tabs) wraps overview, builds,
  and tags so the existing builds/[buildId] build-detail page is
  untouched (sibling, not inside the group).
- [templateId]/page.tsx redirects to /overview.
- Names: name-cell click on the list page navigates to /overview.
  Default (E2B) templates remain non-clickable. Copy moves to a
  hover-revealed icon button in the corner of the cell.

Header
- Reusable usePageTitle Zustand hook (~30 LOC) lets pages override
  the dashboard title bar with fetched data. Global header reads the
  override; falls back to pathname-derived layout config when none.
- DetailsRow with 5 cells: Memory, CPU, Created, Updated, Visibility.
- No-successful-build state renders '--' for cpu/memory.
- Visibility dropdown reuses the existing updateTemplate mutation
  with optimistic updates across both list and detail caches.

Builds tab
- BuildsTable now accepts optional templateId prop; when set, the
  Template column is hidden and a scoped filter hook
  (useTemplateBuildsFilters, statuses-only URL state) is used.
- BuildsHeader gains showSearchInput and scoped props; the all-team
  /templates/builds page is unchanged.

Tags tab
- New templates.getTags tRPC procedure + repository method backed by
  the existing GET /templates/{templateID}/tags infra endpoint.
- Read-only table: tag pill | linked build ID + relative time.
- Sortable on both columns; client-side search by name; info banner
  copy matches Figma; empty state.

tRPC + repository
- New templates.getTemplate procedure filters server-side over the
  existing getTeamTemplates result; throws NOT_FOUND when the
  templateID isn't in the team's list (catches stale links, wrong
  team, and default-template URL guessing).

Telemetry
- PostHog events: 'template detail opened' (mount), 'template detail
  tab switched' (tab change), 'template visibility changed from
  header' (mutation success). 'template detail opened' is also
  emitted on name-cell click from the list with fromTab=list.

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../(detail-tabs)/builds/page.tsx             |  15 ++
 .../[templateId]/(detail-tabs)/layout.tsx     |  20 ++
 .../[templateId]/(detail-tabs)/loading.tsx    |   5 +
 .../(detail-tabs)/overview/page.tsx           |  24 +++
 .../[templateId]/(detail-tabs)/tags/page.tsx  |  17 ++
 .../templates/[templateId]/page.tsx           |  10 +
 src/configs/layout.ts                         |  35 ++++
 src/configs/urls.ts                           |   8 +
 src/core/modules/templates/models.ts          |   2 +
 .../modules/templates/repository.server.ts    |  55 +++++-
 src/core/server/api/routers/templates.ts      |  24 +++
 src/features/dashboard/layouts/header.tsx     |   8 +-
 .../dashboard/templates/builds/header.tsx     |  58 ++++--
 .../dashboard/templates/builds/table.tsx      |  70 +++++--
 .../builds/use-template-builds-filters.tsx    |  36 ++++
 .../templates/detail/header-skeleton.tsx      |  27 +++
 .../dashboard/templates/detail/header.tsx     | 108 +++++++++++
 .../dashboard/templates/detail/tabs.tsx       |  79 ++++++++
 .../templates/detail/title-binder.tsx         |  75 ++++++++
 .../templates/detail/visibility-dropdown.tsx  | 174 ++++++++++++++++++
 .../dashboard/templates/list/table-cells.tsx  |  79 ++++++--
 .../dashboard/templates/tags/empty.tsx        |  25 +++
 .../dashboard/templates/tags/header.tsx       |  51 +++++
 .../templates/tags/sortable-header.tsx        |  47 +++++
 .../dashboard/templates/tags/table-cells.tsx  |  83 +++++++++
 .../dashboard/templates/tags/table.tsx        | 135 ++++++++++++++
 src/lib/hooks/use-page-title.ts               |  65 +++++++
 src/ui/primitives/icons.tsx                   |  19 ++
 28 files changed, 1302 insertions(+), 52 deletions(-)
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/loading.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/page.tsx
 create mode 100644 src/features/dashboard/templates/builds/use-template-builds-filters.tsx
 create mode 100644 src/features/dashboard/templates/detail/header-skeleton.tsx
 create mode 100644 src/features/dashboard/templates/detail/header.tsx
 create mode 100644 src/features/dashboard/templates/detail/tabs.tsx
 create mode 100644 src/features/dashboard/templates/detail/title-binder.tsx
 create mode 100644 src/features/dashboard/templates/detail/visibility-dropdown.tsx
 create mode 100644 src/features/dashboard/templates/tags/empty.tsx
 create mode 100644 src/features/dashboard/templates/tags/header.tsx
 create mode 100644 src/features/dashboard/templates/tags/sortable-header.tsx
 create mode 100644 src/features/dashboard/templates/tags/table-cells.tsx
 create mode 100644 src/features/dashboard/templates/tags/table.tsx
 create mode 100644 src/lib/hooks/use-page-title.ts

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
new file mode 100644
index 000000000..9544e7657
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -0,0 +1,15 @@
+import BuildsHeader from '@/features/dashboard/templates/builds/header'
+import BuildsTable from '@/features/dashboard/templates/builds/table'
+
+export default async function TemplateDetailBuildsPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
+  const { templateId } = await params
+
+  return (
+    <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
+      <BuildsHeader showSearchInput={false} scoped />
+      <BuildsTable templateId={templateId} />
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
new file mode 100644
index 000000000..9526e76b5
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
@@ -0,0 +1,20 @@
+import { Suspense } from 'react'
+import TemplateDetailTabs from '@/features/dashboard/templates/detail/tabs'
+import TemplateTitleBinder from '@/features/dashboard/templates/detail/title-binder'
+
+export default async function TemplateDetailLayout({
+  children,
+  params,
+}: LayoutProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
+  const { teamSlug, templateId } = await params
+
+  return (
+    <div className="pt-2 flex-1 md:pt-3 min-h-0 h-full flex flex-col">
+      <Suspense fallback={null}>
+        <TemplateTitleBinder teamSlug={teamSlug} templateId={templateId} />
+      </Suspense>
+      <TemplateDetailTabs teamSlug={teamSlug} templateId={templateId} />
+      {children}
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/loading.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/loading.tsx
new file mode 100644
index 000000000..2b9dc7302
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingLayout from '@/features/dashboard/loading-layout'
+
+export default function TemplateDetailLoading() {
+  return <LoadingLayout />
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
new file mode 100644
index 000000000..dcbf1a68a
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -0,0 +1,24 @@
+import { Suspense } from 'react'
+import TemplateDetailHeader from '@/features/dashboard/templates/detail/header'
+import TemplateDetailHeaderSkeleton from '@/features/dashboard/templates/detail/header-skeleton'
+
+/**
+ * Template detail \u2014 Overview tab.
+ *
+ * v1: the 5-cell DetailsRow is the only content.
+ * Future iterations will add: running-sandboxes chart, description /
+ * dockerfile-like view, and a versions section. See the v1 plan.
+ */
+export default async function TemplateOverviewPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
+  const { teamSlug, templateId } = await params
+
+  return (
+    <div className="p-3 md:p-6 flex flex-col gap-6">
+      <Suspense fallback={<TemplateDetailHeaderSkeleton />}>
+        <TemplateDetailHeader teamSlug={teamSlug} templateId={templateId} />
+      </Suspense>
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
new file mode 100644
index 000000000..72459a9ff
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
@@ -0,0 +1,17 @@
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import TagsTable from '@/features/dashboard/templates/tags/table'
+
+export default async function TemplateTagsPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
+  const { teamSlug, templateId } = await params
+
+  return (
+    <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
+      <Suspense fallback={<LoadingLayout />}>
+        <TagsTable teamSlug={teamSlug} templateId={templateId} />
+      </Suspense>
+    </div>
+  )
+}
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/page.tsx
new file mode 100644
index 000000000..8cf4ea965
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/page.tsx
@@ -0,0 +1,10 @@
+import { redirect } from 'next/navigation'
+import { PROTECTED_URLS } from '@/configs/urls'
+
+export default async function TemplateDetailPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
+  const { teamSlug, templateId } = await params
+
+  redirect(PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, templateId))
+}
diff --git a/src/configs/layout.ts b/src/configs/layout.ts
index 0f29ab80c..d7078f60e 100644
--- a/src/configs/layout.ts
+++ b/src/configs/layout.ts
@@ -89,6 +89,17 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
       },
     }
   },
+  // Template detail tabs: fallback title (UUID-derived) used until
+  // usePageTitle injects the friendly template name from fetched data.
+  '/dashboard/*/templates/*/overview': (pathname) =>
+    templateDetailLayoutConfig(pathname),
+  '/dashboard/*/templates/*/tags': (pathname) =>
+    templateDetailLayoutConfig(pathname),
+  // Template detail Builds tab — same fallback, but the path matches
+  // /templates/*/builds (no trailing buildId) so it doesn't collide
+  // with the build-detail glob above (/templates/*/builds/*).
+  '/dashboard/*/templates/*/builds': (pathname) =>
+    templateDetailLayoutConfig(pathname),
 
   // integrations
   '/dashboard/*/webhooks': () => ({
@@ -163,6 +174,30 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
   }),
 }
 
+function templateDetailLayoutConfig(pathname: string): DashboardLayoutConfig {
+  const parts = pathname.split('/')
+  const teamSlug = parts[2]!
+  const templateId = parts[4]!
+  const templateIdSliced =
+    templateId.length > 14
+      ? `${templateId.slice(0, 6)}...${templateId.slice(-6)}`
+      : templateId
+
+  // Note: no `includeHeaderBottomStyles` — the tabs row sits flush
+  // below the global title bar, matching /templates/list and /sandboxes.
+  return {
+    title: [
+      {
+        label: 'Templates',
+        href: PROTECTED_URLS.TEMPLATES_LIST(teamSlug),
+      },
+      { label: templateIdSliced },
+    ],
+    type: 'custom',
+    copyValue: templateId,
+  }
+}
+
 /**
  * Returns the layout config for a given dashboard pathname.
  * @param pathname - The current route pathname
diff --git a/src/configs/urls.ts b/src/configs/urls.ts
index 9412b2a97..0056dfdfd 100644
--- a/src/configs/urls.ts
+++ b/src/configs/urls.ts
@@ -44,6 +44,14 @@ export const PROTECTED_URLS = {
   TEMPLATES_LIST: (teamSlug: string) => `/dashboard/${teamSlug}/templates/list`,
   TEMPLATES_BUILDS: (teamSlug: string) =>
     `/dashboard/${teamSlug}/templates/builds`,
+  TEMPLATE_DETAIL: (teamSlug: string, templateId: string) =>
+    `/dashboard/${teamSlug}/templates/${templateId}/overview`,
+  TEMPLATE_OVERVIEW: (teamSlug: string, templateId: string) =>
+    `/dashboard/${teamSlug}/templates/${templateId}/overview`,
+  TEMPLATE_DETAIL_BUILDS: (teamSlug: string, templateId: string) =>
+    `/dashboard/${teamSlug}/templates/${templateId}/builds`,
+  TEMPLATE_TAGS: (teamSlug: string, templateId: string) =>
+    `/dashboard/${teamSlug}/templates/${templateId}/tags`,
   TEMPLATE_BUILD: (teamSlug: string, templateId: string, buildId: string) =>
     `/dashboard/${teamSlug}/templates/${templateId}/builds/${buildId}`,
 
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index aa08bebab..62e6269b9 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -23,3 +23,5 @@ export type DefaultTemplate = Template & {
   isDefault: true
   defaultDescription?: string
 }
+
+export type TemplateTag = InfraComponents['schemas']['TemplateTag']
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 9d282af3e..c4d5bd47c 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -7,7 +7,11 @@ import {
   MOCK_DEFAULT_TEMPLATES_DATA,
   MOCK_TEMPLATES_DATA,
 } from '@/configs/mock-data'
-import type { DefaultTemplate, Template } from '@/core/modules/templates/models'
+import type {
+  DefaultTemplate,
+  Template,
+  TemplateTag,
+} from '@/core/modules/templates/models'
 import {
   type AuthUserEmailResolver,
   getAuthUserEmailsById,
@@ -30,6 +34,8 @@ type TemplatesRepositoryDeps = {
 
 export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
+  getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
+  getTags(templateId: string): Promise<RepoResult<{ tags: TemplateTag[] }>>
   deleteTemplate(templateId: string): Promise<RepoResult<{ success: true }>>
   updateTemplateVisibility(
     templateId: string,
@@ -53,6 +59,53 @@ export function createTemplatesRepository(
   }
 ): TeamTemplatesRepository {
   return {
+    async getTemplate(templateId) {
+      // v1: filter server-side over the existing list endpoint. No
+      // separate per-template fetch needed; this keeps the cache hot
+      // for cross-page reuse and avoids any new infra dependencies.
+      const listResult = await this.getTeamTemplates()
+      if (!listResult.ok) return listResult
+
+      const template = listResult.data.templates.find(
+        (t) => t.templateID === templateId
+      )
+
+      if (!template) {
+        return err(
+          repoErrorFromHttp(404, 'Template not found in this team', undefined)
+        )
+      }
+
+      return ok({ template })
+    },
+    async getTags(templateId) {
+      if (USE_MOCK_DATA) {
+        return ok({ tags: [] })
+      }
+
+      const res = await deps.infraClient.GET('/templates/{templateID}/tags', {
+        params: {
+          path: {
+            templateID: templateId,
+          },
+        },
+        headers: {
+          ...deps.authHeaders(scope.accessToken, scope.teamId),
+        },
+      })
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template tags',
+            res.error
+          )
+        )
+      }
+
+      return ok({ tags: res.data ?? [] })
+    },
     async getTeamTemplates() {
       if (USE_MOCK_DATA) {
         return ok({
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index d063c251c..ccbeebf80 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -42,6 +42,30 @@ export const templatesRouter = createTRPCRouter({
     return result.data
   }),
 
+  getTemplate: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getTemplate(input.templateId)
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
+  getTags: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getTags(input.templateId)
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
   getDefaultTemplatesCached: templatesRepositoryProcedure.query(
     async ({ ctx }) => {
       const result = await ctx.templatesRepository.getDefaultTemplatesCached()
diff --git a/src/features/dashboard/layouts/header.tsx b/src/features/dashboard/layouts/header.tsx
index e1a780ee7..14efdff95 100644
--- a/src/features/dashboard/layouts/header.tsx
+++ b/src/features/dashboard/layouts/header.tsx
@@ -4,6 +4,7 @@ import Link from 'next/link'
 import { usePathname } from 'next/navigation'
 import { Fragment } from 'react'
 import { getDashboardLayoutConfig, type TitleSegment } from '@/configs/layout'
+import { usePageTitleStore } from '@/lib/hooks/use-page-title'
 import { cn } from '@/lib/utils'
 import ClientOnly from '@/ui/client-only'
 import CopyButton from '@/ui/copy-button'
@@ -21,7 +22,10 @@ export default function DashboardLayoutHeader({
 }: DashboardLayoutHeaderProps) {
   const pathname = usePathname()
   const config = getDashboardLayoutConfig(pathname)
-  const copyableValue = config.copyValue ?? null
+  const override = usePageTitleStore((state) => state.override)
+
+  const title = override?.title ?? config.title
+  const copyableValue = override?.copyValue ?? config.copyValue ?? null
 
   return (
     <div
@@ -43,7 +47,7 @@ export default function DashboardLayoutHeader({
 
         <div className="min-w-0 flex-1 flex items-center gap-2">
           <h1 className="truncate min-w-0">
-            <HeaderTitle title={config.title} />
+            <HeaderTitle title={title} />
           </h1>
           {copyableValue && (
             <CopyButton
diff --git a/src/features/dashboard/templates/builds/header.tsx b/src/features/dashboard/templates/builds/header.tsx
index 2c783b8d8..21a7987a3 100644
--- a/src/features/dashboard/templates/builds/header.tsx
+++ b/src/features/dashboard/templates/builds/header.tsx
@@ -14,6 +14,7 @@ import {
 import { Input } from '@/ui/primitives/input'
 import { Status } from './table-cells'
 import useFilters from './use-filters'
+import useTemplateBuildsFilters from './use-template-builds-filters'
 
 interface DashedStatusCircleIconProps {
   status: BuildStatus
@@ -62,9 +63,40 @@ const STATUS_OPTIONS: Array<{ value: BuildStatus; label: string }> = [
   { value: 'failed', label: 'Failed' },
 ]
 
-export default function BuildsHeader() {
-  const { statuses, setStatuses, buildIdOrTemplate, setBuildIdOrTemplate } =
-    useFilters()
+interface BuildsHeaderProps {
+  /**
+   * When false, hides the build/template search input. Used on the
+   * per-template detail page where the table is already scoped via the
+   * `templateId` prop on `BuildsTable`. Defaults to true.
+   */
+  showSearchInput?: boolean
+  /**
+   * When provided, the header uses the template-scoped filters hook
+   * (statuses-only URL state) instead of the shared `useFilters` hook.
+   * Pair this with `BuildsTable templateId={...}` so both surfaces read
+   * from the same URL state.
+   */
+  scoped?: boolean
+}
+
+export default function BuildsHeader({
+  showSearchInput = true,
+  scoped = false,
+}: BuildsHeaderProps = {}) {
+  // Both hooks must be called unconditionally to satisfy React's rules.
+  // `scoped` only changes via route navigation — the component is
+  // unmounted between transitions, so hook order remains consistent.
+  const sharedFilters = useFilters()
+  const scopedFilters = useTemplateBuildsFilters()
+
+  const statuses = scoped ? scopedFilters.statuses : sharedFilters.statuses
+  const setStatuses = scoped
+    ? scopedFilters.setStatuses
+    : sharedFilters.setStatuses
+  const buildIdOrTemplate = scoped ? undefined : sharedFilters.buildIdOrTemplate
+  const setBuildIdOrTemplate = scoped
+    ? undefined
+    : sharedFilters.setBuildIdOrTemplate
 
   const [localBuildIdOrTemplate, setLocalBuildIdOrTemplate] = useState<string>(
     buildIdOrTemplate ?? ''
@@ -103,15 +135,17 @@ export default function BuildsHeader() {
 
   return (
     <div className="flex flex-col gap-3">
-      <Input
-        placeholder="Build ID, Template ID or Name"
-        className="w-full max-w-62"
-        value={localBuildIdOrTemplate}
-        onChange={(e) => {
-          setLocalBuildIdOrTemplate(e.target.value)
-          setBuildIdOrTemplate(e.target.value)
-        }}
-      />
+      {showSearchInput && setBuildIdOrTemplate && (
+        <Input
+          placeholder="Build ID, Template ID or Name"
+          className="w-full max-w-62"
+          value={localBuildIdOrTemplate}
+          onChange={(e) => {
+            setLocalBuildIdOrTemplate(e.target.value)
+            setBuildIdOrTemplate(e.target.value)
+          }}
+        />
+      )}
 
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index 493280d3e..e320d02e8 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -38,6 +38,7 @@ import {
   Template,
 } from './table-cells'
 import useFilters from './use-filters'
+import useTemplateBuildsFilters from './use-template-builds-filters'
 
 const BUILDS_REFETCH_INTERVAL_MS = 15_000
 const RUNNING_BUILD_POLL_INTERVAL_MS = 3_000
@@ -51,14 +52,40 @@ const COLUMN_WIDTHS = {
   duration: 96,
 } as const
 
-const BuildsTable = () => {
+interface BuildsTableProps {
+  /**
+   * When provided, the table is scoped to a single template:
+   *  - filters are read from `useTemplateBuildsFilters` (statuses only,
+   *    no search input affects the list)
+   *  - the Template column is hidden
+   *  - the `buildIdOrTemplate` query param is set to this UUID
+   */
+  templateId?: string
+}
+
+const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
   const trpc = useTRPC()
   const queryClient = useQueryClient()
   const router = useRouter()
   const scrollContainerRef = useRef<HTMLDivElement>(null)
 
   const { teamSlug } = useRouteParams<'/dashboard/[teamSlug]/templates'>()
-  const { statuses, buildIdOrTemplate } = useFilters()
+
+  const isTemplateScoped = templateId !== undefined
+
+  // Two filter hooks live here, but only one is active per render. React
+  // requires consistent hook order across renders — `templateId` only
+  // changes via route navigation (which unmounts the component), so it is
+  // safe to call both unconditionally and pick which result to use.
+  const sharedFilters = useFilters()
+  const scopedFilters = useTemplateBuildsFilters()
+
+  const statuses = isTemplateScoped
+    ? scopedFilters.statuses
+    : sharedFilters.statuses
+  const buildIdOrTemplate = isTemplateScoped
+    ? templateId
+    : sharedFilters.buildIdOrTemplate
   const { isFilterRefetching, clearFilterRefetching } = useFilterChangeTracking(
     statuses,
     buildIdOrTemplate
@@ -154,6 +181,11 @@ const BuildsTable = () => {
   const showEmpty = !isInitialLoad && !isFetchingBuilds && !hasData
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
 
+  // colSpan must match the visible column count (status + [template] +
+  // started + duration + id + reason filler) when the Template column is
+  // conditionally hidden in template-scoped mode.
+  const colSpan = isTemplateScoped ? 5 : 6
+
   return (
     <div className="flex h-full min-h-0 flex-col overflow-hidden relative">
       <div
@@ -163,7 +195,9 @@ const BuildsTable = () => {
         <Table suppressHydrationWarning>
           <colgroup>
             <col style={colStyle(COLUMN_WIDTHS.status)} />
-            <col style={colStyle(COLUMN_WIDTHS.template)} />
+            {!isTemplateScoped && (
+              <col style={colStyle(COLUMN_WIDTHS.template)} />
+            )}
             <col style={colStyle(COLUMN_WIDTHS.started)} />
             <col style={colStyle(COLUMN_WIDTHS.duration)} />
             <col style={colStyle(COLUMN_WIDTHS.id)} />
@@ -173,7 +207,7 @@ const BuildsTable = () => {
           <TableHeader className="sticky top-0 z-10 bg-bg">
             <TableRow>
               <TableHead>Status</TableHead>
-              <TableHead>Template</TableHead>
+              {!isTemplateScoped && <TableHead>Template</TableHead>}
               <TableHead>
                 <span className="inline-flex items-center gap-1 text-fg">
                   Started
@@ -193,7 +227,7 @@ const BuildsTable = () => {
           >
             {showLoader && (
               <TableRow>
-                <TableCell colSpan={6}>
+                <TableCell colSpan={colSpan}>
                   <div className="h-[35svh] w-full flex justify-center items-center">
                     <Loader variant="slash" size="lg" />
                   </div>
@@ -203,7 +237,7 @@ const BuildsTable = () => {
 
             {showEmpty && (
               <TableRow>
-                <TableCell colSpan={6}>
+                <TableCell colSpan={colSpan}>
                   <BuildsEmpty error={buildsError?.message} />
                 </TableCell>
               </TableRow>
@@ -214,7 +248,7 @@ const BuildsTable = () => {
                 {hasScrolledPastInitialPages && (
                   <TableRow>
                     <TableCell
-                      colSpan={6}
+                      colSpan={colSpan}
                       className="text-center max-lg:text-start text-fg-tertiary"
                     >
                       <BackToTopButton onBackToTop={handleBackToTop} />
@@ -250,15 +284,17 @@ const BuildsTable = () => {
                       >
                         <Status status={build.status} />
                       </TableCell>
-                      <TableCell
-                        className="py-1.5 overflow-hidden"
-                        style={{ maxWidth: COLUMN_WIDTHS.template }}
-                      >
-                        <Template
-                          template={build.template}
-                          templateId={build.templateId}
-                        />
-                      </TableCell>
+                      {!isTemplateScoped && (
+                        <TableCell
+                          className="py-1.5 overflow-hidden"
+                          style={{ maxWidth: COLUMN_WIDTHS.template }}
+                        >
+                          <Template
+                            template={build.template}
+                            templateId={build.templateId}
+                          />
+                        </TableCell>
+                      )}
                       <TableCell className="py-1.5">
                         <StartedAt timestamp={build.createdAt} />
                       </TableCell>
@@ -285,7 +321,7 @@ const BuildsTable = () => {
                 {hasNextPage && (
                   <TableRow>
                     <TableCell
-                      colSpan={6}
+                      colSpan={colSpan}
                       className="text-center max-lg:text-start text-fg-tertiary"
                     >
                       <LoadMoreButton
diff --git a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
new file mode 100644
index 000000000..24d29c920
--- /dev/null
+++ b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
@@ -0,0 +1,36 @@
+'use client'
+
+import { parseAsArrayOf, parseAsStringEnum, 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'
+
+/**
+ * Variant of `useFilters` that manages only the `statuses` URL param.
+ * Used on the per-template detail builds tab where the builds list is
+ * already scoped by `templateId` (passed as a prop), so a search input
+ * for templateId/name would be redundant.
+ */
+const templateScopedFilterParams = {
+  statuses: parseAsArrayOf(
+    parseAsStringEnum<BuildStatus>(['building', 'failed', 'success'])
+  ),
+}
+
+export default function useTemplateBuildsFilters() {
+  const [filters, setFilters] = useQueryStates(templateScopedFilterParams, {
+    shallow: true,
+  })
+
+  const statuses: BuildStatus[] = useMemo(
+    () => filters?.statuses ?? INITIAL_BUILD_STATUSES,
+    [filters.statuses]
+  )
+
+  const setStatuses = useDebounceCallback((next: BuildStatus[]) => {
+    setFilters({ statuses: next })
+  }, 300)
+
+  return { statuses, setStatuses }
+}
diff --git a/src/features/dashboard/templates/detail/header-skeleton.tsx b/src/features/dashboard/templates/detail/header-skeleton.tsx
new file mode 100644
index 000000000..a7ec8f943
--- /dev/null
+++ b/src/features/dashboard/templates/detail/header-skeleton.tsx
@@ -0,0 +1,27 @@
+import {
+  DetailsItem,
+  DetailsRow,
+} from '@/features/dashboard/layouts/details-row'
+import { Skeleton } from '@/ui/primitives/skeleton'
+
+export default function TemplateDetailHeaderSkeleton() {
+  return (
+    <DetailsRow>
+      <DetailsItem label="Memory">
+        <Skeleton className="w-20 h-5" />
+      </DetailsItem>
+      <DetailsItem label="CPU">
+        <Skeleton className="w-16 h-5" />
+      </DetailsItem>
+      <DetailsItem label="Created">
+        <Skeleton className="w-36 h-5" />
+      </DetailsItem>
+      <DetailsItem label="Updated">
+        <Skeleton className="w-36 h-5" />
+      </DetailsItem>
+      <DetailsItem label="Visibility">
+        <Skeleton className="w-20 h-5" />
+      </DetailsItem>
+    </DetailsRow>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
new file mode 100644
index 000000000..86b0d4d12
--- /dev/null
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -0,0 +1,108 @@
+'use client'
+
+import { useSuspenseQuery } from '@tanstack/react-query'
+import ResourceUsage from '@/features/dashboard/common/resource-usage'
+import {
+  DetailsItem,
+  DetailsRow,
+} from '@/features/dashboard/layouts/details-row'
+import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
+import { useTRPC } from '@/trpc/client'
+import { TemplateVisibilityDropdown } from './visibility-dropdown'
+
+interface TemplateDetailHeaderProps {
+  teamSlug: string
+  templateId: string
+}
+
+const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+
+/**
+ * Overview-tab header: the 5-cell DetailsRow.
+ *
+ * The fetch here is deduped with the layout-level TemplateTitleBinder
+ * (same query key), so this renders synchronously off the cache when
+ * the user lands on Overview after the binder has already resolved.
+ *
+ * 404 handling lives in the binder, not here \u2014 by the time this
+ * component renders, the template is guaranteed to exist.
+ */
+export default function TemplateDetailHeader({
+  teamSlug,
+  templateId,
+}: TemplateDetailHeaderProps) {
+  const trpc = useTRPC()
+
+  const { data } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions(
+      { teamSlug, templateId },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: false,
+      }
+    )
+  )
+
+  const template = data.template
+  const hasReadyBuild = template.buildID !== NULL_BUILD_ID
+
+  const displayName =
+    template.names.find((n) => !n.includes('/')) ??
+    template.names[0] ??
+    template.templateID
+
+  const created = formatLocalLogStyleTimestamp(template.createdAt, {
+    includeSeconds: false,
+    includeYear: true,
+  })
+  const updated = formatLocalLogStyleTimestamp(template.updatedAt, {
+    includeSeconds: false,
+    includeYear: true,
+  })
+
+  return (
+    <DetailsRow>
+      <DetailsItem label="Memory">
+        {hasReadyBuild ? (
+          <ResourceUsage type="mem" total={template.memoryMB} mode="simple" />
+        ) : (
+          <span className="text-fg-tertiary font-mono">--</span>
+        )}
+      </DetailsItem>
+      <DetailsItem label="CPU">
+        {hasReadyBuild ? (
+          <ResourceUsage type="cpu" total={template.cpuCount} mode="simple" />
+        ) : (
+          <span className="text-fg-tertiary font-mono">--</span>
+        )}
+      </DetailsItem>
+      <DetailsItem label="Created">
+        <span className="font-mono whitespace-nowrap prose-body-numeric">
+          <span className="text-fg-tertiary">{created?.datePart ?? '--'}</span>{' '}
+          {created?.timePart ?? '--'}{' '}
+          <span className="text-fg-tertiary">
+            {created?.timezonePart ?? ''}
+          </span>
+        </span>
+      </DetailsItem>
+      <DetailsItem label="Updated">
+        <span className="font-mono whitespace-nowrap prose-body-numeric">
+          <span className="text-fg-tertiary">{updated?.datePart ?? '--'}</span>{' '}
+          {updated?.timePart ?? '--'}{' '}
+          <span className="text-fg-tertiary">
+            {updated?.timezonePart ?? ''}
+          </span>
+        </span>
+      </DetailsItem>
+      <DetailsItem label="Visibility">
+        <TemplateVisibilityDropdown
+          teamSlug={teamSlug}
+          templateId={template.templateID}
+          isPublic={template.public}
+          displayName={displayName}
+        />
+      </DetailsItem>
+    </DetailsRow>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/tabs.tsx b/src/features/dashboard/templates/detail/tabs.tsx
new file mode 100644
index 000000000..3b849fff6
--- /dev/null
+++ b/src/features/dashboard/templates/detail/tabs.tsx
@@ -0,0 +1,79 @@
+'use client'
+
+import { usePathname } from 'next/navigation'
+import posthog from 'posthog-js'
+import { useEffect, useRef } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { DashboardTabsList } from '@/ui/dashboard-tabs'
+import { BuildIcon, DashboardIcon, TagIcon } from '@/ui/primitives/icons'
+
+interface TemplateDetailTabsProps {
+  teamSlug: string
+  templateId: string
+}
+
+type DetailTabId = 'overview' | 'builds' | 'tags'
+
+const TAB_PATHS: Record<DetailTabId, (pathname: string) => boolean> = {
+  overview: (p) => p.endsWith('/overview'),
+  builds: (p) => p.endsWith('/builds'),
+  tags: (p) => p.endsWith('/tags'),
+}
+
+function tabFromPath(pathname: string): DetailTabId {
+  if (TAB_PATHS.builds(pathname)) return 'builds'
+  if (TAB_PATHS.tags(pathname)) return 'tags'
+  return 'overview'
+}
+
+export default function TemplateDetailTabs({
+  teamSlug,
+  templateId,
+}: TemplateDetailTabsProps) {
+  const pathname = usePathname()
+  const activeTab = tabFromPath(pathname)
+  const prevTabRef = useRef<DetailTabId | null>(null)
+
+  useEffect(() => {
+    if (prevTabRef.current === null) {
+      // First render \u2014 emit `template detail opened` once per mount.
+      posthog.capture('template detail opened', {
+        templateId,
+        tab: activeTab,
+      })
+    } else if (prevTabRef.current !== activeTab) {
+      posthog.capture('template detail tab switched', {
+        templateId,
+        fromTab: prevTabRef.current,
+        toTab: activeTab,
+      })
+    }
+    prevTabRef.current = activeTab
+  }, [activeTab, templateId])
+
+  return (
+    <DashboardTabsList
+      layoutKey="tabs-indicator-template-detail"
+      tabs={[
+        {
+          id: 'overview',
+          label: 'Overview',
+          href: PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, templateId),
+          icon: <DashboardIcon className="size-4" />,
+        },
+        {
+          id: 'builds',
+          label: 'Builds',
+          href: PROTECTED_URLS.TEMPLATE_DETAIL_BUILDS(teamSlug, templateId),
+          icon: <BuildIcon className="size-4" />,
+        },
+        {
+          id: 'tags',
+          label: 'Tags',
+          href: PROTECTED_URLS.TEMPLATE_TAGS(teamSlug, templateId),
+          icon: <TagIcon className="size-4" />,
+        },
+      ]}
+    />
+  )
+}
diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
new file mode 100644
index 000000000..f38fcd33f
--- /dev/null
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -0,0 +1,75 @@
+'use client'
+
+import { useSuspenseQuery } from '@tanstack/react-query'
+import { TRPCClientError } from '@trpc/client'
+import { notFound } from 'next/navigation'
+import { useMemo } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { usePageTitle } from '@/lib/hooks/use-page-title'
+import { useTRPC } from '@/trpc/client'
+
+interface TemplateTitleBinderProps {
+  teamSlug: string
+  templateId: string
+}
+
+/**
+ * Renders nothing. Fetches the template, then drives the dashboard
+ * title bar via usePageTitle. Lives in the detail layout so the title
+ * stays correct on every tab (Overview, Builds, Tags) without each
+ * tab needing its own title-management logic.
+ *
+ * Doubles as the central 404 entry point: if the templateId isn't in
+ * the team's list, this throws notFound() and all three tabs fail
+ * cleanly to the dashboard not-found page.
+ */
+export default function TemplateTitleBinder({
+  teamSlug,
+  templateId,
+}: TemplateTitleBinderProps) {
+  const trpc = useTRPC()
+
+  const { data, error } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions(
+      { teamSlug, templateId },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: false,
+        retry: (failureCount, err) => {
+          if (
+            err instanceof TRPCClientError &&
+            err.data?.code === 'NOT_FOUND'
+          ) {
+            return false
+          }
+          return failureCount < 3
+        },
+      }
+    )
+  )
+
+  if (error instanceof TRPCClientError && error.data?.code === 'NOT_FOUND') {
+    notFound()
+  }
+
+  const template = data.template
+
+  const displayName = useMemo(() => {
+    const noSlash = template.names.find((n) => !n.includes('/'))
+    return noSlash ?? template.names[0] ?? template.templateID
+  }, [template.names, template.templateID])
+
+  usePageTitle(
+    [
+      {
+        label: 'Templates',
+        href: PROTECTED_URLS.TEMPLATES_LIST(teamSlug),
+      },
+      { label: displayName },
+    ],
+    template.templateID
+  )
+
+  return null
+}
diff --git a/src/features/dashboard/templates/detail/visibility-dropdown.tsx b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
new file mode 100644
index 000000000..a6e4f6213
--- /dev/null
+++ b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
@@ -0,0 +1,174 @@
+'use client'
+
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import posthog from 'posthog-js'
+import {
+  defaultErrorToast,
+  defaultSuccessToast,
+  useToast,
+} from '@/lib/hooks/use-toast'
+import { cn } from '@/lib/utils/ui'
+import { useTRPC } from '@/trpc/client'
+import { Badge } from '@/ui/primitives/badge'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/ui/primitives/dropdown-menu'
+import { EditIcon, PrivateIcon, UnlockIcon } from '@/ui/primitives/icons'
+import { Loader } from '@/ui/primitives/loader'
+
+interface TemplateVisibilityDropdownProps {
+  teamSlug: string
+  templateId: string
+  isPublic: boolean
+  displayName: string
+}
+
+export function TemplateVisibilityDropdown({
+  teamSlug,
+  templateId,
+  isPublic,
+  displayName,
+}: TemplateVisibilityDropdownProps) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+  const { toast } = useToast()
+
+  const updateTemplate = useMutation(
+    trpc.templates.updateTemplate.mutationOptions({
+      onSuccess: async (data, variables) => {
+        toast(
+          defaultSuccessToast(
+            <>
+              Template{' '}
+              <span className="prose-body-highlight">{displayName}</span> is now{' '}
+              {data.public ? 'public' : 'internal'}.
+            </>
+          )
+        )
+
+        posthog.capture('template visibility changed from header', {
+          templateId,
+          public: variables.public,
+        })
+
+        // Optimistically update both the list and the per-template caches.
+        const listKey = trpc.templates.getTemplates.queryKey({ teamSlug })
+        const detailKey = trpc.templates.getTemplate.queryKey({
+          teamSlug,
+          templateId,
+        })
+
+        await Promise.all([
+          queryClient.cancelQueries({ queryKey: listKey }),
+          queryClient.cancelQueries({ queryKey: detailKey }),
+        ])
+
+        queryClient.setQueryData(listKey, (old) => {
+          if (!old?.templates) return old
+          return {
+            ...old,
+            templates: old.templates.map((t) =>
+              t.templateID === variables.templateId
+                ? { ...t, public: variables.public }
+                : t
+            ),
+          }
+        })
+
+        queryClient.setQueryData(detailKey, (old) => {
+          if (!old?.template) return old
+          return {
+            ...old,
+            template: { ...old.template, public: variables.public },
+          }
+        })
+      },
+      onError: (error) => {
+        toast(
+          defaultErrorToast(
+            error.message || `Failed to update template ${displayName}.`
+          )
+        )
+      },
+      onSettled: () => {
+        queryClient.invalidateQueries({
+          queryKey: trpc.templates.getTemplates.queryKey({ teamSlug }),
+        })
+        queryClient.invalidateQueries({
+          queryKey: trpc.templates.getTemplate.queryKey({
+            teamSlug,
+            templateId,
+          }),
+        })
+      },
+    })
+  )
+
+  const isPending = updateTemplate.isPending
+
+  const togglePublish = () => {
+    updateTemplate.mutate({
+      teamSlug,
+      templateId,
+      public: !isPublic,
+    })
+  }
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <button
+          type="button"
+          disabled={isPending}
+          className={cn(
+            'flex items-center gap-2 group/visibility',
+            'cursor-pointer focus-visible:outline-none',
+            'disabled:cursor-not-allowed disabled:opacity-60'
+          )}
+          aria-label="Change template visibility"
+        >
+          <Badge
+            variant="default"
+            size="sm"
+            className={cn('uppercase bg-fill', !isPublic && 'pl-[3]')}
+          >
+            {!isPublic && <PrivateIcon className="size-3 text-fg-tertiary" />}
+            {isPublic ? 'Public' : 'Internal'}
+          </Badge>
+          <span
+            className={cn(
+              'text-fg-tertiary opacity-60 transition-opacity',
+              'group-hover/visibility:opacity-100',
+              'group-focus-visible/visibility:opacity-100'
+            )}
+            aria-hidden="true"
+          >
+            {isPending ? (
+              <Loader className="size-3" variant="square" />
+            ) : (
+              <EditIcon className="size-3" />
+            )}
+          </span>
+        </button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start">
+        <DropdownMenuItem onClick={togglePublish} disabled={isPending}>
+          {isPublic ? (
+            <>
+              <PrivateIcon className="!size-3" />
+              Set Internal
+            </>
+          ) : (
+            <>
+              <UnlockIcon className="!size-3" />
+              Set Public
+            </>
+          )}
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
diff --git a/src/features/dashboard/templates/list/table-cells.tsx b/src/features/dashboard/templates/list/table-cells.tsx
index 591cec46a..b6e2fd112 100644
--- a/src/features/dashboard/templates/list/table-cells.tsx
+++ b/src/features/dashboard/templates/list/table-cells.tsx
@@ -2,7 +2,10 @@
 
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import type { CellContext } from '@tanstack/react-table'
+import Link from 'next/link'
+import posthog from 'posthog-js'
 import { useMemo, useState } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
 import type { DefaultTemplate, Template } from '@/core/modules/templates/models'
 import { useClipboard } from '@/lib/hooks/use-clipboard'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
@@ -292,7 +295,9 @@ export function TemplateIdCell({
 export function TemplateNameCell({
   row,
 }: CellContext<Template | DefaultTemplate, unknown>) {
-  const names = row.original.names
+  const template = row.original
+  const names = template.names
+  const { teamSlug } = useRouteParams<'/dashboard/[teamSlug]/templates'>()
 
   // Prefer a name without "/" as the primary display name
   const primaryName = names.find((name) => !name.includes('/')) ?? names[0]
@@ -301,24 +306,28 @@ export function TemplateNameCell({
   const [wasCopied, copy] = useClipboard(2000)
   const nameValue = (primaryName as string) ?? '--'
 
+  const isDefault = 'isDefault' in template && template.isDefault
+  // v1: only team-owned templates have a detail page. Default (E2B)
+  // templates render the name as plain text, not a link.
+  const isLinkable = !isDefault && nameValue !== '--'
+
   const handleCopy = (e: React.MouseEvent) => {
+    e.preventDefault()
     e.stopPropagation()
     if (nameValue !== '--') {
       copy(nameValue)
     }
   }
 
-  return (
-    <div
-      onClick={handleCopy}
-      className={cn(
-        'flex items-center gap-2 prose-body min-w-0 relative group/name w-full h-9',
-        {
-          'text-fg-tertiary': !primaryName,
-          'cursor-pointer': nameValue !== '--',
-        }
-      )}
-    >
+  const handleNavigate = () => {
+    posthog.capture('template detail opened', {
+      templateId: template.templateID,
+      fromTab: 'list',
+    })
+  }
+
+  const content = (
+    <>
       <span className="truncate">{nameValue}</span>
       {additionalNames.length > 0 && (
         <HelpTooltip
@@ -342,24 +351,54 @@ export function TemplateNameCell({
           </div>
         </HelpTooltip>
       )}
-      {'isDefault' in row.original && row.original.isDefault && (
-        <E2BTemplateBadge />
-      )}
+      {isDefault && <E2BTemplateBadge />}
       {nameValue !== '--' && (
-        <div
+        <button
+          type="button"
+          onClick={handleCopy}
           className={cn(
-            'absolute right-0 p-1.5 rounded bg-bg pointer-events-none',
-            'opacity-0 group-hover/name:opacity-100'
+            'absolute right-0 p-1.5 rounded bg-bg',
+            'opacity-0 group-hover/name:opacity-100',
+            'focus-visible:opacity-100 focus-visible:outline-none',
+            'hover:bg-bg-hover transition-colors'
           )}
-          aria-hidden="true"
+          aria-label={wasCopied ? 'Copied' : 'Copy template name'}
         >
           {wasCopied ? (
             <CheckIcon className="size-3 text-icon" />
           ) : (
             <CopyIcon className="size-3 text-icon-secondary" />
           )}
-        </div>
+        </button>
+      )}
+    </>
+  )
+
+  if (isLinkable) {
+    return (
+      <Link
+        href={PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, template.templateID)}
+        onClick={handleNavigate}
+        className={cn(
+          'flex items-center gap-2 prose-body min-w-0 relative group/name w-full h-9',
+          'hover:text-fg transition-colors focus-visible:outline-none'
+        )}
+      >
+        {content}
+      </Link>
+    )
+  }
+
+  return (
+    <div
+      className={cn(
+        'flex items-center gap-2 prose-body min-w-0 relative group/name w-full h-9',
+        {
+          'text-fg-tertiary': !primaryName,
+        }
       )}
+    >
+      {content}
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/empty.tsx b/src/features/dashboard/templates/tags/empty.tsx
new file mode 100644
index 000000000..978024947
--- /dev/null
+++ b/src/features/dashboard/templates/tags/empty.tsx
@@ -0,0 +1,25 @@
+'use client'
+
+import { TagIcon } from '@/ui/primitives/icons'
+
+interface TagsEmptyProps {
+  hasSearch: boolean
+}
+
+export default function TagsEmpty({ hasSearch }: TagsEmptyProps) {
+  return (
+    <div className="h-[35svh] w-full flex flex-col items-center justify-center gap-3 text-center px-4">
+      <TagIcon className="size-6 text-fg-tertiary" />
+      <div className="flex flex-col gap-1">
+        <p className="prose-body-highlight text-fg">
+          {hasSearch ? 'No matching tags' : 'No tags yet'}
+        </p>
+        <p className="prose-body text-fg-tertiary max-w-80">
+          {hasSearch
+            ? 'Try a different search term.'
+            : 'Tags identify builds. Assign one when you promote a build to a named release.'}
+        </p>
+      </div>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
new file mode 100644
index 000000000..e09030c02
--- /dev/null
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -0,0 +1,51 @@
+'use client'
+
+import { InfoIcon, SearchIcon } from '@/ui/primitives/icons'
+import { Input } from '@/ui/primitives/input'
+
+interface TagsHeaderProps {
+  search: string
+  onSearchChange: (value: string) => void
+  totalCount: number
+  visibleCount: number
+}
+
+export default function TagsHeader({
+  search,
+  onSearchChange,
+  totalCount,
+  visibleCount,
+}: TagsHeaderProps) {
+  const isFiltered = search.trim().length > 0
+
+  return (
+    <div className="flex flex-col gap-3">
+      <div className="flex flex-col gap-2 md:flex-row md:items-center md:justify-between">
+        <div className="relative w-full max-w-62">
+          <SearchIcon className="absolute left-2 top-1/2 -translate-y-1/2 size-3 text-fg-tertiary pointer-events-none" />
+          <Input
+            placeholder="Search by name"
+            className="pl-7"
+            value={search}
+            onChange={(e) => onSearchChange(e.target.value)}
+          />
+        </div>
+      </div>
+
+      <div className="flex items-start gap-2 bg-bg-1 border border-stroke p-2.5">
+        <InfoIcon className="size-3.5 text-fg-tertiary mt-0.5 shrink-0" />
+        <p className="prose-body text-fg-secondary">
+          Tags identify builds and can only be assigned to one build at once.
+        </p>
+      </div>
+
+      <p className="prose-body text-fg-tertiary">
+        {isFiltered
+          ? `${visibleCount} of ${totalCount} ${
+              totalCount === 1 ? 'tag' : 'tags'
+            }`
+          : `${totalCount} ${totalCount === 1 ? 'tag' : 'tags'} in total`}
+      </p>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/sortable-header.tsx b/src/features/dashboard/templates/tags/sortable-header.tsx
new file mode 100644
index 000000000..8ac294aad
--- /dev/null
+++ b/src/features/dashboard/templates/tags/sortable-header.tsx
@@ -0,0 +1,47 @@
+'use client'
+
+import { cn } from '@/lib/utils/ui'
+import { SortAscIcon, SortDescIcon, SortIcon } from '@/ui/primitives/icons'
+
+export type SortKey = 'tag' | 'createdAt'
+export type SortDir = 'asc' | 'desc'
+
+interface SortableHeaderProps {
+  label: string
+  sortKey: SortKey
+  activeKey: SortKey
+  dir: SortDir
+  onChange: (key: SortKey) => void
+}
+
+export function SortableHeader({
+  label,
+  sortKey,
+  activeKey,
+  dir,
+  onChange,
+}: SortableHeaderProps) {
+  const isActive = activeKey === sortKey
+  const Icon = !isActive ? SortIcon : dir === 'asc' ? SortAscIcon : SortDescIcon
+
+  return (
+    <button
+      type="button"
+      onClick={() => onChange(sortKey)}
+      className={cn(
+        'inline-flex items-center gap-1 text-fg-secondary',
+        'hover:text-fg transition-colors',
+        'focus-visible:outline-none focus-visible:text-fg'
+      )}
+      aria-label={`Sort by ${label}`}
+    >
+      {label}
+      <Icon
+        className={cn(
+          'size-3 transition-opacity',
+          isActive ? 'opacity-100 text-fg' : 'opacity-50'
+        )}
+      />
+    </button>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
new file mode 100644
index 000000000..726c51249
--- /dev/null
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -0,0 +1,83 @@
+'use client'
+
+import { formatDistanceToNowStrict } from 'date-fns'
+import Link from 'next/link'
+import { useMemo } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { cn } from '@/lib/utils/ui'
+import { Badge } from '@/ui/primitives/badge'
+
+interface TagPillCellProps {
+  tag: string
+}
+
+export function TagPillCell({ tag }: TagPillCellProps) {
+  return (
+    <Badge variant="default" size="sm" className="uppercase bg-fill">
+      {tag}
+    </Badge>
+  )
+}
+
+interface BuildLinkCellProps {
+  teamSlug: string
+  templateId: string
+  buildId: string
+  createdAt: string
+}
+
+const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+
+export function BuildLinkCell({
+  teamSlug,
+  templateId,
+  buildId,
+  createdAt,
+}: BuildLinkCellProps) {
+  const shortId = useMemo(() => {
+    if (buildId === NULL_BUILD_ID) return '--'
+    if (buildId.length <= 12) return buildId
+    return `${buildId.slice(0, 5)}…${buildId.slice(-5)}`
+  }, [buildId])
+
+  const relative = useMemo(() => {
+    try {
+      return `${formatDistanceToNowStrict(new Date(createdAt))} ago`
+    } catch {
+      return ''
+    }
+  }, [createdAt])
+
+  const isLinkable = buildId !== NULL_BUILD_ID
+
+  const inner = (
+    <span
+      className={cn(
+        'font-mono prose-body-numeric',
+        isLinkable && 'underline-offset-2 group-hover/build:underline'
+      )}
+    >
+      {shortId}
+    </span>
+  )
+
+  return (
+    <div className="flex items-center gap-2 min-w-0">
+      {isLinkable ? (
+        <Link
+          href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
+          className="group/build text-fg hover:text-fg transition-colors"
+        >
+          {inner}
+        </Link>
+      ) : (
+        <span className="text-fg-tertiary">{inner}</span>
+      )}
+      {relative && (
+        <span className="text-fg-tertiary prose-body whitespace-nowrap">
+          · {relative}
+        </span>
+      )}
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
new file mode 100644
index 000000000..deecd012c
--- /dev/null
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -0,0 +1,135 @@
+'use client'
+
+import { useSuspenseQuery } from '@tanstack/react-query'
+import { useMemo, useState } from 'react'
+import type { TemplateTag } from '@/core/modules/templates/models'
+import { useTRPC } from '@/trpc/client'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/ui/primitives/table'
+import TagsEmpty from './empty'
+import TagsHeader from './header'
+import { SortableHeader, type SortDir, type SortKey } from './sortable-header'
+import { BuildLinkCell, TagPillCell } from './table-cells'
+
+interface TagsTableProps {
+  teamSlug: string
+  templateId: string
+}
+
+export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
+  const trpc = useTRPC()
+
+  const { data } = useSuspenseQuery(
+    trpc.templates.getTags.queryOptions(
+      { teamSlug, templateId },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: false,
+        refetchOnReconnect: false,
+      }
+    )
+  )
+
+  const allTags = data.tags
+
+  const [search, setSearch] = useState('')
+  const [sortKey, setSortKey] = useState<SortKey>('createdAt')
+  const [sortDir, setSortDir] = useState<SortDir>('desc')
+
+  const visibleTags = useMemo<TemplateTag[]>(() => {
+    const query = search.trim().toLowerCase()
+    const filtered = query
+      ? allTags.filter((t) => t.tag.toLowerCase().includes(query))
+      : allTags
+
+    return [...filtered].sort((a, b) => {
+      let cmp = 0
+      if (sortKey === 'tag') {
+        cmp = a.tag.localeCompare(b.tag)
+      } else {
+        const aTime = new Date(a.createdAt).getTime()
+        const bTime = new Date(b.createdAt).getTime()
+        cmp = aTime - bTime
+      }
+      return sortDir === 'asc' ? cmp : -cmp
+    })
+  }, [allTags, search, sortKey, sortDir])
+
+  const handleSortChange = (key: SortKey) => {
+    if (sortKey === key) {
+      setSortDir((d) => (d === 'asc' ? 'desc' : 'asc'))
+    } else {
+      setSortKey(key)
+      setSortDir(key === 'tag' ? 'asc' : 'desc')
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-4 h-full min-h-0">
+      <TagsHeader
+        search={search}
+        onSearchChange={setSearch}
+        totalCount={allTags.length}
+        visibleCount={visibleTags.length}
+      />
+
+      <div className="flex-1 min-h-0 overflow-y-auto overflow-x-auto">
+        <Table suppressHydrationWarning>
+          <TableHeader className="sticky top-0 z-10 bg-bg">
+            <TableRow>
+              <TableHead className="w-1/3">
+                <SortableHeader
+                  label="Name"
+                  sortKey="tag"
+                  activeKey={sortKey}
+                  dir={sortDir}
+                  onChange={handleSortChange}
+                />
+              </TableHead>
+              <TableHead>
+                <SortableHeader
+                  label="Build"
+                  sortKey="createdAt"
+                  activeKey={sortKey}
+                  dir={sortDir}
+                  onChange={handleSortChange}
+                />
+              </TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {visibleTags.length === 0 ? (
+              <TableRow>
+                <TableCell colSpan={2}>
+                  <TagsEmpty hasSearch={search.trim().length > 0} />
+                </TableCell>
+              </TableRow>
+            ) : (
+              visibleTags.map((t) => (
+                <TableRow key={`${t.tag}-${t.buildID}`}>
+                  <TableCell className="py-2">
+                    <TagPillCell tag={t.tag} />
+                  </TableCell>
+                  <TableCell className="py-2">
+                    <BuildLinkCell
+                      teamSlug={teamSlug}
+                      templateId={templateId}
+                      buildId={t.buildID}
+                      createdAt={t.createdAt}
+                    />
+                  </TableCell>
+                </TableRow>
+              ))
+            )}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/src/lib/hooks/use-page-title.ts b/src/lib/hooks/use-page-title.ts
new file mode 100644
index 000000000..b7197d969
--- /dev/null
+++ b/src/lib/hooks/use-page-title.ts
@@ -0,0 +1,65 @@
+'use client'
+
+import { useEffect } from 'react'
+import { create } from 'zustand'
+import type { TitleSegment } from '@/configs/layout'
+
+/**
+ * Reusable mechanism that lets a client page override the dashboard
+ * title bar with data fetched at runtime (e.g. friendly resource names
+ * derived from a UUID in the URL).
+ *
+ * The global `DashboardLayoutHeader` reads from this store; when no
+ * override is set, it falls back to the pathname-derived
+ * `getDashboardLayoutConfig` mapping.
+ *
+ * Pages call `usePageTitle(segments, copyValue?)` once they have data;
+ * the hook handles cleanup automatically on unmount, so navigating
+ * back to a page without an override restores the pathname-derived title.
+ */
+
+export interface PageTitleOverride {
+  title: string | TitleSegment[]
+  copyValue?: string
+}
+
+interface PageTitleStore {
+  override: PageTitleOverride | null
+  setOverride: (override: PageTitleOverride | null) => void
+}
+
+export const usePageTitleStore = create<PageTitleStore>((set) => ({
+  override: null,
+  setOverride: (override) => set({ override }),
+}))
+
+/**
+ * Set the dashboard title bar contents for as long as the calling
+ * component is mounted. Passing `null` (or omitting `title`) clears
+ * any previously set override on mount.
+ *
+ * Safe to call before data is loaded \u2014 pass `null` while loading and
+ * the pathname-derived fallback title will render.
+ */
+export function usePageTitle(
+  title: string | TitleSegment[] | null,
+  copyValue?: string
+) {
+  useEffect(() => {
+    if (title === null) {
+      usePageTitleStore.getState().setOverride(null)
+      return
+    }
+
+    usePageTitleStore.getState().setOverride({ title, copyValue })
+
+    return () => {
+      // Only clear if this hook is still the active owner of the
+      // override. A subsequent page may have already set its own.
+      const current = usePageTitleStore.getState().override
+      if (current && current.title === title) {
+        usePageTitleStore.getState().setOverride(null)
+      }
+    }
+  }, [title, copyValue])
+}
diff --git a/src/ui/primitives/icons.tsx b/src/ui/primitives/icons.tsx
index 126e7797a..5ad7d1d02 100644
--- a/src/ui/primitives/icons.tsx
+++ b/src/ui/primitives/icons.tsx
@@ -2109,3 +2109,22 @@ export const WebhookIcon = ({ className, ...props }: IconProps) => (
     </defs>
   </svg>
 )
+
+export const TagIcon = ({ className, ...props }: IconProps) => (
+  <svg
+    className={cn(DEFAULT_CLASS_NAMES, className)}
+    fill="none"
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M2 2H7.33333L13.6667 8.33333C13.9533 8.62 14 9.06667 13.7867 9.40667L9.40667 13.7867C9.06667 14 8.62 13.9533 8.33333 13.6667L2 7.33333V2Z"
+      stroke="currentColor"
+      strokeLinecap="square"
+      strokeLinejoin="round"
+      strokeWidth="1.33333"
+    />
+    <circle cx="5" cy="5" r="0.833" fill="currentColor" />
+  </svg>
+)

From 0154cf3c530dc8a56d31ddda19ee3db6d7623c1e Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 16:50:49 +0200
Subject: [PATCH 02/90] feat(templates): add build ID search to detail builds
 tab

Scoped builds tab now matches the all-team builds toolbar (search +
status filter). New URL param 'q' lives on the scoped filter hook.

The backend query stays scoped by templateID (authoritative); 'q'
applies as a client-side substring filter on build IDs over the
already-loaded pages. This avoids cross-template name-match leakage
that 'buildIdOrTemplate=<q>' could otherwise introduce.

BuildsHeader unifies the all-team and scoped search via a single
'search/setSearch' pair backed by the appropriate hook, with
placeholder swapped to 'Search by build ID' in scoped mode.

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../(detail-tabs)/builds/page.tsx             |  2 +-
 .../dashboard/templates/builds/header.tsx     | 43 ++++++++++---------
 .../dashboard/templates/builds/table.tsx      | 25 ++++++++---
 .../builds/use-template-builds-filters.tsx    | 27 +++++++++---
 src/ui/primitives/icons.tsx                   | 18 ++++++--
 5 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
index 9544e7657..577eee371 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -8,7 +8,7 @@ export default async function TemplateDetailBuildsPage({
 
   return (
     <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
-      <BuildsHeader showSearchInput={false} scoped />
+      <BuildsHeader scoped />
       <BuildsTable templateId={templateId} />
     </div>
   )
diff --git a/src/features/dashboard/templates/builds/header.tsx b/src/features/dashboard/templates/builds/header.tsx
index 21a7987a3..adeafa4a9 100644
--- a/src/features/dashboard/templates/builds/header.tsx
+++ b/src/features/dashboard/templates/builds/header.tsx
@@ -65,16 +65,15 @@ const STATUS_OPTIONS: Array<{ value: BuildStatus; label: string }> = [
 
 interface BuildsHeaderProps {
   /**
-   * When false, hides the build/template search input. Used on the
-   * per-template detail page where the table is already scoped via the
-   * `templateId` prop on `BuildsTable`. Defaults to true.
+   * When false, hides the search input entirely. Default true.
    */
   showSearchInput?: boolean
   /**
-   * When provided, the header uses the template-scoped filters hook
-   * (statuses-only URL state) instead of the shared `useFilters` hook.
+   * When true, the header uses the template-scoped filters hook
+   * (statuses + `q` URL state) instead of the shared `useFilters` hook.
    * Pair this with `BuildsTable templateId={...}` so both surfaces read
-   * from the same URL state.
+   * from the same URL state and the search applies client-side to the
+   * templateID-scoped backend results.
    */
   scoped?: boolean
 }
@@ -93,20 +92,24 @@ export default function BuildsHeader({
   const setStatuses = scoped
     ? scopedFilters.setStatuses
     : sharedFilters.setStatuses
-  const buildIdOrTemplate = scoped ? undefined : sharedFilters.buildIdOrTemplate
-  const setBuildIdOrTemplate = scoped
-    ? undefined
+
+  // Unified search state: in scoped mode it maps to `q` (URL),
+  // in all-team mode it maps to `buildIdOrTemplate` (URL).
+  const search = scoped ? scopedFilters.q : sharedFilters.buildIdOrTemplate
+  const setSearch = scoped
+    ? scopedFilters.setQ
     : sharedFilters.setBuildIdOrTemplate
+  const searchPlaceholder = scoped
+    ? 'Search by build ID'
+    : 'Build ID, Template ID or Name'
 
-  const [localBuildIdOrTemplate, setLocalBuildIdOrTemplate] = useState<string>(
-    buildIdOrTemplate ?? ''
-  )
+  const [localSearch, setLocalSearch] = useState<string>(search ?? '')
 
   const [localStatuses, setLocalStatuses] = useState<BuildStatus[]>(statuses)
 
   useEffect(() => {
-    setLocalBuildIdOrTemplate(buildIdOrTemplate ?? '')
-  }, [buildIdOrTemplate])
+    setLocalSearch(search ?? '')
+  }, [search])
 
   useEffect(() => {
     setLocalStatuses(statuses)
@@ -134,15 +137,15 @@ export default function BuildsHeader({
   }
 
   return (
-    <div className="flex flex-col gap-3">
-      {showSearchInput && setBuildIdOrTemplate && (
+    <div className="flex sm:flex-row flex-col gap-1">
+      {showSearchInput && (
         <Input
-          placeholder="Build ID, Template ID or Name"
+          placeholder={searchPlaceholder}
           className="w-full max-w-62"
-          value={localBuildIdOrTemplate}
+          value={localSearch}
           onChange={(e) => {
-            setLocalBuildIdOrTemplate(e.target.value)
-            setBuildIdOrTemplate(e.target.value)
+            setLocalSearch(e.target.value)
+            setSearch(e.target.value)
           }}
         />
       )}
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index e320d02e8..15eeac5fd 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -55,10 +55,13 @@ const COLUMN_WIDTHS = {
 interface BuildsTableProps {
   /**
    * When provided, the table is scoped to a single template:
-   *  - filters are read from `useTemplateBuildsFilters` (statuses only,
-   *    no search input affects the list)
+   *  - filters are read from `useTemplateBuildsFilters` (statuses + `q`)
    *  - the Template column is hidden
-   *  - the `buildIdOrTemplate` query param is set to this UUID
+   *  - the `buildIdOrTemplate` query param is set to this UUID, so the
+   *    backend returns only builds for this template
+   *  - the scoped `q` value applies as an additional client-side filter
+   *    (case-insensitive substring match on build ID) so cross-template
+   *    name matches can never leak in
    */
   templateId?: string
 }
@@ -157,6 +160,18 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     [builds, runningStatusesData]
   )
 
+  // Client-side narrowing for the scoped builds tab. The backend query
+  // is templateID-scoped (authoritative); `q` only filters the loaded
+  // pages by build-ID substring.
+  const visibleBuilds = useMemo(() => {
+    if (!isTemplateScoped) return buildsWithLiveStatus
+    const query = scopedFilters.q?.trim().toLowerCase()
+    if (!query) return buildsWithLiveStatus
+    return buildsWithLiveStatus.filter((b) =>
+      b.id.toLowerCase().includes(query)
+    )
+  }, [buildsWithLiveStatus, isTemplateScoped, scopedFilters.q])
+
   // Handlers
   const buildsQueryKey = trpc.builds.list.infiniteQueryOptions({
     teamSlug,
@@ -176,7 +191,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
   }, [queryClient, buildsQueryKey])
 
   // Derived UI state
-  const hasData = buildsWithLiveStatus.length > 0
+  const hasData = visibleBuilds.length > 0
   const showLoader = isInitialLoad && !hasData
   const showEmpty = !isInitialLoad && !isFetchingBuilds && !hasData
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
@@ -256,7 +271,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
                   </TableRow>
                 )}
 
-                {buildsWithLiveStatus.map((build) => {
+                {visibleBuilds.map((build) => {
                   const isBuilding = build.status === 'building'
 
                   return (
diff --git a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
index 24d29c920..db105af24 100644
--- a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
@@ -1,21 +1,30 @@
 'use client'
 
-import { parseAsArrayOf, parseAsStringEnum, useQueryStates } from 'nuqs'
+import {
+  parseAsArrayOf,
+  parseAsString,
+  parseAsStringEnum,
+  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'
 
 /**
- * Variant of `useFilters` that manages only the `statuses` URL param.
- * Used on the per-template detail builds tab where the builds list is
- * already scoped by `templateId` (passed as a prop), so a search input
- * for templateId/name would be redundant.
+ * Variant of `useFilters` scoped to a single template's builds tab.
+ *
+ * URL state:
+ *  - `statuses` — build status filter, same as the all-team page
+ *  - `q` — free-text search applied client-side against build IDs.
+ *    Backend scoping by templateID stays authoritative; `q` only
+ *    narrows the already-loaded result set.
  */
 const templateScopedFilterParams = {
   statuses: parseAsArrayOf(
     parseAsStringEnum<BuildStatus>(['building', 'failed', 'success'])
   ),
+  q: parseAsString,
 }
 
 export default function useTemplateBuildsFilters() {
@@ -28,9 +37,15 @@ export default function useTemplateBuildsFilters() {
     [filters.statuses]
   )
 
+  const q = filters?.q ?? undefined
+
   const setStatuses = useDebounceCallback((next: BuildStatus[]) => {
     setFilters({ statuses: next })
   }, 300)
 
-  return { statuses, setStatuses }
+  const setQ = useDebounceCallback((next: string) => {
+    setFilters({ q: next.length > 0 ? next : null })
+  }, 300)
+
+  return { statuses, setStatuses, q, setQ }
 }
diff --git a/src/ui/primitives/icons.tsx b/src/ui/primitives/icons.tsx
index 5ad7d1d02..674f1941b 100644
--- a/src/ui/primitives/icons.tsx
+++ b/src/ui/primitives/icons.tsx
@@ -2119,12 +2119,22 @@ export const TagIcon = ({ className, ...props }: IconProps) => (
     {...props}
   >
     <path
-      d="M2 2H7.33333L13.6667 8.33333C13.9533 8.62 14 9.06667 13.7867 9.40667L9.40667 13.7867C9.06667 14 8.62 13.9533 8.33333 13.6667L2 7.33333V2Z"
+      d="M2 8V2H8L14 8L8 14L2 8Z"
+      stroke="currentColor"
+      strokeLinecap="square"
+      strokeWidth="1.33333"
+    />
+    <path
+      d="M5.33366 4.99996C5.33366 5.18405 5.18442 5.33329 5.00033 5.33329C4.81623 5.33329 4.66699 5.18405 4.66699 4.99996C4.66699 4.81587 4.81623 4.66663 5.00033 4.66663C5.18442 4.66663 5.33366 4.81587 5.33366 4.99996Z"
+      stroke="currentColor"
+      strokeLinecap="square"
+      strokeWidth="1.33333"
+    />
+    <path
+      d="M4.93262 5H5.06595"
       stroke="currentColor"
       strokeLinecap="square"
-      strokeLinejoin="round"
       strokeWidth="1.33333"
     />
-    <circle cx="5" cy="5" r="0.833" fill="currentColor" />
   </svg>
-)
+);

From dc1c58cd14106464b8032d79c8b168247e6e10a9 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 17:38:11 +0200
Subject: [PATCH 03/90] fix(tags): drop callout box, inline info + count row

Align toolbar with Figma 5418:195576 / 5630:152026:

- Info text is plain gray body, no icon, no border, no background.
- Info + tag count sit on a single horizontal row with space-between
  (mirrors the design's 'tags identify\u2026' / '8 tags in total' bar).
- 'Read more.' is rendered as an underlined inert span until a docs
  URL is wired in.
- Build column header is renamed 'Assigned to' to match the design
  and the actual semantic (timestamp = when the tag was assigned).

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../dashboard/templates/tags/header.tsx       | 33 ++++++++++---------
 .../dashboard/templates/tags/table.tsx        |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index e09030c02..988aaa558 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { InfoIcon, SearchIcon } from '@/ui/primitives/icons'
+import { SearchIcon } from '@/ui/primitives/icons'
 import { Input } from '@/ui/primitives/input'
 
 interface TagsHeaderProps {
@@ -20,8 +20,9 @@ export default function TagsHeader({
 
   return (
     <div className="flex flex-col gap-3">
-      <div className="flex flex-col gap-2 md:flex-row md:items-center md:justify-between">
-        <div className="relative w-full max-w-62">
+      {/* Toolbar row. v1 omits the "Assign new tag" CTA on the right. */}
+      <div className="flex items-center gap-2">
+        <div className="relative w-full max-w-70">
           <SearchIcon className="absolute left-2 top-1/2 -translate-y-1/2 size-3 text-fg-tertiary pointer-events-none" />
           <Input
             placeholder="Search by name"
@@ -32,20 +33,22 @@ export default function TagsHeader({
         </div>
       </div>
 
-      <div className="flex items-start gap-2 bg-bg-1 border border-stroke p-2.5">
-        <InfoIcon className="size-3.5 text-fg-tertiary mt-0.5 shrink-0" />
-        <p className="prose-body text-fg-secondary">
-          Tags identify builds and can only be assigned to one build at once.
+      {/* Info row \u2014 plain helper text (left) + tag count (right). */}
+      <div className="flex items-center justify-between gap-4">
+        <p className="prose-body text-fg-tertiary">
+          Tags identify builds and can only be assigned to one build at once.{' '}
+          <span className="underline cursor-default" aria-disabled="true">
+            Read more.
+          </span>
+        </p>
+        <p className="prose-body text-fg-tertiary whitespace-nowrap">
+          {isFiltered
+            ? `${visibleCount} of ${totalCount} ${
+                totalCount === 1 ? 'tag' : 'tags'
+              }`
+            : `${totalCount} ${totalCount === 1 ? 'tag' : 'tags'} in total`}
         </p>
       </div>
-
-      <p className="prose-body text-fg-tertiary">
-        {isFiltered
-          ? `${visibleCount} of ${totalCount} ${
-              totalCount === 1 ? 'tag' : 'tags'
-            }`
-          : `${totalCount} ${totalCount === 1 ? 'tag' : 'tags'} in total`}
-      </p>
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index deecd012c..9af4d050f 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -94,7 +94,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
               </TableHead>
               <TableHead>
                 <SortableHeader
-                  label="Build"
+                  label="Assigned to"
                   sortKey="createdAt"
                   activeKey={sortKey}
                   dir={sortDir}

From 4a044231233d63855705bf20df95be398e772845 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 17:41:01 +0200
Subject: [PATCH 04/90] feat(templates): link 'Read more' in tags info banner
 to e2b docs

Replaces the inert placeholder with a live link to
https://e2b.dev/docs/template/tags, with a trailing external-link icon
for consistency with other off-site references in the dashboard.

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 src/features/dashboard/templates/tags/header.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 988aaa558..941f93879 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { SearchIcon } from '@/ui/primitives/icons'
+import { ExternalLinkIcon, SearchIcon } from '@/ui/primitives/icons'
 import { Input } from '@/ui/primitives/input'
 
 interface TagsHeaderProps {
@@ -37,9 +37,15 @@ export default function TagsHeader({
       <div className="flex items-center justify-between gap-4">
         <p className="prose-body text-fg-tertiary">
           Tags identify builds and can only be assigned to one build at once.{' '}
-          <span className="underline cursor-default" aria-disabled="true">
-            Read more.
-          </span>
+          <a
+            href="https://e2b.dev/docs/template/tags"
+            target="_blank"
+            rel="noopener"
+            className="text-fg-secondary underline-offset-2 hover:underline inline-flex items-center gap-0.5"
+          >
+            Read more
+            <ExternalLinkIcon className="size-3" />
+          </a>
         </p>
         <p className="prose-body text-fg-tertiary whitespace-nowrap">
           {isFiltered

From a77ce4d4818e3710fd608e6da0f2ef02e36c8dcd Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 17:41:23 +0200
Subject: [PATCH 05/90] fix(tags): match templates list sort header styling

Mirror the DataTableHead visual treatment used on /templates/list:

- font-mono uppercase prose-label
- text-fg-tertiary by default \u2014 dims the column name
- prose-label-highlight + text-fg on the active column
- SortAscIcon / SortDescIcon (was a generic three-line SortIcon)
- icon hidden until hover when inactive; on hover it previews the
  direction the first click will sort to (defaultDir prop per column:
  asc for Name, desc for Assigned to)
- active column shows the current direction icon always

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../dashboard/templates/builds/header.tsx     | 22 ++++++----
 .../dashboard/templates/tags/header.tsx       | 10 ++---
 .../templates/tags/sortable-header.tsx        | 42 ++++++++++++++-----
 .../dashboard/templates/tags/table.tsx        |  2 +
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/features/dashboard/templates/builds/header.tsx b/src/features/dashboard/templates/builds/header.tsx
index adeafa4a9..45da3f05d 100644
--- a/src/features/dashboard/templates/builds/header.tsx
+++ b/src/features/dashboard/templates/builds/header.tsx
@@ -15,6 +15,7 @@ import { Input } from '@/ui/primitives/input'
 import { Status } from './table-cells'
 import useFilters from './use-filters'
 import useTemplateBuildsFilters from './use-template-builds-filters'
+import { SearchIcon } from '@/ui/primitives/icons'
 
 interface DashedStatusCircleIconProps {
   status: BuildStatus
@@ -139,15 +140,18 @@ export default function BuildsHeader({
   return (
     <div className="flex sm:flex-row flex-col gap-1">
       {showSearchInput && (
-        <Input
-          placeholder={searchPlaceholder}
-          className="w-full max-w-62"
-          value={localSearch}
-          onChange={(e) => {
-            setLocalSearch(e.target.value)
-            setSearch(e.target.value)
-          }}
-        />
+        <div className="relative w-full max-w-70">
+          <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
+          <Input
+            placeholder={searchPlaceholder}
+            className="pl-[30px]"
+              value={localSearch}
+              onChange={(e) => {
+                setLocalSearch(e.target.value)
+                setSearch(e.target.value)
+              }}
+          />
+        </div>
       )}
 
       <DropdownMenu>
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 941f93879..1b0d0d5f8 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { ExternalLinkIcon, SearchIcon } from '@/ui/primitives/icons'
+import { SearchIcon } from '@/ui/primitives/icons'
 import { Input } from '@/ui/primitives/input'
 
 interface TagsHeaderProps {
@@ -23,10 +23,10 @@ export default function TagsHeader({
       {/* Toolbar row. v1 omits the "Assign new tag" CTA on the right. */}
       <div className="flex items-center gap-2">
         <div className="relative w-full max-w-70">
-          <SearchIcon className="absolute left-2 top-1/2 -translate-y-1/2 size-3 text-fg-tertiary pointer-events-none" />
+          <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
           <Input
             placeholder="Search by name"
-            className="pl-7"
+            className="pl-[30px]"
             value={search}
             onChange={(e) => onSearchChange(e.target.value)}
           />
@@ -41,11 +41,11 @@ export default function TagsHeader({
             href="https://e2b.dev/docs/template/tags"
             target="_blank"
             rel="noopener"
-            className="text-fg-secondary underline-offset-2 hover:underline inline-flex items-center gap-0.5"
+            className="text-fg-secondary underline-offset-2 underline"
           >
             Read more
-            <ExternalLinkIcon className="size-3" />
           </a>
+          .
         </p>
         <p className="prose-body text-fg-tertiary whitespace-nowrap">
           {isFiltered
diff --git a/src/features/dashboard/templates/tags/sortable-header.tsx b/src/features/dashboard/templates/tags/sortable-header.tsx
index 8ac294aad..51c380752 100644
--- a/src/features/dashboard/templates/tags/sortable-header.tsx
+++ b/src/features/dashboard/templates/tags/sortable-header.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { cn } from '@/lib/utils/ui'
-import { SortAscIcon, SortDescIcon, SortIcon } from '@/ui/primitives/icons'
+import { SortAscIcon, SortDescIcon } from '@/ui/primitives/icons'
 
 export type SortKey = 'tag' | 'createdAt'
 export type SortDir = 'asc' | 'desc'
@@ -11,37 +11,59 @@ interface SortableHeaderProps {
   sortKey: SortKey
   activeKey: SortKey
   dir: SortDir
+  /**
+   * Hint shown on hover when this column is inactive. Mirrors the
+   * `sortDescFirst` flag on the templates list \u2014 the inactive icon
+   * previews the direction a first click will sort to.
+   */
+  defaultDir: SortDir
   onChange: (key: SortKey) => void
 }
 
+/**
+ * Visual treatment matches the templates list header (see
+ * `DataTableHead` in `src/ui/data-table.tsx`):
+ *  - mono uppercase prose-label
+ *  - dimmer default (`text-fg-tertiary`), brighter active
+ *    (`prose-label-highlight text-fg`)
+ *  - icon hidden until hover when inactive, with the direction icon
+ *    of `defaultDir` previewed
+ *  - active state always shows the current direction icon
+ */
 export function SortableHeader({
   label,
   sortKey,
   activeKey,
   dir,
+  defaultDir,
   onChange,
 }: SortableHeaderProps) {
   const isActive = activeKey === sortKey
-  const Icon = !isActive ? SortIcon : dir === 'asc' ? SortAscIcon : SortDescIcon
+  const visibleDir = isActive ? dir : defaultDir
+  const Icon = visibleDir === 'desc' ? SortDescIcon : SortAscIcon
 
   return (
     <button
       type="button"
       onClick={() => onChange(sortKey)}
       className={cn(
-        'inline-flex items-center gap-1 text-fg-secondary',
-        'hover:text-fg transition-colors',
-        'focus-visible:outline-none focus-visible:text-fg'
+        'group/sort flex h-8 items-center gap-1 font-mono uppercase whitespace-nowrap',
+        'cursor-pointer focus-visible:outline-none transition-colors',
+        isActive
+          ? 'prose-label-highlight text-fg'
+          : 'prose-label text-fg-tertiary hover:text-fg-secondary'
       )}
-      aria-label={`Sort by ${label}`}
     >
       {label}
-      <Icon
+      <span
         className={cn(
-          'size-3 transition-opacity',
-          isActive ? 'opacity-100 text-fg' : 'opacity-50'
+          'size-5 min-w-5 flex items-center justify-center',
+          !isActive && 'opacity-0 group-hover/sort:opacity-100'
         )}
-      />
+        aria-hidden="true"
+      >
+        <Icon className="size-3" />
+      </span>
     </button>
   )
 }
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 9af4d050f..47eb878b9 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -89,6 +89,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
                   sortKey="tag"
                   activeKey={sortKey}
                   dir={sortDir}
+                  defaultDir="asc"
                   onChange={handleSortChange}
                 />
               </TableHead>
@@ -98,6 +99,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
                   sortKey="createdAt"
                   activeKey={sortKey}
                   dir={sortDir}
+                  defaultDir="desc"
                   onChange={handleSortChange}
                 />
               </TableHead>

From 413a38d84aba2bf518bb2a8d2e8ae217ee8ac4fd Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 17:56:19 +0200
Subject: [PATCH 06/90] fix(tags): underline build IDs by default in Assigned
 to column

Persistent underline (decoration-fg-tertiary) makes the build IDs read
as links at rest, matching the Figma. Hover transitions the
decoration to the brighter foreground color.

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 src/features/dashboard/templates/builds/table.tsx     | 2 +-
 src/features/dashboard/templates/tags/header.tsx      | 2 +-
 src/features/dashboard/templates/tags/table-cells.tsx | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index 15eeac5fd..58c512c92 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -45,7 +45,7 @@ const RUNNING_BUILD_POLL_INTERVAL_MS = 3_000
 const MAX_CACHED_PAGES = 3
 
 const COLUMN_WIDTHS = {
-  id: 152,
+  id: 168,
   status: 96,
   template: 192,
   started: 126,
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 1b0d0d5f8..27aad56c8 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -41,7 +41,7 @@ export default function TagsHeader({
             href="https://e2b.dev/docs/template/tags"
             target="_blank"
             rel="noopener"
-            className="text-fg-secondary underline-offset-2 underline"
+            className="underline-offset-2 underline"
           >
             Read more
           </a>
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 726c51249..77c4e9f2d 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -54,7 +54,8 @@ export function BuildLinkCell({
     <span
       className={cn(
         'font-mono prose-body-numeric',
-        isLinkable && 'underline-offset-2 group-hover/build:underline'
+        isLinkable &&
+          'underline underline-offset-2 decoration-fg-tertiary group-hover/build:decoration-fg'
       )}
     >
       {shortId}

From 4578e04b573163d420cb3614f5273ce7d79eabbf Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 18:31:14 +0200
Subject: [PATCH 07/90] refactor(builds): split BuildsHeader into explicit
 variants

BuildsHeader carried two booleans (scoped, showSearchInput) and called
both filter hooks every render to keep hook order stable. It also
mirrored URL state into local useState via two useEffects to keep the
inputs snappy while the URL writes debounced.

Replace with the same pattern used by features/dashboard/sandbox/events:
- BuildsStatusFilter: pure presentational, statuses + onStatusesChange,
  no hooks beyond UI primitives. Mirrors EventTypeFilter.
- AllBuildsHeader: uses useFilters, composes the filter + search.
- TemplateBuildsHeader: uses useTemplateBuildsFilters (statuses + q),
  composes the same filter + search with a scoped placeholder.

The bespoke local-state + mirroring useEffect goes away. Search inputs
switch to the DebouncedInput primitive (ui/primitives/input.tsx), which
owns the mirror+debounce pattern once instead of duplicating it per
consumer. Filter setters drop the useDebounceCallback wrapper \u2014 status
clicks aren't bursty events and debouncing was only there to mask the
URL-write lag the local mirror was compensating for.

Both consumers updated:
- /templates/builds                            \u2192 <AllBuildsHeader />
- /templates/[templateId]/builds               \u2192 <TemplateBuildsHeader />

Rule alignment (vercel-composition-patterns,
vercel-react-best-practices):
- architecture-avoid-boolean-props: zero booleans on either header
- patterns-explicit-variants: each consumer is named and self-contained
- rerender-derived-state-no-effect: no state mirroring in the headers
- state-decouple-implementation: BuildsStatusFilter doesn't know where
  its state comes from

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../templates/(tabs)/builds/page.tsx          |   4 +-
 .../(detail-tabs)/builds/page.tsx             |   4 +-
 .../templates/builds/all-builds-header.tsx    |  34 ++++
 .../dashboard/templates/builds/header.tsx     | 187 ------------------
 .../templates/builds/status-filter.tsx        | 128 ++++++++++++
 .../builds/template-builds-header.tsx         |  34 ++++
 .../templates/builds/use-filters.tsx          |  23 ++-
 .../builds/use-template-builds-filters.tsx    |  21 +-
 8 files changed, 227 insertions(+), 208 deletions(-)
 create mode 100644 src/features/dashboard/templates/builds/all-builds-header.tsx
 delete mode 100644 src/features/dashboard/templates/builds/header.tsx
 create mode 100644 src/features/dashboard/templates/builds/status-filter.tsx
 create mode 100644 src/features/dashboard/templates/builds/template-builds-header.tsx

diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
index 971ead502..25adc1c1c 100644
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
@@ -1,10 +1,10 @@
-import BuildsHeader from '@/features/dashboard/templates/builds/header'
+import { AllBuildsHeader } from '@/features/dashboard/templates/builds/all-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 />
+      <AllBuildsHeader />
       <BuildsTable />
     </div>
   )
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
index 577eee371..d3743a337 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -1,5 +1,5 @@
-import BuildsHeader from '@/features/dashboard/templates/builds/header'
 import BuildsTable from '@/features/dashboard/templates/builds/table'
+import { TemplateBuildsHeader } from '@/features/dashboard/templates/builds/template-builds-header'
 
 export default async function TemplateDetailBuildsPage({
   params,
@@ -8,7 +8,7 @@ export default async function TemplateDetailBuildsPage({
 
   return (
     <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
-      <BuildsHeader scoped />
+      <TemplateBuildsHeader />
       <BuildsTable templateId={templateId} />
     </div>
   )
diff --git a/src/features/dashboard/templates/builds/all-builds-header.tsx b/src/features/dashboard/templates/builds/all-builds-header.tsx
new file mode 100644
index 000000000..f18b4a62f
--- /dev/null
+++ b/src/features/dashboard/templates/builds/all-builds-header.tsx
@@ -0,0 +1,34 @@
+'use client'
+
+import { SearchIcon } from '@/ui/primitives/icons'
+import { DebouncedInput } from '@/ui/primitives/input'
+import { BuildsStatusFilter } from './status-filter'
+import useFilters from './use-filters'
+
+/**
+ * Toolbar for the all-team builds list (`/templates/builds`).
+ *
+ * Search input writes the `buildIdOrTemplate` URL param, which the
+ * backend resolves against build IDs and template IDs/names. Status
+ * filter writes `statuses`.
+ */
+export function AllBuildsHeader() {
+  const { statuses, setStatuses, buildIdOrTemplate, setBuildIdOrTemplate } =
+    useFilters()
+
+  return (
+    <div className="flex sm:flex-row flex-col gap-1">
+      <div className="relative w-full max-w-70">
+        <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
+        <DebouncedInput
+          placeholder="Build ID, Template ID or Name"
+          className="pl-[30px]"
+          value={buildIdOrTemplate ?? ''}
+          onChange={(v) => setBuildIdOrTemplate(String(v))}
+          debounce={300}
+        />
+      </div>
+      <BuildsStatusFilter statuses={statuses} onStatusesChange={setStatuses} />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/builds/header.tsx b/src/features/dashboard/templates/builds/header.tsx
deleted file mode 100644
index 45da3f05d..000000000
--- a/src/features/dashboard/templates/builds/header.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-'use client'
-
-import { useEffect, useState } from 'react'
-import type { BuildStatus } from '@/core/modules/builds/models'
-import { cn } from '@/lib/utils'
-import { Button } from '@/ui/primitives/button'
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from '@/ui/primitives/dropdown-menu'
-import { Input } from '@/ui/primitives/input'
-import { Status } from './table-cells'
-import useFilters from './use-filters'
-import useTemplateBuildsFilters from './use-template-builds-filters'
-import { SearchIcon } from '@/ui/primitives/icons'
-
-interface DashedStatusCircleIconProps {
-  status: BuildStatus
-  index: number
-}
-
-const DashedStatusCircleIcon = ({
-  status,
-  index,
-}: DashedStatusCircleIconProps) => {
-  return (
-    <div
-      className={cn(
-        'size-3.5 rounded-full bg-bg border-[1.5px] border-dashed',
-        {
-          'border-fg-tertiary': status === 'building',
-          'border-accent-positive-highlight': status === 'success',
-          'border-accent-error-highlight': status === 'failed',
-        }
-      )}
-      style={{ rotate: `${index * 50}deg`, zIndex: index + 1 }}
-    />
-  )
-}
-
-const StatusIcons = ({
-  selectedStatuses,
-}: {
-  selectedStatuses: BuildStatus[]
-}) => {
-  const statusOrder: BuildStatus[] = ['building', 'failed', 'success']
-  const sortedStatuses = statusOrder.filter((s) => selectedStatuses.includes(s))
-
-  return (
-    <div className="flex -space-x-1.5">
-      {sortedStatuses.map((status, i) => (
-        <DashedStatusCircleIcon key={status} status={status} index={i} />
-      ))}
-    </div>
-  )
-}
-
-const STATUS_OPTIONS: Array<{ value: BuildStatus; label: string }> = [
-  { value: 'building', label: 'Building' },
-  { value: 'success', label: 'Success' },
-  { value: 'failed', label: 'Failed' },
-]
-
-interface BuildsHeaderProps {
-  /**
-   * When false, hides the search input entirely. Default true.
-   */
-  showSearchInput?: boolean
-  /**
-   * When true, the header uses the template-scoped filters hook
-   * (statuses + `q` URL state) instead of the shared `useFilters` hook.
-   * Pair this with `BuildsTable templateId={...}` so both surfaces read
-   * from the same URL state and the search applies client-side to the
-   * templateID-scoped backend results.
-   */
-  scoped?: boolean
-}
-
-export default function BuildsHeader({
-  showSearchInput = true,
-  scoped = false,
-}: BuildsHeaderProps = {}) {
-  // Both hooks must be called unconditionally to satisfy React's rules.
-  // `scoped` only changes via route navigation — the component is
-  // unmounted between transitions, so hook order remains consistent.
-  const sharedFilters = useFilters()
-  const scopedFilters = useTemplateBuildsFilters()
-
-  const statuses = scoped ? scopedFilters.statuses : sharedFilters.statuses
-  const setStatuses = scoped
-    ? scopedFilters.setStatuses
-    : sharedFilters.setStatuses
-
-  // Unified search state: in scoped mode it maps to `q` (URL),
-  // in all-team mode it maps to `buildIdOrTemplate` (URL).
-  const search = scoped ? scopedFilters.q : sharedFilters.buildIdOrTemplate
-  const setSearch = scoped
-    ? scopedFilters.setQ
-    : sharedFilters.setBuildIdOrTemplate
-  const searchPlaceholder = scoped
-    ? 'Search by build ID'
-    : 'Build ID, Template ID or Name'
-
-  const [localSearch, setLocalSearch] = useState<string>(search ?? '')
-
-  const [localStatuses, setLocalStatuses] = useState<BuildStatus[]>(statuses)
-
-  useEffect(() => {
-    setLocalSearch(search ?? '')
-  }, [search])
-
-  useEffect(() => {
-    setLocalStatuses(statuses)
-  }, [statuses])
-
-  const toggleStatus = (status: BuildStatus) => {
-    const isSelected = localStatuses.includes(status)
-
-    if (isSelected && localStatuses.length === 1) {
-      return
-    }
-
-    const newStatuses = isSelected
-      ? localStatuses.filter((s) => s !== status)
-      : [...localStatuses, status]
-
-    setLocalStatuses(newStatuses)
-    setStatuses(newStatuses)
-  }
-
-  const selectAllStatuses = () => {
-    const allStatuses = STATUS_OPTIONS.map((s) => s.value)
-    setLocalStatuses(allStatuses)
-    setStatuses(allStatuses)
-  }
-
-  return (
-    <div className="flex sm:flex-row flex-col gap-1">
-      {showSearchInput && (
-        <div className="relative w-full max-w-70">
-          <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
-          <Input
-            placeholder={searchPlaceholder}
-            className="pl-[30px]"
-              value={localSearch}
-              onChange={(e) => {
-                setLocalSearch(e.target.value)
-                setSearch(e.target.value)
-              }}
-          />
-        </div>
-      )}
-
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button variant="secondary" className="w-min pr-3 pl-2.5">
-            <StatusIcons selectedStatuses={localStatuses} /> Status •{' '}
-            {localStatuses.length}/{STATUS_OPTIONS.length}
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="start">
-          <DropdownMenuCheckboxItem
-            checked={localStatuses.length === STATUS_OPTIONS.length}
-            onCheckedChange={selectAllStatuses}
-            onSelect={(e) => e.preventDefault()}
-          >
-            All
-          </DropdownMenuCheckboxItem>
-          <DropdownMenuSeparator />
-          {STATUS_OPTIONS.map((option) => (
-            <DropdownMenuCheckboxItem
-              key={option.value}
-              checked={localStatuses.includes(option.value)}
-              onCheckedChange={() => toggleStatus(option.value)}
-              onSelect={(e) => e.preventDefault()}
-            >
-              <Status status={option.value} />
-            </DropdownMenuCheckboxItem>
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  )
-}
diff --git a/src/features/dashboard/templates/builds/status-filter.tsx b/src/features/dashboard/templates/builds/status-filter.tsx
new file mode 100644
index 000000000..f113ec9ae
--- /dev/null
+++ b/src/features/dashboard/templates/builds/status-filter.tsx
@@ -0,0 +1,128 @@
+'use client'
+
+import type { BuildStatus } from '@/core/modules/builds/models'
+import { cn } from '@/lib/utils'
+import { Button } from '@/ui/primitives/button'
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/ui/primitives/dropdown-menu'
+import { Status } from './table-cells'
+
+const STATUS_OPTIONS: Array<{ value: BuildStatus; label: string }> = [
+  { value: 'building', label: 'Building' },
+  { value: 'success', label: 'Success' },
+  { value: 'failed', label: 'Failed' },
+]
+
+const STATUS_DISPLAY_ORDER: BuildStatus[] = ['building', 'failed', 'success']
+
+interface BuildsStatusFilterProps {
+  statuses: BuildStatus[]
+  onStatusesChange: (statuses: BuildStatus[]) => void
+}
+
+/**
+ * Pure presentational status filter for the builds list. Takes a value
+ * and a change callback; owns no state, calls no hooks beyond primitive
+ * UI ones. Mirrors the pattern used by `EventTypeFilter` in
+ * `features/dashboard/sandbox/events/`.
+ */
+export function BuildsStatusFilter({
+  statuses,
+  onStatusesChange,
+}: BuildsStatusFilterProps) {
+  const toggleStatus = (status: BuildStatus) => {
+    const isSelected = statuses.includes(status)
+
+    // Don't allow deselecting the last status \u2014 the table query needs
+    // at least one to filter on.
+    if (isSelected && statuses.length === 1) return
+
+    const next = isSelected
+      ? statuses.filter((s) => s !== status)
+      : [...statuses, status]
+
+    onStatusesChange(next)
+  }
+
+  const selectAll = () => {
+    onStatusesChange(STATUS_OPTIONS.map((s) => s.value))
+  }
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button variant="secondary" className="w-min pr-3 pl-2.5">
+          <StatusIcons selectedStatuses={statuses} /> Status • {statuses.length}
+          /{STATUS_OPTIONS.length}
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start">
+        <DropdownMenuCheckboxItem
+          checked={statuses.length === STATUS_OPTIONS.length}
+          onCheckedChange={selectAll}
+          onSelect={(e) => e.preventDefault()}
+        >
+          All
+        </DropdownMenuCheckboxItem>
+        <DropdownMenuSeparator />
+        {STATUS_OPTIONS.map((option) => (
+          <DropdownMenuCheckboxItem
+            key={option.value}
+            checked={statuses.includes(option.value)}
+            onCheckedChange={() => toggleStatus(option.value)}
+            onSelect={(e) => e.preventDefault()}
+          >
+            <Status status={option.value} />
+          </DropdownMenuCheckboxItem>
+        ))}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
+
+interface StatusIconsProps {
+  selectedStatuses: BuildStatus[]
+}
+
+function StatusIcons({ selectedStatuses }: StatusIconsProps) {
+  const sortedStatuses = STATUS_DISPLAY_ORDER.filter((s) =>
+    selectedStatuses.includes(s)
+  )
+
+  return (
+    <div className="flex -space-x-1.5">
+      {sortedStatuses.map((status, i) => (
+        <DashedStatusCircleIcon key={status} status={status} index={i} />
+      ))}
+    </div>
+  )
+}
+
+interface DashedStatusCircleIconProps {
+  status: BuildStatus
+  index: number
+}
+
+function DashedStatusCircleIcon({
+  status,
+  index,
+}: DashedStatusCircleIconProps) {
+  return (
+    <div
+      className={cn(
+        'size-3.5 rounded-full bg-bg border-[1.5px] border-dashed',
+        {
+          'border-fg-tertiary': status === 'building',
+          'border-accent-positive-highlight': status === 'success',
+          'border-accent-error-highlight': status === 'failed',
+        }
+      )}
+      style={{ rotate: `${index * 50}deg`, zIndex: index + 1 }}
+    />
+  )
+}
diff --git a/src/features/dashboard/templates/builds/template-builds-header.tsx b/src/features/dashboard/templates/builds/template-builds-header.tsx
new file mode 100644
index 000000000..4110d3a82
--- /dev/null
+++ b/src/features/dashboard/templates/builds/template-builds-header.tsx
@@ -0,0 +1,34 @@
+'use client'
+
+import { SearchIcon } from '@/ui/primitives/icons'
+import { DebouncedInput } from '@/ui/primitives/input'
+import { BuildsStatusFilter } from './status-filter'
+import useTemplateBuildsFilters from './use-template-builds-filters'
+
+/**
+ * Toolbar for a single template's builds tab
+ * (`/templates/[templateId]/builds`).
+ *
+ * Search input writes the `q` URL param, which is applied client-side
+ * as a substring match on build IDs (the backend query stays scoped
+ * by templateID). Status filter writes `statuses`.
+ */
+export function TemplateBuildsHeader() {
+  const { statuses, setStatuses, q, setQ } = useTemplateBuildsFilters()
+
+  return (
+    <div className="flex sm:flex-row flex-col gap-1">
+      <div className="relative w-full max-w-70">
+        <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
+        <DebouncedInput
+          placeholder="Search by build ID"
+          className="pl-[30px]"
+          value={q ?? ''}
+          onChange={(v) => setQ(String(v))}
+          debounce={300}
+        />
+      </div>
+      <BuildsStatusFilter statuses={statuses} onStatusesChange={setStatuses} />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/builds/use-filters.tsx b/src/features/dashboard/templates/builds/use-filters.tsx
index 03ca7b2b1..3477d7500 100644
--- a/src/features/dashboard/templates/builds/use-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-filters.tsx
@@ -1,8 +1,7 @@
 'use client'
 
 import { useQueryStates } from 'nuqs'
-import { useMemo } from 'react'
-import { useDebounceCallback } from 'usehooks-ts'
+import { useCallback, useMemo } from 'react'
 import { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
 import type { BuildStatus } from '@/core/modules/builds/models'
 import { templateBuildsFilterParams } from './filter-params'
@@ -19,15 +18,21 @@ export default function useFilters() {
 
   const buildIdOrTemplate = filters?.buildIdOrTemplate ?? undefined
 
-  const setStatuses = useDebounceCallback((statuses: BuildStatus[]) => {
-    setFilters({ statuses: statuses })
-  }, 300)
+  // Setters write to the URL synchronously. Bursty input (search keystrokes)
+  // is debounced at the source via `DebouncedInput`, not here \u2014 so consumers
+  // get a stable, predictable setter signature.
+  const setStatuses = useCallback(
+    (next: BuildStatus[]) => {
+      setFilters({ statuses: next })
+    },
+    [setFilters]
+  )
 
-  const setBuildIdOrTemplate = useDebounceCallback(
-    (buildIdOrTemplate: string) => {
-      setFilters({ buildIdOrTemplate })
+  const setBuildIdOrTemplate = useCallback(
+    (next: string) => {
+      setFilters({ buildIdOrTemplate: next.length > 0 ? next : null })
     },
-    300
+    [setFilters]
   )
 
   return {
diff --git a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
index db105af24..7ca4d2a32 100644
--- a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
@@ -6,8 +6,7 @@ import {
   parseAsStringEnum,
   useQueryStates,
 } from 'nuqs'
-import { useMemo } from 'react'
-import { useDebounceCallback } from 'usehooks-ts'
+import { useCallback, useMemo } from 'react'
 import { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
 import type { BuildStatus } from '@/core/modules/builds/models'
 
@@ -39,13 +38,19 @@ export default function useTemplateBuildsFilters() {
 
   const q = filters?.q ?? undefined
 
-  const setStatuses = useDebounceCallback((next: BuildStatus[]) => {
-    setFilters({ statuses: next })
-  }, 300)
+  const setStatuses = useCallback(
+    (next: BuildStatus[]) => {
+      setFilters({ statuses: next })
+    },
+    [setFilters]
+  )
 
-  const setQ = useDebounceCallback((next: string) => {
-    setFilters({ q: next.length > 0 ? next : null })
-  }, 300)
+  const setQ = useCallback(
+    (next: string) => {
+      setFilters({ q: next.length > 0 ? next : null })
+    },
+    [setFilters]
+  )
 
   return { statuses, setStatuses, q, setQ }
 }

From 3fda9670ff8f5977a5297923e1fac17c03e728a6 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 18:45:59 +0200
Subject: [PATCH 08/90] chore(templates): trim restating comments across the
 branch

Remove JSDoc blocks and inline comments that restate the code or
narrate section boundaries. Keep only the ~10 single-line notes that
communicate non-obvious context naming cannot express:

- use-page-title cleanup-equality (subtle ownership check)
- layout.ts pathname-fallback role + glob ordering + flush-tabs note
- repository.server.ts: 'no per-template GET on infra' explainer
- title-binder.tsx: 'drives title + 404 entry point for all tabs'
- list/table-cells: 'defaults have no detail page'
- status-filter: 'can't deselect the last status' business rule
- use-filters / use-template-builds-filters: 'debounce in DebouncedInput'
- table.tsx: 'hook order stability' + 'q is client-side narrow'

Also rename BuildsTable's 'colSpan' to 'visibleColumnCount' so the
isTemplateScoped ? 5 : 6 calculation reads itself without needing a
3-line comment.

Net change: -131 +20 = -111 lines of comment surface area on the
branch (~60% reduction).

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 .../(detail-tabs)/overview/page.tsx           |  7 ----
 src/configs/layout.ts                         | 10 ++---
 .../modules/templates/repository.server.ts    |  4 +-
 .../templates/builds/all-builds-header.tsx    |  7 ----
 .../templates/builds/status-filter.tsx        |  9 +----
 .../dashboard/templates/builds/table.tsx      | 37 ++++---------------
 .../builds/template-builds-header.tsx         |  9 +----
 .../templates/builds/use-filters.tsx          |  4 +-
 .../builds/use-template-builds-filters.tsx    | 10 +----
 .../dashboard/templates/detail/header.tsx     | 10 -----
 .../dashboard/templates/detail/tabs.tsx       |  1 -
 .../templates/detail/title-binder.tsx         | 11 +-----
 .../templates/detail/visibility-dropdown.tsx  |  1 -
 .../dashboard/templates/list/table-cells.tsx  |  3 +-
 .../dashboard/templates/tags/header.tsx       |  1 -
 .../templates/tags/sortable-header.tsx        | 16 +-------
 .../dashboard/templates/tags/table-cells.tsx  |  2 +-
 src/lib/hooks/use-page-title.ts               | 11 +-----
 18 files changed, 21 insertions(+), 132 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index dcbf1a68a..6693a24a1 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -2,13 +2,6 @@ import { Suspense } from 'react'
 import TemplateDetailHeader from '@/features/dashboard/templates/detail/header'
 import TemplateDetailHeaderSkeleton from '@/features/dashboard/templates/detail/header-skeleton'
 
-/**
- * Template detail \u2014 Overview tab.
- *
- * v1: the 5-cell DetailsRow is the only content.
- * Future iterations will add: running-sandboxes chart, description /
- * dockerfile-like view, and a versions section. See the v1 plan.
- */
 export default async function TemplateOverviewPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
diff --git a/src/configs/layout.ts b/src/configs/layout.ts
index d7078f60e..47debffa7 100644
--- a/src/configs/layout.ts
+++ b/src/configs/layout.ts
@@ -89,15 +89,12 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
       },
     }
   },
-  // Template detail tabs: fallback title (UUID-derived) used until
-  // usePageTitle injects the friendly template name from fetched data.
+  // Pathname fallback; usePageTitle replaces with the friendly template name once data loads.
   '/dashboard/*/templates/*/overview': (pathname) =>
     templateDetailLayoutConfig(pathname),
   '/dashboard/*/templates/*/tags': (pathname) =>
     templateDetailLayoutConfig(pathname),
-  // Template detail Builds tab — same fallback, but the path matches
-  // /templates/*/builds (no trailing buildId) so it doesn't collide
-  // with the build-detail glob above (/templates/*/builds/*).
+  // Distinct from /templates/*/builds/* (build detail) — keep the more specific glob earlier.
   '/dashboard/*/templates/*/builds': (pathname) =>
     templateDetailLayoutConfig(pathname),
 
@@ -183,8 +180,7 @@ function templateDetailLayoutConfig(pathname: string): DashboardLayoutConfig {
       ? `${templateId.slice(0, 6)}...${templateId.slice(-6)}`
       : templateId
 
-  // Note: no `includeHeaderBottomStyles` — the tabs row sits flush
-  // below the global title bar, matching /templates/list and /sandboxes.
+  // No `includeHeaderBottomStyles` — tabs row sits flush below the title bar.
   return {
     title: [
       {
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index c4d5bd47c..2381803d5 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -60,9 +60,7 @@ export function createTemplatesRepository(
 ): TeamTemplatesRepository {
   return {
     async getTemplate(templateId) {
-      // v1: filter server-side over the existing list endpoint. No
-      // separate per-template fetch needed; this keeps the cache hot
-      // for cross-page reuse and avoids any new infra dependencies.
+      // Filter the list endpoint; infra has no per-template GET that exposes the same shape.
       const listResult = await this.getTeamTemplates()
       if (!listResult.ok) return listResult
 
diff --git a/src/features/dashboard/templates/builds/all-builds-header.tsx b/src/features/dashboard/templates/builds/all-builds-header.tsx
index f18b4a62f..107c50599 100644
--- a/src/features/dashboard/templates/builds/all-builds-header.tsx
+++ b/src/features/dashboard/templates/builds/all-builds-header.tsx
@@ -5,13 +5,6 @@ import { DebouncedInput } from '@/ui/primitives/input'
 import { BuildsStatusFilter } from './status-filter'
 import useFilters from './use-filters'
 
-/**
- * Toolbar for the all-team builds list (`/templates/builds`).
- *
- * Search input writes the `buildIdOrTemplate` URL param, which the
- * backend resolves against build IDs and template IDs/names. Status
- * filter writes `statuses`.
- */
 export function AllBuildsHeader() {
   const { statuses, setStatuses, buildIdOrTemplate, setBuildIdOrTemplate } =
     useFilters()
diff --git a/src/features/dashboard/templates/builds/status-filter.tsx b/src/features/dashboard/templates/builds/status-filter.tsx
index f113ec9ae..41ca529d9 100644
--- a/src/features/dashboard/templates/builds/status-filter.tsx
+++ b/src/features/dashboard/templates/builds/status-filter.tsx
@@ -25,12 +25,6 @@ interface BuildsStatusFilterProps {
   onStatusesChange: (statuses: BuildStatus[]) => void
 }
 
-/**
- * Pure presentational status filter for the builds list. Takes a value
- * and a change callback; owns no state, calls no hooks beyond primitive
- * UI ones. Mirrors the pattern used by `EventTypeFilter` in
- * `features/dashboard/sandbox/events/`.
- */
 export function BuildsStatusFilter({
   statuses,
   onStatusesChange,
@@ -38,8 +32,7 @@ export function BuildsStatusFilter({
   const toggleStatus = (status: BuildStatus) => {
     const isSelected = statuses.includes(status)
 
-    // Don't allow deselecting the last status \u2014 the table query needs
-    // at least one to filter on.
+    // Don't allow deselecting the last status — the table query needs at least one.
     if (isSelected && statuses.length === 1) return
 
     const next = isSelected
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index 58c512c92..bc9663fea 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -53,16 +53,7 @@ const COLUMN_WIDTHS = {
 } as const
 
 interface BuildsTableProps {
-  /**
-   * When provided, the table is scoped to a single template:
-   *  - filters are read from `useTemplateBuildsFilters` (statuses + `q`)
-   *  - the Template column is hidden
-   *  - the `buildIdOrTemplate` query param is set to this UUID, so the
-   *    backend returns only builds for this template
-   *  - the scoped `q` value applies as an additional client-side filter
-   *    (case-insensitive substring match on build ID) so cross-template
-   *    name matches can never leak in
-   */
+  // When set, scopes the backend query to this template and enables 'q' as a client-side build-ID filter.
   templateId?: string
 }
 
@@ -76,10 +67,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
 
   const isTemplateScoped = templateId !== undefined
 
-  // Two filter hooks live here, but only one is active per render. React
-  // requires consistent hook order across renders — `templateId` only
-  // changes via route navigation (which unmounts the component), so it is
-  // safe to call both unconditionally and pick which result to use.
+  // Hook order must stay stable; templateId only changes on route navigation (component unmount).
   const sharedFilters = useFilters()
   const scopedFilters = useTemplateBuildsFilters()
 
@@ -94,7 +82,6 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     buildIdOrTemplate
   )
 
-  // Builds list query
   const {
     data: paginatedBuilds,
     fetchNextPage,
@@ -131,7 +118,6 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     }
   }, [isFetchingBuilds, isFilterRefetching, clearFilterRefetching])
 
-  // Running builds status polling
   const runningBuildIds = useMemo(
     () => builds.filter((b) => b.status === 'building').map((b) => b.id),
     [builds]
@@ -160,9 +146,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     [builds, runningStatusesData]
   )
 
-  // Client-side narrowing for the scoped builds tab. The backend query
-  // is templateID-scoped (authoritative); `q` only filters the loaded
-  // pages by build-ID substring.
+  // 'q' is a client-side narrow over the templateID-scoped backend result.
   const visibleBuilds = useMemo(() => {
     if (!isTemplateScoped) return buildsWithLiveStatus
     const query = scopedFilters.q?.trim().toLowerCase()
@@ -172,7 +156,6 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     )
   }, [buildsWithLiveStatus, isTemplateScoped, scopedFilters.q])
 
-  // Handlers
   const buildsQueryKey = trpc.builds.list.infiniteQueryOptions({
     teamSlug,
     statuses,
@@ -190,16 +173,12 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     }
   }, [queryClient, buildsQueryKey])
 
-  // Derived UI state
   const hasData = visibleBuilds.length > 0
   const showLoader = isInitialLoad && !hasData
   const showEmpty = !isInitialLoad && !isFetchingBuilds && !hasData
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
 
-  // colSpan must match the visible column count (status + [template] +
-  // started + duration + id + reason filler) when the Template column is
-  // conditionally hidden in template-scoped mode.
-  const colSpan = isTemplateScoped ? 5 : 6
+  const visibleColumnCount = isTemplateScoped ? 5 : 6
 
   return (
     <div className="flex h-full min-h-0 flex-col overflow-hidden relative">
@@ -242,7 +221,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
           >
             {showLoader && (
               <TableRow>
-                <TableCell colSpan={colSpan}>
+                <TableCell colSpan={visibleColumnCount}>
                   <div className="h-[35svh] w-full flex justify-center items-center">
                     <Loader variant="slash" size="lg" />
                   </div>
@@ -252,7 +231,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
 
             {showEmpty && (
               <TableRow>
-                <TableCell colSpan={colSpan}>
+                <TableCell colSpan={visibleColumnCount}>
                   <BuildsEmpty error={buildsError?.message} />
                 </TableCell>
               </TableRow>
@@ -263,7 +242,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
                 {hasScrolledPastInitialPages && (
                   <TableRow>
                     <TableCell
-                      colSpan={colSpan}
+                      colSpan={visibleColumnCount}
                       className="text-center max-lg:text-start text-fg-tertiary"
                     >
                       <BackToTopButton onBackToTop={handleBackToTop} />
@@ -336,7 +315,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
                 {hasNextPage && (
                   <TableRow>
                     <TableCell
-                      colSpan={colSpan}
+                      colSpan={visibleColumnCount}
                       className="text-center max-lg:text-start text-fg-tertiary"
                     >
                       <LoadMoreButton
diff --git a/src/features/dashboard/templates/builds/template-builds-header.tsx b/src/features/dashboard/templates/builds/template-builds-header.tsx
index 4110d3a82..d068d0669 100644
--- a/src/features/dashboard/templates/builds/template-builds-header.tsx
+++ b/src/features/dashboard/templates/builds/template-builds-header.tsx
@@ -5,14 +5,7 @@ import { DebouncedInput } from '@/ui/primitives/input'
 import { BuildsStatusFilter } from './status-filter'
 import useTemplateBuildsFilters from './use-template-builds-filters'
 
-/**
- * Toolbar for a single template's builds tab
- * (`/templates/[templateId]/builds`).
- *
- * Search input writes the `q` URL param, which is applied client-side
- * as a substring match on build IDs (the backend query stays scoped
- * by templateID). Status filter writes `statuses`.
- */
+// 'q' filters client-side over the templateID-scoped backend results (see BuildsTable).
 export function TemplateBuildsHeader() {
   const { statuses, setStatuses, q, setQ } = useTemplateBuildsFilters()
 
diff --git a/src/features/dashboard/templates/builds/use-filters.tsx b/src/features/dashboard/templates/builds/use-filters.tsx
index 3477d7500..9b721cd34 100644
--- a/src/features/dashboard/templates/builds/use-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-filters.tsx
@@ -18,9 +18,7 @@ export default function useFilters() {
 
   const buildIdOrTemplate = filters?.buildIdOrTemplate ?? undefined
 
-  // Setters write to the URL synchronously. Bursty input (search keystrokes)
-  // is debounced at the source via `DebouncedInput`, not here \u2014 so consumers
-  // get a stable, predictable setter signature.
+  // Debouncing lives in DebouncedInput; setters here write synchronously.
   const setStatuses = useCallback(
     (next: BuildStatus[]) => {
       setFilters({ statuses: next })
diff --git a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
index 7ca4d2a32..c68d77969 100644
--- a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
@@ -10,15 +10,7 @@ import { useCallback, useMemo } from 'react'
 import { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
 import type { BuildStatus } from '@/core/modules/builds/models'
 
-/**
- * Variant of `useFilters` scoped to a single template's builds tab.
- *
- * URL state:
- *  - `statuses` — build status filter, same as the all-team page
- *  - `q` — free-text search applied client-side against build IDs.
- *    Backend scoping by templateID stays authoritative; `q` only
- *    narrows the already-loaded result set.
- */
+// 'q' applies client-side over the already-templateID-scoped builds list — see BuildsTable.
 const templateScopedFilterParams = {
   statuses: parseAsArrayOf(
     parseAsStringEnum<BuildStatus>(['building', 'failed', 'success'])
diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
index 86b0d4d12..e8141dc6b 100644
--- a/src/features/dashboard/templates/detail/header.tsx
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -17,16 +17,6 @@ interface TemplateDetailHeaderProps {
 
 const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
 
-/**
- * Overview-tab header: the 5-cell DetailsRow.
- *
- * The fetch here is deduped with the layout-level TemplateTitleBinder
- * (same query key), so this renders synchronously off the cache when
- * the user lands on Overview after the binder has already resolved.
- *
- * 404 handling lives in the binder, not here \u2014 by the time this
- * component renders, the template is guaranteed to exist.
- */
 export default function TemplateDetailHeader({
   teamSlug,
   templateId,
diff --git a/src/features/dashboard/templates/detail/tabs.tsx b/src/features/dashboard/templates/detail/tabs.tsx
index 3b849fff6..746fa9954 100644
--- a/src/features/dashboard/templates/detail/tabs.tsx
+++ b/src/features/dashboard/templates/detail/tabs.tsx
@@ -36,7 +36,6 @@ export default function TemplateDetailTabs({
 
   useEffect(() => {
     if (prevTabRef.current === null) {
-      // First render \u2014 emit `template detail opened` once per mount.
       posthog.capture('template detail opened', {
         templateId,
         tab: activeTab,
diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
index f38fcd33f..db22ecde1 100644
--- a/src/features/dashboard/templates/detail/title-binder.tsx
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -13,16 +13,7 @@ interface TemplateTitleBinderProps {
   templateId: string
 }
 
-/**
- * Renders nothing. Fetches the template, then drives the dashboard
- * title bar via usePageTitle. Lives in the detail layout so the title
- * stays correct on every tab (Overview, Builds, Tags) without each
- * tab needing its own title-management logic.
- *
- * Doubles as the central 404 entry point: if the templateId isn't in
- * the team's list, this throws notFound() and all three tabs fail
- * cleanly to the dashboard not-found page.
- */
+// Drives the dashboard title for all detail tabs from a single fetch; also the 404 entry point.
 export default function TemplateTitleBinder({
   teamSlug,
   templateId,
diff --git a/src/features/dashboard/templates/detail/visibility-dropdown.tsx b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
index a6e4f6213..975f1df80 100644
--- a/src/features/dashboard/templates/detail/visibility-dropdown.tsx
+++ b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
@@ -54,7 +54,6 @@ export function TemplateVisibilityDropdown({
           public: variables.public,
         })
 
-        // Optimistically update both the list and the per-template caches.
         const listKey = trpc.templates.getTemplates.queryKey({ teamSlug })
         const detailKey = trpc.templates.getTemplate.queryKey({
           teamSlug,
diff --git a/src/features/dashboard/templates/list/table-cells.tsx b/src/features/dashboard/templates/list/table-cells.tsx
index b6e2fd112..0b6105e84 100644
--- a/src/features/dashboard/templates/list/table-cells.tsx
+++ b/src/features/dashboard/templates/list/table-cells.tsx
@@ -307,8 +307,7 @@ export function TemplateNameCell({
   const nameValue = (primaryName as string) ?? '--'
 
   const isDefault = 'isDefault' in template && template.isDefault
-  // v1: only team-owned templates have a detail page. Default (E2B)
-  // templates render the name as plain text, not a link.
+  // Default (E2B) templates have no detail page; render as plain text.
   const isLinkable = !isDefault && nameValue !== '--'
 
   const handleCopy = (e: React.MouseEvent) => {
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 27aad56c8..b3c51911b 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -33,7 +33,6 @@ export default function TagsHeader({
         </div>
       </div>
 
-      {/* Info row \u2014 plain helper text (left) + tag count (right). */}
       <div className="flex items-center justify-between gap-4">
         <p className="prose-body text-fg-tertiary">
           Tags identify builds and can only be assigned to one build at once.{' '}
diff --git a/src/features/dashboard/templates/tags/sortable-header.tsx b/src/features/dashboard/templates/tags/sortable-header.tsx
index 51c380752..4c18b16a5 100644
--- a/src/features/dashboard/templates/tags/sortable-header.tsx
+++ b/src/features/dashboard/templates/tags/sortable-header.tsx
@@ -11,25 +11,11 @@ interface SortableHeaderProps {
   sortKey: SortKey
   activeKey: SortKey
   dir: SortDir
-  /**
-   * Hint shown on hover when this column is inactive. Mirrors the
-   * `sortDescFirst` flag on the templates list \u2014 the inactive icon
-   * previews the direction a first click will sort to.
-   */
+  // Direction previewed on hover when this column is inactive.
   defaultDir: SortDir
   onChange: (key: SortKey) => void
 }
 
-/**
- * Visual treatment matches the templates list header (see
- * `DataTableHead` in `src/ui/data-table.tsx`):
- *  - mono uppercase prose-label
- *  - dimmer default (`text-fg-tertiary`), brighter active
- *    (`prose-label-highlight text-fg`)
- *  - icon hidden until hover when inactive, with the direction icon
- *    of `defaultDir` previewed
- *  - active state always shows the current direction icon
- */
 export function SortableHeader({
   label,
   sortKey,
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 77c4e9f2d..df81852dd 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -37,7 +37,7 @@ export function BuildLinkCell({
   const shortId = useMemo(() => {
     if (buildId === NULL_BUILD_ID) return '--'
     if (buildId.length <= 12) return buildId
-    return `${buildId.slice(0, 5)}…${buildId.slice(-5)}`
+    return `${buildId.slice(0, 5)}...${buildId.slice(-5)}`
   }, [buildId])
 
   const relative = useMemo(() => {
diff --git a/src/lib/hooks/use-page-title.ts b/src/lib/hooks/use-page-title.ts
index b7197d969..5760af3f7 100644
--- a/src/lib/hooks/use-page-title.ts
+++ b/src/lib/hooks/use-page-title.ts
@@ -33,14 +33,6 @@ export const usePageTitleStore = create<PageTitleStore>((set) => ({
   setOverride: (override) => set({ override }),
 }))
 
-/**
- * Set the dashboard title bar contents for as long as the calling
- * component is mounted. Passing `null` (or omitting `title`) clears
- * any previously set override on mount.
- *
- * Safe to call before data is loaded \u2014 pass `null` while loading and
- * the pathname-derived fallback title will render.
- */
 export function usePageTitle(
   title: string | TitleSegment[] | null,
   copyValue?: string
@@ -54,8 +46,7 @@ export function usePageTitle(
     usePageTitleStore.getState().setOverride({ title, copyValue })
 
     return () => {
-      // Only clear if this hook is still the active owner of the
-      // override. A subsequent page may have already set its own.
+      // Don't clear if a subsequent page has already replaced our override.
       const current = usePageTitleStore.getState().override
       if (current && current.title === title) {
         usePageTitleStore.getState().setOverride(null)

From accc6c9a0c4c468be46c2f418093e3b37212e814 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 25 May 2026 18:59:04 +0200
Subject: [PATCH 09/90] refactor(builds): lift filter resolution to page
 consumers

BuildsTable previously called both useFilters and useTemplateBuildsFilters
every render to keep React hook order stable, and derived
isTemplateScoped from the presence of an optional templateId prop \u2014
which then gated six conditional branches (statuses selection,
buildIdOrTemplate selection, client-side q narrowing, colgroup,
TableHead, per-row TableCell).

Replace the templateId presence-based mode toggle with explicit,
pre-resolved props:

- filters: { statuses, buildIdOrTemplate } \u2014 passed straight to the
  backend query
- postFilter?: (build) => boolean \u2014 optional client-side narrowing
- showTemplateColumn?: boolean \u2014 explicit structural visibility toggle

Filter hooks move up to the two page consumers, each calling exactly
one (the right one for its route). The detail builds page builds its
own postFilter from the scoped 'q' URL param; the templateID flows
into filters.buildIdOrTemplate directly. Both pages become 'use
client' (they were trivial wrappers with no server-only logic).

Rule alignment (vercel-composition-patterns):
- architecture-avoid-boolean-props: the one remaining boolean
  (showTemplateColumn) is a purely structural visibility flag, not the
  exponential-state-space behavioural booleans the rule targets
- state-decouple-implementation: BuildsTable no longer knows which URL
  hook drives its filters \u2014 consumer chooses, table works with any
  source

The variant identity now lives at the page level: TemplateBuildsPage
vs TemplateDetailBuildsPage are the explicit variants. Each calls one
hook, builds its own props, hands a fully-resolved configuration to a
single shared component.

Co-Authored-By: Craft Agent <agents-noreply@craft.do>
---
 spec/openapi.dashboard-api.yaml               |  316 +++
 .../templates/(tabs)/builds/page.tsx          |    7 +-
 .../(detail-tabs)/builds/page.tsx             |   26 +-
 .../[templateId]/(detail-tabs)/tags/page.tsx  |    2 +-
 src/core/modules/templates/models.ts          |    8 +
 .../modules/templates/repository.server.ts    |  108 +
 src/core/server/api/routers/templates.ts      |   49 +
 .../shared/contracts/dashboard-api.types.ts   | 2027 ++++++++++-------
 .../dashboard/templates/builds/table.tsx      |   55 +-
 .../dashboard/templates/tags/build-link.tsx   |   68 +
 .../templates/tags/delete-dialog.tsx          |  113 +
 .../dashboard/templates/tags/group.ts         |   41 +
 .../dashboard/templates/tags/header.tsx       |   57 +-
 .../templates/tags/sortable-header.tsx        |   55 -
 .../templates/tags/stores/table-store.ts      |   76 +
 .../dashboard/templates/tags/table-cells.tsx  |  207 +-
 .../dashboard/templates/tags/table-config.tsx |  101 +
 .../dashboard/templates/tags/table.tsx        |  464 +++-
 .../dashboard/templates/tags/types.ts         |    8 +
 src/ui/primitives/collapsible.tsx             |   27 +
 src/ui/primitives/icons.tsx                   |   68 +-
 src/ui/primitives/table.tsx                   |    2 +-
 src/ui/row-hover-frame.tsx                    |   53 +
 23 files changed, 2797 insertions(+), 1141 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/build-link.tsx
 create mode 100644 src/features/dashboard/templates/tags/delete-dialog.tsx
 create mode 100644 src/features/dashboard/templates/tags/group.ts
 delete mode 100644 src/features/dashboard/templates/tags/sortable-header.tsx
 create mode 100644 src/features/dashboard/templates/tags/stores/table-store.ts
 create mode 100644 src/features/dashboard/templates/tags/table-config.tsx
 create mode 100644 src/features/dashboard/templates/tags/types.ts
 create mode 100644 src/ui/primitives/collapsible.tsx
 create mode 100644 src/ui/row-hover-frame.tsx

diff --git a/spec/openapi.dashboard-api.yaml b/spec/openapi.dashboard-api.yaml
index 453c94c8b..b79ea085e 100644
--- a/spec/openapi.dashboard-api.yaml
+++ b/spec/openapi.dashboard-api.yaml
@@ -10,6 +10,9 @@ components:
       type: apiKey
       in: header
       name: X-Admin-Token
+    # Generated code uses security schemas in the alphabetical order.
+    # In order to check first the token, and then the team (so we can already use the user),
+    # there is a 1 and 2 present in the names of the security schemas.
     Supabase1TokenAuth:
       type: apiKey
       in: header
@@ -18,6 +21,16 @@ components:
       type: apiKey
       in: header
       name: X-Supabase-Team
+    # AuthProviderBearerAuth / AuthProviderTeamAuth: B before T in the name
+    # so Bearer is validated before Team (same reason as Supabase1/2 above).
+    AuthProviderBearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: access_token
+    AuthProviderTeamAuth:
+      type: apiKey
+      in: header
+      name: X-Team-ID
 
   parameters:
     build_id:
@@ -108,6 +121,32 @@ components:
       description: Team slug to resolve.
       schema:
         type: string
+    templateID:
+      name: templateID
+      in: path
+      required: true
+      description: Identifier of the template.
+      schema:
+        type: string
+    tag:
+      name: tag
+      in: query
+      required: true
+      description: Template tag name to check.
+      schema:
+        type: string
+        minLength: 1
+    tag_assignment_limit:
+      name: assignmentLimit
+      in: query
+      required: false
+      description: Maximum number of ready assignment rows to return per tag.
+      schema:
+        type: integer
+        format: int32
+        minimum: 1
+        maximum: 25
+        default: 6
 
   responses:
     "400":
@@ -156,6 +195,54 @@ components:
           type: string
           description: Error message.
 
+    AdminAuthProviderProfile:
+      type: object
+      required:
+        - userId
+        - email
+      properties:
+        userId:
+          type: string
+          format: uuid
+          description: Internal E2B user identifier.
+        email:
+          type: string
+          nullable: true
+          description: Email address from the configured auth provider.
+
+    AdminAuthProviderProfilesResponse:
+      type: object
+      required:
+        - profiles
+      properties:
+        profiles:
+          type: array
+          items:
+            $ref: "#/components/schemas/AdminAuthProviderProfile"
+
+    AdminAuthProviderProfilesResolveRequest:
+      type: object
+      required:
+        - userIds
+      properties:
+        userIds:
+          type: array
+          minItems: 1
+          maxItems: 100
+          uniqueItems: true
+          items:
+            type: string
+            format: uuid
+
+    AdminAuthProviderProfilesLookupEmailRequest:
+      type: object
+      required:
+        - email
+      properties:
+        email:
+          type: string
+          format: email
+
     BuildStatus:
       type: string
       description: Build status mapped for dashboard clients.
@@ -580,6 +667,79 @@ components:
           items:
             $ref: "#/components/schemas/DefaultTemplate"
 
+    TemplateTagAssignment:
+      type: object
+      required:
+        - assignmentId
+        - buildId
+        - assignedAt
+        - buildCreatedAt
+        - buildFinishedAt
+      properties:
+        assignmentId:
+          type: string
+          format: uuid
+          description: Identifier of the tag assignment event.
+        buildId:
+          type: string
+          format: uuid
+          description: Identifier of the assigned build.
+        assignedAt:
+          type: string
+          format: date-time
+          description: Time when the tag was assigned to the build.
+        buildCreatedAt:
+          type: string
+          format: date-time
+          description: Time when the assigned build was created.
+        buildFinishedAt:
+          type: string
+          format: date-time
+          nullable: true
+          description: Time when the assigned build finished.
+
+    TemplateTagGroup:
+      type: object
+      required:
+        - tag
+        - assignments
+        - hasMore
+      properties:
+        tag:
+          type: string
+          description: Template tag name.
+        assignments:
+          type: array
+          description: Ready assignment events for this tag, sorted latest first.
+          items:
+            $ref: "#/components/schemas/TemplateTagAssignment"
+        hasMore:
+          type: boolean
+          description: Whether more ready assignment events exist beyond the requested assignment limit.
+
+    TemplateTagGroupsResponse:
+      type: object
+      required:
+        - tags
+      properties:
+        tags:
+          type: array
+          items:
+            $ref: "#/components/schemas/TemplateTagGroup"
+
+    TemplateTagExistsResponse:
+      type: object
+      required:
+        - exists
+        - normalizedTag
+      properties:
+        exists:
+          type: boolean
+          description: Whether the template tag has at least one ready assignment.
+        normalizedTag:
+          type: string
+          description: Normalized template tag name.
+
     TeamResolveResponse:
       type: object
       required:
@@ -617,6 +777,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/build_id_or_template"
         - $ref: "#/components/parameters/build_statuses"
@@ -645,6 +807,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/build_ids"
 
@@ -671,6 +835,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/build_id"
       responses:
@@ -696,6 +862,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/sandboxID"
       responses:
@@ -721,6 +889,7 @@ paths:
       tags: [teams]
       security:
         - Supabase1TokenAuth: []
+        - AuthProviderBearerAuth: []
       responses:
         "200":
           description: Successfully returned user teams.
@@ -737,6 +906,7 @@ paths:
       tags: [teams]
       security:
         - Supabase1TokenAuth: []
+        - AuthProviderBearerAuth: []
       requestBody:
         required: true
         content:
@@ -777,6 +947,80 @@ paths:
         "500":
           $ref: "#/components/responses/500"
 
+  /admin/user-profiles/resolve:
+    post:
+      summary: Resolve user profiles
+      tags: [admin]
+      security:
+        - AdminTokenAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/AdminAuthProviderProfilesResolveRequest"
+      responses:
+        "200":
+          description: Successfully resolved profiles.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/AdminAuthProviderProfilesResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "500":
+          $ref: "#/components/responses/500"
+
+  /admin/user-profiles/by-email:
+    post:
+      summary: Lookup user profiles by email
+      tags: [admin]
+      security:
+        - AdminTokenAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/AdminAuthProviderProfilesLookupEmailRequest"
+      responses:
+        "200":
+          description: Successfully found matching profiles.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/AdminAuthProviderProfilesResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "500":
+          $ref: "#/components/responses/500"
+
+  /admin/user-profiles/{userId}:
+    get:
+      summary: Get user profile
+      tags: [admin]
+      security:
+        - AdminTokenAuth: []
+      parameters:
+        - $ref: "#/components/parameters/userId"
+      responses:
+        "200":
+          description: Successfully found profile.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/AdminAuthProviderProfilesResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "500":
+          $ref: "#/components/responses/500"
+
   /teams/resolve:
     get:
       summary: Resolve team identity
@@ -784,6 +1028,7 @@ paths:
       tags: [teams]
       security:
         - Supabase1TokenAuth: []
+        - AuthProviderBearerAuth: []
       parameters:
         - $ref: "#/components/parameters/teamSlug"
       responses:
@@ -809,6 +1054,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/teamID"
       requestBody:
@@ -840,6 +1087,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/teamID"
       responses:
@@ -861,6 +1110,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/teamID"
       requestBody:
@@ -890,6 +1141,8 @@ paths:
       security:
         - Supabase1TokenAuth: []
           Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
       parameters:
         - $ref: "#/components/parameters/teamID"
         - $ref: "#/components/parameters/userId"
@@ -912,6 +1165,7 @@ paths:
       tags: [templates]
       security:
         - Supabase1TokenAuth: []
+        - AuthProviderBearerAuth: []
       responses:
         "200":
           description: Successfully returned default templates.
@@ -923,3 +1177,65 @@ paths:
           $ref: "#/components/responses/401"
         "500":
           $ref: "#/components/responses/500"
+
+  /templates/{templateID}/tags/groups:
+    get:
+      summary: List template tag groups
+      description: Returns ready template tag assignment groups with bounded per-tag history.
+      tags: [templates]
+      security:
+        - Supabase1TokenAuth: []
+          Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
+      parameters:
+        - $ref: "#/components/parameters/templateID"
+        - $ref: "#/components/parameters/tag_assignment_limit"
+      responses:
+        "200":
+          description: Successfully returned template tag groups.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TemplateTagGroupsResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "403":
+          $ref: "#/components/responses/403"
+        "404":
+          $ref: "#/components/responses/404"
+        "500":
+          $ref: "#/components/responses/500"
+
+  /templates/{templateID}/tags/exists:
+    get:
+      summary: Check ready template tag existence
+      description: Checks whether a template tag has at least one ready assignment.
+      tags: [templates]
+      security:
+        - Supabase1TokenAuth: []
+          Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
+      parameters:
+        - $ref: "#/components/parameters/templateID"
+        - $ref: "#/components/parameters/tag"
+      responses:
+        "200":
+          description: Successfully checked template tag existence.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TemplateTagExistsResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "403":
+          $ref: "#/components/responses/403"
+        "404":
+          $ref: "#/components/responses/404"
+        "500":
+          $ref: "#/components/responses/500"
diff --git a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
index 25adc1c1c..362545aaf 100644
--- a/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/(tabs)/builds/page.tsx
@@ -1,11 +1,16 @@
+'use client'
+
 import { AllBuildsHeader } from '@/features/dashboard/templates/builds/all-builds-header'
 import BuildsTable from '@/features/dashboard/templates/builds/table'
+import useFilters from '@/features/dashboard/templates/builds/use-filters'
 
 export default function TemplateBuildsPage() {
+  const { statuses, buildIdOrTemplate } = useFilters()
+
   return (
     <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
       <AllBuildsHeader />
-      <BuildsTable />
+      <BuildsTable filters={{ statuses, buildIdOrTemplate }} />
     </div>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
index d3743a337..4c24c5e69 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -1,15 +1,35 @@
+'use client'
+
+import { use, useCallback } from 'react'
+import type { ListedBuildModel } from '@/core/modules/builds/models'
 import BuildsTable from '@/features/dashboard/templates/builds/table'
 import { TemplateBuildsHeader } from '@/features/dashboard/templates/builds/template-builds-header'
+import useTemplateBuildsFilters from '@/features/dashboard/templates/builds/use-template-builds-filters'
 
-export default async function TemplateDetailBuildsPage({
+export default function TemplateDetailBuildsPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
-  const { templateId } = await params
+  const { templateId } = use(params)
+  const { statuses, q } = useTemplateBuildsFilters()
+
+  // Substring match on build ID over the already-loaded pages. The
+  // backend query stays scoped by templateID (authoritative).
+  const postFilter = useCallback(
+    (build: ListedBuildModel) => {
+      if (!q) return true
+      return build.id.toLowerCase().includes(q.toLowerCase())
+    },
+    [q]
+  )
 
   return (
     <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
       <TemplateBuildsHeader />
-      <BuildsTable templateId={templateId} />
+      <BuildsTable
+        filters={{ statuses, buildIdOrTemplate: templateId }}
+        postFilter={postFilter}
+        showTemplateColumn={false}
+      />
     </div>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
index 72459a9ff..8d64dc753 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
@@ -8,7 +8,7 @@ export default async function TemplateTagsPage({
   const { teamSlug, templateId } = await params
 
   return (
-    <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
+    <div className="h-full min-h-0 flex-1 py-6 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
       <Suspense fallback={<LoadingLayout />}>
         <TagsTable teamSlug={teamSlug} templateId={templateId} />
       </Suspense>
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index 62e6269b9..bed8849cc 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -1,3 +1,4 @@
+import type { components as DashboardComponents } from '@/contracts/dashboard-api'
 import type { components as InfraComponents } from '@/contracts/infra-api'
 
 export type Template = Pick<
@@ -25,3 +26,10 @@ export type DefaultTemplate = Template & {
 }
 
 export type TemplateTag = InfraComponents['schemas']['TemplateTag']
+
+export type TemplateTagAssignment =
+  DashboardComponents['schemas']['TemplateTagAssignment']
+export type TemplateTagGroup =
+  DashboardComponents['schemas']['TemplateTagGroup']
+export type TemplateTagExistsResult =
+  DashboardComponents['schemas']['TemplateTagExistsResponse']
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 2381803d5..811b27534 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -11,6 +11,8 @@ import type {
   DefaultTemplate,
   Template,
   TemplateTag,
+  TemplateTagExistsResult,
+  TemplateTagGroup,
 } from '@/core/modules/templates/models'
 import {
   type AuthUserEmailResolver,
@@ -36,7 +38,19 @@ export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
   getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
   getTags(templateId: string): Promise<RepoResult<{ tags: TemplateTag[] }>>
+  getTagGroups(
+    templateId: string,
+    options?: { assignmentLimit?: number }
+  ): Promise<RepoResult<{ tags: TemplateTagGroup[] }>>
+  checkTagExists(
+    templateId: string,
+    tag: string
+  ): Promise<RepoResult<TemplateTagExistsResult>>
   deleteTemplate(templateId: string): Promise<RepoResult<{ success: true }>>
+  deleteTags(
+    templateName: string,
+    tags: string[]
+  ): Promise<RepoResult<{ success: true }>>
   updateTemplateVisibility(
     templateId: string,
     isPublic: boolean
@@ -104,6 +118,77 @@ export function createTemplatesRepository(
 
       return ok({ tags: res.data ?? [] })
     },
+    async getTagGroups(templateId, options) {
+      if (USE_MOCK_DATA) {
+        return ok({ tags: [] })
+      }
+
+      const res = await deps.apiClient.GET(
+        '/templates/{templateID}/tags/groups',
+        {
+          params: {
+            path: {
+              templateID: templateId,
+            },
+            query: {
+              assignmentLimit: options?.assignmentLimit,
+            },
+          },
+          headers: {
+            ...deps.authHeaders(scope.accessToken, scope.teamId),
+          },
+        }
+      )
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template tag groups',
+            res.error
+          )
+        )
+      }
+
+      return ok({ tags: res.data?.tags ?? [] })
+    },
+    async checkTagExists(templateId, tag) {
+      if (USE_MOCK_DATA) {
+        return ok({ exists: false, normalizedTag: tag })
+      }
+
+      const res = await deps.apiClient.GET(
+        '/templates/{templateID}/tags/exists',
+        {
+          params: {
+            path: {
+              templateID: templateId,
+            },
+            query: {
+              tag,
+            },
+          },
+          headers: {
+            ...deps.authHeaders(scope.accessToken, scope.teamId),
+          },
+        }
+      )
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to check template tag existence',
+            res.error
+          )
+        )
+      }
+
+      return ok({
+        exists: res.data?.exists ?? false,
+        normalizedTag: res.data?.normalizedTag ?? tag,
+      })
+    },
     async getTeamTemplates() {
       if (USE_MOCK_DATA) {
         return ok({
@@ -138,6 +223,29 @@ export function createTemplatesRepository(
         ),
       })
     },
+    async deleteTags(templateName, tags) {
+      const res = await deps.infraClient.DELETE('/templates/tags', {
+        body: {
+          name: templateName,
+          tags,
+        },
+        headers: {
+          ...deps.authHeaders(scope.accessToken, scope.teamId),
+        },
+      })
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to delete template tags',
+            res.error
+          )
+        )
+      }
+
+      return ok({ success: true as const })
+    },
     async deleteTemplate(templateId) {
       const res = await deps.infraClient.DELETE('/templates/{templateID}', {
         params: {
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index ccbeebf80..e3687b767 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -66,6 +66,38 @@ export const templatesRouter = createTRPCRouter({
       return result.data
     }),
 
+  getTagGroups: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+        assignmentLimit: z.number().int().min(1).max(25).optional(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getTagGroups(
+        input.templateId,
+        { assignmentLimit: input.assignmentLimit }
+      )
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
+  checkTagExists: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+        tag: z.string().min(1),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.checkTagExists(
+        input.templateId,
+        input.tag
+      )
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
   getDefaultTemplatesCached: templatesRepositoryProcedure.query(
     async ({ ctx }) => {
       const result = await ctx.templatesRepository.getDefaultTemplatesCached()
@@ -124,4 +156,21 @@ export const templatesRouter = createTRPCRouter({
 
       return result.data
     }),
+
+  deleteTags: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+        templateName: z.string(),
+        tags: z.array(z.string()).min(1),
+      })
+    )
+    .mutation(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.deleteTags(
+        input.templateName,
+        input.tags
+      )
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
 })
diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index 6cf043667..04969ec09 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -4,871 +4,1168 @@
  */
 
 export interface paths {
-  '/health': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Health check */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Health check successful */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['HealthResponse']
-          }
-        }
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** List team builds */
-    get: {
-      parameters: {
-        query?: {
-          /** @description Optional filter by build identifier, template identifier, or template alias. */
-          build_id_or_template?: components['parameters']['build_id_or_template']
-          /** @description Comma-separated list of build statuses to include. */
-          statuses?: components['parameters']['build_statuses']
-          /** @description Maximum number of items to return per page. */
-          limit?: components['parameters']['builds_limit']
-          /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-          cursor?: components['parameters']['builds_cursor']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned paginated builds. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildsListResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds/statuses': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get build statuses */
-    get: {
-      parameters: {
-        query: {
-          /** @description Comma-separated list of build IDs to get statuses for. */
-          build_ids: components['parameters']['build_ids']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned build statuses */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildsStatusesResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds/{build_id}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get build details */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the build. */
-          build_id: components['parameters']['build_id']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned build details. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildInfo']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/sandboxes/{sandboxID}/record': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get sandbox record */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the sandbox. */
-          sandboxID: components['parameters']['sandboxID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned sandbox details. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['SandboxRecord']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List user teams
-     * @description Returns all teams the authenticated user belongs to, with limits and default flag.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned user teams. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['UserTeamsResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    /** Create team */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['CreateTeamRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully created team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/users/{userId}/bootstrap': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Bootstrap user */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the user. */
-          userId: components['parameters']['userId']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully bootstrapped user. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/resolve': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Resolve team identity
-     * @description Resolves a team slug to the team's identity, validating the user is a member.
-     */
-    get: {
-      parameters: {
-        query: {
-          /** @description Team slug to resolve. */
-          slug: components['parameters']['teamSlug']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully resolved team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/{teamID}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    /** Update team */
-    patch: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['UpdateTeamRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully updated team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['UpdateTeamResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    trace?: never
-  }
-  '/teams/{teamID}/members': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** List team members */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned team members. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamMembersResponse']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    /** Add team member */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['AddTeamMemberRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully added team member. */
-        201: {
-          headers: {
-            [name: string]: unknown
-          }
-          content?: never
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/{teamID}/members/{userId}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    post?: never
-    /** Remove team member */
-    delete: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-          /** @description Identifier of the user. */
-          userId: components['parameters']['userId']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully removed team member. */
-        204: {
-          headers: {
-            [name: string]: unknown
-          }
-          content?: never
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/defaults': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List default templates
-     * @description Returns the list of default templates with their latest build info and aliases.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned default templates. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['DefaultTemplatesResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
+    "/health": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Health check */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Health check successful */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["HealthResponse"];
+                    };
+                };
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** List team builds */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Optional filter by build identifier, template identifier, or template alias. */
+                    build_id_or_template?: components["parameters"]["build_id_or_template"];
+                    /** @description Comma-separated list of build statuses to include. */
+                    statuses?: components["parameters"]["build_statuses"];
+                    /** @description Maximum number of items to return per page. */
+                    limit?: components["parameters"]["builds_limit"];
+                    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+                    cursor?: components["parameters"]["builds_cursor"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned paginated builds. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildsListResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds/statuses": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get build statuses */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Comma-separated list of build IDs to get statuses for. */
+                    build_ids: components["parameters"]["build_ids"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned build statuses */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildsStatusesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds/{build_id}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get build details */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the build. */
+                    build_id: components["parameters"]["build_id"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned build details. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildInfo"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/sandboxes/{sandboxID}/record": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get sandbox record */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the sandbox. */
+                    sandboxID: components["parameters"]["sandboxID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned sandbox details. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SandboxRecord"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List user teams
+         * @description Returns all teams the authenticated user belongs to, with limits and default flag.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned user teams. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["UserTeamsResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        /** Create team */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["CreateTeamRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully created team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/users/{userId}/bootstrap": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Bootstrap user */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully bootstrapped user. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/resolve": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Resolve user profiles */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminAuthProviderProfilesResolveRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully resolved profiles. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/by-email": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Lookup user profiles by email */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminAuthProviderProfilesLookupEmailRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully found matching profiles. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/{userId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get user profile */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully found profile. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/resolve": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Resolve team identity
+         * @description Resolves a team slug to the team's identity, validating the user is a member.
+         */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Team slug to resolve. */
+                    slug: components["parameters"]["teamSlug"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully resolved team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/{teamID}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        /** Update team */
+        patch: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["UpdateTeamRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully updated team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["UpdateTeamResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        trace?: never;
+    };
+    "/teams/{teamID}/members": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** List team members */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned team members. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamMembersResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        /** Add team member */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AddTeamMemberRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully added team member. */
+                201: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content?: never;
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/{teamID}/members/{userId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        post?: never;
+        /** Remove team member */
+        delete: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully removed team member. */
+                204: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content?: never;
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/defaults": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List default templates
+         * @description Returns the list of default templates with their latest build info and aliases.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned default templates. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["DefaultTemplatesResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/groups": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List template tag groups
+         * @description Returns ready template tag assignment groups with bounded per-tag history.
+         */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Maximum number of ready assignment rows to return per tag. */
+                    assignmentLimit?: components["parameters"]["tag_assignment_limit"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned template tag groups. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagGroupsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/exists": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Check ready template tag existence
+         * @description Checks whether a template tag has at least one ready assignment.
+         */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Template tag name to check. */
+                    tag: components["parameters"]["tag"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully checked template tag existence. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagExistsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
 }
-export type webhooks = Record<string, never>
+export type webhooks = Record<string, never>;
 export interface components {
-  schemas: {
-    Error: {
-      /**
-       * Format: int32
-       * @description Error code.
-       */
-      code: number
-      /** @description Error message. */
-      message: string
-    }
-    /**
-     * @description Build status mapped for dashboard clients.
-     * @enum {string}
-     */
-    BuildStatus: 'building' | 'failed' | 'success'
-    ListedBuild: {
-      /**
-       * Format: uuid
-       * @description Identifier of the build.
-       */
-      id: string
-      /** @description Template alias when present, otherwise template ID. */
-      template: string
-      /** @description Identifier of the template. */
-      templateId: string
-      status: components['schemas']['BuildStatus']
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-      /**
-       * Format: date-time
-       * @description Build creation timestamp in RFC3339 format.
-       */
-      createdAt: string
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-    }
-    BuildsListResponse: {
-      data: components['schemas']['ListedBuild'][]
-      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-      nextCursor: string | null
-    }
-    BuildStatusItem: {
-      /**
-       * Format: uuid
-       * @description Identifier of the build.
-       */
-      id: string
-      status: components['schemas']['BuildStatus']
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-    }
-    BuildsStatusesResponse: {
-      /** @description List of build statuses */
-      buildStatuses: components['schemas']['BuildStatusItem'][]
-    }
-    BuildInfo: {
-      /** @description Template names related to this build, if available. */
-      names?: string[] | null
-      /**
-       * Format: date-time
-       * @description Build creation timestamp in RFC3339 format.
-       */
-      createdAt: string
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-      status: components['schemas']['BuildStatus']
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-    }
-    /**
-     * Format: int64
-     * @description CPU cores for the sandbox
-     */
-    CPUCount: number
-    /**
-     * Format: int64
-     * @description Memory for the sandbox in MiB
-     */
-    MemoryMB: number
-    /**
-     * Format: int64
-     * @description Disk size for the sandbox in MiB
-     */
-    DiskSizeMB: number
-    SandboxRecord: {
-      /** @description Identifier of the template from which is the sandbox created */
-      templateID: string
-      /** @description Alias of the template */
-      alias?: string
-      /** @description Identifier of the sandbox */
-      sandboxID: string
-      /**
-       * Format: date-time
-       * @description Time when the sandbox was started
-       */
-      startedAt: string
-      /**
-       * Format: date-time
-       * @description Time when the sandbox was stopped
-       */
-      stoppedAt?: string | null
-      /** @description Base domain where the sandbox traffic is accessible */
-      domain?: string | null
-      cpuCount: components['schemas']['CPUCount']
-      memoryMB: components['schemas']['MemoryMB']
-      diskSizeMB: components['schemas']['DiskSizeMB']
-    }
-    HealthResponse: {
-      /** @description Human-readable health check result. */
-      message: string
-    }
-    UserTeamLimits: {
-      /** Format: int64 */
-      maxLengthHours: number
-      /** Format: int32 */
-      concurrentSandboxes: number
-      /** Format: int32 */
-      concurrentTemplateBuilds: number
-      /** Format: int32 */
-      maxVcpu: number
-      /** Format: int32 */
-      maxRamMb: number
-      /** Format: int32 */
-      diskMb: number
-    }
-    UserTeam: {
-      /** Format: uuid */
-      id: string
-      name: string
-      slug: string
-      tier: string
-      email: string
-      profilePictureUrl: string | null
-      isBlocked: boolean
-      isBanned: boolean
-      blockedReason: string | null
-      isDefault: boolean
-      limits: components['schemas']['UserTeamLimits']
-      /** Format: date-time */
-      createdAt: string
-    }
-    UserTeamsResponse: {
-      teams: components['schemas']['UserTeam'][]
-    }
-    TeamMember: {
-      /** Format: uuid */
-      id: string
-      email: string
-      isDefault: boolean
-      /** Format: uuid */
-      addedBy?: string | null
-      /** Format: date-time */
-      createdAt: string | null
-    }
-    TeamMembersResponse: {
-      members: components['schemas']['TeamMember'][]
-    }
-    UpdateTeamRequest: {
-      name?: string
-      profilePictureUrl?: string | null
-    }
-    UpdateTeamResponse: {
-      /** Format: uuid */
-      id: string
-      name: string
-      profilePictureUrl?: string | null
-    }
-    AddTeamMemberRequest: {
-      /** Format: email */
-      email: string
-    }
-    CreateTeamRequest: {
-      name: string
-    }
-    DefaultTemplateAlias: {
-      alias: string
-      namespace?: string | null
-    }
-    DefaultTemplate: {
-      id: string
-      aliases: components['schemas']['DefaultTemplateAlias'][]
-      /** Format: uuid */
-      buildId: string
-      /** Format: int64 */
-      ramMb: number
-      /** Format: int64 */
-      vcpu: number
-      /** Format: int64 */
-      totalDiskSizeMb: number | null
-      envdVersion?: string | null
-      /** Format: date-time */
-      createdAt: string
-      public: boolean
-      /** Format: int32 */
-      buildCount: number
-      /** Format: int64 */
-      spawnCount: number
-    }
-    DefaultTemplatesResponse: {
-      templates: components['schemas']['DefaultTemplate'][]
-    }
-    TeamResolveResponse: {
-      /** Format: uuid */
-      id: string
-      slug: string
-    }
-  }
-  responses: {
-    /** @description Bad request */
-    400: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Authentication error */
-    401: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Forbidden */
-    403: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Not found */
-    404: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Server error */
-    500: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-  }
-  parameters: {
-    /** @description Identifier of the build. */
-    build_id: string
-    /** @description Identifier of the sandbox. */
-    sandboxID: string
-    /** @description Maximum number of items to return per page. */
-    builds_limit: number
-    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-    builds_cursor: string
-    /** @description Optional filter by build identifier, template identifier, or template alias. */
-    build_id_or_template: string
-    /** @description Comma-separated list of build statuses to include. */
-    build_statuses: components['schemas']['BuildStatus'][]
-    /** @description Comma-separated list of build IDs to get statuses for. */
-    build_ids: string[]
-    /** @description Identifier of the team. */
-    teamID: string
-    /** @description Identifier of the user. */
-    userId: string
-    /** @description Team slug to resolve. */
-    teamSlug: string
-  }
-  requestBodies: never
-  headers: never
-  pathItems: never
+    schemas: {
+        Error: {
+            /**
+             * Format: int32
+             * @description Error code.
+             */
+            code: number;
+            /** @description Error message. */
+            message: string;
+        };
+        AdminAuthProviderProfile: {
+            /**
+             * Format: uuid
+             * @description Internal E2B user identifier.
+             */
+            userId: string;
+            /** @description Email address from the configured auth provider. */
+            email: string | null;
+        };
+        AdminAuthProviderProfilesResponse: {
+            profiles: components["schemas"]["AdminAuthProviderProfile"][];
+        };
+        AdminAuthProviderProfilesResolveRequest: {
+            userIds: string[];
+        };
+        AdminAuthProviderProfilesLookupEmailRequest: {
+            /** Format: email */
+            email: string;
+        };
+        /**
+         * @description Build status mapped for dashboard clients.
+         * @enum {string}
+         */
+        BuildStatus: "building" | "failed" | "success";
+        ListedBuild: {
+            /**
+             * Format: uuid
+             * @description Identifier of the build.
+             */
+            id: string;
+            /** @description Template alias when present, otherwise template ID. */
+            template: string;
+            /** @description Identifier of the template. */
+            templateId: string;
+            status: components["schemas"]["BuildStatus"];
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+            /**
+             * Format: date-time
+             * @description Build creation timestamp in RFC3339 format.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+        };
+        BuildsListResponse: {
+            data: components["schemas"]["ListedBuild"][];
+            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
+        BuildStatusItem: {
+            /**
+             * Format: uuid
+             * @description Identifier of the build.
+             */
+            id: string;
+            status: components["schemas"]["BuildStatus"];
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+        };
+        BuildsStatusesResponse: {
+            /** @description List of build statuses */
+            buildStatuses: components["schemas"]["BuildStatusItem"][];
+        };
+        BuildInfo: {
+            /** @description Template names related to this build, if available. */
+            names?: string[] | null;
+            /**
+             * Format: date-time
+             * @description Build creation timestamp in RFC3339 format.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+            status: components["schemas"]["BuildStatus"];
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+        };
+        /**
+         * Format: int64
+         * @description CPU cores for the sandbox
+         */
+        CPUCount: number;
+        /**
+         * Format: int64
+         * @description Memory for the sandbox in MiB
+         */
+        MemoryMB: number;
+        /**
+         * Format: int64
+         * @description Disk size for the sandbox in MiB
+         */
+        DiskSizeMB: number;
+        SandboxRecord: {
+            /** @description Identifier of the template from which is the sandbox created */
+            templateID: string;
+            /** @description Alias of the template */
+            alias?: string;
+            /** @description Identifier of the sandbox */
+            sandboxID: string;
+            /**
+             * Format: date-time
+             * @description Time when the sandbox was started
+             */
+            startedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the sandbox was stopped
+             */
+            stoppedAt?: string | null;
+            /** @description Base domain where the sandbox traffic is accessible */
+            domain?: string | null;
+            cpuCount: components["schemas"]["CPUCount"];
+            memoryMB: components["schemas"]["MemoryMB"];
+            diskSizeMB: components["schemas"]["DiskSizeMB"];
+        };
+        HealthResponse: {
+            /** @description Human-readable health check result. */
+            message: string;
+        };
+        UserTeamLimits: {
+            /** Format: int64 */
+            maxLengthHours: number;
+            /** Format: int32 */
+            concurrentSandboxes: number;
+            /** Format: int32 */
+            concurrentTemplateBuilds: number;
+            /** Format: int32 */
+            maxVcpu: number;
+            /** Format: int32 */
+            maxRamMb: number;
+            /** Format: int32 */
+            diskMb: number;
+        };
+        UserTeam: {
+            /** Format: uuid */
+            id: string;
+            name: string;
+            slug: string;
+            tier: string;
+            email: string;
+            profilePictureUrl: string | null;
+            isBlocked: boolean;
+            isBanned: boolean;
+            blockedReason: string | null;
+            isDefault: boolean;
+            limits: components["schemas"]["UserTeamLimits"];
+            /** Format: date-time */
+            createdAt: string;
+        };
+        UserTeamsResponse: {
+            teams: components["schemas"]["UserTeam"][];
+        };
+        TeamMember: {
+            /** Format: uuid */
+            id: string;
+            email: string;
+            isDefault: boolean;
+            /** Format: uuid */
+            addedBy?: string | null;
+            /** Format: date-time */
+            createdAt: string | null;
+        };
+        TeamMembersResponse: {
+            members: components["schemas"]["TeamMember"][];
+        };
+        UpdateTeamRequest: {
+            name?: string;
+            profilePictureUrl?: string | null;
+        };
+        UpdateTeamResponse: {
+            /** Format: uuid */
+            id: string;
+            name: string;
+            profilePictureUrl?: string | null;
+        };
+        AddTeamMemberRequest: {
+            /** Format: email */
+            email: string;
+        };
+        CreateTeamRequest: {
+            name: string;
+        };
+        DefaultTemplateAlias: {
+            alias: string;
+            namespace?: string | null;
+        };
+        DefaultTemplate: {
+            id: string;
+            aliases: components["schemas"]["DefaultTemplateAlias"][];
+            /** Format: uuid */
+            buildId: string;
+            /** Format: int64 */
+            ramMb: number;
+            /** Format: int64 */
+            vcpu: number;
+            /** Format: int64 */
+            totalDiskSizeMb: number | null;
+            envdVersion?: string | null;
+            /** Format: date-time */
+            createdAt: string;
+            public: boolean;
+            /** Format: int32 */
+            buildCount: number;
+            /** Format: int64 */
+            spawnCount: number;
+        };
+        DefaultTemplatesResponse: {
+            templates: components["schemas"]["DefaultTemplate"][];
+        };
+        TemplateTagAssignment: {
+            /**
+             * Format: uuid
+             * @description Identifier of the tag assignment event.
+             */
+            assignmentId: string;
+            /**
+             * Format: uuid
+             * @description Identifier of the assigned build.
+             */
+            buildId: string;
+            /**
+             * Format: date-time
+             * @description Time when the tag was assigned to the build.
+             */
+            assignedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the assigned build was created.
+             */
+            buildCreatedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the assigned build finished.
+             */
+            buildFinishedAt: string | null;
+        };
+        TemplateTagGroup: {
+            /** @description Template tag name. */
+            tag: string;
+            /** @description Ready assignment events for this tag, sorted latest first. */
+            assignments: components["schemas"]["TemplateTagAssignment"][];
+            /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
+            hasMore: boolean;
+        };
+        TemplateTagGroupsResponse: {
+            tags: components["schemas"]["TemplateTagGroup"][];
+        };
+        TemplateTagExistsResponse: {
+            /** @description Whether the template tag has at least one ready assignment. */
+            exists: boolean;
+            /** @description Normalized template tag name. */
+            normalizedTag: string;
+        };
+        TeamResolveResponse: {
+            /** Format: uuid */
+            id: string;
+            slug: string;
+        };
+    };
+    responses: {
+        /** @description Bad request */
+        400: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Authentication error */
+        401: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Forbidden */
+        403: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Not found */
+        404: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Server error */
+        500: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+    };
+    parameters: {
+        /** @description Identifier of the build. */
+        build_id: string;
+        /** @description Identifier of the sandbox. */
+        sandboxID: string;
+        /** @description Maximum number of items to return per page. */
+        builds_limit: number;
+        /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+        builds_cursor: string;
+        /** @description Optional filter by build identifier, template identifier, or template alias. */
+        build_id_or_template: string;
+        /** @description Comma-separated list of build statuses to include. */
+        build_statuses: components["schemas"]["BuildStatus"][];
+        /** @description Comma-separated list of build IDs to get statuses for. */
+        build_ids: string[];
+        /** @description Identifier of the team. */
+        teamID: string;
+        /** @description Identifier of the user. */
+        userId: string;
+        /** @description Team slug to resolve. */
+        teamSlug: string;
+        /** @description Identifier of the template. */
+        templateID: string;
+        /** @description Template tag name to check. */
+        tag: string;
+        /** @description Maximum number of ready assignment rows to return per tag. */
+        tag_assignment_limit: number;
+    };
+    requestBodies: never;
+    headers: never;
+    pathItems: never;
 }
-export type $defs = Record<string, never>
-export type operations = Record<string, never>
+export type $defs = Record<string, never>;
+export type operations = Record<string, never>;
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index bc9663fea..2e208491f 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -10,6 +10,7 @@ import { useRouter } from 'next/navigation'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type {
+  BuildStatus,
   ListedBuildModel,
   RunningBuildStatusModel,
 } from '@/core/modules/builds/models'
@@ -37,8 +38,6 @@ import {
   Status,
   Template,
 } from './table-cells'
-import useFilters from './use-filters'
-import useTemplateBuildsFilters from './use-template-builds-filters'
 
 const BUILDS_REFETCH_INTERVAL_MS = 15_000
 const RUNNING_BUILD_POLL_INTERVAL_MS = 3_000
@@ -53,11 +52,22 @@ const COLUMN_WIDTHS = {
 } as const
 
 interface BuildsTableProps {
-  // When set, scopes the backend query to this template and enables 'q' as a client-side build-ID filter.
-  templateId?: string
+  // Pre-resolved filter values; the table is hook-source agnostic.
+  filters: {
+    statuses: BuildStatus[]
+    buildIdOrTemplate?: string
+  }
+  // Optional client-side row filter applied after fetch + live-status merge.
+  postFilter?: (build: ListedBuildModel) => boolean
+  // Whether to render the Template column. Default true.
+  showTemplateColumn?: boolean
 }
 
-const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
+const BuildsTable = ({
+  filters,
+  postFilter,
+  showTemplateColumn = true,
+}: BuildsTableProps) => {
   const trpc = useTRPC()
   const queryClient = useQueryClient()
   const router = useRouter()
@@ -65,18 +75,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
 
   const { teamSlug } = useRouteParams<'/dashboard/[teamSlug]/templates'>()
 
-  const isTemplateScoped = templateId !== undefined
-
-  // Hook order must stay stable; templateId only changes on route navigation (component unmount).
-  const sharedFilters = useFilters()
-  const scopedFilters = useTemplateBuildsFilters()
-
-  const statuses = isTemplateScoped
-    ? scopedFilters.statuses
-    : sharedFilters.statuses
-  const buildIdOrTemplate = isTemplateScoped
-    ? templateId
-    : sharedFilters.buildIdOrTemplate
+  const { statuses, buildIdOrTemplate } = filters
   const { isFilterRefetching, clearFilterRefetching } = useFilterChangeTracking(
     statuses,
     buildIdOrTemplate
@@ -146,15 +145,13 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
     [builds, runningStatusesData]
   )
 
-  // 'q' is a client-side narrow over the templateID-scoped backend result.
+  // Optional client-side row filter from the caller. The backend query
+  // is the source of truth for which builds belong to this table; the
+  // postFilter only narrows the already-loaded pages.
   const visibleBuilds = useMemo(() => {
-    if (!isTemplateScoped) return buildsWithLiveStatus
-    const query = scopedFilters.q?.trim().toLowerCase()
-    if (!query) return buildsWithLiveStatus
-    return buildsWithLiveStatus.filter((b) =>
-      b.id.toLowerCase().includes(query)
-    )
-  }, [buildsWithLiveStatus, isTemplateScoped, scopedFilters.q])
+    if (!postFilter) return buildsWithLiveStatus
+    return buildsWithLiveStatus.filter(postFilter)
+  }, [buildsWithLiveStatus, postFilter])
 
   const buildsQueryKey = trpc.builds.list.infiniteQueryOptions({
     teamSlug,
@@ -178,7 +175,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
   const showEmpty = !isInitialLoad && !isFetchingBuilds && !hasData
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
 
-  const visibleColumnCount = isTemplateScoped ? 5 : 6
+  const visibleColumnCount = showTemplateColumn ? 6 : 5
 
   return (
     <div className="flex h-full min-h-0 flex-col overflow-hidden relative">
@@ -189,7 +186,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
         <Table suppressHydrationWarning>
           <colgroup>
             <col style={colStyle(COLUMN_WIDTHS.status)} />
-            {!isTemplateScoped && (
+            {showTemplateColumn && (
               <col style={colStyle(COLUMN_WIDTHS.template)} />
             )}
             <col style={colStyle(COLUMN_WIDTHS.started)} />
@@ -201,7 +198,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
           <TableHeader className="sticky top-0 z-10 bg-bg">
             <TableRow>
               <TableHead>Status</TableHead>
-              {!isTemplateScoped && <TableHead>Template</TableHead>}
+              {showTemplateColumn && <TableHead>Template</TableHead>}
               <TableHead>
                 <span className="inline-flex items-center gap-1 text-fg">
                   Started
@@ -278,7 +275,7 @@ const BuildsTable = ({ templateId }: BuildsTableProps = {}) => {
                       >
                         <Status status={build.status} />
                       </TableCell>
-                      {!isTemplateScoped && (
+                      {showTemplateColumn && (
                         <TableCell
                           className="py-1.5 overflow-hidden"
                           style={{ maxWidth: COLUMN_WIDTHS.template }}
diff --git a/src/features/dashboard/templates/tags/build-link.tsx b/src/features/dashboard/templates/tags/build-link.tsx
new file mode 100644
index 000000000..54ff07dbc
--- /dev/null
+++ b/src/features/dashboard/templates/tags/build-link.tsx
@@ -0,0 +1,68 @@
+'use client'
+
+import Link from 'next/link'
+import { useMemo } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { formatRelativeAgo } from '@/lib/utils/formatting'
+import { cn } from '@/lib/utils/ui'
+
+const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+
+interface BuildLinkProps {
+  teamSlug: string
+  templateId: string
+  buildId: string
+  assignedAt: string
+}
+
+export function BuildLink({
+  teamSlug,
+  templateId,
+  buildId,
+  assignedAt,
+}: BuildLinkProps) {
+  const shortId = useMemo(() => {
+    if (buildId === NULL_BUILD_ID) return '--'
+    if (buildId.length <= 12) return buildId
+    return `${buildId.slice(0, 5)}...${buildId.slice(-5)}`
+  }, [buildId])
+
+  const relative = useMemo(() => {
+    const d = new Date(assignedAt)
+    return Number.isNaN(d.getTime()) ? '' : formatRelativeAgo(d)
+  }, [assignedAt])
+
+  const isLinkable = buildId !== NULL_BUILD_ID
+
+  const inner = (
+    <span
+      className={cn(
+        'font-mono prose-body-numeric',
+        isLinkable &&
+          'underline underline-offset-2 decoration-fg-tertiary group-hover/build:decoration-fg'
+      )}
+    >
+      {shortId}
+    </span>
+  )
+
+  return (
+    <div className="flex items-center gap-2 min-w-0">
+      {isLinkable ? (
+        <Link
+          href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
+          className="group/build text-fg hover:text-fg"
+        >
+          {inner}
+        </Link>
+      ) : (
+        <span className="text-fg-tertiary">{inner}</span>
+      )}
+      {relative && (
+        <span className="text-fg-tertiary prose-body whitespace-nowrap">
+          · {relative}
+        </span>
+      )}
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
new file mode 100644
index 000000000..70bfac79c
--- /dev/null
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -0,0 +1,113 @@
+'use client'
+
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import {
+  defaultErrorToast,
+  defaultSuccessToast,
+  useToast,
+} from '@/lib/hooks/use-toast'
+import { useTRPC } from '@/trpc/client'
+import { AlertDialog } from '@/ui/alert-dialog'
+import { WarningIcon } from '@/ui/primitives/icons'
+import { Loader } from '@/ui/primitives/loader'
+
+interface TagDeleteDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  tag: string
+  teamSlug: string
+  templateId: string
+  templateName: string
+}
+
+export default function TagDeleteDialog({
+  open,
+  onOpenChange,
+  tag,
+  teamSlug,
+  templateId,
+  templateName,
+}: TagDeleteDialogProps) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+  const { toast } = useToast()
+
+  const tagsQueryKey = trpc.templates.getTagGroups.queryKey({
+    teamSlug,
+    templateId,
+  })
+
+  const deleteTags = useMutation(
+    trpc.templates.deleteTags.mutationOptions({
+      onSuccess: async (_, variables) => {
+        const deletedTag = variables.tags[0] ?? tag
+        toast(
+          defaultSuccessToast(
+            <>
+              Tag <span className="prose-body-highlight">{deletedTag}</span> has
+              been deleted.
+            </>
+          )
+        )
+
+        await queryClient.cancelQueries({ queryKey: tagsQueryKey })
+
+        queryClient.setQueryData(tagsQueryKey, (old) => {
+          if (!old?.tags) return old
+          const removed = new Set(variables.tags)
+          return {
+            ...old,
+            tags: old.tags.filter((t) => !removed.has(t.tag)),
+          }
+        })
+      },
+      onError: (error) => {
+        toast(
+          defaultErrorToast(error.message || `Failed to delete tag ${tag}.`)
+        )
+      },
+      onSettled: () => {
+        onOpenChange(false)
+        queryClient.invalidateQueries({ queryKey: tagsQueryKey })
+      },
+    })
+  )
+
+  const isDeleting = deleteTags.isPending
+
+  return (
+    <AlertDialog
+      open={open}
+      onOpenChange={onOpenChange}
+      title={
+        <span className="flex items-center gap-2 text-accent-error-highlight">
+          <WarningIcon className="size-4" />
+          <span>{`Delete '${tag}' tag?`}</span>
+        </span>
+      }
+      description="Any associated history will be also deleted. This action is irreversible."
+      confirm={
+        isDeleting ? (
+          <>
+            <Loader variant="slash" />
+            <span>Deleting...</span>
+          </>
+        ) : (
+          'Delete'
+        )
+      }
+      confirmProps={{
+        variant: 'error',
+        disabled: isDeleting,
+      }}
+      onConfirm={() => {
+        deleteTags.mutate({
+          teamSlug,
+          templateId,
+          templateName,
+          tags: [tag],
+        })
+      }}
+    />
+  )
+}
diff --git a/src/features/dashboard/templates/tags/group.ts b/src/features/dashboard/templates/tags/group.ts
new file mode 100644
index 000000000..7b0eb8928
--- /dev/null
+++ b/src/features/dashboard/templates/tags/group.ts
@@ -0,0 +1,41 @@
+import type {
+  TemplateTag,
+  TemplateTagAssignment,
+} from '@/core/modules/templates/models'
+import type { TagGroup } from './types'
+
+export function groupTagsByName(tags: TemplateTag[]): TagGroup[] {
+  const byTag = new Map<string, TemplateTagAssignment[]>()
+
+  for (const tag of tags) {
+    const assignments = byTag.get(tag.tag) ?? []
+    assignments.push(templateTagToAssignment(tag))
+    byTag.set(tag.tag, assignments)
+  }
+
+  const groups: TagGroup[] = []
+  for (const [tag, assignments] of byTag.entries()) {
+    assignments.sort((a, b) => b.assignedAt.localeCompare(a.assignedAt))
+    const primaryAssignment = assignments[0]
+    if (!primaryAssignment) continue
+    groups.push({ tag, primaryAssignment, assignments, hasMore: false })
+  }
+
+  groups.sort((a, b) =>
+    b.primaryAssignment.assignedAt.localeCompare(a.primaryAssignment.assignedAt)
+  )
+
+  return groups
+}
+
+export const injectDevDebugBuilds = (groups: TagGroup[]) => groups
+
+function templateTagToAssignment(tag: TemplateTag): TemplateTagAssignment {
+  return {
+    assignmentId: tag.buildID,
+    buildId: tag.buildID,
+    assignedAt: tag.createdAt,
+    buildCreatedAt: tag.createdAt,
+    buildFinishedAt: null,
+  }
+}
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index b3c51911b..2106eacb8 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -1,36 +1,57 @@
 'use client'
 
-import { SearchIcon } from '@/ui/primitives/icons'
-import { Input } from '@/ui/primitives/input'
+import type { Table } from '@tanstack/react-table'
+import { useCallback } from 'react'
+import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
+import { Button } from '@/ui/primitives/button'
+import { AddIcon, SearchIcon } from '@/ui/primitives/icons'
+import { DebouncedInput } from '@/ui/primitives/input'
+import { useTagTableStore } from './stores/table-store'
+import type { TagGroup } from './types'
 
 interface TagsHeaderProps {
-  search: string
-  onSearchChange: (value: string) => void
-  totalCount: number
-  visibleCount: number
+  table: Table<TagGroup>
 }
 
-export default function TagsHeader({
-  search,
-  onSearchChange,
-  totalCount,
-  visibleCount,
-}: TagsHeaderProps) {
-  const isFiltered = search.trim().length > 0
+export default function TagsHeader({ table }: TagsHeaderProps) {
+  'use no memo'
+
+  const { toast } = useToast()
+  const globalFilter = useTagTableStore((s) => s.globalFilter)
+  const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
+
+  const totalCount = table.options.data.length
+  const visibleCount = table.getFilteredRowModel().rows.length
+  const isFiltered = globalFilter.trim().length > 0
+
+  const handleSearchChange = useCallback(
+    (value: string | number) => {
+      setGlobalFilter(String(value))
+    },
+    [setGlobalFilter]
+  )
+
+  const handleAssignClick = () => {
+    toast(defaultErrorToast('Assign new tag: not implemented yet'))
+  }
 
   return (
     <div className="flex flex-col gap-3">
-      {/* Toolbar row. v1 omits the "Assign new tag" CTA on the right. */}
-      <div className="flex items-center gap-2">
+      <div className="flex items-center gap-2 justify-between">
         <div className="relative w-full max-w-70">
           <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
-          <Input
+          <DebouncedInput
             placeholder="Search by name"
             className="pl-[30px]"
-            value={search}
-            onChange={(e) => onSearchChange(e.target.value)}
+            value={globalFilter}
+            onChange={handleSearchChange}
+            debounce={300}
           />
         </div>
+        <Button variant="primary" onClick={handleAssignClick}>
+          <AddIcon />
+          Assign new tag
+        </Button>
       </div>
 
       <div className="flex items-center justify-between gap-4">
diff --git a/src/features/dashboard/templates/tags/sortable-header.tsx b/src/features/dashboard/templates/tags/sortable-header.tsx
deleted file mode 100644
index 4c18b16a5..000000000
--- a/src/features/dashboard/templates/tags/sortable-header.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-'use client'
-
-import { cn } from '@/lib/utils/ui'
-import { SortAscIcon, SortDescIcon } from '@/ui/primitives/icons'
-
-export type SortKey = 'tag' | 'createdAt'
-export type SortDir = 'asc' | 'desc'
-
-interface SortableHeaderProps {
-  label: string
-  sortKey: SortKey
-  activeKey: SortKey
-  dir: SortDir
-  // Direction previewed on hover when this column is inactive.
-  defaultDir: SortDir
-  onChange: (key: SortKey) => void
-}
-
-export function SortableHeader({
-  label,
-  sortKey,
-  activeKey,
-  dir,
-  defaultDir,
-  onChange,
-}: SortableHeaderProps) {
-  const isActive = activeKey === sortKey
-  const visibleDir = isActive ? dir : defaultDir
-  const Icon = visibleDir === 'desc' ? SortDescIcon : SortAscIcon
-
-  return (
-    <button
-      type="button"
-      onClick={() => onChange(sortKey)}
-      className={cn(
-        'group/sort flex h-8 items-center gap-1 font-mono uppercase whitespace-nowrap',
-        'cursor-pointer focus-visible:outline-none transition-colors',
-        isActive
-          ? 'prose-label-highlight text-fg'
-          : 'prose-label text-fg-tertiary hover:text-fg-secondary'
-      )}
-    >
-      {label}
-      <span
-        className={cn(
-          'size-5 min-w-5 flex items-center justify-center',
-          !isActive && 'opacity-0 group-hover/sort:opacity-100'
-        )}
-        aria-hidden="true"
-      >
-        <Icon className="size-3" />
-      </span>
-    </button>
-  )
-}
diff --git a/src/features/dashboard/templates/tags/stores/table-store.ts b/src/features/dashboard/templates/tags/stores/table-store.ts
new file mode 100644
index 000000000..48ab7fd3e
--- /dev/null
+++ b/src/features/dashboard/templates/tags/stores/table-store.ts
@@ -0,0 +1,76 @@
+import type {
+  ExpandedState,
+  OnChangeFn,
+  SortingState,
+} from '@tanstack/react-table'
+import { create } from 'zustand'
+import { createJSONStorage, persist } from 'zustand/middleware'
+import { createHashStorage } from '@/lib/utils/store'
+import { trackTagTableInteraction } from '../table-config'
+
+interface TagTableState {
+  sorting: SortingState
+  globalFilter: string
+  expanded: ExpandedState
+}
+
+interface TagTableActions {
+  setSorting: OnChangeFn<SortingState>
+  setGlobalFilter: OnChangeFn<string>
+  setExpanded: OnChangeFn<ExpandedState>
+  resetFilters: () => void
+}
+
+type Store = TagTableState & TagTableActions
+
+const initialState: TagTableState = {
+  sorting: [{ id: 'assignedAt', desc: true }],
+  globalFilter: '',
+  expanded: {},
+}
+
+export const useTagTableStore = create<Store>()(
+  persist(
+    (set, get) => ({
+      ...initialState,
+
+      setSorting: (sorting) => {
+        const next =
+          typeof sorting === 'function' ? sorting(get().sorting) : sorting
+        set({ sorting: next })
+        trackTagTableInteraction('sorted', { column_count: next.length })
+      },
+
+      setGlobalFilter: (globalFilter) => {
+        const next =
+          typeof globalFilter === 'function'
+            ? globalFilter(get().globalFilter)
+            : globalFilter
+        if (next !== get().globalFilter) {
+          trackTagTableInteraction('searched', {
+            has_query: Boolean(next),
+            query: next,
+          })
+        }
+        set({ globalFilter: next })
+      },
+
+      setExpanded: (expanded) => {
+        const next =
+          typeof expanded === 'function' ? expanded(get().expanded) : expanded
+        set({ expanded: next })
+      },
+
+      resetFilters: () => {
+        set({ globalFilter: '' })
+        trackTagTableInteraction('reset filters')
+      },
+    }),
+    {
+      name: 'tags-table',
+      storage: createJSONStorage(() => createHashStorage(initialState)),
+      // `expanded` is transient UI state — don't pollute the URL with it.
+      partialize: ({ sorting, globalFilter }) => ({ sorting, globalFilter }),
+    }
+  )
+)
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index df81852dd..db3bfc76f 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -1,84 +1,165 @@
 'use client'
 
-import { formatDistanceToNowStrict } from 'date-fns'
-import Link from 'next/link'
-import { useMemo } from 'react'
-import { PROTECTED_URLS } from '@/configs/urls'
+import type { CellContext } from '@tanstack/react-table'
+import { useState } from 'react'
+import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
 import { cn } from '@/lib/utils/ui'
 import { Badge } from '@/ui/primitives/badge'
+import { Button } from '@/ui/primitives/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/ui/primitives/dropdown-menu'
+import { IconButton } from '@/ui/primitives/icon-button'
+import {
+  ArrowUpIcon,
+  MoreActionsIcon,
+  TrashIcon,
+  UndoIcon,
+} from '@/ui/primitives/icons'
+import { BuildLink } from './build-link'
+import TagDeleteDialog from './delete-dialog'
+import type { TagGroup } from './types'
 
-interface TagPillCellProps {
-  tag: string
+const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
+
+export interface TagTableMeta {
+  teamSlug: string
+  templateId: string
+  templateName: string
+}
+
+function getMeta(ctx: CellContext<TagGroup, unknown>): TagTableMeta {
+  return ctx.table.options.meta as TagTableMeta
 }
 
-export function TagPillCell({ tag }: TagPillCellProps) {
+export function TagPillCell({ row }: CellContext<TagGroup, unknown>) {
   return (
-    <Badge variant="default" size="sm" className="uppercase bg-fill">
-      {tag}
+    <Badge
+      variant="default"
+      size="sm"
+      className="uppercase bg-fill pointer-events-none"
+    >
+      {row.original.tag}
     </Badge>
   )
 }
 
-interface BuildLinkCellProps {
-  teamSlug: string
-  templateId: string
-  buildId: string
-  createdAt: string
+export function BuildLinkCell(ctx: CellContext<TagGroup, unknown>) {
+  const { teamSlug, templateId } = getMeta(ctx)
+  const { primaryAssignment } = ctx.row.original
+  return (
+    <BuildLink
+      teamSlug={teamSlug}
+      templateId={templateId}
+      buildId={primaryAssignment.buildId}
+      assignedAt={primaryAssignment.assignedAt}
+    />
+  )
 }
 
-const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
-
-export function BuildLinkCell({
-  teamSlug,
-  templateId,
-  buildId,
-  createdAt,
-}: BuildLinkCellProps) {
-  const shortId = useMemo(() => {
-    if (buildId === NULL_BUILD_ID) return '--'
-    if (buildId.length <= 12) return buildId
-    return `${buildId.slice(0, 5)}...${buildId.slice(-5)}`
-  }, [buildId])
-
-  const relative = useMemo(() => {
-    try {
-      return `${formatDistanceToNowStrict(new Date(createdAt))} ago`
-    } catch {
-      return ''
-    }
-  }, [createdAt])
+export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
+  const { row } = ctx
+  const { teamSlug, templateId, templateName } = getMeta(ctx)
+  const { toast } = useToast()
+  const [menuOpen, setMenuOpen] = useState(false)
+  const [deleteOpen, setDeleteOpen] = useState(false)
 
-  const isLinkable = buildId !== NULL_BUILD_ID
-
-  const inner = (
-    <span
-      className={cn(
-        'font-mono prose-body-numeric',
-        isLinkable &&
-          'underline underline-offset-2 decoration-fg-tertiary group-hover/build:decoration-fg'
-      )}
-    >
-      {shortId}
-    </span>
-  )
+  const isExpanded = row.getIsExpanded()
+  const group = row.original
 
   return (
-    <div className="flex items-center gap-2 min-w-0">
-      {isLinkable ? (
-        <Link
-          href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
-          className="group/build text-fg hover:text-fg transition-colors"
+    <div className="flex items-center justify-end gap-4 w-full">
+      <div
+        className={cn(
+          'flex items-center gap-1 max-sm:hidden',
+          isExpanded
+            ? 'opacity-100'
+            : // Reveal on mouse hover anywhere in the row, or when a
+              // keyboard-focused descendant is inside the row.
+              // `has-[:focus-visible]` (not focus-within) avoids the
+              // buttons lingering after a mouse click leaves focus on them.
+              'opacity-0 group-hover/row:opacity-100 group-has-[:focus-visible]/row:opacity-100'
+        )}
+      >
+        <Button
+          variant="primary"
+          size="none"
+          className={SMALL_BUTTON}
+          onClick={(e) => {
+            e.stopPropagation()
+            toast(defaultErrorToast('Promote: not implemented yet'))
+          }}
+        >
+          Promote
+        </Button>
+        <Button
+          variant="secondary"
+          size="none"
+          className={SMALL_BUTTON}
+          onClick={(e) => {
+            e.stopPropagation()
+            toast(defaultErrorToast('Rollback: not implemented yet'))
+          }}
         >
-          {inner}
-        </Link>
-      ) : (
-        <span className="text-fg-tertiary">{inner}</span>
-      )}
-      {relative && (
-        <span className="text-fg-tertiary prose-body whitespace-nowrap">
-          · {relative}
-        </span>
-      )}
+          Rollback
+        </Button>
+      </div>
+
+      <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
+        <DropdownMenuTrigger asChild>
+          <IconButton
+            aria-label={`Actions for tag ${group.tag}`}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <MoreActionsIcon />
+          </IconButton>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+          <DropdownMenuItem
+            className="sm:hidden"
+            onSelect={() =>
+              toast(defaultErrorToast('Promote: not implemented yet'))
+            }
+          >
+            <ArrowUpIcon className="size-4" />
+            Promote
+          </DropdownMenuItem>
+          <DropdownMenuItem
+            className="sm:hidden"
+            onSelect={() =>
+              toast(defaultErrorToast('Rollback: not implemented yet'))
+            }
+          >
+            <UndoIcon className="size-4" />
+            Rollback
+          </DropdownMenuItem>
+          <DropdownMenuSeparator className="md:hidden" />
+          <DropdownMenuItem
+            variant="error"
+            onSelect={(e) => {
+              e.preventDefault()
+              setMenuOpen(false)
+              setDeleteOpen(true)
+            }}
+          >
+            <TrashIcon className="size-4" />
+            Delete
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+
+      <TagDeleteDialog
+        open={deleteOpen}
+        onOpenChange={setDeleteOpen}
+        tag={group.tag}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+      />
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/table-config.tsx b/src/features/dashboard/templates/tags/table-config.tsx
new file mode 100644
index 000000000..ccdf329b9
--- /dev/null
+++ b/src/features/dashboard/templates/tags/table-config.tsx
@@ -0,0 +1,101 @@
+'use client'
+
+import { rankItem } from '@tanstack/match-sorter-utils'
+import {
+  type ColumnDef,
+  type FilterFn,
+  getCoreRowModel,
+  getExpandedRowModel,
+  getFilteredRowModel,
+  getSortedRowModel,
+  type TableOptions,
+} from '@tanstack/react-table'
+import posthog from 'posthog-js'
+import { useMemo } from 'react'
+import { ActionsCell, BuildLinkCell, TagPillCell } from './table-cells'
+import type { TagGroup } from './types'
+
+export const fuzzyFilter: FilterFn<TagGroup> = (
+  row,
+  columnId,
+  value,
+  addMeta
+) => {
+  if (!value || !value.length) return true
+
+  const searchValue = String(value).toLowerCase()
+  const rowValue = row.getValue(columnId)
+
+  if (rowValue == null) return false
+
+  const itemStr = String(rowValue).toLowerCase()
+  const itemRank = rankItem(itemStr, searchValue)
+
+  addMeta({ itemRank })
+
+  return itemRank.passed
+}
+
+export const fallbackData: TagGroup[] = []
+
+export const trackTagTableInteraction = (
+  action: string,
+  properties: Record<string, unknown> = {}
+) => {
+  posthog.capture('tag table interacted', {
+    action,
+    ...properties,
+  })
+}
+
+export const useTagColumns = () =>
+  useMemo<ColumnDef<TagGroup>[]>(
+    () => [
+      {
+        accessorKey: 'tag',
+        id: 'tag',
+        header: 'Name',
+        cell: TagPillCell,
+        enableSorting: true,
+        enableGlobalFilter: true,
+        sortingFn: (a, b) => a.original.tag.localeCompare(b.original.tag),
+      },
+      {
+        accessorFn: (row) => row.primaryAssignment.assignedAt,
+        id: 'assignedAt',
+        header: 'Assigned to',
+        size: 178,
+        cell: BuildLinkCell,
+        enableSorting: true,
+        enableGlobalFilter: false,
+        sortDescFirst: true,
+        sortingFn: (a, b) =>
+          a.original.primaryAssignment.assignedAt.localeCompare(
+            b.original.primaryAssignment.assignedAt
+          ),
+      },
+      {
+        id: 'actions',
+        size: 203,
+        enableSorting: false,
+        enableGlobalFilter: false,
+        cell: ActionsCell,
+      },
+    ],
+    []
+  )
+
+export const tagsTableConfig: Partial<TableOptions<TagGroup>> = {
+  filterFns: { fuzzy: fuzzyFilter },
+  getCoreRowModel: getCoreRowModel(),
+  getFilteredRowModel: getFilteredRowModel(),
+  getSortedRowModel: getSortedRowModel(),
+  getExpandedRowModel: getExpandedRowModel(),
+  enableSorting: true,
+  enableMultiSort: false,
+  enableSortingRemoval: false,
+  enableGlobalFilter: true,
+  enableColumnResizing: false,
+  // @ts-expect-error globalFilterFn keyed by string is valid at runtime
+  globalFilterFn: 'fuzzy',
+}
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 47eb878b9..6d2105f27 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -1,21 +1,37 @@
 'use client'
 
 import { useSuspenseQuery } from '@tanstack/react-query'
-import { useMemo, useState } from 'react'
-import type { TemplateTag } from '@/core/modules/templates/models'
+import {
+  flexRender,
+  type Row,
+  type TableOptions,
+  useReactTable,
+} from '@tanstack/react-table'
+import { type KeyboardEvent, type MouseEvent, useMemo } from 'react'
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
+import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/ui/primitives/table'
+  DataTable,
+  DataTableCell,
+  DataTableHead,
+  DataTableHeader,
+  DataTableRow,
+} from '@/ui/data-table'
+import { TriangleIcon, UndoIcon } from '@/ui/primitives/icons'
+import { RowHoverFrame } from '@/ui/row-hover-frame'
+import { BuildLink } from './build-link'
 import TagsEmpty from './empty'
 import TagsHeader from './header'
-import { SortableHeader, type SortDir, type SortKey } from './sortable-header'
-import { BuildLinkCell, TagPillCell } from './table-cells'
+import { useTagTableStore } from './stores/table-store'
+import {
+  fallbackData,
+  tagsTableConfig,
+  trackTagTableInteraction,
+  useTagColumns,
+} from './table-config'
+import type { TagGroup } from './types'
 
 interface TagsTableProps {
   teamSlug: string
@@ -23,115 +39,355 @@ interface TagsTableProps {
 }
 
 export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
+  'use no memo'
+
   const trpc = useTRPC()
 
-  const { data } = useSuspenseQuery(
-    trpc.templates.getTags.queryOptions(
+  const { data: tagsData } = useSuspenseQuery(
+    trpc.templates.getTagGroups.queryOptions(
       { teamSlug, templateId },
       {
         refetchOnMount: false,
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
+        refetchOnWindowFocus: true,
+        refetchOnReconnect: true,
       }
     )
   )
 
-  const allTags = data.tags
-
-  const [search, setSearch] = useState('')
-  const [sortKey, setSortKey] = useState<SortKey>('createdAt')
-  const [sortDir, setSortDir] = useState<SortDir>('desc')
-
-  const visibleTags = useMemo<TemplateTag[]>(() => {
-    const query = search.trim().toLowerCase()
-    const filtered = query
-      ? allTags.filter((t) => t.tag.toLowerCase().includes(query))
-      : allTags
-
-    return [...filtered].sort((a, b) => {
-      let cmp = 0
-      if (sortKey === 'tag') {
-        cmp = a.tag.localeCompare(b.tag)
-      } else {
-        const aTime = new Date(a.createdAt).getTime()
-        const bTime = new Date(b.createdAt).getTime()
-        cmp = aTime - bTime
+  const { data: templateData } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions(
+      { teamSlug, templateId },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: true,
+        refetchOnReconnect: true,
       }
-      return sortDir === 'asc' ? cmp : -cmp
+    )
+  )
+
+  const templateName = useMemo(
+    () =>
+      templateData.template.names.find((n) => !n.includes('/')) ??
+      templateData.template.names[0] ??
+      templateData.template.templateID,
+    [templateData]
+  )
+
+  const groups = useMemo<TagGroup[]>(
+    () =>
+      tagsData.tags.flatMap((group) => {
+        const primaryAssignment = group.assignments[0]
+        if (!primaryAssignment) return []
+
+        return [
+          {
+            tag: group.tag,
+            primaryAssignment,
+            assignments: group.assignments,
+            hasMore: group.hasMore,
+          },
+        ]
+      }),
+    [tagsData.tags]
+  )
+
+  const sorting = useTagTableStore((s) => s.sorting)
+  const setSorting = useTagTableStore((s) => s.setSorting)
+  const globalFilter = useTagTableStore((s) => s.globalFilter)
+  const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
+  const expanded = useTagTableStore((s) => s.expanded)
+  const setExpanded = useTagTableStore((s) => s.setExpanded)
+
+  const columns = useTagColumns()
+
+  const table = useReactTable<TagGroup>({
+    ...tagsTableConfig,
+    data: groups ?? fallbackData,
+    columns,
+    state: { sorting, globalFilter, expanded },
+    onSortingChange: setSorting,
+    onGlobalFilterChange: setGlobalFilter,
+    onExpandedChange: setExpanded,
+    getRowCanExpand: (row) =>
+      row.original.assignments.length > 1 || row.original.hasMore,
+    meta: { teamSlug, templateId, templateName },
+  } as TableOptions<TagGroup>)
+
+  const rows = table.getRowModel().rows
+
+  return (
+    <div className="flex flex-col gap-6 h-full min-h-0">
+      <TagsHeader table={table} />
+
+      <div className="flex-1 min-h-0 -mx-3 px-3">
+        <DataTable className="w-full">
+          <DataTableHeader className="sticky top-0 z-10 bg-bg border-b-0">
+            {table.getHeaderGroups().map((headerGroup) => (
+              <DataTableRow
+                key={headerGroup.id}
+                className="border-b-0 flex w-full items-center gap-6"
+              >
+                {headerGroup.headers.map((header) => (
+                  <DataTableHead
+                    key={header.id}
+                    header={header}
+                    sorting={sorting.find((s) => s.id === header.id)?.desc}
+                    align={header.id === 'actions' ? 'right' : 'left'}
+                    className={cn(
+                      // Figma spec: header height = text line-height (17px).
+                      'h-auto px-0',
+                      header.id === 'tag' && 'flex-1 min-w-0',
+                      header.id === 'assignedAt' && 'w-[178px] shrink-0',
+                      header.id === 'actions' &&
+                        'w-[203px] max-sm:w-4 shrink-0 justify-end'
+                    )}
+                    style={
+                      header.id === 'tag' ? undefined : { width: undefined }
+                    }
+                  >
+                    <span>
+                      {header.isPlaceholder
+                        ? null
+                        : flexRender(
+                            header.column.columnDef.header,
+                            header.getContext()
+                          )}
+                    </span>
+                  </DataTableHead>
+                ))}
+              </DataTableRow>
+            ))}
+          </DataTableHeader>
+
+          {rows.length === 0 ? (
+            <TagsEmpty hasSearch={globalFilter.trim().length > 0} />
+          ) : (
+            <div className="flex flex-col divide-y divide-stroke/80">
+              {rows.map((row) => (
+                <GroupSection
+                  key={row.id}
+                  row={row}
+                  teamSlug={teamSlug}
+                  templateId={templateId}
+                />
+              ))}
+            </div>
+          )}
+        </DataTable>
+      </div>
+    </div>
+  )
+}
+
+interface GroupSectionProps {
+  row: Row<TagGroup>
+  teamSlug: string
+  templateId: string
+}
+
+function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
+  'use no memo'
+
+  const canExpand = row.getCanExpand()
+  const isExpanded = row.getIsExpanded()
+  const dataState = isExpanded ? 'open' : 'closed'
+
+  const toggle = () => {
+    row.toggleExpanded()
+    trackTagTableInteraction('expanded', {
+      tag: row.original.tag,
+      next: !isExpanded,
     })
-  }, [allTags, search, sortKey, sortDir])
-
-  const handleSortChange = (key: SortKey) => {
-    if (sortKey === key) {
-      setSortDir((d) => (d === 'asc' ? 'desc' : 'asc'))
-    } else {
-      setSortKey(key)
-      setSortDir(key === 'tag' ? 'asc' : 'desc')
-    }
   }
 
+  const handleClick = canExpand
+    ? (e: MouseEvent<HTMLDivElement>) => {
+        const target = e.target as HTMLElement | null
+        if (target?.closest('button, a, [role=button]') !== e.currentTarget) {
+          return
+        }
+        toggle()
+      }
+    : undefined
+  const handleKeyDown = canExpand
+    ? (e: KeyboardEvent<HTMLDivElement>) => {
+        if (e.currentTarget !== e.target) return
+        if (e.key === 'Enter' || e.key === ' ') {
+          e.preventDefault()
+          toggle()
+        }
+      }
+    : undefined
+
   return (
-    <div className="flex flex-col gap-4 h-full min-h-0">
-      <TagsHeader
-        search={search}
-        onSearchChange={setSearch}
-        totalCount={allTags.length}
-        visibleCount={visibleTags.length}
-      />
-
-      <div className="flex-1 min-h-0 overflow-y-auto overflow-x-auto">
-        <Table suppressHydrationWarning>
-          <TableHeader className="sticky top-0 z-10 bg-bg">
-            <TableRow>
-              <TableHead className="w-1/3">
-                <SortableHeader
-                  label="Name"
-                  sortKey="tag"
-                  activeKey={sortKey}
-                  dir={sortDir}
-                  defaultDir="asc"
-                  onChange={handleSortChange}
-                />
-              </TableHead>
-              <TableHead>
-                <SortableHeader
-                  label="Assigned to"
-                  sortKey="createdAt"
-                  activeKey={sortKey}
-                  dir={sortDir}
-                  defaultDir="desc"
-                  onChange={handleSortChange}
-                />
-              </TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {visibleTags.length === 0 ? (
-              <TableRow>
-                <TableCell colSpan={2}>
-                  <TagsEmpty hasSearch={search.trim().length > 0} />
-                </TableCell>
-              </TableRow>
-            ) : (
-              visibleTags.map((t) => (
-                <TableRow key={`${t.tag}-${t.buildID}`}>
-                  <TableCell className="py-2">
-                    <TagPillCell tag={t.tag} />
-                  </TableCell>
-                  <TableCell className="py-2">
-                    <BuildLinkCell
-                      teamSlug={teamSlug}
-                      templateId={templateId}
-                      buildId={t.buildID}
-                      createdAt={t.createdAt}
-                    />
-                  </TableCell>
-                </TableRow>
-              ))
+    <div className="flex flex-col divide-y divide-stroke/80">
+      <DataTableRow
+        data-state={dataState}
+        role={canExpand ? 'button' : undefined}
+        tabIndex={canExpand ? 0 : undefined}
+        aria-expanded={canExpand ? isExpanded : undefined}
+        onClick={handleClick}
+        onKeyDown={handleKeyDown}
+        className={cn(
+          'group/row relative flex items-center gap-6 border-b-0 -mx-3 px-3 w-[calc(100%+24px)]',
+          canExpand && 'cursor-pointer'
+        )}
+      >
+        {canExpand && (
+          // increase hit box size
+          <span
+            aria-hidden
+            className={cn(
+              'flex absolute -left-6 top-1/2 -translate-y-1/2',
+              'size-6 items-center justify-center cursor-pointer',
+              isExpanded
+                ? 'opacity-100'
+                : 'opacity-0 group-hover/row:opacity-100'
             )}
-          </TableBody>
-        </Table>
+          >
+            <TriangleIcon
+              className={cn(
+                'size-4 transition-[transform,color]',
+                isExpanded && 'rotate-90',
+                'text-fg-tertiary',
+                'group-hover/row:text-fg',
+                'group-focus-visible/row:text-fg'
+              )}
+            />
+          </span>
+        )}
+
+        {row.getVisibleCells().map((cell) => (
+          <DataTableCell
+            key={cell.id}
+            cell={cell}
+            className={cn(
+              'py-2',
+              cell.column.id === 'tag' && 'flex-1 min-w-0',
+              cell.column.id === 'assignedAt' && 'w-[178px] shrink-0',
+              cell.column.id === 'actions' &&
+                'w-[203px] max-sm:w-4 shrink-0 justify-end'
+            )}
+            style={{ width: undefined }}
+          >
+            {flexRender(cell.column.columnDef.cell, cell.getContext())}
+          </DataTableCell>
+        ))}
+
+        <RowHoverFrame
+          className={cn(
+            'group-has-[button[aria-haspopup=menu][data-state=open]]/row:border-stroke',
+            'group-has-[button[aria-haspopup=menu][data-state=open]]/row:[--corner-mark-color:var(--color-fg-tertiary)]',
+            'group-data-[state=open]/row:hidden'
+          )}
+        />
+      </DataTableRow>
+
+      {isExpanded && (
+        <div className="flex flex-col divide-y divide-stroke/80">
+          {row.original.assignments.slice(1).map((assignment) => (
+            <HistoryBuildRow
+              key={assignment.assignmentId}
+              assignment={assignment}
+              teamSlug={teamSlug}
+              templateId={templateId}
+            />
+          ))}
+          {row.original.hasMore && <ShowFullHistoryRow />}
+        </div>
+      )}
+    </div>
+  )
+}
+
+interface HistoryBuildRowProps {
+  assignment: TemplateTagAssignment
+  teamSlug: string
+  templateId: string
+}
+
+function HistoryBuildRow({
+  assignment,
+  teamSlug,
+  templateId,
+}: HistoryBuildRowProps) {
+  'use no memo'
+
+  const { toast } = useToast()
+
+  const rollback = () => {
+    toast(defaultErrorToast('Rollback to this build: not implemented yet'))
+  }
+
+  const handleClick = (e: MouseEvent<HTMLDivElement>) => {
+    const target = e.target as HTMLElement | null
+    if (target?.closest('button, a, [role=button]') !== e.currentTarget) {
+      return
+    }
+    rollback()
+  }
+  const handleKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
+    if (e.currentTarget !== e.target) return
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.preventDefault()
+      rollback()
+    }
+  }
+
+  return (
+    // biome-ignore lint/a11y/useSemanticElements: The row contains nested links, so a button would be invalid HTML.
+    <div
+      role="button"
+      tabIndex={0}
+      onClick={handleClick}
+      onKeyDown={handleKeyDown}
+      className={cn(
+        'group/childRow flex w-full items-center justify-between gap-4',
+        'bg-bg py-2 cursor-pointer',
+        'focus-visible:outline-none'
+      )}
+    >
+      <div className="flex items-center gap-2 prose-body text-fg-tertiary">
+        <span>Assigned to</span>
+        <BuildLink
+          teamSlug={teamSlug}
+          templateId={templateId}
+          buildId={assignment.buildId}
+          assignedAt={assignment.assignedAt}
+        />
       </div>
+      <span
+        aria-hidden
+        className={cn(
+          'inline-flex items-center gap-1',
+          'prose-body-highlight text-fg',
+          'opacity-0 group-hover/childRow:opacity-100 group-focus-visible/childRow:opacity-100',
+          'group-has-[a:hover]/childRow:opacity-0',
+          '[&_svg]:size-4 [&_svg]:text-icon-tertiary'
+        )}
+      >
+        <UndoIcon />
+        Rollback to this build
+      </span>
     </div>
   )
 }
+
+function ShowFullHistoryRow() {
+  const { toast } = useToast()
+
+  return (
+    <button
+      type="button"
+      onClick={() =>
+        toast(defaultErrorToast('Show full history: not implemented yet'))
+      }
+      className={cn(
+        'flex w-full items-center justify-center bg-bg py-2 cursor-pointer',
+        'prose-body-highlight text-fg-tertiary hover:text-fg transition-colors'
+      )}
+    >
+      Show full history
+    </button>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/types.ts b/src/features/dashboard/templates/tags/types.ts
new file mode 100644
index 000000000..001feab55
--- /dev/null
+++ b/src/features/dashboard/templates/tags/types.ts
@@ -0,0 +1,8 @@
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+
+export interface TagGroup {
+  tag: string
+  primaryAssignment: TemplateTagAssignment
+  assignments: TemplateTagAssignment[]
+  hasMore: boolean
+}
diff --git a/src/ui/primitives/collapsible.tsx b/src/ui/primitives/collapsible.tsx
new file mode 100644
index 000000000..3401f6c69
--- /dev/null
+++ b/src/ui/primitives/collapsible.tsx
@@ -0,0 +1,27 @@
+'use client'
+
+import * as CollapsiblePrimitive from '@radix-ui/react-collapsible'
+
+function Collapsible({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
+  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />
+}
+
+function CollapsibleTrigger({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.Trigger>) {
+  return (
+    <CollapsiblePrimitive.Trigger data-slot="collapsible-trigger" {...props} />
+  )
+}
+
+function CollapsibleContent({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.Content>) {
+  return (
+    <CollapsiblePrimitive.Content data-slot="collapsible-content" {...props} />
+  )
+}
+
+export { Collapsible, CollapsibleContent, CollapsibleTrigger }
diff --git a/src/ui/primitives/icons.tsx b/src/ui/primitives/icons.tsx
index 674f1941b..1d84bd373 100644
--- a/src/ui/primitives/icons.tsx
+++ b/src/ui/primitives/icons.tsx
@@ -578,6 +578,32 @@ export const IndicatorDotsIcon = ({ className, ...props }: IconProps) => (
   </svg>
 )
 
+export const MoreActionsIcon = ({ className, ...props }: IconProps) => (
+  <svg
+    className={cn(DEFAULT_CLASS_NAMES, className)}
+    fill="none"
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M2 8.66663L2 7.33329L3.33333 7.33329L3.33333 8.66663L2 8.66663Z"
+      stroke="currentColor"
+      strokeWidth="1.33333"
+    />
+    <path
+      d="M7.33398 7.33329L7.33398 8.66663L8.66732 8.66663L8.66732 7.33329L7.33398 7.33329Z"
+      stroke="currentColor"
+      strokeWidth="1.33333"
+    />
+    <path
+      d="M12.667 8.66663L12.667 7.33329L14.0003 7.33329L14.0003 8.66663L12.667 8.66663Z"
+      stroke="currentColor"
+      strokeWidth="1.33333"
+    />
+  </svg>
+)
+
 export const UnhealthyIcon = ({ className, ...props }: IconProps) => (
   <svg
     className={cn(DEFAULT_CLASS_NAMES, className)}
@@ -815,6 +841,23 @@ export const ChevronLeftIcon = ({ className, ...props }: IconProps) => (
   </svg>
 )
 
+export const TriangleIcon = ({ className, ...props }: IconProps) => (
+  <svg
+    className={cn(DEFAULT_CLASS_NAMES, className)}
+    fill="currentColor"
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M7 5.5L7 10.82L10.55 8.16L7 5.5Z"
+      stroke="currentColor"
+      strokeWidth="1.77333"
+      strokeLinejoin="round"
+    />
+  </svg>
+)
+
 export const TrashIcon = ({ className, ...props }: IconProps) => (
   <svg
     className={cn(DEFAULT_CLASS_NAMES, className)}
@@ -966,6 +1009,29 @@ export const BuildIcon = ({ className, ...props }: IconProps) => (
   </svg>
 )
 
+export const UndoIcon = ({ className, ...props }: IconProps) => (
+  <svg
+    className={cn(DEFAULT_CLASS_NAMES, className)}
+    fill="none"
+    viewBox="0 0 16 16"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M4.6665 3.33301L1.99984 5.99967L4.6665 8.66634"
+      stroke="currentColor"
+      strokeLinecap="square"
+      strokeWidth="1.33333"
+    />
+    <path
+      d="M2.6665 6H13.9998V11.9997H7.99984"
+      stroke="currentColor"
+      strokeLinecap="square"
+      strokeWidth="1.33333"
+    />
+  </svg>
+)
+
 export const RemoveIcon = ({ className, ...props }: IconProps) => (
   <svg
     className={cn(DEFAULT_CLASS_NAMES, className)}
@@ -2137,4 +2203,4 @@ export const TagIcon = ({ className, ...props }: IconProps) => (
       strokeWidth="1.33333"
     />
   </svg>
-);
+)
diff --git a/src/ui/primitives/table.tsx b/src/ui/primitives/table.tsx
index 99f16420b..6d5224dd3 100644
--- a/src/ui/primitives/table.tsx
+++ b/src/ui/primitives/table.tsx
@@ -33,7 +33,7 @@ const TableBody = React.forwardRef<
     ref={ref}
     className={cn(
       '[&_tr:last-child]:border-0',
-      '[&_tr]:border-b [&_tr]:border-stroke/80',
+      '[&_tr]:border-b [&_tr]:border-b-stroke/80',
       className
     )}
     {...props}
diff --git a/src/ui/row-hover-frame.tsx b/src/ui/row-hover-frame.tsx
new file mode 100644
index 000000000..cd54f4e52
--- /dev/null
+++ b/src/ui/row-hover-frame.tsx
@@ -0,0 +1,53 @@
+import { cn } from '@/lib/utils/ui'
+
+interface RowHoverFrameProps {
+  className?: string
+}
+
+/**
+ * Decorative hover frame for table rows. Place as a child of a row that
+ * carries `group/row` and `relative`.
+ *
+ * Defaults:
+ *  - 12px horizontal bleed, 1px vertical bleed
+ *  - visible on `group-hover/row` and `group-focus-visible/row`
+ *  - corner marks driven by `--corner-mark-color` (transparent until lit)
+ *
+ * Extend by passing className with Tailwind utilities. To override the
+ * corner colour with a non-default trigger, prefix with `!` so it wins
+ * against the variant-prefixed defaults (twMerge can't always reconcile
+ * arbitrary CSS-variable assignments).
+ */
+export function RowHoverFrame({ className }: RowHoverFrameProps) {
+  return (
+    <div
+      aria-hidden
+      className={cn(
+        'pointer-events-none absolute inset-x-0 -inset-y-px z-20',
+        'border border-transparent',
+        'group-hover/row:border-stroke',
+        'group-hover/row:[--corner-mark-color:var(--color-fg-tertiary)]',
+        'group-focus-visible/row:border-stroke',
+        'group-focus-visible/row:[--corner-mark-color:var(--color-fg-tertiary)]',
+        className
+      )}
+    >
+      <span
+        aria-hidden
+        className="absolute -top-px -left-px h-1 w-1 border-t border-l border-[var(--corner-mark-color,transparent)]"
+      />
+      <span
+        aria-hidden
+        className="absolute -top-px -right-px h-1 w-1 border-t border-r border-[var(--corner-mark-color,transparent)]"
+      />
+      <span
+        aria-hidden
+        className="absolute -bottom-px -left-px h-1 w-1 border-b border-l border-[var(--corner-mark-color,transparent)]"
+      />
+      <span
+        aria-hidden
+        className="absolute -bottom-px -right-px h-1 w-1 border-b border-r border-[var(--corner-mark-color,transparent)]"
+      />
+    </div>
+  )
+}

From 460fedb352d9c2c998622cf4ed191a9cccab7989 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 28 May 2026 14:58:01 +0200
Subject: [PATCH 10/90] update delete dialog

---
 .../templates/tags/delete-dialog.tsx          | 92 ++++++++++++-------
 1 file changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index 70bfac79c..c6bd25622 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -7,9 +7,16 @@ import {
   useToast,
 } from '@/lib/hooks/use-toast'
 import { useTRPC } from '@/trpc/client'
-import { AlertDialog } from '@/ui/alert-dialog'
+import { Button } from '@/ui/primitives/button'
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from '@/ui/primitives/dialog'
 import { WarningIcon } from '@/ui/primitives/icons'
-import { Loader } from '@/ui/primitives/loader'
 
 interface TagDeleteDialogProps {
   open: boolean
@@ -76,38 +83,53 @@ export default function TagDeleteDialog({
   const isDeleting = deleteTags.isPending
 
   return (
-    <AlertDialog
-      open={open}
-      onOpenChange={onOpenChange}
-      title={
-        <span className="flex items-center gap-2 text-accent-error-highlight">
-          <WarningIcon className="size-4" />
-          <span>{`Delete '${tag}' tag?`}</span>
-        </span>
-      }
-      description="Any associated history will be also deleted. This action is irreversible."
-      confirm={
-        isDeleting ? (
-          <>
-            <Loader variant="slash" />
-            <span>Deleting...</span>
-          </>
-        ) : (
-          'Delete'
-        )
-      }
-      confirmProps={{
-        variant: 'error',
-        disabled: isDeleting,
-      }}
-      onConfirm={() => {
-        deleteTags.mutate({
-          teamSlug,
-          templateId,
-          templateName,
-          tags: [tag],
-        })
-      }}
-    />
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent hideClose className="gap-0 sm:max-w-[520px]">
+        <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:gap-6">
+          <DialogHeader className="min-w-0 flex-1 text-left">
+            <DialogTitle className="flex items-center gap-2 text-accent-error-highlight">
+              <WarningIcon className="size-4" />
+              <span>{`Delete '${tag}' tag?`}</span>
+            </DialogTitle>
+            <DialogDescription className="sr-only">
+              Confirm deletion of this tag. This cannot be undone.
+            </DialogDescription>
+            <p className="text-fg-primary mt-2 font-sans text-sm">
+              Any associated history will be also deleted. This action is
+              irreversible.
+            </p>
+          </DialogHeader>
+          <div className="flex shrink-0 items-center justify-end gap-5">
+            <DialogClose asChild>
+              <Button
+                type="button"
+                variant="tertiary"
+                disabled={isDeleting}
+                className="text-fg-tertiary font-sans normal-case hover:text-fg-tertiary focus:text-fg-tertiary"
+              >
+                Cancel
+              </Button>
+            </DialogClose>
+            <Button
+              type="button"
+              variant="error"
+              loading={isDeleting ? 'Deleting' : undefined}
+              disabled={isDeleting}
+              className="font-sans normal-case"
+              onClick={() => {
+                deleteTags.mutate({
+                  teamSlug,
+                  templateId,
+                  templateName,
+                  tags: [tag],
+                })
+              }}
+            >
+              Delete
+            </Button>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }

From 10da554d0963ada55650fceeeeaa438f8d9257ec Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 28 May 2026 15:05:00 +0200
Subject: [PATCH 11/90] disable context menu for default tag

---
 src/features/dashboard/templates/tags/table-cells.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index db3bfc76f..a603c07bf 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -26,6 +26,8 @@ import type { TagGroup } from './types'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
 
+const DEFAULT_TAG_NAME = 'default'
+
 export interface TagTableMeta {
   teamSlug: string
   templateId: string
@@ -70,6 +72,7 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
 
   const isExpanded = row.getIsExpanded()
   const group = row.original
+  const isDefaultTag = group.tag === DEFAULT_TAG_NAME
 
   return (
     <div className="flex items-center justify-end gap-4 w-full">
@@ -112,7 +115,12 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
       <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
         <DropdownMenuTrigger asChild>
           <IconButton
-            aria-label={`Actions for tag ${group.tag}`}
+            aria-label={
+              isDefaultTag
+                ? 'Actions unavailable for default tag'
+                : `Actions for tag ${group.tag}`
+            }
+            disabled={isDefaultTag}
             onClick={(e) => e.stopPropagation()}
           >
             <MoreActionsIcon />

From 16caa33e0d3fd6f9fa375f5b415b8893430e0b8f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 28 May 2026 15:06:39 +0200
Subject: [PATCH 12/90] no need for promote/rollback in context menu for mobile

---
 .../dashboard/templates/tags/table-cells.tsx  | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index a603c07bf..ca40c6743 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -127,25 +127,6 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
           </IconButton>
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end">
-          <DropdownMenuItem
-            className="sm:hidden"
-            onSelect={() =>
-              toast(defaultErrorToast('Promote: not implemented yet'))
-            }
-          >
-            <ArrowUpIcon className="size-4" />
-            Promote
-          </DropdownMenuItem>
-          <DropdownMenuItem
-            className="sm:hidden"
-            onSelect={() =>
-              toast(defaultErrorToast('Rollback: not implemented yet'))
-            }
-          >
-            <UndoIcon className="size-4" />
-            Rollback
-          </DropdownMenuItem>
-          <DropdownMenuSeparator className="md:hidden" />
           <DropdownMenuItem
             variant="error"
             onSelect={(e) => {

From 2472ddde4f59957d89fd4d3d53749e395fae75fd Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 28 May 2026 15:25:49 +0200
Subject: [PATCH 13/90] clean up imports

---
 src/features/dashboard/templates/tags/table-cells.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index ca40c6743..ba60d11d7 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -10,16 +10,10 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/ui/primitives/dropdown-menu'
 import { IconButton } from '@/ui/primitives/icon-button'
-import {
-  ArrowUpIcon,
-  MoreActionsIcon,
-  TrashIcon,
-  UndoIcon,
-} from '@/ui/primitives/icons'
+import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from './build-link'
 import TagDeleteDialog from './delete-dialog'
 import type { TagGroup } from './types'

From 61262ccafbcd32b7bda966edb05517dfc65e7c60 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 28 May 2026 17:55:59 +0200
Subject: [PATCH 14/90] add assign new tag flow

---
 .../modules/templates/repository.server.ts    |  31 ++
 src/core/server/api/routers/templates.ts      |  23 ++
 .../templates/tags/assign-dialog.helpers.ts   |  35 ++
 .../templates/tags/assign-dialog.tsx          | 350 ++++++++++++++++++
 .../templates/tags/build-picker-row.tsx       |  37 ++
 .../dashboard/templates/tags/build-picker.tsx | 326 ++++++++++++++++
 .../templates/tags/delete-dialog.tsx          |   2 +-
 .../dashboard/templates/tags/header.tsx       |  33 +-
 .../dashboard/templates/tags/table.tsx        |   8 +-
 .../templates/tags/tag-name-field.tsx         |  77 ++++
 src/lib/hooks/use-debounced-value.ts          |  12 +
 src/lib/utils/ui.ts                           |   3 +-
 src/styles/theme.css                          |   3 +
 src/ui/primitives/dialog.tsx                  |   4 +-
 tests/unit/assign-tag-dialog-helpers.test.ts  |  78 ++++
 .../templates-repository-assign-tag.test.ts   | 148 ++++++++
 16 files changed, 1148 insertions(+), 22 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/assign-dialog.helpers.ts
 create mode 100644 src/features/dashboard/templates/tags/assign-dialog.tsx
 create mode 100644 src/features/dashboard/templates/tags/build-picker-row.tsx
 create mode 100644 src/features/dashboard/templates/tags/build-picker.tsx
 create mode 100644 src/features/dashboard/templates/tags/tag-name-field.tsx
 create mode 100644 src/lib/hooks/use-debounced-value.ts
 create mode 100644 tests/unit/assign-tag-dialog-helpers.test.ts
 create mode 100644 tests/unit/templates-repository-assign-tag.test.ts

diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 811b27534..c08942653 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -46,6 +46,11 @@ export interface TeamTemplatesRepository {
     templateId: string,
     tag: string
   ): Promise<RepoResult<TemplateTagExistsResult>>
+  assignTag(input: {
+    templateName: string
+    buildId: string
+    tag: string
+  }): Promise<RepoResult<{ tags: string[]; buildID: string }>>
   deleteTemplate(templateId: string): Promise<RepoResult<{ success: true }>>
   deleteTags(
     templateName: string,
@@ -223,6 +228,32 @@ export function createTemplatesRepository(
         ),
       })
     },
+    async assignTag({ templateName, buildId, tag }) {
+      const res = await deps.infraClient.POST('/templates/tags', {
+        body: {
+          target: `${templateName}:${buildId}`,
+          tags: [tag],
+        },
+        headers: {
+          ...deps.authHeaders(scope.accessToken, scope.teamId),
+        },
+      })
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to assign template tag',
+            res.error
+          )
+        )
+      }
+
+      return ok({
+        tags: res.data?.tags ?? [tag],
+        buildID: res.data?.buildID ?? buildId,
+      })
+    },
     async deleteTags(templateName, tags) {
       const res = await deps.infraClient.DELETE('/templates/tags', {
         body: {
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index e3687b767..5cb4b591c 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -173,4 +173,27 @@ export const templatesRouter = createTRPCRouter({
       if (!result.ok) throwTRPCErrorFromRepoError(result.error)
       return result.data
     }),
+
+  assignTag: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+        templateName: z.string(),
+        buildId: z.string().uuid(),
+        tag: z
+          .string()
+          .min(1)
+          .max(128)
+          .regex(/^[a-z0-9._-]+$/),
+      })
+    )
+    .mutation(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.assignTag({
+        templateName: input.templateName,
+        buildId: input.buildId,
+        tag: input.tag,
+      })
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
 })
diff --git a/src/features/dashboard/templates/tags/assign-dialog.helpers.ts b/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
new file mode 100644
index 000000000..6f6ef3512
--- /dev/null
+++ b/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
@@ -0,0 +1,35 @@
+export const TAG_REGEX = /^[a-z0-9._-]+$/
+export const TAG_MAX_LENGTH = 128
+export const UUID_REGEX =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+/**
+ * Mirrors the infra `id.ValidateAndDeduplicateTags` normalization on the
+ * client so the input value the user sees matches what the server will
+ * persist: lowercase + every whitespace character replaced with `-`.
+ */
+export function normalizeTagInput(raw: string): string {
+  return raw.toLowerCase().replace(/\s/g, '-')
+}
+
+export function isValidUuid(value: string): boolean {
+  return UUID_REGEX.test(value)
+}
+
+export function isValidTagShape(value: string): boolean {
+  return (
+    value.length > 0 && value.length <= TAG_MAX_LENGTH && TAG_REGEX.test(value)
+  )
+}
+
+/**
+ * Builds the infra POST `target` field. The dashboard handler accepts a
+ * UUID in the tag slot via `try_cast_uuid` in
+ * `get_template_with_build_by_tag.sql`, so we anchor by build ID directly.
+ */
+export function buildAssignTarget(
+  templateName: string,
+  buildId: string
+): string {
+  return `${templateName}:${buildId}`
+}
diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
new file mode 100644
index 000000000..e282ef7f6
--- /dev/null
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -0,0 +1,350 @@
+'use client'
+
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import posthog from 'posthog-js'
+import { type FormEvent, useEffect, useMemo, useState } from 'react'
+import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
+import { useTRPC } from '@/trpc/client'
+import { Button } from '@/ui/primitives/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/ui/primitives/dialog'
+import { AddIcon, ArrowRightIcon, CheckIcon } from '@/ui/primitives/icons'
+import { Loader } from '@/ui/primitives/loader'
+import {
+  isValidTagShape,
+  normalizeTagInput,
+  TAG_MAX_LENGTH,
+  TAG_REGEX,
+} from './assign-dialog.helpers'
+import BuildPicker, { type BuildSelectionSource } from './build-picker'
+import TagNameField, { type TagNameStatus } from './tag-name-field'
+
+const NAME_DEBOUNCE_MS = 350
+
+interface AssignTagDialogProps {
+  teamSlug: string
+  templateId: string
+  templateName: string
+}
+
+export default function AssignTagDialog({
+  teamSlug,
+  templateId,
+  templateName,
+}: AssignTagDialogProps) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+
+  const [open, setOpen] = useState(false)
+  const [name, setNameRaw] = useState('')
+  const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
+  const [selectionSource, setSelectionSource] =
+    useState<BuildSelectionSource | null>(null)
+
+  const debouncedName = useDebouncedValue(name, NAME_DEBOUNCE_MS)
+  const normalizedDebouncedName = debouncedName.trim()
+  const hasValidShape = isValidTagShape(normalizedDebouncedName)
+
+  const existsQuery = useQuery(
+    trpc.templates.checkTagExists.queryOptions(
+      { teamSlug, templateId, tag: normalizedDebouncedName },
+      {
+        enabled: open && hasValidShape,
+        staleTime: 30_000,
+        refetchOnWindowFocus: false,
+      }
+    )
+  )
+
+  const mutation = useMutation(
+    trpc.templates.assignTag.mutationOptions({
+      onSuccess: (data, variables) => {
+        const persistedTag =
+          existsQuery.data?.normalizedTag ?? data.tags[0] ?? variables.tag
+        queryClient.setQueryData(
+          trpc.templates.checkTagExists.queryKey({
+            teamSlug,
+            templateId,
+            tag: persistedTag,
+          }),
+          { exists: true, normalizedTag: persistedTag }
+        )
+        queryClient.invalidateQueries({
+          queryKey: trpc.templates.getTagGroups.queryKey({
+            teamSlug,
+            templateId,
+          }),
+        })
+        trackAssign('assign succeeded', {})
+      },
+      onError: (error) => {
+        trackAssign('assign failed', {
+          error_status: error.data?.httpStatus ?? null,
+          error_code: error.data?.code ?? null,
+        })
+      },
+    })
+  )
+
+  const setName = (raw: string) => {
+    setNameRaw(normalizeTagInput(raw))
+    if (mutation.isError) mutation.reset()
+  }
+  const handleSetSelectedBuildId = (
+    id: string | null,
+    source: BuildSelectionSource
+  ) => {
+    setSelectedBuildId(id)
+    setSelectionSource(id ? source : null)
+    if (mutation.isError) mutation.reset()
+  }
+
+  const nameStatus: TagNameStatus = useMemo(() => {
+    if (name.trim() === '') return 'idle'
+    if (name.length > TAG_MAX_LENGTH || !TAG_REGEX.test(name)) {
+      return 'invalid'
+    }
+    if (name !== normalizedDebouncedName) return 'checking'
+    if (!hasValidShape) return 'invalid'
+    if (existsQuery.isFetching) return 'checking'
+    if (existsQuery.data?.exists) return 'exists'
+    return 'available'
+  }, [name, normalizedDebouncedName, hasValidShape, existsQuery])
+
+  const canSubmit =
+    nameStatus === 'available' &&
+    selectedBuildId !== null &&
+    !mutation.isPending
+
+  useEffect(() => {
+    if (!open) return
+    trackAssign('assign opened', { template_id: templateId })
+  }, [open, templateId])
+
+  const resetState = () => {
+    setNameRaw('')
+    setSelectedBuildId(null)
+    setSelectionSource(null)
+    mutation.reset()
+  }
+
+  const handleOpenChange = (next: boolean) => {
+    if (mutation.isPending) return
+    // Reset before opening so the dialog mounts with clean state. Don't reset
+    // on close — the dialog stays mounted during its exit animation and any
+    // visible body swap (e.g. success → idle form) would flicker through.
+    if (next && !open) resetState()
+    setOpen(next)
+  }
+
+  const handleSubmit = (e?: FormEvent<HTMLFormElement>) => {
+    e?.preventDefault()
+    if (!canSubmit || !selectedBuildId) return
+    const tagToSubmit =
+      existsQuery.data?.normalizedTag ?? normalizedDebouncedName
+    trackAssign('assign submitted', {
+      via_search: selectionSource === 'search',
+    })
+    mutation.mutate({
+      teamSlug,
+      templateId,
+      templateName,
+      buildId: selectedBuildId,
+      tag: tagToSubmit,
+    })
+  }
+
+  const stage: Stage =
+    mutation.status === 'pending'
+      ? 'pending'
+      : mutation.status === 'error'
+        ? 'error'
+        : mutation.status === 'success'
+          ? 'success'
+          : 'idle'
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>
+        <Button variant="primary">
+          <AddIcon />
+          Assign new tag
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent
+        hideClose={stage === 'pending'}
+        className="sm:max-w-[450px] sm:h-[436px]"
+        onPointerDownOutside={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+      >
+        <DialogHeader>
+          <DialogTitle>Assign new tag</DialogTitle>
+        </DialogHeader>
+
+        {stage === 'success' ? (
+          <SuccessBody
+            tag={
+              existsQuery.data?.normalizedTag ??
+              mutation.data?.tags[0] ??
+              normalizedDebouncedName
+            }
+          />
+        ) : (
+          <form onSubmit={handleSubmit} className="flex flex-col gap-2">
+            <TagNameField
+              value={name}
+              onChange={setName}
+              status={nameStatus}
+              disabled={stage === 'pending'}
+              autoFocus
+            />
+
+            <ArrowDivider />
+
+            <div className="flex items-center gap-3 mb-1">
+              <span className="prose-label-highlight uppercase text-fg-tertiary">
+                Target
+              </span>
+              <span className="prose-body font-mono text-fg-primary">
+                {selectedBuildId ? selectedBuildId : '--'}
+              </span>
+            </div>
+
+            <BuildPicker
+              open={open}
+              teamSlug={teamSlug}
+              templateId={templateId}
+              selectedBuildId={selectedBuildId}
+              onSelect={handleSetSelectedBuildId}
+              disabled={stage === 'pending'}
+            />
+
+            {/* Hidden submit so Enter from any input triggers submit if enabled. */}
+            <button type="submit" hidden aria-hidden tabIndex={-1} />
+          </form>
+        )}
+
+        <Footer
+          stage={stage}
+          canSubmit={canSubmit}
+          errorMessage={mutation.error?.message ?? null}
+          onSubmit={handleSubmit}
+          onCancel={() => handleOpenChange(false)}
+          onDismiss={() => handleOpenChange(false)}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+type Stage = 'idle' | 'pending' | 'error' | 'success'
+
+interface FooterProps {
+  stage: Stage
+  canSubmit: boolean
+  errorMessage: string | null
+  onSubmit: () => void
+  onCancel: () => void
+  onDismiss: () => void
+}
+
+function Footer({
+  stage,
+  canSubmit,
+  errorMessage,
+  onSubmit,
+  onCancel,
+  onDismiss,
+}: FooterProps) {
+  switch (stage) {
+    case 'pending':
+      return (
+        <DialogFooter className="flex-col sm:flex-row">
+          <div className="flex w-full items-center justify-center gap-2 py-2">
+            <Loader variant="slash" size="sm" />
+            <span className="prose-body text-fg-secondary">Assigning…</span>
+          </div>
+        </DialogFooter>
+      )
+    case 'error':
+      return (
+        <DialogFooter className="flex-col gap-3 sm:flex-col">
+          {errorMessage ? (
+            <p className="prose-body w-full text-accent-error-highlight">
+              {errorMessage}
+            </p>
+          ) : null}
+          <div className="grid w-full grid-cols-2 gap-2">
+            <Button variant="secondary" onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button autoFocus onClick={onSubmit}>
+              Retry
+            </Button>
+          </div>
+        </DialogFooter>
+      )
+    case 'success':
+      return (
+        <DialogFooter className="mt-auto">
+          <Button autoFocus className="w-full" onClick={onDismiss}>
+            Dismiss
+          </Button>
+        </DialogFooter>
+      )
+    default:
+      return (
+        <DialogFooter className="grid grid-cols-2 gap-2 sm:flex-row">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button disabled={!canSubmit} onClick={onSubmit}>
+            Assign
+          </Button>
+        </DialogFooter>
+      )
+  }
+}
+
+function SuccessBody({ tag }: { tag: string }) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-3 py-8 text-center">
+      <span className="flex size-12 items-center justify-center rounded-full bg-accent-positive-bg text-accent-positive-highlight">
+        <CheckIcon className="size-6" />
+      </span>
+      <p className="prose-headline-small text-fg">
+        <span className="font-mono">‘{tag}’</span>
+        <br />
+        assigned successfully
+      </p>
+    </div>
+  )
+}
+
+function ArrowDivider() {
+  return (
+    <div className="flex items-center gap-2">
+      <span className="h-px flex-1 bg-stroke" aria-hidden />
+      <ArrowRightIcon className="size-4 rotate-90 text-fg-tertiary" />
+      <span className="h-px flex-1 bg-stroke" aria-hidden />
+    </div>
+  )
+}
+
+function trackAssign(action: string, properties: Record<string, unknown>) {
+  posthog.capture('tag table interacted', {
+    action,
+    ...properties,
+  })
+}
diff --git a/src/features/dashboard/templates/tags/build-picker-row.tsx b/src/features/dashboard/templates/tags/build-picker-row.tsx
new file mode 100644
index 000000000..826bcdf58
--- /dev/null
+++ b/src/features/dashboard/templates/tags/build-picker-row.tsx
@@ -0,0 +1,37 @@
+'use client'
+
+import { memo } from 'react'
+import { formatTimeAgoCompact } from '@/lib/utils/formatting'
+import { Label } from '@/ui/primitives/label'
+import { RadioGroupItem } from '@/ui/primitives/radio-group'
+
+interface BuildPickerRowProps {
+  buildId: string
+  createdAt: number
+  disabled?: boolean
+}
+
+function BuildPickerRowComponent({
+  buildId,
+  createdAt,
+  disabled,
+}: BuildPickerRowProps) {
+  const id = `build-row-${buildId}`
+
+  return (
+    <div className="flex items-center gap-2 hover:bg-bg-hover">
+      <RadioGroupItem id={id} value={buildId} disabled={disabled} />
+      <Label
+        htmlFor={id}
+        className="prose-table-numeric min-w-0 flex-1 cursor-pointer select-none truncate font-mono normal-case text-fg-secondary"
+      >
+        {buildId}
+      </Label>
+      <span className="prose-body whitespace-nowrap text-fg-tertiary">
+        {formatTimeAgoCompact(Date.now() - createdAt)}
+      </span>
+    </div>
+  )
+}
+
+export const BuildPickerRow = memo(BuildPickerRowComponent)
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
new file mode 100644
index 000000000..4602bf114
--- /dev/null
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -0,0 +1,326 @@
+'use client'
+
+import { useQuery } from '@tanstack/react-query'
+import { type ReactElement, useEffect, useId, useMemo, useState } from 'react'
+import type { ListedBuildModel } from '@/core/modules/builds/models'
+import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
+import { cn } from '@/lib/utils'
+import { useTRPC } from '@/trpc/client'
+import { Button } from '@/ui/primitives/button'
+import { AlertIcon, BuildIcon, SearchIcon } from '@/ui/primitives/icons'
+import { RadioGroup } from '@/ui/primitives/radio-group'
+import { Skeleton } from '@/ui/primitives/skeleton'
+import { isValidUuid } from './assign-dialog.helpers'
+import { BuildPickerRow } from './build-picker-row'
+
+type BuildsQueryResult = {
+  data?: { data: ListedBuildModel[]; nextCursor: string | null }
+  isPending: boolean
+  isError: boolean
+  refetch: () => void
+}
+
+export type BuildSelectionSource = 'default' | 'search'
+
+const DEFAULT_LIMIT = 5
+const PICKER_REGION_MIN_HEIGHT = 'min-h-[170px]'
+
+interface BuildPickerProps {
+  open: boolean
+  teamSlug: string
+  templateId: string
+  selectedBuildId: string | null
+  onSelect: (buildId: string | null, source: BuildSelectionSource) => void
+  disabled?: boolean
+}
+
+export default function BuildPicker({
+  open,
+  teamSlug,
+  templateId,
+  selectedBuildId,
+  onSelect,
+  disabled,
+}: BuildPickerProps) {
+  const trpc = useTRPC()
+  const [searchValue, setSearchValue] = useState('')
+  const debouncedSearch = useDebouncedValue(searchValue.trim(), 300)
+  const isUuid = isValidUuid(debouncedSearch)
+
+  const defaultQuery = useQuery(
+    trpc.builds.list.queryOptions(
+      {
+        teamSlug,
+        buildIdOrTemplate: templateId,
+        statuses: ['success'],
+        limit: DEFAULT_LIMIT,
+      },
+      {
+        enabled: open,
+        staleTime: 30_000,
+        refetchOnWindowFocus: false,
+      }
+    )
+  )
+
+  const searchQuery = useQuery(
+    trpc.builds.list.queryOptions(
+      {
+        teamSlug,
+        buildIdOrTemplate: debouncedSearch,
+        statuses: ['success'],
+        limit: 1,
+      },
+      {
+        enabled: open && isUuid,
+        staleTime: 30_000,
+        refetchOnWindowFocus: false,
+        retry: false,
+      }
+    )
+  )
+
+  const isSearchMode = debouncedSearch.length > 0 && isUuid
+
+  const defaultBuilds = useMemo(
+    () => defaultQuery.data?.data ?? [],
+    [defaultQuery.data]
+  )
+
+  const searchResult = useMemo(() => {
+    if (!isSearchMode) return null
+    const build = searchQuery.data?.data[0]
+    if (!build) return { kind: 'not-found' as const }
+    if (build.templateId !== templateId) return { kind: 'not-found' as const }
+    return { kind: 'found' as const, build }
+  }, [isSearchMode, searchQuery.data, templateId])
+
+  // Drop selection when the selected build is no longer renderable.
+  useEffect(() => {
+    if (!selectedBuildId) return
+    if (isSearchMode) {
+      if (
+        searchResult?.kind === 'found' &&
+        searchResult.build.id === selectedBuildId
+      ) {
+        return
+      }
+      onSelect(null, 'search')
+      return
+    }
+    if (!defaultBuilds.some((b) => b.id === selectedBuildId)) {
+      onSelect(null, 'default')
+    }
+  }, [selectedBuildId, isSearchMode, searchResult, defaultBuilds, onSelect])
+
+  return (
+    <div className="flex flex-col gap-2.5">
+      <BuildSearchInput
+        value={searchValue}
+        onChange={setSearchValue}
+        disabled={disabled}
+      />
+
+      <div className={cn('flex flex-col', PICKER_REGION_MIN_HEIGHT)}>
+        <PickerBody
+          isSearchMode={isSearchMode}
+          defaultQuery={defaultQuery}
+          searchQuery={searchQuery}
+          searchResult={searchResult}
+          defaultBuilds={defaultBuilds}
+          selectedBuildId={selectedBuildId}
+          onSelect={onSelect}
+          disabled={disabled}
+        />
+      </div>
+    </div>
+  )
+}
+
+interface PickerBodyProps {
+  isSearchMode: boolean
+  defaultQuery: BuildsQueryResult
+  searchQuery: BuildsQueryResult
+  searchResult:
+    | { kind: 'found'; build: ListedBuildModel }
+    | { kind: 'not-found' }
+    | null
+  defaultBuilds: ListedBuildModel[]
+  selectedBuildId: string | null
+  onSelect: (buildId: string | null, source: BuildSelectionSource) => void
+  disabled?: boolean
+}
+
+function PickerBody({
+  isSearchMode,
+  defaultQuery,
+  searchQuery,
+  searchResult,
+  defaultBuilds,
+  selectedBuildId,
+  onSelect,
+  disabled,
+}: PickerBodyProps) {
+  if (isSearchMode) {
+    if (searchQuery.isPending) {
+      return <SkeletonRows count={1} />
+    }
+    if (searchQuery.isError) {
+      return (
+        <PickerMessage
+          icon={<AlertIcon className="size-5 text-accent-error-highlight" />}
+          title="Failed to look up build."
+          action={
+            <Button variant="secondary" onClick={() => searchQuery.refetch()}>
+              Retry
+            </Button>
+          }
+        />
+      )
+    }
+    if (!searchResult || searchResult.kind === 'not-found') {
+      return (
+        <PickerMessage
+          icon={<SearchIcon className="size-5 text-fg-tertiary" />}
+          title="No build found with this ID."
+        />
+      )
+    }
+    return (
+      <RadioGroup
+        value={selectedBuildId ?? ''}
+        onValueChange={(value) => onSelect(value || null, 'search')}
+        className="flex flex-col gap-1"
+        aria-label="Build search result"
+      >
+        <BuildPickerRow
+          buildId={searchResult.build.id}
+          createdAt={searchResult.build.createdAt}
+          disabled={disabled}
+        />
+      </RadioGroup>
+    )
+  }
+
+  if (defaultQuery.isPending) {
+    return <SkeletonRows count={DEFAULT_LIMIT} />
+  }
+  if (defaultQuery.isError) {
+    return (
+      <PickerMessage
+        icon={<AlertIcon className="size-5 text-accent-error-highlight" />}
+        title="Failed to load builds."
+        action={
+          <Button variant="secondary" onClick={() => defaultQuery.refetch()}>
+            Retry
+          </Button>
+        }
+      />
+    )
+  }
+  if (defaultBuilds.length === 0) {
+    return (
+      <PickerMessage
+        icon={<BuildIcon className="size-5 text-fg-tertiary" />}
+        title="No ready builds yet"
+        description="Builds appear here once they finish successfully."
+      />
+    )
+  }
+  return (
+    <RadioGroup
+      value={selectedBuildId ?? ''}
+      onValueChange={(value) => onSelect(value || null, 'default')}
+      className="flex flex-col gap-1"
+      aria-label="Recent ready builds"
+    >
+      {defaultBuilds.map((build) => (
+        <BuildPickerRow
+          key={build.id}
+          buildId={build.id}
+          createdAt={build.createdAt}
+          disabled={disabled}
+        />
+      ))}
+    </RadioGroup>
+  )
+}
+
+interface BuildSearchInputProps {
+  value: string
+  onChange: (next: string) => void
+  disabled?: boolean
+}
+
+function BuildSearchInput({
+  value,
+  onChange,
+  disabled,
+}: BuildSearchInputProps) {
+  const id = useId()
+  return (
+    <label
+      htmlFor={id}
+      className={cn(
+        'flex h-9 w-full min-w-0 items-center gap-2 border bg-transparent px-3',
+        'transition-colors anim-ease-appear anim-duration-fast',
+        'hover:border-stroke-active',
+        'focus-within:border-stroke-active focus-within:bg-bg-highlight'
+      )}
+    >
+      <SearchIcon className="size-4 shrink-0 text-fg-tertiary" />
+      <input
+        id={id}
+        type="text"
+        aria-label="Search by build ID"
+        placeholder="Build ID"
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        disabled={disabled}
+        className="prose-body min-w-0 flex-1 bg-transparent font-mono outline-none placeholder:font-sans placeholder:text-fg-tertiary"
+      />
+    </label>
+  )
+}
+
+function SkeletonRows({ count }: { count: number }) {
+  return (
+    <ul className="flex flex-col" aria-hidden="true">
+      {Array.from({ length: count }, (_, i) => (
+        <li
+          key={`skeleton-${i}`}
+          className="flex items-center gap-3 px-2 py-1.5"
+        >
+          <Skeleton className="size-4" />
+          <Skeleton className="h-4 w-64" />
+          <Skeleton className="ml-auto h-4 w-14" />
+        </li>
+      ))}
+    </ul>
+  )
+}
+
+interface PickerMessageProps {
+  icon: ReactElement
+  title: string
+  description?: string
+  action?: ReactElement
+}
+
+function PickerMessage({
+  icon,
+  title,
+  description,
+  action,
+}: PickerMessageProps) {
+  return (
+    <div className="flex flex-1 flex-col items-center justify-center gap-2 px-4 py-6 text-center">
+      {icon}
+      <p className="prose-body-highlight text-fg">{title}</p>
+      {description ? (
+        <p className="prose-body max-w-64 text-fg-tertiary">{description}</p>
+      ) : null}
+      {action ? <div className="pt-1">{action}</div> : null}
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index c6bd25622..550ff23c1 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -88,7 +88,7 @@ export default function TagDeleteDialog({
         <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:gap-6">
           <DialogHeader className="min-w-0 flex-1 text-left">
             <DialogTitle className="flex items-center gap-2 text-accent-error-highlight">
-              <WarningIcon className="size-4" />
+              <WarningIcon className="size-4 shrink-0" />
               <span>{`Delete '${tag}' tag?`}</span>
             </DialogTitle>
             <DialogDescription className="sr-only">
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 2106eacb8..fc9c96430 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -2,21 +2,25 @@
 
 import type { Table } from '@tanstack/react-table'
 import { useCallback } from 'react'
-import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
-import { Button } from '@/ui/primitives/button'
-import { AddIcon, SearchIcon } from '@/ui/primitives/icons'
+import { SearchIcon } from '@/ui/primitives/icons'
 import { DebouncedInput } from '@/ui/primitives/input'
+import AssignTagDialog from './assign-dialog'
 import { useTagTableStore } from './stores/table-store'
 import type { TagGroup } from './types'
 
 interface TagsHeaderProps {
   table: Table<TagGroup>
+  teamSlug: string
+  templateId: string
+  templateName: string
 }
 
-export default function TagsHeader({ table }: TagsHeaderProps) {
-  'use no memo'
-
-  const { toast } = useToast()
+export default function TagsHeader({
+  table,
+  teamSlug,
+  templateId,
+  templateName,
+}: TagsHeaderProps) {
   const globalFilter = useTagTableStore((s) => s.globalFilter)
   const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
 
@@ -31,10 +35,6 @@ export default function TagsHeader({ table }: TagsHeaderProps) {
     [setGlobalFilter]
   )
 
-  const handleAssignClick = () => {
-    toast(defaultErrorToast('Assign new tag: not implemented yet'))
-  }
-
   return (
     <div className="flex flex-col gap-3">
       <div className="flex items-center gap-2 justify-between">
@@ -45,13 +45,14 @@ export default function TagsHeader({ table }: TagsHeaderProps) {
             className="pl-[30px]"
             value={globalFilter}
             onChange={handleSearchChange}
-            debounce={300}
+            debounce={200}
           />
         </div>
-        <Button variant="primary" onClick={handleAssignClick}>
-          <AddIcon />
-          Assign new tag
-        </Button>
+        <AssignTagDialog
+          teamSlug={teamSlug}
+          templateId={templateId}
+          templateName={templateName}
+        />
       </div>
 
       <div className="flex items-center justify-between gap-4">
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 6d2105f27..20823cd4d 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -117,7 +117,12 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
 
   return (
     <div className="flex flex-col gap-6 h-full min-h-0">
-      <TagsHeader table={table} />
+      <TagsHeader
+        table={table}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+      />
 
       <div className="flex-1 min-h-0 -mx-3 px-3">
         <DataTable className="w-full">
@@ -134,7 +139,6 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
                     sorting={sorting.find((s) => s.id === header.id)?.desc}
                     align={header.id === 'actions' ? 'right' : 'left'}
                     className={cn(
-                      // Figma spec: header height = text line-height (17px).
                       'h-auto px-0',
                       header.id === 'tag' && 'flex-1 min-w-0',
                       header.id === 'assignedAt' && 'w-[178px] shrink-0',
diff --git a/src/features/dashboard/templates/tags/tag-name-field.tsx b/src/features/dashboard/templates/tags/tag-name-field.tsx
new file mode 100644
index 000000000..bc510829b
--- /dev/null
+++ b/src/features/dashboard/templates/tags/tag-name-field.tsx
@@ -0,0 +1,77 @@
+'use client'
+
+import { type ReactElement, useId } from 'react'
+import { cn } from '@/lib/utils'
+import { SearchIcon } from '@/ui/primitives/icons'
+import { Loader } from '@/ui/primitives/loader'
+
+export type TagNameStatus =
+  | 'idle'
+  | 'invalid'
+  | 'checking'
+  | 'exists'
+  | 'available'
+
+interface TagNameFieldProps {
+  value: string
+  onChange: (value: string) => void
+  status: TagNameStatus
+  disabled?: boolean
+  autoFocus?: boolean
+}
+
+const STATUS_INDICATOR: Partial<Record<TagNameStatus, ReactElement>> = {
+  checking: <Loader variant="slash" size="sm" aria-label="Checking tag name" />,
+  exists: (
+    <span className="prose-body whitespace-nowrap text-accent-error-highlight">
+      Already exists
+    </span>
+  ),
+}
+
+export default function TagNameField({
+  value,
+  onChange,
+  status,
+  disabled,
+  autoFocus,
+}: TagNameFieldProps) {
+  const id = useId()
+  const indicator = STATUS_INDICATOR[status]
+  const showAsInvalid = status === 'invalid' || status === 'exists'
+
+  return (
+    <label
+      htmlFor={id}
+      className={cn(
+        'flex h-9 w-full min-w-0 items-center gap-2 border bg-transparent px-3',
+        'transition-colors anim-ease-appear anim-duration-fast',
+        'hover:border-stroke-active',
+        'focus-within:border-stroke-active focus-within:bg-bg-highlight',
+        showAsInvalid && 'border-accent-error-highlight'
+      )}
+    >
+      <input
+        id={id}
+        type="text"
+        // biome-ignore lint/a11y/noAutofocus: dialog-scoped focus is expected UX
+        autoFocus={autoFocus}
+        disabled={disabled}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        placeholder="Enter tag name"
+        aria-invalid={showAsInvalid || undefined}
+        className={cn(
+          'prose-body min-w-0 flex-1 bg-transparent outline-none placeholder:text-fg-tertiary',
+          // Leading-truncation trick: flip to RTL only when blurred AND has content,
+          // so the ellipsis appears at the start of the value.
+          '[&:not(:focus):not(:placeholder-shown)]:[direction:rtl]',
+          '[&:not(:focus):not(:placeholder-shown)]:text-left'
+        )}
+      />
+      {indicator ? (
+        <span className="flex shrink-0 items-center">{indicator}</span>
+      ) : null}
+    </label>
+  )
+}
diff --git a/src/lib/hooks/use-debounced-value.ts b/src/lib/hooks/use-debounced-value.ts
new file mode 100644
index 000000000..e75ee907e
--- /dev/null
+++ b/src/lib/hooks/use-debounced-value.ts
@@ -0,0 +1,12 @@
+import { useEffect, useState } from 'react'
+
+export function useDebouncedValue<T>(value: T, delay: number): T {
+  const [debounced, setDebounced] = useState(value)
+
+  useEffect(() => {
+    const timeout = setTimeout(() => setDebounced(value), delay)
+    return () => clearTimeout(timeout)
+  }, [value, delay])
+
+  return debounced
+}
diff --git a/src/lib/utils/ui.ts b/src/lib/utils/ui.ts
index 49b6770ce..42118a71a 100644
--- a/src/lib/utils/ui.ts
+++ b/src/lib/utils/ui.ts
@@ -7,7 +7,8 @@ export function cn(...inputs: ClassValue[]) {
 
 /**
  * Animation easing curves
- * ⚠️ Must be kept in sync with theme.css utilities (anim-ease-appear, anim-ease-transform)
+ * ⚠️ Must be kept in sync with theme.css `--ease-*` tokens.
  */
 export const EASE_APPEAR = [0.23, 1, 0.32, 1] as const // ease-out-quint
 export const EASE_TRANSFORM = [0.79, 0.14, 0.15, 0.86] as const // ease-in-out-circ
+export const EASE_IN_OUT_QUINT = [0.83, 0, 0.17, 1] as const // ease-in-out-quint
diff --git a/src/styles/theme.css b/src/styles/theme.css
index 2d05dd6cc..e6f3af337 100644
--- a/src/styles/theme.css
+++ b/src/styles/theme.css
@@ -480,6 +480,9 @@
   --animate-shiny-text: shiny-text 0.5s linear infinite;
   --animate-loader-slash: loader-slash 0.4s linear infinite;
   --animate-loader-square: loader-square 0.4s linear infinite;
+
+  /* Easings (kept in sync with src/lib/utils/ui.ts) */
+  --ease-in-out-quint: cubic-bezier(0.83, 0, 0.17, 1);
 }
 
 /* Container */
diff --git a/src/ui/primitives/dialog.tsx b/src/ui/primitives/dialog.tsx
index df083de53..ba60ad270 100644
--- a/src/ui/primitives/dialog.tsx
+++ b/src/ui/primitives/dialog.tsx
@@ -89,7 +89,7 @@ function DialogContent({
             className={cn(
               [
                 'absolute top-4 right-4',
-                'text-icon-tertiary transition-colors hover:text-icon',
+                'text-icon-tertiary transition-colors hover:text-icon cursor-pointer',
                 'outline-none focus-visible:ring-1 focus-visible:ring-accent-main-highlight',
                 'disabled:pointer-events-none',
                 "[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
@@ -135,7 +135,7 @@ function DialogTitle({
   return (
     <DialogPrimitive.Title
       data-slot="dialog-title"
-      className={cn('text-headline-small! uppercase', className)}
+      className={cn('prose-headline-small! uppercase', className)}
       {...props}
     />
   )
diff --git a/tests/unit/assign-tag-dialog-helpers.test.ts b/tests/unit/assign-tag-dialog-helpers.test.ts
new file mode 100644
index 000000000..6d5937f2c
--- /dev/null
+++ b/tests/unit/assign-tag-dialog-helpers.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest'
+import {
+  buildAssignTarget,
+  isValidTagShape,
+  isValidUuid,
+  normalizeTagInput,
+  TAG_MAX_LENGTH,
+} from '@/features/dashboard/templates/tags/assign-dialog.helpers'
+
+describe('normalizeTagInput', () => {
+  it('lowercases ASCII letters so user input matches the server normalization', () => {
+    expect(normalizeTagInput('MyRelease')).toBe('myrelease')
+  })
+
+  it('replaces every whitespace character with a hyphen without collapsing runs', () => {
+    expect(normalizeTagInput('new release')).toBe('new-release')
+    expect(normalizeTagInput('new  release')).toBe('new--release')
+    expect(normalizeTagInput('paste\twith\nnewlines')).toBe(
+      'paste-with-newlines'
+    )
+  })
+
+  it('leaves an already-valid value untouched', () => {
+    expect(normalizeTagInput('v1.2.3-rc4')).toBe('v1.2.3-rc4')
+  })
+})
+
+describe('isValidTagShape', () => {
+  it('accepts the tag charset shared with infra `id.tagRegex`', () => {
+    expect(isValidTagShape('new-release')).toBe(true)
+    expect(isValidTagShape('v1.2.3')).toBe(true)
+    expect(isValidTagShape('snake_case')).toBe(true)
+  })
+
+  it('rejects uppercase characters', () => {
+    expect(isValidTagShape('MyTag')).toBe(false)
+  })
+
+  it('rejects whitespace and reserved chars', () => {
+    expect(isValidTagShape('with space')).toBe(false)
+    expect(isValidTagShape('slash/here')).toBe(false)
+    expect(isValidTagShape('colon:here')).toBe(false)
+    expect(isValidTagShape('')).toBe(false)
+  })
+
+  it('caps length at the infra tag max', () => {
+    expect(isValidTagShape('a'.repeat(TAG_MAX_LENGTH))).toBe(true)
+    expect(isValidTagShape('a'.repeat(TAG_MAX_LENGTH + 1))).toBe(false)
+  })
+})
+
+describe('isValidUuid', () => {
+  it('accepts canonical UUIDs', () => {
+    expect(isValidUuid('bcdaef01-2345-6789-0abc-def123456789')).toBe(true)
+  })
+
+  it('is case insensitive', () => {
+    expect(isValidUuid('BCDAEF01-2345-6789-0ABC-DEF123456789')).toBe(true)
+  })
+
+  it('rejects partial UUIDs', () => {
+    expect(isValidUuid('bcdaef01-2345')).toBe(false)
+  })
+
+  it('rejects malformed UUIDs', () => {
+    expect(isValidUuid('not-a-uuid')).toBe(false)
+    expect(isValidUuid('')).toBe(false)
+    expect(isValidUuid('  bcdaef01-2345-6789-0abc-def123456789  ')).toBe(false)
+  })
+})
+
+describe('buildAssignTarget', () => {
+  it('joins template name and build UUID with a colon', () => {
+    expect(
+      buildAssignTarget('my-template', 'bcdaef01-2345-6789-0abc-def123456789')
+    ).toBe('my-template:bcdaef01-2345-6789-0abc-def123456789')
+  })
+})
diff --git a/tests/unit/templates-repository-assign-tag.test.ts b/tests/unit/templates-repository-assign-tag.test.ts
new file mode 100644
index 000000000..6b4818aed
--- /dev/null
+++ b/tests/unit/templates-repository-assign-tag.test.ts
@@ -0,0 +1,148 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createTemplatesRepository } from '@/core/modules/templates/repository.server'
+
+function createApiResponse<T>(input: {
+  ok: boolean
+  status: number
+  data?: T
+  error?: { message?: string } | null
+}) {
+  return {
+    data: input.data,
+    error: input.error ?? null,
+    response: { ok: input.ok, status: input.status },
+  }
+}
+
+function createDeps(infraPost: ReturnType<typeof vi.fn>) {
+  return {
+    apiClient: {
+      GET: vi.fn(),
+      POST: vi.fn(),
+      PATCH: vi.fn(),
+      DELETE: vi.fn(),
+    } as unknown as Parameters<
+      typeof createTemplatesRepository
+    >[1]['apiClient'],
+    infraClient: {
+      GET: vi.fn(),
+      POST: infraPost,
+      PATCH: vi.fn(),
+      DELETE: vi.fn(),
+    } as unknown as Parameters<
+      typeof createTemplatesRepository
+    >[1]['infraClient'],
+    authHeaders: vi.fn(() => ({ 'X-Supabase-Token': 'token' })),
+    resolveAuthUserEmailsById: vi.fn(async () => new Map<string, string>()),
+  }
+}
+
+const scope = { accessToken: 'token', teamId: 'team-id' }
+
+describe('createTemplatesRepository.assignTag', () => {
+  it('builds the infra target as "<templateName>:<buildId>" and forwards the tag', async () => {
+    const post = vi.fn().mockResolvedValue(
+      createApiResponse<{ tags: string[]; buildID: string }>({
+        ok: true,
+        status: 201,
+        data: {
+          tags: ['new-release'],
+          buildID: 'bcdaef01-2345-6789-0abc-def123456789',
+        },
+      })
+    )
+    const repo = createTemplatesRepository(scope, createDeps(post))
+
+    const result = await repo.assignTag({
+      templateName: 'my-template',
+      buildId: 'bcdaef01-2345-6789-0abc-def123456789',
+      tag: 'new-release',
+    })
+
+    expect(result).toEqual({
+      ok: true,
+      data: {
+        tags: ['new-release'],
+        buildID: 'bcdaef01-2345-6789-0abc-def123456789',
+      },
+    })
+    expect(post).toHaveBeenCalledWith(
+      '/templates/tags',
+      expect.objectContaining({
+        body: {
+          target: 'my-template:bcdaef01-2345-6789-0abc-def123456789',
+          tags: ['new-release'],
+        },
+      })
+    )
+  })
+
+  it('maps a 400 response to a validation repo error preserving the server message', async () => {
+    const post = vi.fn().mockResolvedValue(
+      createApiResponse({
+        ok: false,
+        status: 400,
+        error: { message: 'Invalid tag' },
+      })
+    )
+    const repo = createTemplatesRepository(scope, createDeps(post))
+
+    const result = await repo.assignTag({
+      templateName: 'my-template',
+      buildId: 'bcdaef01-2345-6789-0abc-def123456789',
+      tag: 'Bad Tag',
+    })
+
+    expect(result).toEqual({
+      ok: false,
+      error: expect.objectContaining({
+        code: 'validation',
+        status: 400,
+        message: 'Invalid tag',
+      }),
+    })
+  })
+
+  it('maps a 404 response to a not-found repo error', async () => {
+    const post = vi.fn().mockResolvedValue(
+      createApiResponse({
+        ok: false,
+        status: 404,
+        error: { message: 'Template not found' },
+      })
+    )
+    const repo = createTemplatesRepository(scope, createDeps(post))
+
+    const result = await repo.assignTag({
+      templateName: 'unknown',
+      buildId: 'bcdaef01-2345-6789-0abc-def123456789',
+      tag: 'v1',
+    })
+
+    expect(result.ok).toBe(false)
+    if (result.ok) return
+    expect(result.error.status).toBe(404)
+  })
+
+  it('maps a 500 response to a generic repo error', async () => {
+    const post = vi.fn().mockResolvedValue(
+      createApiResponse({
+        ok: false,
+        status: 500,
+        error: { message: 'duplicate key value violates unique constraint' },
+      })
+    )
+    const repo = createTemplatesRepository(scope, createDeps(post))
+
+    const result = await repo.assignTag({
+      templateName: 'my-template',
+      buildId: 'bcdaef01-2345-6789-0abc-def123456789',
+      tag: 'existing',
+    })
+
+    expect(result.ok).toBe(false)
+    if (result.ok) return
+    expect(result.error.status).toBe(500)
+    expect(result.error.message).toContain('duplicate key')
+  })
+})

From aabee699d1821da044dd742f2e3bbdbf1d563714 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 13:08:06 +0200
Subject: [PATCH 15/90] scrollable table

---
 src/features/dashboard/templates/tags/table.tsx | 7 +++----
 src/ui/row-hover-frame.tsx                      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 20823cd4d..d3e9aff00 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -123,14 +123,13 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
         templateId={templateId}
         templateName={templateName}
       />
-
-      <div className="flex-1 min-h-0 -mx-3 px-3">
+      <div className="flex-1 min-h-0 overflow-y-auto overflow-x-hidden -mx-8 px-8 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
         <DataTable className="w-full">
-          <DataTableHeader className="sticky top-0 z-10 bg-bg border-b-0">
+          <DataTableHeader className="sticky top-0 z-10 bg-bg border-b-0 mb-px">
             {table.getHeaderGroups().map((headerGroup) => (
               <DataTableRow
                 key={headerGroup.id}
-                className="border-b-0 flex w-full items-center gap-6"
+                className="border-b-0 flex items-center gap-6 -mx-8 px-8 w-[calc(100%+64px)]"
               >
                 {headerGroup.headers.map((header) => (
                   <DataTableHead
diff --git a/src/ui/row-hover-frame.tsx b/src/ui/row-hover-frame.tsx
index cd54f4e52..2028fb8b1 100644
--- a/src/ui/row-hover-frame.tsx
+++ b/src/ui/row-hover-frame.tsx
@@ -23,7 +23,7 @@ export function RowHoverFrame({ className }: RowHoverFrameProps) {
     <div
       aria-hidden
       className={cn(
-        'pointer-events-none absolute inset-x-0 -inset-y-px z-20',
+        'pointer-events-none absolute inset-x-0 -inset-y-px',
         'border border-transparent',
         'group-hover/row:border-stroke',
         'group-hover/row:[--corner-mark-color:var(--color-fg-tertiary)]',

From 67c491d4e0aaa6c50d0b30f901a723cba3ab37bb Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 13:31:41 +0200
Subject: [PATCH 16/90] promote->reassign

---
 src/features/dashboard/templates/tags/table-cells.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index ba60d11d7..8fc9a433c 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -88,10 +88,10 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
           className={SMALL_BUTTON}
           onClick={(e) => {
             e.stopPropagation()
-            toast(defaultErrorToast('Promote: not implemented yet'))
+            toast(defaultErrorToast('Reassign: not implemented yet'))
           }}
         >
-          Promote
+          Reassign
         </Button>
         <Button
           variant="secondary"

From b50c3c96b7879177d8a531fcf3b934523d23efd7 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 13:37:55 +0200
Subject: [PATCH 17/90] make actions visible on section hover

---
 src/features/dashboard/templates/tags/table-cells.tsx | 9 +--------
 src/features/dashboard/templates/tags/table.tsx       | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 8fc9a433c..6235c82e1 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -64,7 +64,6 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
 
-  const isExpanded = row.getIsExpanded()
   const group = row.original
   const isDefaultTag = group.tag === DEFAULT_TAG_NAME
 
@@ -73,13 +72,7 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
       <div
         className={cn(
           'flex items-center gap-1 max-sm:hidden',
-          isExpanded
-            ? 'opacity-100'
-            : // Reveal on mouse hover anywhere in the row, or when a
-              // keyboard-focused descendant is inside the row.
-              // `has-[:focus-visible]` (not focus-within) avoids the
-              // buttons lingering after a mouse click leaves focus on them.
-              'opacity-0 group-hover/row:opacity-100 group-has-[:focus-visible]/row:opacity-100'
+          'opacity-0 group-hover/section:opacity-100 group-has-focus-visible/section:opacity-100'
         )}
       >
         <Button
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index d3e9aff00..618772b6f 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -223,7 +223,7 @@ function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
     : undefined
 
   return (
-    <div className="flex flex-col divide-y divide-stroke/80">
+    <div className="group/section flex flex-col divide-y divide-stroke/80">
       <DataTableRow
         data-state={dataState}
         role={canExpand ? 'button' : undefined}

From 2fc503a42746b8c58b745cbb2fb35c3d61610abc Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 14:48:16 +0200
Subject: [PATCH 18/90] tag history page

---
 spec/openapi.dashboard-api.yaml               | 125 ++++++++++++
 .../(detail-tabs)/tags/[tag]/page.tsx         |  22 +++
 src/configs/layout.ts                         |   3 +
 src/configs/urls.ts                           |   2 +
 .../modules/templates/repository.server.ts    |  50 +++++
 src/core/server/api/routers/templates.ts      |  19 ++
 .../shared/contracts/dashboard-api.types.ts   | 131 +++++++++++++
 .../dashboard/templates/detail/tabs.tsx       |   6 +-
 .../templates/tags/delete-dialog.tsx          |   9 +
 .../tags/history/tag-history-empty.tsx        |  17 ++
 .../tags/history/tag-history-header.tsx       | 142 ++++++++++++++
 .../tags/history/tag-history-row.tsx          |  88 +++++++++
 .../tags/history/tag-history-view.tsx         | 182 ++++++++++++++++++
 .../dashboard/templates/tags/table.tsx        | 101 ++--------
 14 files changed, 814 insertions(+), 83 deletions(-)
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
 create mode 100644 src/features/dashboard/templates/tags/history/tag-history-empty.tsx
 create mode 100644 src/features/dashboard/templates/tags/history/tag-history-header.tsx
 create mode 100644 src/features/dashboard/templates/tags/history/tag-history-row.tsx
 create mode 100644 src/features/dashboard/templates/tags/history/tag-history-view.tsx

diff --git a/spec/openapi.dashboard-api.yaml b/spec/openapi.dashboard-api.yaml
index b79ea085e..94fb9e3e9 100644
--- a/spec/openapi.dashboard-api.yaml
+++ b/spec/openapi.dashboard-api.yaml
@@ -147,6 +147,32 @@ components:
         minimum: 1
         maximum: 25
         default: 6
+    tag_path:
+      name: tag
+      in: path
+      required: true
+      description: Template tag name.
+      schema:
+        type: string
+        minLength: 1
+    tag_assignments_limit:
+      name: limit
+      in: query
+      required: false
+      description: Maximum number of assignment rows to return per page.
+      schema:
+        type: integer
+        format: int32
+        minimum: 1
+        maximum: 100
+        default: 50
+    tag_assignments_cursor:
+      name: cursor
+      in: query
+      required: false
+      description: Cursor returned by the previous list response in `assigned_at|assignment_id` format.
+      schema:
+        type: string
 
   responses:
     "400":
@@ -179,6 +205,12 @@ components:
         application/json:
           schema:
             $ref: "#/components/schemas/Error"
+    "502":
+      description: Upstream error
+      content:
+        application/json:
+          schema:
+            $ref: "#/components/schemas/Error"
 
   schemas:
     Error:
@@ -243,6 +275,21 @@ components:
           type: string
           format: email
 
+    AdminTeamBootstrapRequest:
+      type: object
+      required:
+        - name
+        - email
+      properties:
+        name:
+          type: string
+          minLength: 1
+          description: Team name.
+        email:
+          type: string
+          format: email
+          description: Billing/contact email for the team.
+
     BuildStatus:
       type: string
       description: Build status mapped for dashboard clients.
@@ -740,6 +787,22 @@ components:
           type: string
           description: Normalized template tag name.
 
+    TemplateTagAssignmentsResponse:
+      type: object
+      required:
+        - data
+        - nextCursor
+      properties:
+        data:
+          type: array
+          description: Ready assignment events for the tag, sorted latest first.
+          items:
+            $ref: "#/components/schemas/TemplateTagAssignment"
+        nextCursor:
+          type: string
+          nullable: true
+          description: Cursor to pass to the next list request, or `null` if there is no next page.
+
     TeamResolveResponse:
       type: object
       required:
@@ -947,6 +1010,35 @@ paths:
         "500":
           $ref: "#/components/responses/500"
 
+  /admin/teams/bootstrap:
+    post:
+      summary: Bootstrap team
+      description: Creates and provisions a team for an admin-authenticated bootstrap workflow.
+      tags: [admin]
+      security:
+        - AdminTokenAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/AdminTeamBootstrapRequest"
+      responses:
+        "200":
+          description: Successfully bootstrapped team.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TeamResolveResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "502":
+          $ref: "#/components/responses/502"
+        "500":
+          $ref: "#/components/responses/500"
+
   /admin/user-profiles/resolve:
     post:
       summary: Resolve user profiles
@@ -1239,3 +1331,36 @@ paths:
           $ref: "#/components/responses/404"
         "500":
           $ref: "#/components/responses/500"
+
+  /templates/{templateID}/tags/{tag}/assignments:
+    get:
+      summary: List ready assignments for a single template tag
+      description: Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
+      tags: [templates]
+      security:
+        - Supabase1TokenAuth: []
+          Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
+      parameters:
+        - $ref: "#/components/parameters/templateID"
+        - $ref: "#/components/parameters/tag_path"
+        - $ref: "#/components/parameters/tag_assignments_cursor"
+        - $ref: "#/components/parameters/tag_assignments_limit"
+      responses:
+        "200":
+          description: Successfully returned tag assignment page.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TemplateTagAssignmentsResponse"
+        "400":
+          $ref: "#/components/responses/400"
+        "401":
+          $ref: "#/components/responses/401"
+        "403":
+          $ref: "#/components/responses/403"
+        "404":
+          $ref: "#/components/responses/404"
+        "500":
+          $ref: "#/components/responses/500"
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
new file mode 100644
index 000000000..4192ef2cb
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
@@ -0,0 +1,22 @@
+import { Suspense } from 'react'
+import LoadingLayout from '@/features/dashboard/loading-layout'
+import TagHistoryView from '@/features/dashboard/templates/tags/history/tag-history-view'
+
+export default async function TemplateTagHistoryPage({
+  params,
+}: PageProps<'/dashboard/[teamSlug]/templates/[templateId]/tags/[tag]'>) {
+  const { teamSlug, templateId, tag } = await params
+  const decodedTag = decodeURIComponent(tag)
+
+  return (
+    <div className="h-full min-h-0 flex-1 py-6 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
+      <Suspense fallback={<LoadingLayout />}>
+        <TagHistoryView
+          teamSlug={teamSlug}
+          templateId={templateId}
+          tag={decodedTag}
+        />
+      </Suspense>
+    </div>
+  )
+}
diff --git a/src/configs/layout.ts b/src/configs/layout.ts
index 47debffa7..6543d00f2 100644
--- a/src/configs/layout.ts
+++ b/src/configs/layout.ts
@@ -94,6 +94,9 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
     templateDetailLayoutConfig(pathname),
   '/dashboard/*/templates/*/tags': (pathname) =>
     templateDetailLayoutConfig(pathname),
+  // Tag history page lives under (detail-tabs); same chrome as the parent tags tab.
+  '/dashboard/*/templates/*/tags/*': (pathname) =>
+    templateDetailLayoutConfig(pathname),
   // Distinct from /templates/*/builds/* (build detail) — keep the more specific glob earlier.
   '/dashboard/*/templates/*/builds': (pathname) =>
     templateDetailLayoutConfig(pathname),
diff --git a/src/configs/urls.ts b/src/configs/urls.ts
index 0056dfdfd..1332ffc5b 100644
--- a/src/configs/urls.ts
+++ b/src/configs/urls.ts
@@ -52,6 +52,8 @@ export const PROTECTED_URLS = {
     `/dashboard/${teamSlug}/templates/${templateId}/builds`,
   TEMPLATE_TAGS: (teamSlug: string, templateId: string) =>
     `/dashboard/${teamSlug}/templates/${templateId}/tags`,
+  TEMPLATE_TAG_HISTORY: (teamSlug: string, templateId: string, tag: string) =>
+    `/dashboard/${teamSlug}/templates/${templateId}/tags/${encodeURIComponent(tag)}`,
   TEMPLATE_BUILD: (teamSlug: string, templateId: string, buildId: string) =>
     `/dashboard/${teamSlug}/templates/${templateId}/builds/${buildId}`,
 
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index c08942653..a519830b5 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -11,6 +11,7 @@ import type {
   DefaultTemplate,
   Template,
   TemplateTag,
+  TemplateTagAssignment,
   TemplateTagExistsResult,
   TemplateTagGroup,
 } from '@/core/modules/templates/models'
@@ -42,6 +43,16 @@ export interface TeamTemplatesRepository {
     templateId: string,
     options?: { assignmentLimit?: number }
   ): Promise<RepoResult<{ tags: TemplateTagGroup[] }>>
+  getTagAssignments(
+    templateId: string,
+    tag: string,
+    options?: { cursor?: string; limit?: number }
+  ): Promise<
+    RepoResult<{
+      data: TemplateTagAssignment[]
+      nextCursor: string | null
+    }>
+  >
   checkTagExists(
     templateId: string,
     tag: string
@@ -157,6 +168,45 @@ export function createTemplatesRepository(
 
       return ok({ tags: res.data?.tags ?? [] })
     },
+    async getTagAssignments(templateId, tag, options) {
+      if (USE_MOCK_DATA) {
+        return ok({ data: [], nextCursor: null })
+      }
+
+      const res = await deps.apiClient.GET(
+        '/templates/{templateID}/tags/{tag}/assignments',
+        {
+          params: {
+            path: {
+              templateID: templateId,
+              tag,
+            },
+            query: {
+              cursor: options?.cursor,
+              limit: options?.limit,
+            },
+          },
+          headers: {
+            ...deps.authHeaders(scope.accessToken, scope.teamId),
+          },
+        }
+      )
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template tag assignments',
+            res.error
+          )
+        )
+      }
+
+      return ok({
+        data: res.data?.data ?? [],
+        nextCursor: res.data?.nextCursor ?? null,
+      })
+    },
     async checkTagExists(templateId, tag) {
       if (USE_MOCK_DATA) {
         return ok({ exists: false, normalizedTag: tag })
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index 5cb4b591c..5fb059dcf 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -82,6 +82,25 @@ export const templatesRouter = createTRPCRouter({
       return result.data
     }),
 
+  getTagAssignments: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+        tag: z.string().min(1),
+        cursor: z.string().optional(),
+        limit: z.number().int().min(1).max(100).default(50),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getTagAssignments(
+        input.templateId,
+        input.tag,
+        { cursor: input.cursor, limit: input.limit }
+      )
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
   checkTagExists: teamTemplatesRepositoryProcedure
     .input(
       z.object({
diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index 04969ec09..97ba8e7e0 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -327,6 +327,53 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/admin/teams/bootstrap": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Bootstrap team
+         * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
+         */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminTeamBootstrapRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully bootstrapped team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+                502: components["responses"]["502"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/admin/user-profiles/resolve": {
         parameters: {
             query?: never;
@@ -804,6 +851,60 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/templates/{templateID}/tags/{tag}/assignments": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List ready assignments for a single template tag
+         * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
+         */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+                    cursor?: components["parameters"]["tag_assignments_cursor"];
+                    /** @description Maximum number of assignment rows to return per page. */
+                    limit?: components["parameters"]["tag_assignments_limit"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                    /** @description Template tag name. */
+                    tag: components["parameters"]["tag_path"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned tag assignment page. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagAssignmentsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
 }
 export type webhooks = Record<string, never>;
 export interface components {
@@ -836,6 +937,15 @@ export interface components {
             /** Format: email */
             email: string;
         };
+        AdminTeamBootstrapRequest: {
+            /** @description Team name. */
+            name: string;
+            /**
+             * Format: email
+             * @description Billing/contact email for the team.
+             */
+            email: string;
+        };
         /**
          * @description Build status mapped for dashboard clients.
          * @enum {string}
@@ -1082,6 +1192,12 @@ export interface components {
             /** @description Normalized template tag name. */
             normalizedTag: string;
         };
+        TemplateTagAssignmentsResponse: {
+            /** @description Ready assignment events for the tag, sorted latest first. */
+            data: components["schemas"]["TemplateTagAssignment"][];
+            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
         TeamResolveResponse: {
             /** Format: uuid */
             id: string;
@@ -1134,6 +1250,15 @@ export interface components {
                 "application/json": components["schemas"]["Error"];
             };
         };
+        /** @description Upstream error */
+        502: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
     };
     parameters: {
         /** @description Identifier of the build. */
@@ -1162,6 +1287,12 @@ export interface components {
         tag: string;
         /** @description Maximum number of ready assignment rows to return per tag. */
         tag_assignment_limit: number;
+        /** @description Template tag name. */
+        tag_path: string;
+        /** @description Maximum number of assignment rows to return per page. */
+        tag_assignments_limit: number;
+        /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+        tag_assignments_cursor: string;
     };
     requestBodies: never;
     headers: never;
diff --git a/src/features/dashboard/templates/detail/tabs.tsx b/src/features/dashboard/templates/detail/tabs.tsx
index 746fa9954..17d2a90ee 100644
--- a/src/features/dashboard/templates/detail/tabs.tsx
+++ b/src/features/dashboard/templates/detail/tabs.tsx
@@ -15,9 +15,9 @@ interface TemplateDetailTabsProps {
 type DetailTabId = 'overview' | 'builds' | 'tags'
 
 const TAB_PATHS: Record<DetailTabId, (pathname: string) => boolean> = {
-  overview: (p) => p.endsWith('/overview'),
-  builds: (p) => p.endsWith('/builds'),
-  tags: (p) => p.endsWith('/tags'),
+  overview: (p) => /\/overview(\/|$)/.test(p),
+  builds: (p) => /\/builds(\/|$)/.test(p),
+  tags: (p) => /\/tags(\/|$)/.test(p),
 }
 
 function tabFromPath(pathname: string): DetailTabId {
diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index 550ff23c1..900a3455b 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -25,6 +25,12 @@ interface TagDeleteDialogProps {
   teamSlug: string
   templateId: string
   templateName: string
+  /**
+   * Optional hook called after the success toast fires, before the dialog closes
+   * and `getTagGroups` is invalidated. Used by surfaces that need to navigate
+   * away (e.g. the tag-history page redirects back to the Tags list).
+   */
+  onDeleted?: () => void | Promise<void>
 }
 
 export default function TagDeleteDialog({
@@ -34,6 +40,7 @@ export default function TagDeleteDialog({
   teamSlug,
   templateId,
   templateName,
+  onDeleted,
 }: TagDeleteDialogProps) {
   const trpc = useTRPC()
   const queryClient = useQueryClient()
@@ -67,6 +74,8 @@ export default function TagDeleteDialog({
             tags: old.tags.filter((t) => !removed.has(t.tag)),
           }
         })
+
+        await onDeleted?.()
       },
       onError: (error) => {
         toast(
diff --git a/src/features/dashboard/templates/tags/history/tag-history-empty.tsx b/src/features/dashboard/templates/tags/history/tag-history-empty.tsx
new file mode 100644
index 000000000..9a3537838
--- /dev/null
+++ b/src/features/dashboard/templates/tags/history/tag-history-empty.tsx
@@ -0,0 +1,17 @@
+import { HistoryIcon } from '@/ui/primitives/icons'
+
+interface TagHistoryEmptyProps {
+  tag: string
+}
+
+export function TagHistoryEmpty({ tag }: TagHistoryEmptyProps) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-3 py-12 text-center">
+      <HistoryIcon className="size-5 text-icon-tertiary" />
+      <p className="prose-body text-fg-tertiary">
+        No assignment history for tag{' '}
+        <span className="prose-body-highlight text-fg">{tag}</span>.
+      </p>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
new file mode 100644
index 000000000..1dd122389
--- /dev/null
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -0,0 +1,142 @@
+'use client'
+
+import { useState } from 'react'
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
+import { cn } from '@/lib/utils/ui'
+import { Badge } from '@/ui/primitives/badge'
+import { Button } from '@/ui/primitives/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/ui/primitives/dropdown-menu'
+import { IconButton } from '@/ui/primitives/icon-button'
+import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
+import { BuildLink } from '../build-link'
+import TagDeleteDialog from '../delete-dialog'
+
+const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
+
+const DEFAULT_TAG_NAME = 'default'
+
+interface TagHistoryHeaderProps {
+  tag: string
+  teamSlug: string
+  templateId: string
+  templateName: string
+  primaryAssignment: TemplateTagAssignment
+  /**
+   * Called after the tag is successfully deleted. The history page passes a
+   * handler that invalidates the assignments query for this tag and routes
+   * back to the Tags list.
+   */
+  onTagDeleted: () => void | Promise<void>
+}
+
+export function TagHistoryHeader({
+  tag,
+  teamSlug,
+  templateId,
+  templateName,
+  primaryAssignment,
+  onTagDeleted,
+}: TagHistoryHeaderProps) {
+  const { toast } = useToast()
+  const [menuOpen, setMenuOpen] = useState(false)
+  const [deleteOpen, setDeleteOpen] = useState(false)
+
+  const isDefaultTag = tag === DEFAULT_TAG_NAME
+
+  return (
+    <div
+      className={cn(
+        'group/row relative flex items-center gap-6',
+        '-mx-3 px-3 w-[calc(100%+24px)] py-2'
+      )}
+    >
+      <div className="flex-1 min-w-0">
+        <Badge
+          variant="default"
+          size="sm"
+          className="uppercase bg-fill pointer-events-none"
+        >
+          {tag}
+        </Badge>
+      </div>
+
+      <div className="w-[178px] shrink-0">
+        <BuildLink
+          teamSlug={teamSlug}
+          templateId={templateId}
+          buildId={primaryAssignment.buildId}
+          assignedAt={primaryAssignment.assignedAt}
+        />
+      </div>
+
+      <div className="w-[203px] max-sm:w-4 shrink-0 flex items-center justify-end gap-4">
+        <div className="flex items-center gap-1 max-sm:hidden">
+          <Button
+            variant="primary"
+            size="none"
+            className={SMALL_BUTTON}
+            onClick={() =>
+              toast(defaultErrorToast('Reassign: not implemented yet'))
+            }
+          >
+            Reassign
+          </Button>
+          <Button
+            variant="secondary"
+            size="none"
+            className={SMALL_BUTTON}
+            onClick={() =>
+              toast(defaultErrorToast('Rollback: not implemented yet'))
+            }
+          >
+            Rollback
+          </Button>
+        </div>
+
+        <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
+          <DropdownMenuTrigger asChild>
+            <IconButton
+              aria-label={
+                isDefaultTag
+                  ? 'Actions unavailable for default tag'
+                  : `Actions for tag ${tag}`
+              }
+              disabled={isDefaultTag}
+            >
+              <MoreActionsIcon />
+            </IconButton>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end">
+            <DropdownMenuItem
+              variant="error"
+              onSelect={(e) => {
+                e.preventDefault()
+                setMenuOpen(false)
+                setDeleteOpen(true)
+              }}
+            >
+              <TrashIcon className="size-4" />
+              Delete
+            </DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+
+      <TagDeleteDialog
+        open={deleteOpen}
+        onOpenChange={setDeleteOpen}
+        tag={tag}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        onDeleted={onTagDeleted}
+      />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
new file mode 100644
index 000000000..9e48cee0a
--- /dev/null
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -0,0 +1,88 @@
+'use client'
+
+import type { KeyboardEvent, MouseEvent } from 'react'
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
+import { cn } from '@/lib/utils/ui'
+import { UndoIcon } from '@/ui/primitives/icons'
+import { BuildLink } from '../build-link'
+
+interface TagHistoryRowProps {
+  assignment: TemplateTagAssignment
+  teamSlug: string
+  templateId: string
+}
+
+/**
+ * Single historical assignment row, shared between:
+ * - the collapsed history under a tag group in `tags/table.tsx`
+ * - the full-history page at `tags/[tag]`
+ *
+ * Full-row click / Enter / Space fires the rollback demo toast. Inner BuildLink
+ * still navigates to the build: the click handler early-returns when the event
+ * target isn't the row itself.
+ */
+export function TagHistoryRow({
+  assignment,
+  teamSlug,
+  templateId,
+}: TagHistoryRowProps) {
+  const { toast } = useToast()
+
+  const rollback = () => {
+    toast(defaultErrorToast('Rollback to this build: not implemented yet'))
+  }
+
+  const handleClick = (e: MouseEvent<HTMLDivElement>) => {
+    const target = e.target as HTMLElement | null
+    if (target?.closest('button, a, [role=button]') !== e.currentTarget) {
+      return
+    }
+    rollback()
+  }
+  const handleKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
+    if (e.currentTarget !== e.target) return
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.preventDefault()
+      rollback()
+    }
+  }
+
+  return (
+    // biome-ignore lint/a11y/useSemanticElements: The row contains nested links, so a button would be invalid HTML.
+    <div
+      role="button"
+      tabIndex={0}
+      onClick={handleClick}
+      onKeyDown={handleKeyDown}
+      className={cn(
+        'group/childRow flex w-full items-center justify-between gap-4',
+        'bg-bg py-2 cursor-pointer',
+        'focus-visible:outline-none'
+      )}
+    >
+      <div className="flex items-center gap-2 prose-body text-fg-tertiary">
+        <span>Assigned to</span>
+        <BuildLink
+          teamSlug={teamSlug}
+          templateId={templateId}
+          buildId={assignment.buildId}
+          assignedAt={assignment.assignedAt}
+        />
+      </div>
+      <span
+        aria-hidden
+        className={cn(
+          'inline-flex items-center gap-1',
+          'prose-body-highlight text-fg',
+          'opacity-0 group-hover/childRow:opacity-100 group-focus-visible/childRow:opacity-100',
+          'group-has-[a:hover]/childRow:opacity-0',
+          '[&_svg]:size-4 [&_svg]:text-icon-tertiary'
+        )}
+      >
+        <UndoIcon />
+        Rollback to this build
+      </span>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
new file mode 100644
index 000000000..997db8ff5
--- /dev/null
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -0,0 +1,182 @@
+'use client'
+
+import {
+  keepPreviousData,
+  useInfiniteQuery,
+  useQueryClient,
+  useSuspenseQuery,
+} from '@tanstack/react-query'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { useRouter } from 'next/navigation'
+import { useEffect, useMemo, useRef } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cells'
+import { useTRPC } from '@/trpc/client'
+import { Loader } from '@/ui/primitives/loader'
+import { TagHistoryEmpty } from './tag-history-empty'
+import { TagHistoryHeader } from './tag-history-header'
+import { TagHistoryRow } from './tag-history-row'
+
+interface TagHistoryViewProps {
+  teamSlug: string
+  templateId: string
+  tag: string
+}
+
+const ROW_HEIGHT_PX = 36
+const VIRTUAL_OVERSCAN = 12
+const PREFETCH_THRESHOLD = 8
+
+export default function TagHistoryView({
+  teamSlug,
+  templateId,
+  tag,
+}: TagHistoryViewProps) {
+  'use no memo'
+
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+  const router = useRouter()
+  const scrollRef = useRef<HTMLDivElement>(null)
+
+  const { data: templateData } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions(
+      { teamSlug, templateId },
+      {
+        refetchOnMount: false,
+        refetchOnWindowFocus: true,
+        refetchOnReconnect: true,
+      }
+    )
+  )
+
+  const templateName = useMemo(
+    () =>
+      templateData.template.names.find((n) => !n.includes('/')) ??
+      templateData.template.names[0] ??
+      templateData.template.templateID,
+    [templateData]
+  )
+
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isPending } =
+    useInfiniteQuery(
+      trpc.templates.getTagAssignments.infiniteQueryOptions(
+        { teamSlug, templateId, tag, limit: 50 },
+        {
+          getNextPageParam: (page) => page.nextCursor ?? undefined,
+          initialCursor: undefined,
+          placeholderData: keepPreviousData,
+          refetchOnWindowFocus: true,
+        }
+      )
+    )
+
+  const assignments = useMemo(
+    () => data?.pages.flatMap((p) => p.data) ?? [],
+    [data]
+  )
+
+  const primary = assignments[0]
+  const history = useMemo(() => assignments.slice(1), [assignments])
+
+  const virtualizer = useVirtualizer({
+    count: history.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => ROW_HEIGHT_PX,
+    overscan: VIRTUAL_OVERSCAN,
+  })
+
+  const virtualItems = virtualizer.getVirtualItems()
+  const lastVisibleIndex = virtualItems[virtualItems.length - 1]?.index ?? -1
+
+  useEffect(() => {
+    if (
+      hasNextPage &&
+      !isFetchingNextPage &&
+      lastVisibleIndex >= history.length - PREFETCH_THRESHOLD
+    ) {
+      fetchNextPage()
+    }
+  }, [
+    hasNextPage,
+    isFetchingNextPage,
+    lastVisibleIndex,
+    history.length,
+    fetchNextPage,
+  ])
+
+  const handleTagDeleted = async () => {
+    await queryClient.invalidateQueries({
+      queryKey: trpc.templates.getTagAssignments.queryKey({
+        teamSlug,
+        templateId,
+        tag,
+      }),
+    })
+    router.push(PROTECTED_URLS.TEMPLATE_TAGS(teamSlug, templateId))
+  }
+
+  if (isPending) {
+    return (
+      <div className="flex flex-1 items-center justify-center py-12">
+        <Loader variant="slash" size="lg" />
+      </div>
+    )
+  }
+
+  if (!primary) {
+    return <TagHistoryEmpty tag={tag} />
+  }
+
+  return (
+    <div className="flex h-full min-h-0 flex-col gap-3">
+      <TagHistoryHeader
+        tag={tag}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        primaryAssignment={primary}
+        onTagDeleted={handleTagDeleted}
+      />
+
+      <div
+        ref={scrollRef}
+        className="flex-1 min-h-0 overflow-y-auto -mx-3 px-3"
+      >
+        <div
+          className="relative"
+          style={{ height: `${virtualizer.getTotalSize()}px` }}
+        >
+          {virtualItems.map((virtualRow) => {
+            const assignment = history[virtualRow.index]
+            if (!assignment) return null
+            return (
+              <div
+                key={virtualRow.key}
+                data-index={virtualRow.index}
+                ref={(node) => virtualizer.measureElement(node)}
+                className="absolute left-0 right-0 border-b border-stroke/80"
+                style={{ transform: `translateY(${virtualRow.start}px)` }}
+              >
+                <TagHistoryRow
+                  assignment={assignment}
+                  teamSlug={teamSlug}
+                  templateId={templateId}
+                />
+              </div>
+            )
+          })}
+        </div>
+
+        {hasNextPage && (
+          <div className="flex w-full items-center justify-center py-3">
+            <LoadMoreButton
+              isLoading={isFetchingNextPage}
+              onLoadMore={() => fetchNextPage()}
+            />
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 618772b6f..84b84da7e 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -7,9 +7,9 @@ import {
   type TableOptions,
   useReactTable,
 } from '@tanstack/react-table'
+import Link from 'next/link'
 import { type KeyboardEvent, type MouseEvent, useMemo } from 'react'
-import type { TemplateTagAssignment } from '@/core/modules/templates/models'
-import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
+import { PROTECTED_URLS } from '@/configs/urls'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
@@ -19,11 +19,11 @@ import {
   DataTableHeader,
   DataTableRow,
 } from '@/ui/data-table'
-import { TriangleIcon, UndoIcon } from '@/ui/primitives/icons'
+import { TriangleIcon } from '@/ui/primitives/icons'
 import { RowHoverFrame } from '@/ui/row-hover-frame'
-import { BuildLink } from './build-link'
 import TagsEmpty from './empty'
 import TagsHeader from './header'
+import { TagHistoryRow } from './history/tag-history-row'
 import { useTagTableStore } from './stores/table-store'
 import {
   fallbackData,
@@ -289,101 +289,42 @@ function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
       {isExpanded && (
         <div className="flex flex-col divide-y divide-stroke/80">
           {row.original.assignments.slice(1).map((assignment) => (
-            <HistoryBuildRow
+            <TagHistoryRow
               key={assignment.assignmentId}
               assignment={assignment}
               teamSlug={teamSlug}
               templateId={templateId}
             />
           ))}
-          {row.original.hasMore && <ShowFullHistoryRow />}
+          {row.original.hasMore && (
+            <ShowFullHistoryRow
+              tag={row.original.tag}
+              teamSlug={teamSlug}
+              templateId={templateId}
+            />
+          )}
         </div>
       )}
     </div>
   )
 }
 
-interface HistoryBuildRowProps {
-  assignment: TemplateTagAssignment
+interface ShowFullHistoryRowProps {
+  tag: string
   teamSlug: string
   templateId: string
 }
 
-function HistoryBuildRow({
-  assignment,
+function ShowFullHistoryRow({
+  tag,
   teamSlug,
   templateId,
-}: HistoryBuildRowProps) {
-  'use no memo'
-
-  const { toast } = useToast()
-
-  const rollback = () => {
-    toast(defaultErrorToast('Rollback to this build: not implemented yet'))
-  }
-
-  const handleClick = (e: MouseEvent<HTMLDivElement>) => {
-    const target = e.target as HTMLElement | null
-    if (target?.closest('button, a, [role=button]') !== e.currentTarget) {
-      return
-    }
-    rollback()
-  }
-  const handleKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
-    if (e.currentTarget !== e.target) return
-    if (e.key === 'Enter' || e.key === ' ') {
-      e.preventDefault()
-      rollback()
-    }
-  }
-
-  return (
-    // biome-ignore lint/a11y/useSemanticElements: The row contains nested links, so a button would be invalid HTML.
-    <div
-      role="button"
-      tabIndex={0}
-      onClick={handleClick}
-      onKeyDown={handleKeyDown}
-      className={cn(
-        'group/childRow flex w-full items-center justify-between gap-4',
-        'bg-bg py-2 cursor-pointer',
-        'focus-visible:outline-none'
-      )}
-    >
-      <div className="flex items-center gap-2 prose-body text-fg-tertiary">
-        <span>Assigned to</span>
-        <BuildLink
-          teamSlug={teamSlug}
-          templateId={templateId}
-          buildId={assignment.buildId}
-          assignedAt={assignment.assignedAt}
-        />
-      </div>
-      <span
-        aria-hidden
-        className={cn(
-          'inline-flex items-center gap-1',
-          'prose-body-highlight text-fg',
-          'opacity-0 group-hover/childRow:opacity-100 group-focus-visible/childRow:opacity-100',
-          'group-has-[a:hover]/childRow:opacity-0',
-          '[&_svg]:size-4 [&_svg]:text-icon-tertiary'
-        )}
-      >
-        <UndoIcon />
-        Rollback to this build
-      </span>
-    </div>
-  )
-}
-
-function ShowFullHistoryRow() {
-  const { toast } = useToast()
-
+}: ShowFullHistoryRowProps) {
   return (
-    <button
-      type="button"
+    <Link
+      href={PROTECTED_URLS.TEMPLATE_TAG_HISTORY(teamSlug, templateId, tag)}
       onClick={() =>
-        toast(defaultErrorToast('Show full history: not implemented yet'))
+        trackTagTableInteraction('show_full_history_clicked', { tag })
       }
       className={cn(
         'flex w-full items-center justify-center bg-bg py-2 cursor-pointer',
@@ -391,6 +332,6 @@ function ShowFullHistoryRow() {
       )}
     >
       Show full history
-    </button>
+    </Link>
   )
 }

From da9760f008f5e456d39fe3051a17b102011d99d3 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 15:42:46 +0200
Subject: [PATCH 19/90] chore(ui): polish dialog, heading, caret primitives

---
 src/styles/globals.css            |  4 ++++
 src/styles/theme.css              | 11 +++++++++--
 src/ui/primitives/collapsible.tsx | 27 ---------------------------
 src/ui/primitives/dialog.tsx      |  2 +-
 4 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 src/ui/primitives/collapsible.tsx

diff --git a/src/styles/globals.css b/src/styles/globals.css
index aa092142d..8bd22b6cf 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -10,6 +10,10 @@
   border-radius: 2px;
 }
 
+:root {
+  caret-color: var(--accent-main-highlight);
+}
+
 *::selection {
   background-color: var(--accent-main-bg);
 }
diff --git a/src/styles/theme.css b/src/styles/theme.css
index e6f3af337..0d32468d2 100644
--- a/src/styles/theme.css
+++ b/src/styles/theme.css
@@ -12,16 +12,23 @@
     @apply bg-bg text-fg prose-body antialiased;
   }
 
+  /* Inline heading styles to allow utility overrides. */
   h1,
   h2,
   h3 {
-    @apply prose-headline uppercase;
+    font-size: 1.25rem; /* 20px */
+    line-height: 1.25rem;
+    font-weight: 700;
+    text-transform: uppercase;
   }
 
   h4,
   h5,
   h6 {
-    @apply prose-headline-small uppercase;
+    font-size: 1rem; /* 16px */
+    line-height: 1.25rem;
+    font-weight: 700;
+    text-transform: uppercase;
   }
 
   .font-mono {
diff --git a/src/ui/primitives/collapsible.tsx b/src/ui/primitives/collapsible.tsx
deleted file mode 100644
index 3401f6c69..000000000
--- a/src/ui/primitives/collapsible.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-'use client'
-
-import * as CollapsiblePrimitive from '@radix-ui/react-collapsible'
-
-function Collapsible({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
-  return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />
-}
-
-function CollapsibleTrigger({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Trigger>) {
-  return (
-    <CollapsiblePrimitive.Trigger data-slot="collapsible-trigger" {...props} />
-  )
-}
-
-function CollapsibleContent({
-  ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Content>) {
-  return (
-    <CollapsiblePrimitive.Content data-slot="collapsible-content" {...props} />
-  )
-}
-
-export { Collapsible, CollapsibleContent, CollapsibleTrigger }
diff --git a/src/ui/primitives/dialog.tsx b/src/ui/primitives/dialog.tsx
index ba60ad270..35cdc5123 100644
--- a/src/ui/primitives/dialog.tsx
+++ b/src/ui/primitives/dialog.tsx
@@ -88,7 +88,7 @@ function DialogContent({
           <DialogPrimitive.Close
             className={cn(
               [
-                'absolute top-4 right-4',
+                'absolute top-[18px] right-[20px]',
                 'text-icon-tertiary transition-colors hover:text-icon cursor-pointer',
                 'outline-none focus-visible:ring-1 focus-visible:ring-accent-main-highlight',
                 'disabled:pointer-events-none',

From 81bc69e6fc1c181f6f9d8720d1c82a31448111f9 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 16:46:52 +0200
Subject: [PATCH 20/90] add rollback dialog, update history and assign

---
 .../templates/tags/arrow-divider.tsx          |  11 +
 .../templates/tags/assign-dialog.tsx          |  40 ++-
 .../tags/history/tag-history-header.tsx       |  30 +-
 .../tags/history/tag-history-row.tsx          |  62 ++--
 .../tags/history/tag-history-view.tsx         |  47 +++-
 .../templates/tags/rollback-dialog.tsx        | 264 ++++++++++++++++++
 .../dashboard/templates/tags/table-cells.tsx  |  26 +-
 .../dashboard/templates/tags/table-config.tsx |   1 +
 .../dashboard/templates/tags/table.tsx        |  50 +++-
 9 files changed, 483 insertions(+), 48 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/arrow-divider.tsx
 create mode 100644 src/features/dashboard/templates/tags/rollback-dialog.tsx

diff --git a/src/features/dashboard/templates/tags/arrow-divider.tsx b/src/features/dashboard/templates/tags/arrow-divider.tsx
new file mode 100644
index 000000000..b561c8b77
--- /dev/null
+++ b/src/features/dashboard/templates/tags/arrow-divider.tsx
@@ -0,0 +1,11 @@
+import { ArrowRightIcon } from '@/ui/primitives/icons'
+
+export function ArrowDivider() {
+  return (
+    <div className="flex items-center gap-2">
+      <span className="h-px flex-1 bg-stroke" aria-hidden />
+      <ArrowRightIcon className="size-4 rotate-90 text-fg-tertiary" />
+      <span className="h-px flex-1 bg-stroke" aria-hidden />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index e282ef7f6..381301b8b 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -14,8 +14,9 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/ui/primitives/dialog'
-import { AddIcon, ArrowRightIcon, CheckIcon } from '@/ui/primitives/icons'
+import { AddIcon, CheckIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
+import { ArrowDivider } from './arrow-divider'
 import {
   isValidTagShape,
   normalizeTagInput,
@@ -169,6 +170,11 @@ export default function AssignTagDialog({
           ? 'success'
           : 'idle'
 
+  const successTag =
+    existsQuery.data?.normalizedTag ??
+    mutation.data?.tags[0] ??
+    normalizedDebouncedName
+
   return (
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogTrigger asChild>
@@ -180,7 +186,7 @@ export default function AssignTagDialog({
 
       <DialogContent
         hideClose={stage === 'pending'}
-        className="sm:max-w-[450px] sm:h-[436px]"
+        className="sm:max-w-[425px] sm:h-[436px]"
         onPointerDownOutside={(e) => {
           if (stage === 'pending') e.preventDefault()
         }}
@@ -189,17 +195,15 @@ export default function AssignTagDialog({
         }}
       >
         <DialogHeader>
-          <DialogTitle>Assign new tag</DialogTitle>
+          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+            {stage === 'success'
+              ? `‘${successTag}’ assigned successfully`
+              : 'Assign new tag'}
+          </DialogTitle>
         </DialogHeader>
 
         {stage === 'success' ? (
-          <SuccessBody
-            tag={
-              existsQuery.data?.normalizedTag ??
-              mutation.data?.tags[0] ??
-              normalizedDebouncedName
-            }
-          />
+          <SuccessBody tag={successTag} />
         ) : (
           <form onSubmit={handleSubmit} className="flex flex-col gap-2">
             <TagNameField
@@ -320,10 +324,8 @@ function Footer({
 function SuccessBody({ tag }: { tag: string }) {
   return (
     <div className="flex flex-col items-center justify-center gap-3 py-8 text-center">
-      <span className="flex size-12 items-center justify-center rounded-full bg-accent-positive-bg text-accent-positive-highlight">
-        <CheckIcon className="size-6" />
-      </span>
-      <p className="prose-headline-small text-fg">
+      <CheckIcon className="size-12 text-accent-positive-highlight" />
+      <p className="prose-headline-small uppercase text-fg">
         <span className="font-mono">‘{tag}’</span>
         <br />
         assigned successfully
@@ -332,16 +334,6 @@ function SuccessBody({ tag }: { tag: string }) {
   )
 }
 
-function ArrowDivider() {
-  return (
-    <div className="flex items-center gap-2">
-      <span className="h-px flex-1 bg-stroke" aria-hidden />
-      <ArrowRightIcon className="size-4 rotate-90 text-fg-tertiary" />
-      <span className="h-px flex-1 bg-stroke" aria-hidden />
-    </div>
-  )
-}
-
 function trackAssign(action: string, properties: Record<string, unknown>) {
   posthog.capture('tag table interacted', {
     action,
diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index 1dd122389..b4de3bf35 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -16,6 +16,7 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from '../build-link'
 import TagDeleteDialog from '../delete-dialog'
+import RollbackTagDialog from '../rollback-dialog'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
 
@@ -27,12 +28,14 @@ interface TagHistoryHeaderProps {
   templateId: string
   templateName: string
   primaryAssignment: TemplateTagAssignment
+  previousAssignment: TemplateTagAssignment | undefined
   /**
    * Called after the tag is successfully deleted. The history page passes a
    * handler that invalidates the assignments query for this tag and routes
    * back to the Tags list.
    */
   onTagDeleted: () => void | Promise<void>
+  onRolledBack?: () => void | Promise<void>
 }
 
 export function TagHistoryHeader({
@@ -41,13 +44,17 @@ export function TagHistoryHeader({
   templateId,
   templateName,
   primaryAssignment,
+  previousAssignment,
   onTagDeleted,
+  onRolledBack,
 }: TagHistoryHeaderProps) {
   const { toast } = useToast()
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
+  const [rollbackOpen, setRollbackOpen] = useState(false)
 
   const isDefaultTag = tag === DEFAULT_TAG_NAME
+  const canRollback = !!previousAssignment
 
   return (
     <div
@@ -91,9 +98,13 @@ export function TagHistoryHeader({
             variant="secondary"
             size="none"
             className={SMALL_BUTTON}
-            onClick={() =>
-              toast(defaultErrorToast('Rollback: not implemented yet'))
+            disabled={!canRollback}
+            aria-label={
+              canRollback
+                ? `Rollback tag ${tag} to previous build`
+                : `No previous build to rollback to for tag ${tag}`
             }
+            onClick={() => setRollbackOpen(true)}
           >
             Rollback
           </Button>
@@ -137,6 +148,21 @@ export function TagHistoryHeader({
         templateName={templateName}
         onDeleted={onTagDeleted}
       />
+
+      {previousAssignment && (
+        <RollbackTagDialog
+          open={rollbackOpen}
+          onOpenChange={setRollbackOpen}
+          tag={tag}
+          currentBuildId={primaryAssignment.buildId}
+          targetBuildId={previousAssignment.buildId}
+          teamSlug={teamSlug}
+          templateId={templateId}
+          templateName={templateName}
+          surface="history-header"
+          onRolledBack={onRolledBack}
+        />
+      )}
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
index 9e48cee0a..28080a7f7 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-row.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -2,15 +2,23 @@
 
 import type { KeyboardEvent, MouseEvent } from 'react'
 import type { TemplateTagAssignment } from '@/core/modules/templates/models'
-import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
 import { cn } from '@/lib/utils/ui'
 import { UndoIcon } from '@/ui/primitives/icons'
 import { BuildLink } from '../build-link'
 
 interface TagHistoryRowProps {
   assignment: TemplateTagAssignment
+  /** Current build for this tag. Used to detect the no-op "rollback to current" case. */
+  primaryAssignment: TemplateTagAssignment
   teamSlug: string
   templateId: string
+  /**
+   * Asks the parent to open the rollback dialog with this assignment as
+   * the target. The dialog lives at a stable parent (the GroupSection or
+   * TagHistoryView) so it doesn't get destroyed when this row unmounts
+   * after a successful rollback shuffles the assignments list.
+   */
+  onRequestRollback: (target: TemplateTagAssignment) => void
 }
 
 /**
@@ -18,19 +26,45 @@ interface TagHistoryRowProps {
  * - the collapsed history under a tag group in `tags/table.tsx`
  * - the full-history page at `tags/[tag]`
  *
- * Full-row click / Enter / Space fires the rollback demo toast. Inner BuildLink
- * still navigates to the build: the click handler early-returns when the event
- * target isn't the row itself.
+ * The row is purely presentational. It owns no rollback state and no
+ * dialog. When the user activates the row (click / Enter / Space) it asks
+ * the parent to open the rollback dialog with this row's assignment as
+ * the target. The parent's dialog stays mounted across data refetches,
+ * which is essential because after a successful rollback the parent's
+ * `assignments` list shuffles and this row is destroyed.
+ *
+ * When the row already represents the current build, it's non-
+ * interactive — rolling back to the current build is a no-op.
  */
 export function TagHistoryRow({
   assignment,
+  primaryAssignment,
   teamSlug,
   templateId,
+  onRequestRollback,
 }: TagHistoryRowProps) {
-  const { toast } = useToast()
+  'use no memo'
+
+  const isCurrentBuild = assignment.buildId === primaryAssignment.buildId
 
-  const rollback = () => {
-    toast(defaultErrorToast('Rollback to this build: not implemented yet'))
+  const buildSummary = (
+    <div className="flex items-center gap-2 prose-body text-fg-tertiary">
+      <span>Assigned to</span>
+      <BuildLink
+        teamSlug={teamSlug}
+        templateId={templateId}
+        buildId={assignment.buildId}
+        assignedAt={assignment.assignedAt}
+      />
+    </div>
+  )
+
+  if (isCurrentBuild) {
+    return (
+      <div className="flex w-full items-center justify-between gap-4 bg-bg py-2">
+        {buildSummary}
+      </div>
+    )
   }
 
   const handleClick = (e: MouseEvent<HTMLDivElement>) => {
@@ -38,13 +72,13 @@ export function TagHistoryRow({
     if (target?.closest('button, a, [role=button]') !== e.currentTarget) {
       return
     }
-    rollback()
+    onRequestRollback(assignment)
   }
   const handleKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
     if (e.currentTarget !== e.target) return
     if (e.key === 'Enter' || e.key === ' ') {
       e.preventDefault()
-      rollback()
+      onRequestRollback(assignment)
     }
   }
 
@@ -61,15 +95,7 @@ export function TagHistoryRow({
         'focus-visible:outline-none'
       )}
     >
-      <div className="flex items-center gap-2 prose-body text-fg-tertiary">
-        <span>Assigned to</span>
-        <BuildLink
-          teamSlug={teamSlug}
-          templateId={templateId}
-          buildId={assignment.buildId}
-          assignedAt={assignment.assignedAt}
-        />
-      </div>
+      {buildSummary}
       <span
         aria-hidden
         className={cn(
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index 997db8ff5..cbbe5bc5a 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -8,11 +8,13 @@ import {
 } from '@tanstack/react-query'
 import { useVirtualizer } from '@tanstack/react-virtual'
 import { useRouter } from 'next/navigation'
-import { useEffect, useMemo, useRef } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
 import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cells'
 import { useTRPC } from '@/trpc/client'
 import { Loader } from '@/ui/primitives/loader'
+import RollbackTagDialog from '../rollback-dialog'
 import { TagHistoryEmpty } from './tag-history-empty'
 import { TagHistoryHeader } from './tag-history-header'
 import { TagHistoryRow } from './tag-history-row'
@@ -77,6 +79,7 @@ export default function TagHistoryView({
   )
 
   const primary = assignments[0]
+  const previous = assignments[1]
   const history = useMemo(() => assignments.slice(1), [assignments])
 
   const virtualizer = useVirtualizer({
@@ -116,6 +119,29 @@ export default function TagHistoryView({
     router.push(PROTECTED_URLS.TEMPLATE_TAGS(teamSlug, templateId))
   }
 
+  const handleRolledBack = useCallback(async () => {
+    await queryClient.invalidateQueries({
+      queryKey: trpc.templates.getTagAssignments.queryKey({
+        teamSlug,
+        templateId,
+        tag,
+      }),
+    })
+  }, [queryClient, trpc, teamSlug, templateId, tag])
+
+  const [rollbackRequest, setRollbackRequest] = useState<{
+    target: TemplateTagAssignment
+    currentBuildId: string
+  } | null>(null)
+
+  const handleRequestRowRollback = useCallback(
+    (target: TemplateTagAssignment) => {
+      if (!primary) return
+      setRollbackRequest({ target, currentBuildId: primary.buildId })
+    },
+    [primary]
+  )
+
   if (isPending) {
     return (
       <div className="flex flex-1 items-center justify-center py-12">
@@ -136,7 +162,9 @@ export default function TagHistoryView({
         templateId={templateId}
         templateName={templateName}
         primaryAssignment={primary}
+        previousAssignment={previous}
         onTagDeleted={handleTagDeleted}
+        onRolledBack={handleRolledBack}
       />
 
       <div
@@ -160,8 +188,10 @@ export default function TagHistoryView({
               >
                 <TagHistoryRow
                   assignment={assignment}
+                  primaryAssignment={primary}
                   teamSlug={teamSlug}
                   templateId={templateId}
+                  onRequestRollback={handleRequestRowRollback}
                 />
               </div>
             )
@@ -177,6 +207,21 @@ export default function TagHistoryView({
           </div>
         )}
       </div>
+
+      <RollbackTagDialog
+        open={rollbackRequest !== null}
+        onOpenChange={(next) => {
+          if (!next) setRollbackRequest(null)
+        }}
+        tag={tag}
+        currentBuildId={rollbackRequest?.currentBuildId ?? ''}
+        targetBuildId={rollbackRequest?.target.buildId ?? ''}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        surface="history-row"
+        onRolledBack={handleRolledBack}
+      />
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
new file mode 100644
index 000000000..7433950cc
--- /dev/null
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -0,0 +1,264 @@
+'use client'
+
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { useEffect } from 'react'
+import { useTRPC } from '@/trpc/client'
+import { Button } from '@/ui/primitives/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/ui/primitives/dialog'
+import { CheckIcon } from '@/ui/primitives/icons'
+import { ArrowDivider } from './arrow-divider'
+import { trackTagTableInteraction } from './table-config'
+
+export type RollbackSurface = 'tags-tab' | 'history-header' | 'history-row'
+
+interface RollbackTagDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  tag: string
+  currentBuildId: string
+  targetBuildId: string
+  teamSlug: string
+  templateId: string
+  templateName: string
+  surface: RollbackSurface
+  onRolledBack?: () => void | Promise<void>
+}
+
+export default function RollbackTagDialog({
+  open,
+  onOpenChange,
+  tag,
+  currentBuildId,
+  targetBuildId,
+  teamSlug,
+  templateId,
+  templateName,
+  surface,
+  onRolledBack,
+}: RollbackTagDialogProps) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+
+  const rollback = useMutation(
+    trpc.templates.assignTag.mutationOptions({
+      onSuccess: async () => {
+        trackTagTableInteraction('rollback succeeded', { surface, tag })
+        await queryClient.invalidateQueries({
+          queryKey: trpc.templates.getTagGroups.queryKey({
+            teamSlug,
+            templateId,
+          }),
+        })
+        await onRolledBack?.()
+      },
+      onError: (error) => {
+        trackTagTableInteraction('rollback failed', {
+          surface,
+          tag,
+          error_status: error.data?.httpStatus ?? null,
+          error_code: error.data?.code ?? null,
+        })
+      },
+    })
+  )
+
+  const stage: Stage = rollback.isSuccess
+    ? 'success'
+    : rollback.isPending
+      ? 'pending'
+      : rollback.isError
+        ? 'error'
+        : 'idle'
+
+  const { reset } = rollback
+  useEffect(() => {
+    if (!open) return
+    trackTagTableInteraction('rollback opened', { surface, tag })
+    reset()
+  }, [open, surface, tag, reset])
+
+  const handleOpenChange = (next: boolean) => {
+    if (rollback.isPending) return
+    onOpenChange(next)
+  }
+
+  const submit = () => {
+    trackTagTableInteraction('rollback submitted', { surface, tag })
+    rollback.mutate({
+      teamSlug,
+      templateId,
+      templateName,
+      buildId: targetBuildId,
+      tag,
+    })
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent
+        hideClose={stage === 'pending'}
+        className="sm:max-w-[413px] sm:min-h-[224px] sm:h-[224px]"
+        onPointerDownOutside={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+      >
+        <DialogHeader>
+          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+            {stage === 'success'
+              ? `Rollback ‘${tag}’ succeeded`
+              : `Rollback ‘${tag}’`}
+          </DialogTitle>
+          <DialogDescription className="sr-only">
+            {stage === 'success'
+              ? `Tag ${tag} rolled back to build ${targetBuildId}.`
+              : `Reassign tag ${tag} from the current build to the target build.`}
+          </DialogDescription>
+        </DialogHeader>
+
+        {stage === 'success' ? (
+          <SuccessBody tag={tag} />
+        ) : (
+          <div className="flex flex-col gap-2">
+            <BuildRow label="Current" buildId={currentBuildId} />
+            <ArrowDivider />
+            <BuildRow label="Target" buildId={targetBuildId} />
+          </div>
+        )}
+
+        <Footer
+          stage={stage}
+          errorMessage={rollback.error?.message ?? null}
+          onSubmit={submit}
+          onCancel={() => handleOpenChange(false)}
+          onDismiss={() => handleOpenChange(false)}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+type Stage = 'idle' | 'pending' | 'error' | 'success'
+
+interface BuildRowProps {
+  label: string
+  buildId: string
+}
+
+function BuildRow({ label, buildId }: BuildRowProps) {
+  return (
+    <div className="flex items-center justify-between">
+      <span className="prose-label-highlight uppercase text-fg-tertiary w-14 shrink-0">
+        {label}
+      </span>
+      <span className="prose-body font-mono text-fg-primary truncate">
+        {buildId}
+      </span>
+    </div>
+  )
+}
+
+function SuccessBody({ tag }: { tag: string }) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-3 text-center">
+      <CheckIcon className="size-12 text-accent-positive-highlight" />
+      <p className="prose-headline-small uppercase text-fg">
+        <span className="font-mono">‘{tag}’</span>
+        <br />
+        rolled back successfully
+      </p>
+    </div>
+  )
+}
+
+interface FooterProps {
+  stage: Stage
+  errorMessage: string | null
+  onSubmit: () => void
+  onCancel: () => void
+  onDismiss: () => void
+}
+
+/**
+ * The footer keeps a fixed-height inline message slot above the buttons so
+ * the dialog doesn't jump when an error appears or clears. The slot is
+ * present in idle/pending/error and collapsed in success (which has its
+ * own full-width Dismiss button).
+ */
+function Footer({
+  stage,
+  errorMessage,
+  onSubmit,
+  onCancel,
+  onDismiss,
+}: FooterProps) {
+  if (stage === 'success') {
+    return (
+      <DialogFooter className="sm:flex-row mt-auto">
+        <Button autoFocus className="w-full" onClick={onDismiss}>
+          Dismiss
+        </Button>
+      </DialogFooter>
+    )
+  }
+
+  return (
+    <DialogFooter className="flex-col gap-2 sm:flex-col">
+      <InlineMessage stage={stage} message={errorMessage} />
+      {stage === 'pending' ? (
+        <Button variant="secondary" className="w-full" loading="Rolling back" />
+      ) : stage === 'error' ? (
+        <div className="grid w-full grid-cols-2 gap-2">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button autoFocus onClick={onSubmit}>
+            Retry
+          </Button>
+        </div>
+      ) : (
+        <div className="grid w-full grid-cols-2 gap-2">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button onClick={onSubmit}>Rollback</Button>
+        </div>
+      )}
+    </DialogFooter>
+  )
+}
+
+/**
+ * Reserves a single-line slot for inline feedback so toggling between idle
+ * and error doesn't shift the buttons below.
+ */
+function InlineMessage({
+  stage,
+  message,
+}: {
+  stage: Exclude<Stage, 'success'>
+  message: string | null
+}) {
+  const text = stage === 'error' ? (message ?? 'Rollback failed.') : '\u00a0'
+  return (
+    <p
+      aria-live="polite"
+      className={
+        stage === 'error'
+          ? 'prose-body w-full min-h-5 text-center text-accent-error-highlight'
+          : 'prose-body w-full min-h-5 text-center text-transparent select-none'
+      }
+    >
+      {text}
+    </p>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 6235c82e1..0949817c9 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -16,6 +16,7 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from './build-link'
 import TagDeleteDialog from './delete-dialog'
+import RollbackTagDialog from './rollback-dialog'
 import type { TagGroup } from './types'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
@@ -63,9 +64,12 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
   const { toast } = useToast()
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
+  const [rollbackOpen, setRollbackOpen] = useState(false)
 
   const group = row.original
   const isDefaultTag = group.tag === DEFAULT_TAG_NAME
+  const previousAssignment = group.assignments[1]
+  const canRollback = !!previousAssignment
 
   return (
     <div className="flex items-center justify-end gap-4 w-full">
@@ -90,9 +94,15 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
           variant="secondary"
           size="none"
           className={SMALL_BUTTON}
+          disabled={!canRollback}
+          aria-label={
+            canRollback
+              ? `Rollback tag ${group.tag} to previous build`
+              : `No previous build to rollback to for tag ${group.tag}`
+          }
           onClick={(e) => {
             e.stopPropagation()
-            toast(defaultErrorToast('Rollback: not implemented yet'))
+            setRollbackOpen(true)
           }}
         >
           Rollback
@@ -136,6 +146,20 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
         templateId={templateId}
         templateName={templateName}
       />
+
+      {previousAssignment && (
+        <RollbackTagDialog
+          open={rollbackOpen}
+          onOpenChange={setRollbackOpen}
+          tag={group.tag}
+          currentBuildId={group.primaryAssignment.buildId}
+          targetBuildId={previousAssignment.buildId}
+          teamSlug={teamSlug}
+          templateId={templateId}
+          templateName={templateName}
+          surface="tags-tab"
+        />
+      )}
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/table-config.tsx b/src/features/dashboard/templates/tags/table-config.tsx
index ccdf329b9..c6967c5ef 100644
--- a/src/features/dashboard/templates/tags/table-config.tsx
+++ b/src/features/dashboard/templates/tags/table-config.tsx
@@ -86,6 +86,7 @@ export const useTagColumns = () =>
   )
 
 export const tagsTableConfig: Partial<TableOptions<TagGroup>> = {
+  getRowId: (row) => row.tag,
   filterFns: { fuzzy: fuzzyFilter },
   getCoreRowModel: getCoreRowModel(),
   getFilteredRowModel: getFilteredRowModel(),
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 84b84da7e..8c91bb250 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -8,8 +8,15 @@ import {
   useReactTable,
 } from '@tanstack/react-table'
 import Link from 'next/link'
-import { type KeyboardEvent, type MouseEvent, useMemo } from 'react'
+import {
+  type KeyboardEvent,
+  type MouseEvent,
+  useCallback,
+  useMemo,
+  useState,
+} from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
+import type { TemplateTagAssignment } from '@/core/modules/templates/models'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
@@ -24,6 +31,7 @@ import { RowHoverFrame } from '@/ui/row-hover-frame'
 import TagsEmpty from './empty'
 import TagsHeader from './header'
 import { TagHistoryRow } from './history/tag-history-row'
+import RollbackTagDialog from './rollback-dialog'
 import { useTagTableStore } from './stores/table-store'
 import {
   fallbackData,
@@ -172,6 +180,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
                   row={row}
                   teamSlug={teamSlug}
                   templateId={templateId}
+                  templateName={templateName}
                 />
               ))}
             </div>
@@ -186,15 +195,36 @@ interface GroupSectionProps {
   row: Row<TagGroup>
   teamSlug: string
   templateId: string
+  templateName: string
 }
 
-function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
+function GroupSection({
+  row,
+  teamSlug,
+  templateId,
+  templateName,
+}: GroupSectionProps) {
   'use no memo'
 
   const canExpand = row.getCanExpand()
   const isExpanded = row.getIsExpanded()
   const dataState = isExpanded ? 'open' : 'closed'
 
+  const [rollbackRequest, setRollbackRequest] = useState<{
+    target: TemplateTagAssignment
+    currentBuildId: string
+  } | null>(null)
+
+  const handleRequestRowRollback = useCallback(
+    (target: TemplateTagAssignment) => {
+      setRollbackRequest({
+        target,
+        currentBuildId: row.original.primaryAssignment.buildId,
+      })
+    },
+    [row.original.primaryAssignment.buildId]
+  )
+
   const toggle = () => {
     row.toggleExpanded()
     trackTagTableInteraction('expanded', {
@@ -292,8 +322,10 @@ function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
             <TagHistoryRow
               key={assignment.assignmentId}
               assignment={assignment}
+              primaryAssignment={row.original.primaryAssignment}
               teamSlug={teamSlug}
               templateId={templateId}
+              onRequestRollback={handleRequestRowRollback}
             />
           ))}
           {row.original.hasMore && (
@@ -305,6 +337,20 @@ function GroupSection({ row, teamSlug, templateId }: GroupSectionProps) {
           )}
         </div>
       )}
+
+      <RollbackTagDialog
+        open={rollbackRequest !== null}
+        onOpenChange={(next) => {
+          if (!next) setRollbackRequest(null)
+        }}
+        tag={row.original.tag}
+        currentBuildId={rollbackRequest?.currentBuildId ?? ''}
+        targetBuildId={rollbackRequest?.target.buildId ?? ''}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        surface="history-row"
+      />
     </div>
   )
 }

From eb26f9b43d40a52e558a0782c38f338c333f5571 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 16:59:41 +0200
Subject: [PATCH 21/90] reassign dialog

---
 .../dashboard/templates/tags/build-picker.tsx |   9 +-
 .../tags/history/tag-history-header.tsx       |  23 +-
 .../tags/history/tag-history-view.tsx         |   1 +
 .../templates/tags/reassign-dialog.tsx        | 323 ++++++++++++++++++
 .../dashboard/templates/tags/table-cells.tsx  |  18 +-
 5 files changed, 360 insertions(+), 14 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/reassign-dialog.tsx

diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index 4602bf114..4026f4323 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -23,7 +23,7 @@ type BuildsQueryResult = {
 export type BuildSelectionSource = 'default' | 'search'
 
 const DEFAULT_LIMIT = 5
-const PICKER_REGION_MIN_HEIGHT = 'min-h-[170px]'
+const PICKER_REGION_MIN_HEIGHT = 'min-h-[128px]'
 
 interface BuildPickerProps {
   open: boolean
@@ -285,12 +285,9 @@ function BuildSearchInput({
 
 function SkeletonRows({ count }: { count: number }) {
   return (
-    <ul className="flex flex-col" aria-hidden="true">
+    <ul className="flex flex-col gap-1 pt-0.5" aria-hidden="true">
       {Array.from({ length: count }, (_, i) => (
-        <li
-          key={`skeleton-${i}`}
-          className="flex items-center gap-3 px-2 py-1.5"
-        >
+        <li key={`skeleton-${i}`} className="flex items-center gap-3">
           <Skeleton className="size-4" />
           <Skeleton className="h-4 w-64" />
           <Skeleton className="ml-auto h-4 w-14" />
diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index b4de3bf35..f3b35ec9c 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -2,7 +2,6 @@
 
 import { useState } from 'react'
 import type { TemplateTagAssignment } from '@/core/modules/templates/models'
-import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
 import { cn } from '@/lib/utils/ui'
 import { Badge } from '@/ui/primitives/badge'
 import { Button } from '@/ui/primitives/button'
@@ -16,6 +15,7 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from '../build-link'
 import TagDeleteDialog from '../delete-dialog'
+import ReassignTagDialog from '../reassign-dialog'
 import RollbackTagDialog from '../rollback-dialog'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
@@ -36,6 +36,7 @@ interface TagHistoryHeaderProps {
    */
   onTagDeleted: () => void | Promise<void>
   onRolledBack?: () => void | Promise<void>
+  onReassigned?: () => void | Promise<void>
 }
 
 export function TagHistoryHeader({
@@ -47,11 +48,12 @@ export function TagHistoryHeader({
   previousAssignment,
   onTagDeleted,
   onRolledBack,
+  onReassigned,
 }: TagHistoryHeaderProps) {
-  const { toast } = useToast()
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
   const [rollbackOpen, setRollbackOpen] = useState(false)
+  const [reassignOpen, setReassignOpen] = useState(false)
 
   const isDefaultTag = tag === DEFAULT_TAG_NAME
   const canRollback = !!previousAssignment
@@ -88,9 +90,8 @@ export function TagHistoryHeader({
             variant="primary"
             size="none"
             className={SMALL_BUTTON}
-            onClick={() =>
-              toast(defaultErrorToast('Reassign: not implemented yet'))
-            }
+            aria-label={`Reassign tag ${tag} to a different build`}
+            onClick={() => setReassignOpen(true)}
           >
             Reassign
           </Button>
@@ -163,6 +164,18 @@ export function TagHistoryHeader({
           onRolledBack={onRolledBack}
         />
       )}
+
+      <ReassignTagDialog
+        open={reassignOpen}
+        onOpenChange={setReassignOpen}
+        tag={tag}
+        currentBuildId={primaryAssignment.buildId}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        surface="history-header"
+        onReassigned={onReassigned}
+      />
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index cbbe5bc5a..cf2550e4c 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -165,6 +165,7 @@ export default function TagHistoryView({
         previousAssignment={previous}
         onTagDeleted={handleTagDeleted}
         onRolledBack={handleRolledBack}
+        onReassigned={handleRolledBack}
       />
 
       <div
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
new file mode 100644
index 000000000..1fdcae1e5
--- /dev/null
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -0,0 +1,323 @@
+'use client'
+
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { useEffect, useState } from 'react'
+import { cn } from '@/lib/utils/ui'
+import { useTRPC } from '@/trpc/client'
+import { Button } from '@/ui/primitives/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/ui/primitives/dialog'
+import { CheckIcon } from '@/ui/primitives/icons'
+import { ArrowDivider } from './arrow-divider'
+import BuildPicker, { type BuildSelectionSource } from './build-picker'
+import { trackTagTableInteraction } from './table-config'
+
+export type ReassignSurface = 'tags-tab' | 'history-header'
+
+interface ReassignTagDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  tag: string
+  currentBuildId: string
+  teamSlug: string
+  templateId: string
+  templateName: string
+  surface: ReassignSurface
+  onReassigned?: () => void | Promise<void>
+}
+
+type Stage = 'idle' | 'pending' | 'error' | 'success'
+
+export default function ReassignTagDialog({
+  open,
+  onOpenChange,
+  tag,
+  currentBuildId,
+  teamSlug,
+  templateId,
+  templateName,
+  surface,
+  onReassigned,
+}: ReassignTagDialogProps) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+
+  const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
+  const [selectionSource, setSelectionSource] =
+    useState<BuildSelectionSource | null>(null)
+
+  const reassign = useMutation(
+    trpc.templates.assignTag.mutationOptions({
+      onSuccess: async () => {
+        trackTagTableInteraction('reassign succeeded', { surface, tag })
+        await queryClient.invalidateQueries({
+          queryKey: trpc.templates.getTagGroups.queryKey({
+            teamSlug,
+            templateId,
+          }),
+        })
+        await onReassigned?.()
+      },
+      onError: (error) => {
+        trackTagTableInteraction('reassign failed', {
+          surface,
+          tag,
+          error_status: error.data?.httpStatus ?? null,
+          error_code: error.data?.code ?? null,
+        })
+      },
+    })
+  )
+
+  const stage: Stage = reassign.isSuccess
+    ? 'success'
+    : reassign.isPending
+      ? 'pending'
+      : reassign.isError
+        ? 'error'
+        : 'idle'
+
+  const { reset } = reassign
+  useEffect(() => {
+    if (!open) return
+    trackTagTableInteraction('reassign opened', { surface, tag })
+    setSelectedBuildId(null)
+    setSelectionSource(null)
+    reset()
+  }, [open, surface, tag, reset])
+
+  const handleOpenChange = (next: boolean) => {
+    if (reassign.isPending) return
+    onOpenChange(next)
+  }
+
+  const handleSelect = (id: string | null, source: BuildSelectionSource) => {
+    setSelectedBuildId(id)
+    setSelectionSource(id ? source : null)
+    if (reassign.isError) reassign.reset()
+  }
+
+  const isSameAsCurrent =
+    selectedBuildId !== null && selectedBuildId === currentBuildId
+  const canSubmit =
+    stage === 'idle' && selectedBuildId !== null && !isSameAsCurrent
+
+  const submit = () => {
+    if (!canSubmit || !selectedBuildId) return
+    trackTagTableInteraction('reassign submitted', {
+      surface,
+      tag,
+      via_search: selectionSource === 'search',
+    })
+    reassign.mutate({
+      teamSlug,
+      templateId,
+      templateName,
+      buildId: selectedBuildId,
+      tag,
+    })
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent
+        hideClose={stage === 'pending'}
+        className="sm:max-w-[425px] sm:h-[436px]"
+        onPointerDownOutside={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (stage === 'pending') e.preventDefault()
+        }}
+      >
+        <DialogHeader>
+          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+            {stage === 'success'
+              ? `‘${tag}’ reassigned successfully`
+              : `reassign ‘${tag}’`}
+          </DialogTitle>
+          <DialogDescription className="sr-only">
+            {stage === 'success'
+              ? `Tag ${tag} reassigned.`
+              : `Reassign tag ${tag} from the current build to a different build.`}
+          </DialogDescription>
+        </DialogHeader>
+
+        {stage === 'success' ? (
+          <SuccessBody tag={tag} />
+        ) : (
+          <div className="flex flex-col gap-2">
+            <BuildRow label="Current" buildId={currentBuildId} />
+            <ArrowDivider />
+            <BuildRow
+              label="Target"
+              buildId={selectedBuildId ?? '--'}
+              dim={selectedBuildId === null}
+            />
+            <BuildPicker
+              open={open}
+              teamSlug={teamSlug}
+              templateId={templateId}
+              selectedBuildId={selectedBuildId}
+              onSelect={handleSelect}
+              disabled={stage === 'pending'}
+            />
+          </div>
+        )}
+
+        <Footer
+          stage={stage}
+          canSubmit={canSubmit}
+          warning={
+            isSameAsCurrent
+              ? `This build is currently assigned to ‘${tag}’.`
+              : null
+          }
+          errorMessage={reassign.error?.message ?? null}
+          onSubmit={submit}
+          onCancel={() => handleOpenChange(false)}
+          onDismiss={() => handleOpenChange(false)}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+interface BuildRowProps {
+  label: string
+  buildId: string
+  dim?: boolean
+}
+
+function BuildRow({ label, buildId, dim }: BuildRowProps) {
+  return (
+    <div className="flex items-center gap-3 mb-1">
+      <span className="prose-label-highlight uppercase text-fg-tertiary w-14 shrink-0">
+        {label}
+      </span>
+      <span
+        className={cn(
+          'prose-body font-mono truncate',
+          dim ? 'text-fg-tertiary' : 'text-fg-primary'
+        )}
+      >
+        {buildId}
+      </span>
+    </div>
+  )
+}
+
+function SuccessBody({ tag }: { tag: string }) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-3 text-center">
+      <CheckIcon className="size-12 text-accent-positive-highlight" />
+      <p className="prose-headline-small uppercase text-fg">
+        <span className="font-mono">‘{tag}’</span>
+        <br />
+        reassigned successfully
+      </p>
+    </div>
+  )
+}
+
+interface FooterProps {
+  stage: Stage
+  canSubmit: boolean
+  warning: string | null
+  errorMessage: string | null
+  onSubmit: () => void
+  onCancel: () => void
+  onDismiss: () => void
+}
+
+function Footer({
+  stage,
+  canSubmit,
+  warning,
+  errorMessage,
+  onSubmit,
+  onCancel,
+  onDismiss,
+}: FooterProps) {
+  if (stage === 'success') {
+    return (
+      <DialogFooter className="sm:flex-row mt-auto">
+        <Button autoFocus className="w-full" onClick={onDismiss}>
+          Dismiss
+        </Button>
+      </DialogFooter>
+    )
+  }
+
+  return (
+    <DialogFooter className="flex-col gap-2 sm:flex-col">
+      <InlineMessage
+        stage={stage}
+        warning={warning}
+        errorMessage={errorMessage}
+      />
+      {stage === 'pending' ? (
+        <Button variant="secondary" className="w-full" loading="Reassigning" />
+      ) : stage === 'error' ? (
+        <div className="grid w-full grid-cols-2 gap-2">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button autoFocus onClick={onSubmit}>
+            Retry
+          </Button>
+        </div>
+      ) : (
+        <div className="grid w-full grid-cols-2 gap-2">
+          <Button variant="secondary" onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button disabled={!canSubmit} onClick={onSubmit}>
+            Reassign
+          </Button>
+        </div>
+      )}
+    </DialogFooter>
+  )
+}
+
+/**
+ * Reserves a single-line slot between body and buttons so transitioning
+ * between idle / warning / error doesn't shift the footer below.
+ */
+function InlineMessage({
+  stage,
+  warning,
+  errorMessage,
+}: {
+  stage: Exclude<Stage, 'success'>
+  warning: string | null
+  errorMessage: string | null
+}) {
+  const tone: 'error' | 'warning' | null =
+    stage === 'error' ? 'error' : warning ? 'warning' : null
+  const text =
+    stage === 'error'
+      ? (errorMessage ?? 'Reassign failed.')
+      : (warning ?? '\u00a0')
+
+  return (
+    <p
+      aria-live="polite"
+      className={cn(
+        'prose-body w-full min-h-5 text-center',
+        tone === 'error' && 'text-accent-error-highlight',
+        tone === 'warning' && 'text-accent-warning-highlight',
+        tone === null && 'text-transparent select-none'
+      )}
+    >
+      {text}
+    </p>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 0949817c9..24ab3180e 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -2,7 +2,6 @@
 
 import type { CellContext } from '@tanstack/react-table'
 import { useState } from 'react'
-import { defaultErrorToast, useToast } from '@/lib/hooks/use-toast'
 import { cn } from '@/lib/utils/ui'
 import { Badge } from '@/ui/primitives/badge'
 import { Button } from '@/ui/primitives/button'
@@ -16,6 +15,7 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from './build-link'
 import TagDeleteDialog from './delete-dialog'
+import ReassignTagDialog from './reassign-dialog'
 import RollbackTagDialog from './rollback-dialog'
 import type { TagGroup } from './types'
 
@@ -61,10 +61,10 @@ export function BuildLinkCell(ctx: CellContext<TagGroup, unknown>) {
 export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
   const { row } = ctx
   const { teamSlug, templateId, templateName } = getMeta(ctx)
-  const { toast } = useToast()
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
   const [rollbackOpen, setRollbackOpen] = useState(false)
+  const [reassignOpen, setReassignOpen] = useState(false)
 
   const group = row.original
   const isDefaultTag = group.tag === DEFAULT_TAG_NAME
@@ -83,9 +83,10 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
           variant="primary"
           size="none"
           className={SMALL_BUTTON}
+          aria-label={`Reassign tag ${group.tag} to a different build`}
           onClick={(e) => {
             e.stopPropagation()
-            toast(defaultErrorToast('Reassign: not implemented yet'))
+            setReassignOpen(true)
           }}
         >
           Reassign
@@ -160,6 +161,17 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
           surface="tags-tab"
         />
       )}
+
+      <ReassignTagDialog
+        open={reassignOpen}
+        onOpenChange={setReassignOpen}
+        tag={group.tag}
+        currentBuildId={group.primaryAssignment.buildId}
+        teamSlug={teamSlug}
+        templateId={templateId}
+        templateName={templateName}
+        surface="tags-tab"
+      />
     </div>
   )
 }

From 450a39bc8d98755221d839fcc82a669fa509c469 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 17:53:27 +0200
Subject: [PATCH 22/90] reuse rollback dialog on history page

---
 .../tags/history/tag-history-header.tsx       | 32 +++----------------
 .../tags/history/tag-history-view.tsx         | 27 ++++++++++++----
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index f3b35ec9c..ca16b1fb6 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -16,7 +16,6 @@ import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { BuildLink } from '../build-link'
 import TagDeleteDialog from '../delete-dialog'
 import ReassignTagDialog from '../reassign-dialog'
-import RollbackTagDialog from '../rollback-dialog'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
 
@@ -28,14 +27,8 @@ interface TagHistoryHeaderProps {
   templateId: string
   templateName: string
   primaryAssignment: TemplateTagAssignment
-  previousAssignment: TemplateTagAssignment | undefined
-  /**
-   * Called after the tag is successfully deleted. The history page passes a
-   * handler that invalidates the assignments query for this tag and routes
-   * back to the Tags list.
-   */
   onTagDeleted: () => void | Promise<void>
-  onRolledBack?: () => void | Promise<void>
+  onRequestRollback?: () => void
   onReassigned?: () => void | Promise<void>
 }
 
@@ -45,18 +38,16 @@ export function TagHistoryHeader({
   templateId,
   templateName,
   primaryAssignment,
-  previousAssignment,
   onTagDeleted,
-  onRolledBack,
+  onRequestRollback,
   onReassigned,
 }: TagHistoryHeaderProps) {
   const [menuOpen, setMenuOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
-  const [rollbackOpen, setRollbackOpen] = useState(false)
   const [reassignOpen, setReassignOpen] = useState(false)
 
   const isDefaultTag = tag === DEFAULT_TAG_NAME
-  const canRollback = !!previousAssignment
+  const canRollback = !!onRequestRollback
 
   return (
     <div
@@ -105,7 +96,7 @@ export function TagHistoryHeader({
                 ? `Rollback tag ${tag} to previous build`
                 : `No previous build to rollback to for tag ${tag}`
             }
-            onClick={() => setRollbackOpen(true)}
+            onClick={() => onRequestRollback?.()}
           >
             Rollback
           </Button>
@@ -150,21 +141,6 @@ export function TagHistoryHeader({
         onDeleted={onTagDeleted}
       />
 
-      {previousAssignment && (
-        <RollbackTagDialog
-          open={rollbackOpen}
-          onOpenChange={setRollbackOpen}
-          tag={tag}
-          currentBuildId={primaryAssignment.buildId}
-          targetBuildId={previousAssignment.buildId}
-          teamSlug={teamSlug}
-          templateId={templateId}
-          templateName={templateName}
-          surface="history-header"
-          onRolledBack={onRolledBack}
-        />
-      )}
-
       <ReassignTagDialog
         open={reassignOpen}
         onOpenChange={setReassignOpen}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index cf2550e4c..1545b5d08 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -14,7 +14,7 @@ import type { TemplateTagAssignment } from '@/core/modules/templates/models'
 import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cells'
 import { useTRPC } from '@/trpc/client'
 import { Loader } from '@/ui/primitives/loader'
-import RollbackTagDialog from '../rollback-dialog'
+import RollbackTagDialog, { type RollbackSurface } from '../rollback-dialog'
 import { TagHistoryEmpty } from './tag-history-empty'
 import { TagHistoryHeader } from './tag-history-header'
 import { TagHistoryRow } from './tag-history-row'
@@ -132,16 +132,30 @@ export default function TagHistoryView({
   const [rollbackRequest, setRollbackRequest] = useState<{
     target: TemplateTagAssignment
     currentBuildId: string
+    surface: RollbackSurface
   } | null>(null)
 
-  const handleRequestRowRollback = useCallback(
-    (target: TemplateTagAssignment) => {
+  const requestRollback = useCallback(
+    (target: TemplateTagAssignment, surface: RollbackSurface) => {
       if (!primary) return
-      setRollbackRequest({ target, currentBuildId: primary.buildId })
+      setRollbackRequest({
+        target,
+        currentBuildId: primary.buildId,
+        surface,
+      })
     },
     [primary]
   )
 
+  const handleRequestRowRollback = useCallback(
+    (target: TemplateTagAssignment) => requestRollback(target, 'history-row'),
+    [requestRollback]
+  )
+
+  const handleRequestHeaderRollback = previous
+    ? () => requestRollback(previous, 'history-header')
+    : undefined
+
   if (isPending) {
     return (
       <div className="flex flex-1 items-center justify-center py-12">
@@ -162,9 +176,8 @@ export default function TagHistoryView({
         templateId={templateId}
         templateName={templateName}
         primaryAssignment={primary}
-        previousAssignment={previous}
         onTagDeleted={handleTagDeleted}
-        onRolledBack={handleRolledBack}
+        onRequestRollback={handleRequestHeaderRollback}
         onReassigned={handleRolledBack}
       />
 
@@ -220,7 +233,7 @@ export default function TagHistoryView({
         teamSlug={teamSlug}
         templateId={templateId}
         templateName={templateName}
-        surface="history-row"
+        surface={rollbackRequest?.surface ?? 'history-row'}
         onRolledBack={handleRolledBack}
       />
     </div>

From 796d782ab6c5d2f718817b107586c9a7a1a0825d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 18:04:11 +0200
Subject: [PATCH 23/90] truncate tag badge

---
 src/features/dashboard/templates/tags/table-cells.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 24ab3180e..496b79bfb 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -38,9 +38,11 @@ export function TagPillCell({ row }: CellContext<TagGroup, unknown>) {
     <Badge
       variant="default"
       size="sm"
-      className="uppercase bg-fill pointer-events-none"
+      className="uppercase bg-fill max-w-full min-w-0 shrink pointer-events-none"
     >
-      {row.original.tag}
+      <span className="min-w-0 truncate [direction:rtl]">
+        {row.original.tag}
+      </span>
     </Badge>
   )
 }

From 3c3fbf19b16a21ba48c58d8fc102872bf24492a3 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 18:10:41 +0200
Subject: [PATCH 24/90] handle invalid format

---
 .../templates/tags/tag-name-field.tsx         | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/tag-name-field.tsx b/src/features/dashboard/templates/tags/tag-name-field.tsx
index bc510829b..f9cc665ac 100644
--- a/src/features/dashboard/templates/tags/tag-name-field.tsx
+++ b/src/features/dashboard/templates/tags/tag-name-field.tsx
@@ -4,6 +4,12 @@ import { type ReactElement, useId } from 'react'
 import { cn } from '@/lib/utils'
 import { SearchIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/ui/primitives/tooltip'
+import { TAG_MAX_LENGTH } from './assign-dialog.helpers'
 
 export type TagNameStatus =
   | 'idle'
@@ -27,6 +33,29 @@ const STATUS_INDICATOR: Partial<Record<TagNameStatus, ReactElement>> = {
       Already exists
     </span>
   ),
+  invalid: (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <span className="prose-body cursor-help whitespace-nowrap text-accent-error-highlight decoration-dotted underline-offset-2">
+          Invalid format
+        </span>
+      </TooltipTrigger>
+      <TooltipContent
+        side="bottom"
+        align="end"
+        alignOffset={-13}
+        sideOffset={10}
+        className="max-w-[260px]"
+      >
+        <p className="prose-body text-fg-secondary">
+          Allowed: <span className="text-fg">lowercase letters, digits</span>,
+          and <span className="font-mono text-fg">. _ -</span>
+          <br />
+          Max <span className="text-fg">{TAG_MAX_LENGTH}</span> characters
+        </p>
+      </TooltipContent>
+    </Tooltip>
+  ),
 }
 
 export default function TagNameField({
@@ -62,7 +91,7 @@ export default function TagNameField({
         placeholder="Enter tag name"
         aria-invalid={showAsInvalid || undefined}
         className={cn(
-          'prose-body min-w-0 flex-1 bg-transparent outline-none placeholder:text-fg-tertiary',
+          'prose-body min-w-0 flex-1 truncate bg-transparent outline-none placeholder:text-fg-tertiary',
           // Leading-truncation trick: flip to RTL only when blurred AND has content,
           // so the ellipsis appears at the start of the value.
           '[&:not(:focus):not(:placeholder-shown)]:[direction:rtl]',

From eaedfae2c58f0d84558580be47c80f442be49ada Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 18:19:39 +0200
Subject: [PATCH 25/90] add envd version to overview

---
 .../dashboard/templates/detail/header-skeleton.tsx       | 3 +++
 src/features/dashboard/templates/detail/header.tsx       | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/features/dashboard/templates/detail/header-skeleton.tsx b/src/features/dashboard/templates/detail/header-skeleton.tsx
index a7ec8f943..4026f0848 100644
--- a/src/features/dashboard/templates/detail/header-skeleton.tsx
+++ b/src/features/dashboard/templates/detail/header-skeleton.tsx
@@ -13,6 +13,9 @@ export default function TemplateDetailHeaderSkeleton() {
       <DetailsItem label="CPU">
         <Skeleton className="w-16 h-5" />
       </DetailsItem>
+      <DetailsItem label="Envd">
+        <Skeleton className="w-14 h-5" />
+      </DetailsItem>
       <DetailsItem label="Created">
         <Skeleton className="w-36 h-5" />
       </DetailsItem>
diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
index e8141dc6b..294dc3ace 100644
--- a/src/features/dashboard/templates/detail/header.tsx
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -67,6 +67,15 @@ export default function TemplateDetailHeader({
           <span className="text-fg-tertiary font-mono">--</span>
         )}
       </DetailsItem>
+      <DetailsItem label="Envd">
+        {hasReadyBuild ? (
+          <span className="font-mono whitespace-nowrap">
+            {template.envdVersion}
+          </span>
+        ) : (
+          <span className="text-fg-tertiary font-mono">--</span>
+        )}
+      </DetailsItem>
       <DetailsItem label="Created">
         <span className="font-mono whitespace-nowrap prose-body-numeric">
           <span className="text-fg-tertiary">{created?.datePart ?? '--'}</span>{' '}

From 2b8ccbd3fcf4c40a7b8e57548662ca74428e2b76 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 29 May 2026 18:59:19 +0200
Subject: [PATCH 26/90] invalidate queries on rollback

---
 .../tags/history/tag-history-view.tsx         | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index 1545b5d08..8724ec1f7 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -108,26 +108,21 @@ export default function TagHistoryView({
     fetchNextPage,
   ])
 
+  const tagAssignmentsQueryKey =
+    trpc.templates.getTagAssignments.infiniteQueryOptions({
+      teamSlug,
+      templateId,
+      tag,
+    }).queryKey
+
   const handleTagDeleted = async () => {
-    await queryClient.invalidateQueries({
-      queryKey: trpc.templates.getTagAssignments.queryKey({
-        teamSlug,
-        templateId,
-        tag,
-      }),
-    })
+    await queryClient.invalidateQueries({ queryKey: tagAssignmentsQueryKey })
     router.push(PROTECTED_URLS.TEMPLATE_TAGS(teamSlug, templateId))
   }
 
   const handleRolledBack = useCallback(async () => {
-    await queryClient.invalidateQueries({
-      queryKey: trpc.templates.getTagAssignments.queryKey({
-        teamSlug,
-        templateId,
-        tag,
-      }),
-    })
-  }, [queryClient, trpc, teamSlug, templateId, tag])
+    await queryClient.invalidateQueries({ queryKey: tagAssignmentsQueryKey })
+  }, [queryClient, tagAssignmentsQueryKey])
 
   const [rollbackRequest, setRollbackRequest] = useState<{
     target: TemplateTagAssignment

From c0b5083a21626d30209cd824cd720106dff69fdc Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 10:27:13 +0200
Subject: [PATCH 27/90] Update builds table for template

---
 .../dashboard/templates/builds/table-cells.tsx   |  2 +-
 .../dashboard/templates/builds/table.tsx         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 2222fe610..c85ba263e 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -24,7 +24,7 @@ export function BuildId({ id }: { id: string }) {
   return (
     <CopyButtonInline
       value={id}
-      className="w-full text-left text-fg-tertiary font-mono prose-table-numeric"
+      className="w-full text-left text-fg-secondary font-mono prose-table-numeric"
     >
       {id.slice(0, 6)}...{id.slice(-6)}
     </CopyButtonInline>
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index 2e208491f..d5df93782 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -186,18 +186,19 @@ const BuildsTable = ({
         <Table suppressHydrationWarning>
           <colgroup>
             <col style={colStyle(COLUMN_WIDTHS.status)} />
+            <col style={colStyle(COLUMN_WIDTHS.id)} />
             {showTemplateColumn && (
               <col style={colStyle(COLUMN_WIDTHS.template)} />
             )}
             <col style={colStyle(COLUMN_WIDTHS.started)} />
             <col style={colStyle(COLUMN_WIDTHS.duration)} />
-            <col style={colStyle(COLUMN_WIDTHS.id)} />
             <col className="max-lg:min-w-[500px]" />
           </colgroup>
 
           <TableHeader className="sticky top-0 z-10 bg-bg">
             <TableRow>
               <TableHead>Status</TableHead>
+              <TableHead>ID</TableHead>
               {showTemplateColumn && <TableHead>Template</TableHead>}
               <TableHead>
                 <span className="inline-flex items-center gap-1 text-fg">
@@ -206,7 +207,6 @@ const BuildsTable = ({
                 </span>
               </TableHead>
               <TableHead className="text-end">Duration</TableHead>
-              <TableHead>ID</TableHead>
               <th />
             </TableRow>
           </TableHeader>
@@ -275,6 +275,12 @@ const BuildsTable = ({
                       >
                         <Status status={build.status} />
                       </TableCell>
+                      <TableCell
+                        className="py-1.5 overflow-hidden"
+                        style={{ maxWidth: COLUMN_WIDTHS.id }}
+                      >
+                        <BuildId id={build.id} />
+                      </TableCell>
                       {showTemplateColumn && (
                         <TableCell
                           className="py-1.5 overflow-hidden"
@@ -296,12 +302,6 @@ const BuildsTable = ({
                           isBuilding={isBuilding}
                         />
                       </TableCell>
-                      <TableCell
-                        className="py-1.5 overflow-hidden"
-                        style={{ maxWidth: COLUMN_WIDTHS.id }}
-                      >
-                        <BuildId id={build.id} />
-                      </TableCell>
                       <TableCell className="py-1.5 w-full">
                         <Reason statusMessage={build.statusMessage} />
                       </TableCell>

From b24e5d66c8b8c3e7606579ac94a1fd05be0bc566 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 10:43:49 +0200
Subject: [PATCH 28/90] Update invalid format tooltip

---
 .../templates/tags/tag-name-field.tsx         | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/features/dashboard/templates/tags/tag-name-field.tsx b/src/features/dashboard/templates/tags/tag-name-field.tsx
index f9cc665ac..b1903d031 100644
--- a/src/features/dashboard/templates/tags/tag-name-field.tsx
+++ b/src/features/dashboard/templates/tags/tag-name-field.tsx
@@ -36,7 +36,7 @@ const STATUS_INDICATOR: Partial<Record<TagNameStatus, ReactElement>> = {
   invalid: (
     <Tooltip>
       <TooltipTrigger asChild>
-        <span className="prose-body cursor-help whitespace-nowrap text-accent-error-highlight decoration-dotted underline-offset-2">
+        <span className="prose-body whitespace-nowrap text-accent-error-highlight decoration-dotted underline-offset-2">
           Invalid format
         </span>
       </TooltipTrigger>
@@ -44,14 +44,26 @@ const STATUS_INDICATOR: Partial<Record<TagNameStatus, ReactElement>> = {
         side="bottom"
         align="end"
         alignOffset={-13}
-        sideOffset={10}
+        sideOffset={12}
         className="max-w-[260px]"
       >
-        <p className="prose-body text-fg-secondary">
-          Allowed: <span className="text-fg">lowercase letters, digits</span>,
-          and <span className="font-mono text-fg">. _ -</span>
+        <p className="prose-body font-mono text-fg-secondary">
+          <span className="font-sans text-fg-tertiary">Allowed: </span>
+          <span className="text-fg">a-z</span>,
+          <span className="text-fg">0-9</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">.</span>
+          <span className="text-fg-tertiary">)</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">_</span>
+          <span className="text-fg-tertiary">)</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">-</span>
+          <span className="text-fg-tertiary">)</span>
           <br />
-          Max <span className="text-fg">{TAG_MAX_LENGTH}</span> characters
+          <span className="font-sans text-fg-tertiary">
+            Max {TAG_MAX_LENGTH} characters
+          </span>
         </p>
       </TooltipContent>
     </Tooltip>

From 24115606a1c75ecef26cec2c49603b04055f564f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 10:45:43 +0200
Subject: [PATCH 29/90] Fix tag history scroll

---
 .../tags/history/tag-history-view.tsx         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index 8724ec1f7..6346822f5 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -28,6 +28,9 @@ interface TagHistoryViewProps {
 const ROW_HEIGHT_PX = 36
 const VIRTUAL_OVERSCAN = 12
 const PREFETCH_THRESHOLD = 8
+// Pixel offset of the rows container from the top of the scroll container:
+// TagHistoryHeader (py-2 + h-7 button = 44px) + parent gap-3 (12px).
+const HEADER_SCROLL_MARGIN_PX = 56
 
 export default function TagHistoryView({
   teamSlug,
@@ -87,6 +90,7 @@ export default function TagHistoryView({
     getScrollElement: () => scrollRef.current,
     estimateSize: () => ROW_HEIGHT_PX,
     overscan: VIRTUAL_OVERSCAN,
+    scrollMargin: HEADER_SCROLL_MARGIN_PX,
   })
 
   const virtualItems = virtualizer.getVirtualItems()
@@ -164,7 +168,10 @@ export default function TagHistoryView({
   }
 
   return (
-    <div className="flex h-full min-h-0 flex-col gap-3">
+    <div
+      ref={scrollRef}
+      className="flex h-full min-h-0 flex-col gap-3 overflow-y-auto overflow-x-hidden [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
+    >
       <TagHistoryHeader
         tag={tag}
         teamSlug={teamSlug}
@@ -176,13 +183,12 @@ export default function TagHistoryView({
         onReassigned={handleRolledBack}
       />
 
-      <div
-        ref={scrollRef}
-        className="flex-1 min-h-0 overflow-y-auto -mx-3 px-3"
-      >
+      <div className="-mx-3 px-3">
         <div
           className="relative"
-          style={{ height: `${virtualizer.getTotalSize()}px` }}
+          style={{
+            height: `${virtualizer.getTotalSize() - HEADER_SCROLL_MARGIN_PX}px`,
+          }}
         >
           {virtualItems.map((virtualRow) => {
             const assignment = history[virtualRow.index]
@@ -193,7 +199,9 @@ export default function TagHistoryView({
                 data-index={virtualRow.index}
                 ref={(node) => virtualizer.measureElement(node)}
                 className="absolute left-0 right-0 border-b border-stroke/80"
-                style={{ transform: `translateY(${virtualRow.start}px)` }}
+                style={{
+                  transform: `translateY(${virtualRow.start - HEADER_SCROLL_MARGIN_PX}px)`,
+                }}
               >
                 <TagHistoryRow
                   assignment={assignment}

From 21062a8e9b5a6b5f1836205a5ce935fbcf686c6d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 11:34:46 +0200
Subject: [PATCH 30/90] Middle truncate tag badge

---
 .../tags/history/tag-history-header.tsx       |  5 +--
 .../dashboard/templates/tags/table-cells.tsx  |  5 ++-
 src/ui/primitives/middle-truncate.tsx         | 34 +++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 src/ui/primitives/middle-truncate.tsx

diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index ca16b1fb6..e11458e10 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -13,6 +13,7 @@ import {
 } from '@/ui/primitives/dropdown-menu'
 import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
+import { MiddleTruncate } from '@/ui/primitives/middle-truncate'
 import { BuildLink } from '../build-link'
 import TagDeleteDialog from '../delete-dialog'
 import ReassignTagDialog from '../reassign-dialog'
@@ -60,9 +61,9 @@ export function TagHistoryHeader({
         <Badge
           variant="default"
           size="sm"
-          className="uppercase bg-fill pointer-events-none"
+          className="uppercase bg-fill max-w-full min-w-0 pointer-events-none"
         >
-          {tag}
+          <MiddleTruncate text={tag} />
         </Badge>
       </div>
 
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 496b79bfb..f7bb59ec7 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -13,6 +13,7 @@ import {
 } from '@/ui/primitives/dropdown-menu'
 import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
+import { MiddleTruncate } from '@/ui/primitives/middle-truncate'
 import { BuildLink } from './build-link'
 import TagDeleteDialog from './delete-dialog'
 import ReassignTagDialog from './reassign-dialog'
@@ -40,9 +41,7 @@ export function TagPillCell({ row }: CellContext<TagGroup, unknown>) {
       size="sm"
       className="uppercase bg-fill max-w-full min-w-0 shrink pointer-events-none"
     >
-      <span className="min-w-0 truncate [direction:rtl]">
-        {row.original.tag}
-      </span>
+      <MiddleTruncate text={row.original.tag} />
     </Badge>
   )
 }
diff --git a/src/ui/primitives/middle-truncate.tsx b/src/ui/primitives/middle-truncate.tsx
new file mode 100644
index 000000000..9ac375226
--- /dev/null
+++ b/src/ui/primitives/middle-truncate.tsx
@@ -0,0 +1,34 @@
+import type * as React from 'react'
+import { cn } from '@/lib/utils/ui'
+
+const DEFAULT_TAIL_CHARS = 6
+
+export interface MiddleTruncateProps extends React.ComponentProps<'span'> {
+  text: string
+  tail?: number
+}
+
+export function MiddleTruncate({
+  text,
+  tail = DEFAULT_TAIL_CHARS,
+  className,
+  ...props
+}: MiddleTruncateProps) {
+  if (text.length <= tail * 2) {
+    return (
+      <span className={cn('truncate', className)} {...props}>
+        {text}
+      </span>
+    )
+  }
+
+  const head = text.slice(0, -tail)
+  const end = text.slice(-tail)
+
+  return (
+    <span className={cn('flex min-w-0 max-w-full', className)} {...props}>
+      <span className="truncate">{head}</span>
+      <span className="shrink-0 whitespace-pre">{end}</span>
+    </span>
+  )
+}

From d1075eb09c68c5f77d2f97f6e978dabbf2fe6dc2 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 11:56:45 +0200
Subject: [PATCH 31/90] Reuse dialog footer and polish spacing

---
 .../templates/tags/assign-dialog.tsx          |  98 +++------------
 .../templates/tags/build-picker-row.tsx       |   2 +-
 .../dashboard/templates/tags/build-picker.tsx |  14 ++-
 .../templates/tags/reassign-dialog.tsx        | 114 +----------------
 .../templates/tags/rollback-dialog.tsx        |  95 +--------------
 .../templates/tags/tag-dialog-footer.tsx      | 115 ++++++++++++++++++
 src/ui/primitives/dialog.tsx                  |   2 +-
 7 files changed, 153 insertions(+), 287 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/tag-dialog-footer.tsx

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 381301b8b..cd5b50d6d 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -2,20 +2,18 @@
 
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import posthog from 'posthog-js'
-import { type FormEvent, useEffect, useMemo, useState } from 'react'
+import { type FormEvent, useEffect, useId, useMemo, useState } from 'react'
 import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
 import { useTRPC } from '@/trpc/client'
 import { Button } from '@/ui/primitives/button'
 import {
   Dialog,
   DialogContent,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
   DialogTrigger,
 } from '@/ui/primitives/dialog'
 import { AddIcon, CheckIcon } from '@/ui/primitives/icons'
-import { Loader } from '@/ui/primitives/loader'
 import { ArrowDivider } from './arrow-divider'
 import {
   isValidTagShape,
@@ -24,6 +22,7 @@ import {
   TAG_REGEX,
 } from './assign-dialog.helpers'
 import BuildPicker, { type BuildSelectionSource } from './build-picker'
+import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
 import TagNameField, { type TagNameStatus } from './tag-name-field'
 
 const NAME_DEBOUNCE_MS = 350
@@ -42,6 +41,7 @@ export default function AssignTagDialog({
   const trpc = useTRPC()
   const queryClient = useQueryClient()
 
+  const formId = useId()
   const [open, setOpen] = useState(false)
   const [name, setNameRaw] = useState('')
   const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
@@ -144,8 +144,8 @@ export default function AssignTagDialog({
     setOpen(next)
   }
 
-  const handleSubmit = (e?: FormEvent<HTMLFormElement>) => {
-    e?.preventDefault()
+  const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault()
     if (!canSubmit || !selectedBuildId) return
     const tagToSubmit =
       existsQuery.data?.normalizedTag ?? normalizedDebouncedName
@@ -161,7 +161,7 @@ export default function AssignTagDialog({
     })
   }
 
-  const stage: Stage =
+  const stage: TagDialogStage =
     mutation.status === 'pending'
       ? 'pending'
       : mutation.status === 'error'
@@ -186,7 +186,7 @@ export default function AssignTagDialog({
 
       <DialogContent
         hideClose={stage === 'pending'}
-        className="sm:max-w-[425px] sm:h-[436px]"
+        className="sm:max-w-[430px] sm:h-[422px] gap-4"
         onPointerDownOutside={(e) => {
           if (stage === 'pending') e.preventDefault()
         }}
@@ -205,7 +205,11 @@ export default function AssignTagDialog({
         {stage === 'success' ? (
           <SuccessBody tag={successTag} />
         ) : (
-          <form onSubmit={handleSubmit} className="flex flex-col gap-2">
+          <form
+            id={formId}
+            onSubmit={handleSubmit}
+            className="flex flex-col gap-2"
+          >
             <TagNameField
               value={name}
               onChange={setName}
@@ -233,17 +237,16 @@ export default function AssignTagDialog({
               onSelect={handleSetSelectedBuildId}
               disabled={stage === 'pending'}
             />
-
-            {/* Hidden submit so Enter from any input triggers submit if enabled. */}
-            <button type="submit" hidden aria-hidden tabIndex={-1} />
           </form>
         )}
 
-        <Footer
+        <TagDialogFooter
           stage={stage}
           canSubmit={canSubmit}
           errorMessage={mutation.error?.message ?? null}
-          onSubmit={handleSubmit}
+          submitLabel="Assign"
+          pendingLabel="Assigning"
+          formId={formId}
           onCancel={() => handleOpenChange(false)}
           onDismiss={() => handleOpenChange(false)}
         />
@@ -252,75 +255,6 @@ export default function AssignTagDialog({
   )
 }
 
-type Stage = 'idle' | 'pending' | 'error' | 'success'
-
-interface FooterProps {
-  stage: Stage
-  canSubmit: boolean
-  errorMessage: string | null
-  onSubmit: () => void
-  onCancel: () => void
-  onDismiss: () => void
-}
-
-function Footer({
-  stage,
-  canSubmit,
-  errorMessage,
-  onSubmit,
-  onCancel,
-  onDismiss,
-}: FooterProps) {
-  switch (stage) {
-    case 'pending':
-      return (
-        <DialogFooter className="flex-col sm:flex-row">
-          <div className="flex w-full items-center justify-center gap-2 py-2">
-            <Loader variant="slash" size="sm" />
-            <span className="prose-body text-fg-secondary">Assigning…</span>
-          </div>
-        </DialogFooter>
-      )
-    case 'error':
-      return (
-        <DialogFooter className="flex-col gap-3 sm:flex-col">
-          {errorMessage ? (
-            <p className="prose-body w-full text-accent-error-highlight">
-              {errorMessage}
-            </p>
-          ) : null}
-          <div className="grid w-full grid-cols-2 gap-2">
-            <Button variant="secondary" onClick={onCancel}>
-              Cancel
-            </Button>
-            <Button autoFocus onClick={onSubmit}>
-              Retry
-            </Button>
-          </div>
-        </DialogFooter>
-      )
-    case 'success':
-      return (
-        <DialogFooter className="mt-auto">
-          <Button autoFocus className="w-full" onClick={onDismiss}>
-            Dismiss
-          </Button>
-        </DialogFooter>
-      )
-    default:
-      return (
-        <DialogFooter className="grid grid-cols-2 gap-2 sm:flex-row">
-          <Button variant="secondary" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button disabled={!canSubmit} onClick={onSubmit}>
-            Assign
-          </Button>
-        </DialogFooter>
-      )
-  }
-}
-
 function SuccessBody({ tag }: { tag: string }) {
   return (
     <div className="flex flex-col items-center justify-center gap-3 py-8 text-center">
diff --git a/src/features/dashboard/templates/tags/build-picker-row.tsx b/src/features/dashboard/templates/tags/build-picker-row.tsx
index 826bcdf58..1698ff903 100644
--- a/src/features/dashboard/templates/tags/build-picker-row.tsx
+++ b/src/features/dashboard/templates/tags/build-picker-row.tsx
@@ -19,7 +19,7 @@ function BuildPickerRowComponent({
   const id = `build-row-${buildId}`
 
   return (
-    <div className="flex items-center gap-2 hover:bg-bg-hover">
+    <div className="flex items-center gap-2 hover:bg-bg-hover py-0.5">
       <RadioGroupItem id={id} value={buildId} disabled={disabled} />
       <Label
         htmlFor={id}
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index 4026f4323..32c69bec7 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -114,7 +114,7 @@ export default function BuildPicker({
   }, [selectedBuildId, isSearchMode, searchResult, defaultBuilds, onSelect])
 
   return (
-    <div className="flex flex-col gap-2.5">
+    <div className="flex flex-col gap-1.5">
       <BuildSearchInput
         value={searchValue}
         onChange={setSearchValue}
@@ -182,7 +182,7 @@ function PickerBody({
       return (
         <PickerMessage
           icon={<SearchIcon className="size-5 text-fg-tertiary" />}
-          title="No build found with this ID."
+          title="No build found"
         />
       )
     }
@@ -223,7 +223,7 @@ function PickerBody({
       <PickerMessage
         icon={<BuildIcon className="size-5 text-fg-tertiary" />}
         title="No ready builds yet"
-        description="Builds appear here once they finish successfully."
+        description="Latest successful builds appear here."
       />
     )
   }
@@ -231,7 +231,7 @@ function PickerBody({
     <RadioGroup
       value={selectedBuildId ?? ''}
       onValueChange={(value) => onSelect(value || null, 'default')}
-      className="flex flex-col gap-1"
+      className="flex flex-col gap-0.5"
       aria-label="Recent ready builds"
     >
       {defaultBuilds.map((build) => (
@@ -311,11 +311,13 @@ function PickerMessage({
   action,
 }: PickerMessageProps) {
   return (
-    <div className="flex flex-1 flex-col items-center justify-center gap-2 px-4 py-6 text-center">
+    <div className="flex flex-1 flex-col items-center justify-center gap-1 px-4 pt-3 text-center">
       {icon}
       <p className="prose-body-highlight text-fg">{title}</p>
       {description ? (
-        <p className="prose-body max-w-64 text-fg-tertiary">{description}</p>
+        <p className="prose-body max-w-64 text-fg-tertiary text-balance">
+          {description}
+        </p>
       ) : null}
       {action ? <div className="pt-1">{action}</div> : null}
     </div>
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index 1fdcae1e5..e25321b85 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -4,12 +4,10 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useEffect, useState } from 'react'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
-import { Button } from '@/ui/primitives/button'
 import {
   Dialog,
   DialogContent,
   DialogDescription,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
 } from '@/ui/primitives/dialog'
@@ -17,6 +15,7 @@ import { CheckIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
 import BuildPicker, { type BuildSelectionSource } from './build-picker'
 import { trackTagTableInteraction } from './table-config'
+import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
 
 export type ReassignSurface = 'tags-tab' | 'history-header'
 
@@ -32,8 +31,6 @@ interface ReassignTagDialogProps {
   onReassigned?: () => void | Promise<void>
 }
 
-type Stage = 'idle' | 'pending' | 'error' | 'success'
-
 export default function ReassignTagDialog({
   open,
   onOpenChange,
@@ -75,7 +72,7 @@ export default function ReassignTagDialog({
     })
   )
 
-  const stage: Stage = reassign.isSuccess
+  const stage: TagDialogStage = reassign.isSuccess
     ? 'success'
     : reassign.isPending
       ? 'pending'
@@ -128,7 +125,7 @@ export default function ReassignTagDialog({
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogContent
         hideClose={stage === 'pending'}
-        className="sm:max-w-[425px] sm:h-[436px]"
+        className="sm:max-w-[430px] sm:h-[406px]"
         onPointerDownOutside={(e) => {
           if (stage === 'pending') e.preventDefault()
         }}
@@ -171,15 +168,12 @@ export default function ReassignTagDialog({
           </div>
         )}
 
-        <Footer
+        <TagDialogFooter
           stage={stage}
           canSubmit={canSubmit}
-          warning={
-            isSameAsCurrent
-              ? `This build is currently assigned to ‘${tag}’.`
-              : null
-          }
           errorMessage={reassign.error?.message ?? null}
+          submitLabel="Reassign"
+          pendingLabel="Reassigning"
           onSubmit={submit}
           onCancel={() => handleOpenChange(false)}
           onDismiss={() => handleOpenChange(false)}
@@ -225,99 +219,3 @@ function SuccessBody({ tag }: { tag: string }) {
     </div>
   )
 }
-
-interface FooterProps {
-  stage: Stage
-  canSubmit: boolean
-  warning: string | null
-  errorMessage: string | null
-  onSubmit: () => void
-  onCancel: () => void
-  onDismiss: () => void
-}
-
-function Footer({
-  stage,
-  canSubmit,
-  warning,
-  errorMessage,
-  onSubmit,
-  onCancel,
-  onDismiss,
-}: FooterProps) {
-  if (stage === 'success') {
-    return (
-      <DialogFooter className="sm:flex-row mt-auto">
-        <Button autoFocus className="w-full" onClick={onDismiss}>
-          Dismiss
-        </Button>
-      </DialogFooter>
-    )
-  }
-
-  return (
-    <DialogFooter className="flex-col gap-2 sm:flex-col">
-      <InlineMessage
-        stage={stage}
-        warning={warning}
-        errorMessage={errorMessage}
-      />
-      {stage === 'pending' ? (
-        <Button variant="secondary" className="w-full" loading="Reassigning" />
-      ) : stage === 'error' ? (
-        <div className="grid w-full grid-cols-2 gap-2">
-          <Button variant="secondary" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button autoFocus onClick={onSubmit}>
-            Retry
-          </Button>
-        </div>
-      ) : (
-        <div className="grid w-full grid-cols-2 gap-2">
-          <Button variant="secondary" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button disabled={!canSubmit} onClick={onSubmit}>
-            Reassign
-          </Button>
-        </div>
-      )}
-    </DialogFooter>
-  )
-}
-
-/**
- * Reserves a single-line slot between body and buttons so transitioning
- * between idle / warning / error doesn't shift the footer below.
- */
-function InlineMessage({
-  stage,
-  warning,
-  errorMessage,
-}: {
-  stage: Exclude<Stage, 'success'>
-  warning: string | null
-  errorMessage: string | null
-}) {
-  const tone: 'error' | 'warning' | null =
-    stage === 'error' ? 'error' : warning ? 'warning' : null
-  const text =
-    stage === 'error'
-      ? (errorMessage ?? 'Reassign failed.')
-      : (warning ?? '\u00a0')
-
-  return (
-    <p
-      aria-live="polite"
-      className={cn(
-        'prose-body w-full min-h-5 text-center',
-        tone === 'error' && 'text-accent-error-highlight',
-        tone === 'warning' && 'text-accent-warning-highlight',
-        tone === null && 'text-transparent select-none'
-      )}
-    >
-      {text}
-    </p>
-  )
-}
diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
index 7433950cc..81e8512af 100644
--- a/src/features/dashboard/templates/tags/rollback-dialog.tsx
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -3,18 +3,17 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useEffect } from 'react'
 import { useTRPC } from '@/trpc/client'
-import { Button } from '@/ui/primitives/button'
 import {
   Dialog,
   DialogContent,
   DialogDescription,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
 } from '@/ui/primitives/dialog'
 import { CheckIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
 import { trackTagTableInteraction } from './table-config'
+import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
 
 export type RollbackSurface = 'tags-tab' | 'history-header' | 'history-row'
 
@@ -69,7 +68,7 @@ export default function RollbackTagDialog({
     })
   )
 
-  const stage: Stage = rollback.isSuccess
+  const stage: TagDialogStage = rollback.isSuccess
     ? 'success'
     : rollback.isPending
       ? 'pending'
@@ -135,9 +134,12 @@ export default function RollbackTagDialog({
           </div>
         )}
 
-        <Footer
+        <TagDialogFooter
           stage={stage}
+          canSubmit
           errorMessage={rollback.error?.message ?? null}
+          submitLabel="Rollback"
+          pendingLabel="Rolling back"
           onSubmit={submit}
           onCancel={() => handleOpenChange(false)}
           onDismiss={() => handleOpenChange(false)}
@@ -147,8 +149,6 @@ export default function RollbackTagDialog({
   )
 }
 
-type Stage = 'idle' | 'pending' | 'error' | 'success'
-
 interface BuildRowProps {
   label: string
   buildId: string
@@ -179,86 +179,3 @@ function SuccessBody({ tag }: { tag: string }) {
     </div>
   )
 }
-
-interface FooterProps {
-  stage: Stage
-  errorMessage: string | null
-  onSubmit: () => void
-  onCancel: () => void
-  onDismiss: () => void
-}
-
-/**
- * The footer keeps a fixed-height inline message slot above the buttons so
- * the dialog doesn't jump when an error appears or clears. The slot is
- * present in idle/pending/error and collapsed in success (which has its
- * own full-width Dismiss button).
- */
-function Footer({
-  stage,
-  errorMessage,
-  onSubmit,
-  onCancel,
-  onDismiss,
-}: FooterProps) {
-  if (stage === 'success') {
-    return (
-      <DialogFooter className="sm:flex-row mt-auto">
-        <Button autoFocus className="w-full" onClick={onDismiss}>
-          Dismiss
-        </Button>
-      </DialogFooter>
-    )
-  }
-
-  return (
-    <DialogFooter className="flex-col gap-2 sm:flex-col">
-      <InlineMessage stage={stage} message={errorMessage} />
-      {stage === 'pending' ? (
-        <Button variant="secondary" className="w-full" loading="Rolling back" />
-      ) : stage === 'error' ? (
-        <div className="grid w-full grid-cols-2 gap-2">
-          <Button variant="secondary" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button autoFocus onClick={onSubmit}>
-            Retry
-          </Button>
-        </div>
-      ) : (
-        <div className="grid w-full grid-cols-2 gap-2">
-          <Button variant="secondary" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button onClick={onSubmit}>Rollback</Button>
-        </div>
-      )}
-    </DialogFooter>
-  )
-}
-
-/**
- * Reserves a single-line slot for inline feedback so toggling between idle
- * and error doesn't shift the buttons below.
- */
-function InlineMessage({
-  stage,
-  message,
-}: {
-  stage: Exclude<Stage, 'success'>
-  message: string | null
-}) {
-  const text = stage === 'error' ? (message ?? 'Rollback failed.') : '\u00a0'
-  return (
-    <p
-      aria-live="polite"
-      className={
-        stage === 'error'
-          ? 'prose-body w-full min-h-5 text-center text-accent-error-highlight'
-          : 'prose-body w-full min-h-5 text-center text-transparent select-none'
-      }
-    >
-      {text}
-    </p>
-  )
-}
diff --git a/src/features/dashboard/templates/tags/tag-dialog-footer.tsx b/src/features/dashboard/templates/tags/tag-dialog-footer.tsx
new file mode 100644
index 000000000..f72ead284
--- /dev/null
+++ b/src/features/dashboard/templates/tags/tag-dialog-footer.tsx
@@ -0,0 +1,115 @@
+'use client'
+
+import type { ComponentProps } from 'react'
+import { cn } from '@/lib/utils/ui'
+import { Button } from '@/ui/primitives/button'
+import { DialogFooter } from '@/ui/primitives/dialog'
+import { Loader } from '@/ui/primitives/loader'
+
+export type TagDialogStage = 'idle' | 'pending' | 'error' | 'success'
+
+type BaseProps = {
+  stage: TagDialogStage
+  canSubmit: boolean
+  errorMessage: string | null
+  submitLabel: string
+  pendingLabel: string
+  onCancel: () => void
+  onDismiss: () => void
+}
+
+type SubmitWiring =
+  | { formId: string; onSubmit?: never }
+  | { formId?: never; onSubmit: () => void }
+
+type Props = BaseProps & SubmitWiring
+
+export function TagDialogFooter({
+  stage,
+  canSubmit,
+  errorMessage,
+  submitLabel,
+  pendingLabel,
+  onCancel,
+  onDismiss,
+  formId,
+  onSubmit,
+}: Props) {
+  const submitTrigger: ComponentProps<typeof Button> = formId
+    ? { type: 'submit', form: formId }
+    : { onClick: onSubmit }
+
+  switch (stage) {
+    case 'success':
+      return (
+        <DialogFooter className="sm:flex-row mt-auto">
+          <Button autoFocus className="w-full" onClick={onDismiss}>
+            Dismiss
+          </Button>
+        </DialogFooter>
+      )
+    case 'pending':
+      return (
+        <DialogFooter className="flex-col gap-2 sm:flex-col mt-auto">
+          <InlineMessage stage={stage} errorMessage={errorMessage} />
+          <div className="flex w-full items-center justify-center gap-2 py-2">
+            <Loader variant="slash" size="sm" />
+            <span className="prose-body text-fg-secondary">
+              {pendingLabel}…
+            </span>
+          </div>
+        </DialogFooter>
+      )
+    case 'error':
+      return (
+        <DialogFooter className="flex-col gap-2 sm:flex-col mt-auto">
+          <InlineMessage stage={stage} errorMessage={errorMessage} />
+          <div className="grid w-full grid-cols-2 gap-2">
+            <Button variant="secondary" onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button autoFocus {...submitTrigger}>
+              Retry
+            </Button>
+          </div>
+        </DialogFooter>
+      )
+    default:
+      return (
+        <DialogFooter className="flex-col gap-2 sm:flex-col mt-auto">
+          <InlineMessage stage={stage} errorMessage={errorMessage} />
+          <div className="grid w-full grid-cols-2 gap-2">
+            <Button variant="secondary" onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button disabled={!canSubmit} {...submitTrigger}>
+              {submitLabel}
+            </Button>
+          </div>
+        </DialogFooter>
+      )
+  }
+}
+
+function InlineMessage({
+  stage,
+  errorMessage,
+}: {
+  stage: Exclude<TagDialogStage, 'success'>
+  errorMessage: string | null
+}) {
+  const isError = stage === 'error'
+  const text = isError ? (errorMessage ?? 'Action failed.') : '\u00a0'
+
+  return (
+    <p
+      aria-live="polite"
+      className={cn(
+        'prose-body w-full min-h-5 text-center',
+        isError ? 'text-accent-error-highlight' : 'text-transparent select-none'
+      )}
+    >
+      {text}
+    </p>
+  )
+}
diff --git a/src/ui/primitives/dialog.tsx b/src/ui/primitives/dialog.tsx
index 35cdc5123..1a8473df4 100644
--- a/src/ui/primitives/dialog.tsx
+++ b/src/ui/primitives/dialog.tsx
@@ -72,7 +72,7 @@ function DialogContent({
             'bg-bg-1 text-body text-fg-secondary',
             'fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%]',
             'z-50 grid w-[calc(100%-2rem)] max-h-[calc(100svh-2rem)] overflow-y-auto sm:w-full sm:max-w-lg',
-            'gap-3 border p-5 pt-4 focus:ring-0 focus:outline-none',
+            'gap-3 border px-5 py-4 focus:ring-0 focus:outline-none',
             'data-[state=open]:animate-in data-[state=closed]:animate-out',
             'anim-ease-appear anim-duration-normal', // exit animation is faster
             'data-[state=open]:anim-duration-slow',

From 0aca2a4559f7d633214a36ba4a8d7a09f9e2ea90 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 12:09:40 +0200
Subject: [PATCH 32/90] show currently assigned for same build row in history

---
 .../templates/tags/history/tag-history-row.tsx        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
index 28080a7f7..69d9d4eca 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-row.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -61,8 +61,17 @@ export function TagHistoryRow({
 
   if (isCurrentBuild) {
     return (
-      <div className="flex w-full items-center justify-between gap-4 bg-bg py-2">
+      <div className="group/childRow flex w-full items-center justify-between gap-4 bg-bg py-2">
         {buildSummary}
+        <span
+          className={cn(
+            'inline-flex items-center gap-1',
+            'prose-body-highlight text-fg',
+            'opacity-0 group-hover/childRow:opacity-100'
+          )}
+        >
+          Currently assigned
+        </span>
       </div>
     )
   }

From 157c0e01f860aebdc507434d4a6f9dd49097ceb7 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 13:22:46 +0200
Subject: [PATCH 33/90] Improve empty state

---
 src/features/dashboard/templates/tags/empty.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/empty.tsx b/src/features/dashboard/templates/tags/empty.tsx
index 978024947..d787696ed 100644
--- a/src/features/dashboard/templates/tags/empty.tsx
+++ b/src/features/dashboard/templates/tags/empty.tsx
@@ -8,13 +8,13 @@ interface TagsEmptyProps {
 
 export default function TagsEmpty({ hasSearch }: TagsEmptyProps) {
   return (
-    <div className="h-[35svh] w-full flex flex-col items-center justify-center gap-3 text-center px-4">
+    <div className="h-[35svh] w-full flex flex-col items-center justify-center gap-2 text-center px-4">
       <TagIcon className="size-6 text-fg-tertiary" />
       <div className="flex flex-col gap-1">
         <p className="prose-body-highlight text-fg">
           {hasSearch ? 'No matching tags' : 'No tags yet'}
         </p>
-        <p className="prose-body text-fg-tertiary max-w-80">
+        <p className="prose-body text-fg-tertiary max-w-80 text-balance">
           {hasSearch
             ? 'Try a different search term.'
             : 'Tags identify builds. Assign one when you promote a build to a named release.'}

From e3ba893beb9407b024339b0e79c64bae34ebca0f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 14:07:14 +0200
Subject: [PATCH 34/90] Handle same build in picker search

---
 .../dashboard/templates/tags/build-picker.tsx | 36 +++++++++++++++----
 .../templates/tags/reassign-dialog.tsx        |  1 +
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index 32c69bec7..18e14722d 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -29,6 +29,7 @@ interface BuildPickerProps {
   open: boolean
   teamSlug: string
   templateId: string
+  currentBuildId?: string
   selectedBuildId: string | null
   onSelect: (buildId: string | null, source: BuildSelectionSource) => void
   disabled?: boolean
@@ -38,6 +39,7 @@ export default function BuildPicker({
   open,
   teamSlug,
   templateId,
+  currentBuildId,
   selectedBuildId,
   onSelect,
   disabled,
@@ -47,13 +49,15 @@ export default function BuildPicker({
   const debouncedSearch = useDebouncedValue(searchValue.trim(), 300)
   const isUuid = isValidUuid(debouncedSearch)
 
+  // Fetch one extra so we can still show DEFAULT_LIMIT rows after filtering out
+  // the currently-assigned build.
   const defaultQuery = useQuery(
     trpc.builds.list.queryOptions(
       {
         teamSlug,
         buildIdOrTemplate: templateId,
         statuses: ['success'],
-        limit: DEFAULT_LIMIT,
+        limit: DEFAULT_LIMIT + 1,
       },
       {
         enabled: open,
@@ -82,18 +86,24 @@ export default function BuildPicker({
 
   const isSearchMode = debouncedSearch.length > 0 && isUuid
 
-  const defaultBuilds = useMemo(
-    () => defaultQuery.data?.data ?? [],
-    [defaultQuery.data]
-  )
+  const defaultBuilds = useMemo(() => {
+    const all = defaultQuery.data?.data ?? []
+    const filtered = currentBuildId
+      ? all.filter((b) => b.id !== currentBuildId)
+      : all
+    return filtered.slice(0, DEFAULT_LIMIT)
+  }, [defaultQuery.data, currentBuildId])
 
   const searchResult = useMemo(() => {
     if (!isSearchMode) return null
     const build = searchQuery.data?.data[0]
     if (!build) return { kind: 'not-found' as const }
     if (build.templateId !== templateId) return { kind: 'not-found' as const }
+    if (currentBuildId && build.id === currentBuildId) {
+      return { kind: 'already-assigned' as const, build }
+    }
     return { kind: 'found' as const, build }
-  }, [isSearchMode, searchQuery.data, templateId])
+  }, [isSearchMode, searchQuery.data, templateId, currentBuildId])
 
   // Drop selection when the selected build is no longer renderable.
   useEffect(() => {
@@ -143,6 +153,7 @@ interface PickerBodyProps {
   searchQuery: BuildsQueryResult
   searchResult:
     | { kind: 'found'; build: ListedBuildModel }
+    | { kind: 'already-assigned'; build: ListedBuildModel }
     | { kind: 'not-found' }
     | null
   defaultBuilds: ListedBuildModel[]
@@ -186,6 +197,9 @@ function PickerBody({
         />
       )
     }
+    if (searchResult.kind === 'already-assigned') {
+      return <AlreadyAssignedMessage />
+    }
     return (
       <RadioGroup
         value={selectedBuildId ?? ''}
@@ -304,6 +318,16 @@ interface PickerMessageProps {
   action?: ReactElement
 }
 
+function AlreadyAssignedMessage() {
+  return (
+    <output className="flex flex-1 flex-col items-start justify-start pt-0.5 text-start">
+      <p className="prose-body-regular text-fg-tertiary">
+        Already assigned to this tag
+      </p>
+    </output>
+  )
+}
+
 function PickerMessage({
   icon,
   title,
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index e25321b85..35241a8b6 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -161,6 +161,7 @@ export default function ReassignTagDialog({
               open={open}
               teamSlug={teamSlug}
               templateId={templateId}
+              currentBuildId={currentBuildId}
               selectedBuildId={selectedBuildId}
               onSelect={handleSelect}
               disabled={stage === 'pending'}

From 519619734c752d3c6342bf15ab08aef20e44ebe5 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 14:34:13 +0200
Subject: [PATCH 35/90] Read more hover

---
 src/features/dashboard/templates/tags/header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index fc9c96430..3a5d227ef 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -62,7 +62,7 @@ export default function TagsHeader({
             href="https://e2b.dev/docs/template/tags"
             target="_blank"
             rel="noopener"
-            className="underline-offset-2 underline"
+            className="underline-offset-2 underline hover:text-fg transition-colors"
           >
             Read more
           </a>

From 0260ff4fd8dd25c7cd9c216bdf06d81005ce72fc Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 14:39:39 +0200
Subject: [PATCH 36/90] Copy template naem

---
 src/features/dashboard/templates/detail/title-binder.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
index db22ecde1..3663fd0ec 100644
--- a/src/features/dashboard/templates/detail/title-binder.tsx
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -59,7 +59,7 @@ export default function TemplateTitleBinder({
       },
       { label: displayName },
     ],
-    template.templateID
+    displayName
   )
 
   return null

From ad638fa4a340ef0bbb266bf50d105ad4c6c2d029 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 14:45:34 +0200
Subject: [PATCH 37/90] Navigate to template detail page from builds and
 sandboxes

---
 src/features/dashboard/build/header-cells.tsx | 19 ++++------
 .../dashboard/sandboxes/list/table-cells.tsx  | 37 +++++++++----------
 .../templates/builds/table-cells.tsx          | 19 ++++------
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/features/dashboard/build/header-cells.tsx b/src/features/dashboard/build/header-cells.tsx
index 423013c16..a072653fb 100644
--- a/src/features/dashboard/build/header-cells.tsx
+++ b/src/features/dashboard/build/header-cells.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from 'next/navigation'
+import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
@@ -10,7 +10,6 @@ import {
 import { cn } from '@/lib/utils/ui'
 import CopyButtonInline from '@/ui/copy-button-inline'
 import { Button } from '@/ui/primitives/button'
-import { useTemplateTableStore } from '../templates/list/stores/table-store'
 
 export function Template({
   template,
@@ -21,23 +20,21 @@ export function Template({
   templateId: string
   className?: string
 }) {
-  const router = useRouter()
   const { teamSlug } = useRouteParams<'/dashboard/[teamSlug]/templates'>()
 
   return (
     <Button
+      asChild
       variant="link"
       size="none"
       className={cn('max-w-full', className)}
-      onClick={(e) => {
-        e.stopPropagation()
-        e.preventDefault()
-
-        useTemplateTableStore.getState().setGlobalFilter(templateId)
-        router.push(PROTECTED_URLS.TEMPLATES_LIST(teamSlug))
-      }}
     >
-      <p className="truncate">{template}</p>
+      <Link
+        href={PROTECTED_URLS.TEMPLATE_DETAIL(teamSlug, templateId)}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <p className="truncate">{template}</p>
+      </Link>
     </Button>
   )
 }
diff --git a/src/features/dashboard/sandboxes/list/table-cells.tsx b/src/features/dashboard/sandboxes/list/table-cells.tsx
index 8e6163f71..c56ef3295 100644
--- a/src/features/dashboard/sandboxes/list/table-cells.tsx
+++ b/src/features/dashboard/sandboxes/list/table-cells.tsx
@@ -1,11 +1,10 @@
 'use client'
 
 import type { CellContext } from '@tanstack/react-table'
-import { useRouter } from 'next/navigation'
+import Link from 'next/link'
 import { useMemo } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import ResourceUsage from '@/features/dashboard/common/resource-usage'
-import { useTemplateTableStore } from '@/features/dashboard/templates/list/stores/table-store'
 import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
 import { JsonPopover } from '@/ui/json-popover'
 import { Button } from '@/ui/primitives/button'
@@ -115,27 +114,25 @@ export function TemplateCell({
 }: CellContext<SandboxListRow, unknown>) {
   const templateIdentifier = (getValue() as string | undefined) ?? '--'
   const { team } = useDashboard()
-  const router = useRouter()
   const templateId = row.original.templateID
 
+  if (!templateId) {
+    return (
+      <span className="min-w-0 truncate text-fg-tertiary">
+        {templateIdentifier}
+      </span>
+    )
+  }
+
   return (
-    <Button
-      variant="link-table"
-      size="none"
-      onClick={(e) => {
-        e.stopPropagation()
-        e.preventDefault()
-
-        if (!templateId) {
-          return
-        }
-
-        useTemplateTableStore.getState().setGlobalFilter(templateId)
-        router.push(PROTECTED_URLS.TEMPLATES(team.slug))
-      }}
-    >
-      <span className="min-w-0 truncate">{templateIdentifier}</span>
-      <ExternalLinkIcon className="size-3 shrink-0" />
+    <Button asChild variant="link-table" size="none">
+      <Link
+        href={PROTECTED_URLS.TEMPLATE_DETAIL(team.slug, templateId)}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <span className="min-w-0 truncate">{templateIdentifier}</span>
+        <ExternalLinkIcon className="size-3 shrink-0" />
+      </Link>
     </Button>
   )
 }
diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index c85ba263e..0d9787963 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -1,13 +1,12 @@
 'use client'
 
-import { useRouter } from 'next/navigation'
+import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type {
   BuildStatus,
   ListedBuildModel,
 } from '@/core/modules/builds/models'
-import { useTemplateTableStore } from '@/features/dashboard/templates/list/stores/table-store'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
 import { cn } from '@/lib/utils'
 import {
@@ -40,23 +39,21 @@ export function Template({
   templateId: string
   className?: string
 }) {
-  const router = useRouter()
   const { teamSlug } = useRouteParams<'/dashboard/[teamSlug]/templates'>()
 
   return (
     <Button
+      asChild
       variant="link-table"
       size="none"
       className={cn('max-w-full', className)}
-      onClick={(e) => {
-        e.stopPropagation()
-        e.preventDefault()
-
-        useTemplateTableStore.getState().setGlobalFilter(templateId)
-        router.push(PROTECTED_URLS.TEMPLATES_LIST(teamSlug))
-      }}
     >
-      <p className="truncate">{template}</p>
+      <Link
+        href={PROTECTED_URLS.TEMPLATE_DETAIL(teamSlug, templateId)}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <p className="truncate">{template}</p>
+      </Link>
     </Button>
   )
 }

From fe2b68ac39fb68156eac332dd1e023741c418d09 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 14:52:50 +0200
Subject: [PATCH 38/90] Cleanup verbose comments

---
 .../(detail-tabs)/builds/page.tsx             |  2 --
 src/configs/layout.ts                         |  6 ++---
 .../dashboard/templates/builds/table.tsx      |  5 -----
 .../templates/builds/use-filters.tsx          |  1 -
 .../builds/use-template-builds-filters.tsx    |  1 -
 .../dashboard/templates/list/table-cells.tsx  |  1 -
 .../templates/tags/assign-dialog.helpers.ts   | 10 ---------
 .../templates/tags/assign-dialog.tsx          |  4 +---
 .../dashboard/templates/tags/build-picker.tsx |  1 -
 .../templates/tags/delete-dialog.tsx          |  5 -----
 .../tags/history/tag-history-row.tsx          | 22 -------------------
 .../tags/history/tag-history-view.tsx         |  3 +--
 src/lib/hooks/use-page-title.ts               | 14 ------------
 src/styles/theme.css                          |  4 ++--
 src/ui/row-hover-frame.tsx                    | 15 +++----------
 15 files changed, 9 insertions(+), 85 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
index 4c24c5e69..a1900c750 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -12,8 +12,6 @@ export default function TemplateDetailBuildsPage({
   const { templateId } = use(params)
   const { statuses, q } = useTemplateBuildsFilters()
 
-  // Substring match on build ID over the already-loaded pages. The
-  // backend query stays scoped by templateID (authoritative).
   const postFilter = useCallback(
     (build: ListedBuildModel) => {
       if (!q) return true
diff --git a/src/configs/layout.ts b/src/configs/layout.ts
index 6543d00f2..f8087009c 100644
--- a/src/configs/layout.ts
+++ b/src/configs/layout.ts
@@ -89,15 +89,13 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
       },
     }
   },
-  // Pathname fallback; usePageTitle replaces with the friendly template name once data loads.
   '/dashboard/*/templates/*/overview': (pathname) =>
     templateDetailLayoutConfig(pathname),
   '/dashboard/*/templates/*/tags': (pathname) =>
     templateDetailLayoutConfig(pathname),
-  // Tag history page lives under (detail-tabs); same chrome as the parent tags tab.
   '/dashboard/*/templates/*/tags/*': (pathname) =>
     templateDetailLayoutConfig(pathname),
-  // Distinct from /templates/*/builds/* (build detail) — keep the more specific glob earlier.
+  // Keep this more specific glob ahead of /templates/*/builds/* (build detail).
   '/dashboard/*/templates/*/builds': (pathname) =>
     templateDetailLayoutConfig(pathname),
 
@@ -174,6 +172,7 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<
   }),
 }
 
+// Pathname fallback for detail tabs; usePageTitle replaces with the friendly template name once data loads.
 function templateDetailLayoutConfig(pathname: string): DashboardLayoutConfig {
   const parts = pathname.split('/')
   const teamSlug = parts[2]!
@@ -183,7 +182,6 @@ function templateDetailLayoutConfig(pathname: string): DashboardLayoutConfig {
       ? `${templateId.slice(0, 6)}...${templateId.slice(-6)}`
       : templateId
 
-  // No `includeHeaderBottomStyles` — tabs row sits flush below the title bar.
   return {
     title: [
       {
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index d5df93782..d9c6326b9 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -52,14 +52,12 @@ const COLUMN_WIDTHS = {
 } as const
 
 interface BuildsTableProps {
-  // Pre-resolved filter values; the table is hook-source agnostic.
   filters: {
     statuses: BuildStatus[]
     buildIdOrTemplate?: string
   }
   // Optional client-side row filter applied after fetch + live-status merge.
   postFilter?: (build: ListedBuildModel) => boolean
-  // Whether to render the Template column. Default true.
   showTemplateColumn?: boolean
 }
 
@@ -145,9 +143,6 @@ const BuildsTable = ({
     [builds, runningStatusesData]
   )
 
-  // Optional client-side row filter from the caller. The backend query
-  // is the source of truth for which builds belong to this table; the
-  // postFilter only narrows the already-loaded pages.
   const visibleBuilds = useMemo(() => {
     if (!postFilter) return buildsWithLiveStatus
     return buildsWithLiveStatus.filter(postFilter)
diff --git a/src/features/dashboard/templates/builds/use-filters.tsx b/src/features/dashboard/templates/builds/use-filters.tsx
index 9b721cd34..625d3f417 100644
--- a/src/features/dashboard/templates/builds/use-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-filters.tsx
@@ -18,7 +18,6 @@ export default function useFilters() {
 
   const buildIdOrTemplate = filters?.buildIdOrTemplate ?? undefined
 
-  // Debouncing lives in DebouncedInput; setters here write synchronously.
   const setStatuses = useCallback(
     (next: BuildStatus[]) => {
       setFilters({ statuses: next })
diff --git a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
index c68d77969..0b7eff48c 100644
--- a/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
+++ b/src/features/dashboard/templates/builds/use-template-builds-filters.tsx
@@ -10,7 +10,6 @@ import { useCallback, useMemo } from 'react'
 import { INITIAL_BUILD_STATUSES } from '@/core/modules/builds/constants'
 import type { BuildStatus } from '@/core/modules/builds/models'
 
-// 'q' applies client-side over the already-templateID-scoped builds list — see BuildsTable.
 const templateScopedFilterParams = {
   statuses: parseAsArrayOf(
     parseAsStringEnum<BuildStatus>(['building', 'failed', 'success'])
diff --git a/src/features/dashboard/templates/list/table-cells.tsx b/src/features/dashboard/templates/list/table-cells.tsx
index 0b6105e84..9c8ec61e7 100644
--- a/src/features/dashboard/templates/list/table-cells.tsx
+++ b/src/features/dashboard/templates/list/table-cells.tsx
@@ -307,7 +307,6 @@ export function TemplateNameCell({
   const nameValue = (primaryName as string) ?? '--'
 
   const isDefault = 'isDefault' in template && template.isDefault
-  // Default (E2B) templates have no detail page; render as plain text.
   const isLinkable = !isDefault && nameValue !== '--'
 
   const handleCopy = (e: React.MouseEvent) => {
diff --git a/src/features/dashboard/templates/tags/assign-dialog.helpers.ts b/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
index 6f6ef3512..67edfc59c 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
+++ b/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
@@ -3,11 +3,6 @@ export const TAG_MAX_LENGTH = 128
 export const UUID_REGEX =
   /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
-/**
- * Mirrors the infra `id.ValidateAndDeduplicateTags` normalization on the
- * client so the input value the user sees matches what the server will
- * persist: lowercase + every whitespace character replaced with `-`.
- */
 export function normalizeTagInput(raw: string): string {
   return raw.toLowerCase().replace(/\s/g, '-')
 }
@@ -22,11 +17,6 @@ export function isValidTagShape(value: string): boolean {
   )
 }
 
-/**
- * Builds the infra POST `target` field. The dashboard handler accepts a
- * UUID in the tag slot via `try_cast_uuid` in
- * `get_template_with_build_by_tag.sql`, so we anchor by build ID directly.
- */
 export function buildAssignTarget(
   templateName: string,
   buildId: string
diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index cd5b50d6d..4fe0a964e 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -137,9 +137,7 @@ export default function AssignTagDialog({
 
   const handleOpenChange = (next: boolean) => {
     if (mutation.isPending) return
-    // Reset before opening so the dialog mounts with clean state. Don't reset
-    // on close — the dialog stays mounted during its exit animation and any
-    // visible body swap (e.g. success → idle form) would flicker through.
+    // Reset on open only; resetting on close would flicker through the exit animation.
     if (next && !open) resetState()
     setOpen(next)
   }
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index 18e14722d..aba9ded9b 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -105,7 +105,6 @@ export default function BuildPicker({
     return { kind: 'found' as const, build }
   }, [isSearchMode, searchQuery.data, templateId, currentBuildId])
 
-  // Drop selection when the selected build is no longer renderable.
   useEffect(() => {
     if (!selectedBuildId) return
     if (isSearchMode) {
diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index 900a3455b..e65c13be1 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -25,11 +25,6 @@ interface TagDeleteDialogProps {
   teamSlug: string
   templateId: string
   templateName: string
-  /**
-   * Optional hook called after the success toast fires, before the dialog closes
-   * and `getTagGroups` is invalidated. Used by surfaces that need to navigate
-   * away (e.g. the tag-history page redirects back to the Tags list).
-   */
   onDeleted?: () => void | Promise<void>
 }
 
diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
index 69d9d4eca..04b815a8f 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-row.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -8,34 +8,12 @@ import { BuildLink } from '../build-link'
 
 interface TagHistoryRowProps {
   assignment: TemplateTagAssignment
-  /** Current build for this tag. Used to detect the no-op "rollback to current" case. */
   primaryAssignment: TemplateTagAssignment
   teamSlug: string
   templateId: string
-  /**
-   * Asks the parent to open the rollback dialog with this assignment as
-   * the target. The dialog lives at a stable parent (the GroupSection or
-   * TagHistoryView) so it doesn't get destroyed when this row unmounts
-   * after a successful rollback shuffles the assignments list.
-   */
   onRequestRollback: (target: TemplateTagAssignment) => void
 }
 
-/**
- * Single historical assignment row, shared between:
- * - the collapsed history under a tag group in `tags/table.tsx`
- * - the full-history page at `tags/[tag]`
- *
- * The row is purely presentational. It owns no rollback state and no
- * dialog. When the user activates the row (click / Enter / Space) it asks
- * the parent to open the rollback dialog with this row's assignment as
- * the target. The parent's dialog stays mounted across data refetches,
- * which is essential because after a successful rollback the parent's
- * `assignments` list shuffles and this row is destroyed.
- *
- * When the row already represents the current build, it's non-
- * interactive — rolling back to the current build is a no-op.
- */
 export function TagHistoryRow({
   assignment,
   primaryAssignment,
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index 6346822f5..e4dfbf6c6 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -28,8 +28,7 @@ interface TagHistoryViewProps {
 const ROW_HEIGHT_PX = 36
 const VIRTUAL_OVERSCAN = 12
 const PREFETCH_THRESHOLD = 8
-// Pixel offset of the rows container from the top of the scroll container:
-// TagHistoryHeader (py-2 + h-7 button = 44px) + parent gap-3 (12px).
+// TagHistoryHeader (44px) + parent gap-3 (12px).
 const HEADER_SCROLL_MARGIN_PX = 56
 
 export default function TagHistoryView({
diff --git a/src/lib/hooks/use-page-title.ts b/src/lib/hooks/use-page-title.ts
index 5760af3f7..daf0c4bb1 100644
--- a/src/lib/hooks/use-page-title.ts
+++ b/src/lib/hooks/use-page-title.ts
@@ -4,20 +4,6 @@ import { useEffect } from 'react'
 import { create } from 'zustand'
 import type { TitleSegment } from '@/configs/layout'
 
-/**
- * Reusable mechanism that lets a client page override the dashboard
- * title bar with data fetched at runtime (e.g. friendly resource names
- * derived from a UUID in the URL).
- *
- * The global `DashboardLayoutHeader` reads from this store; when no
- * override is set, it falls back to the pathname-derived
- * `getDashboardLayoutConfig` mapping.
- *
- * Pages call `usePageTitle(segments, copyValue?)` once they have data;
- * the hook handles cleanup automatically on unmount, so navigating
- * back to a page without an override restores the pathname-derived title.
- */
-
 export interface PageTitleOverride {
   title: string | TitleSegment[]
   copyValue?: string
diff --git a/src/styles/theme.css b/src/styles/theme.css
index 0d32468d2..2a54b5954 100644
--- a/src/styles/theme.css
+++ b/src/styles/theme.css
@@ -16,7 +16,7 @@
   h1,
   h2,
   h3 {
-    font-size: 1.25rem; /* 20px */
+    font-size: 1.25rem;
     line-height: 1.25rem;
     font-weight: 700;
     text-transform: uppercase;
@@ -25,7 +25,7 @@
   h4,
   h5,
   h6 {
-    font-size: 1rem; /* 16px */
+    font-size: 1rem;
     line-height: 1.25rem;
     font-weight: 700;
     text-transform: uppercase;
diff --git a/src/ui/row-hover-frame.tsx b/src/ui/row-hover-frame.tsx
index 2028fb8b1..3dbdccd9f 100644
--- a/src/ui/row-hover-frame.tsx
+++ b/src/ui/row-hover-frame.tsx
@@ -5,18 +5,9 @@ interface RowHoverFrameProps {
 }
 
 /**
- * Decorative hover frame for table rows. Place as a child of a row that
- * carries `group/row` and `relative`.
- *
- * Defaults:
- *  - 12px horizontal bleed, 1px vertical bleed
- *  - visible on `group-hover/row` and `group-focus-visible/row`
- *  - corner marks driven by `--corner-mark-color` (transparent until lit)
- *
- * Extend by passing className with Tailwind utilities. To override the
- * corner colour with a non-default trigger, prefix with `!` so it wins
- * against the variant-prefixed defaults (twMerge can't always reconcile
- * arbitrary CSS-variable assignments).
+ * Decorative hover frame for table rows. Parent row must carry `group/row` and `relative`.
+ * Corner marks light via `--corner-mark-color` on hover/focus-visible.
+ * Override the corner colour for custom triggers with a `!`-prefixed utility so it beats the variant defaults.
  */
 export function RowHoverFrame({ className }: RowHoverFrameProps) {
   return (

From edbb60a7acc76399f59bd3f4ce95b1a13817a3a5 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 15:22:22 +0200
Subject: [PATCH 39/90] Improve template header fetching

---
 .../[templateId]/(detail-tabs)/layout.tsx     | 19 ++++++----
 .../templates/[templateId]/error.tsx          |  6 +++
 .../templates/[templateId]/not-found.tsx      | 37 +++++++++++++++++++
 .../dashboard/templates/detail/header.tsx     |  9 +----
 .../templates/detail/title-binder.tsx         | 27 +-------------
 5 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 src/app/dashboard/[teamSlug]/templates/[templateId]/not-found.tsx

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
index 9526e76b5..00c6ea84c 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/layout.tsx
@@ -1,6 +1,7 @@
 import { Suspense } from 'react'
 import TemplateDetailTabs from '@/features/dashboard/templates/detail/tabs'
 import TemplateTitleBinder from '@/features/dashboard/templates/detail/title-binder'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateDetailLayout({
   children,
@@ -8,13 +9,17 @@ export default async function TemplateDetailLayout({
 }: LayoutProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
+  prefetch(trpc.templates.getTemplate.queryOptions({ teamSlug, templateId }))
+
   return (
-    <div className="pt-2 flex-1 md:pt-3 min-h-0 h-full flex flex-col">
-      <Suspense fallback={null}>
-        <TemplateTitleBinder teamSlug={teamSlug} templateId={templateId} />
-      </Suspense>
-      <TemplateDetailTabs teamSlug={teamSlug} templateId={templateId} />
-      {children}
-    </div>
+    <HydrateClient>
+      <div className="pt-2 flex-1 md:pt-3 min-h-0 h-full flex flex-col">
+        <Suspense fallback={null}>
+          <TemplateTitleBinder teamSlug={teamSlug} templateId={templateId} />
+        </Suspense>
+        <TemplateDetailTabs teamSlug={teamSlug} templateId={templateId} />
+        {children}
+      </div>
+    </HydrateClient>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
index de47bcc1e..0dc66d8aa 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/error.tsx
@@ -1,5 +1,7 @@
 'use client'
 
+import { TRPCClientError } from '@trpc/client'
+import { notFound } from 'next/navigation'
 import { DashboardRouteError } from '@/features/dashboard/shared/route-error'
 
 export default function TemplateDetailsError({
@@ -9,5 +11,9 @@ export default function TemplateDetailsError({
   error: Error & { digest?: string }
   reset: () => void
 }) {
+  if (error instanceof TRPCClientError && error.data?.code === 'NOT_FOUND') {
+    notFound()
+  }
+
   return <DashboardRouteError error={error} reset={reset} />
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/not-found.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/not-found.tsx
new file mode 100644
index 000000000..85e73d054
--- /dev/null
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/not-found.tsx
@@ -0,0 +1,37 @@
+'use client'
+
+import { Button } from '@/ui/primitives/button'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardFooter,
+  CardHeader,
+} from '@/ui/primitives/card'
+import { ArrowLeftIcon } from '@/ui/primitives/icons'
+
+export default function TemplateNotFound() {
+  return (
+    <div className="flex min-h-[60vh] items-center justify-center">
+      <Card className="w-full max-w-md border border-stroke bg-bg-1/40 backdrop-blur-lg">
+        <CardHeader className="text-center">
+          <span className="prose-value-big">404</span>
+          <CardDescription>Template not found</CardDescription>
+        </CardHeader>
+        <CardContent className="text-center text-fg-secondary">
+          <p>We couldn’t find this template in your team.</p>
+        </CardContent>
+        <CardFooter>
+          <Button
+            variant="secondary"
+            onClick={() => window.history.back()}
+            className="w-full"
+          >
+            <ArrowLeftIcon />
+            Go Back
+          </Button>
+        </CardFooter>
+      </Card>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
index 294dc3ace..bac5e4847 100644
--- a/src/features/dashboard/templates/detail/header.tsx
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -24,14 +24,7 @@ export default function TemplateDetailHeader({
   const trpc = useTRPC()
 
   const { data } = useSuspenseQuery(
-    trpc.templates.getTemplate.queryOptions(
-      { teamSlug, templateId },
-      {
-        refetchOnMount: false,
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-      }
-    )
+    trpc.templates.getTemplate.queryOptions({ teamSlug, templateId })
   )
 
   const template = data.template
diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
index 3663fd0ec..7891de8c1 100644
--- a/src/features/dashboard/templates/detail/title-binder.tsx
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -1,8 +1,6 @@
 'use client'
 
 import { useSuspenseQuery } from '@tanstack/react-query'
-import { TRPCClientError } from '@trpc/client'
-import { notFound } from 'next/navigation'
 import { useMemo } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { usePageTitle } from '@/lib/hooks/use-page-title'
@@ -13,37 +11,16 @@ interface TemplateTitleBinderProps {
   templateId: string
 }
 
-// Drives the dashboard title for all detail tabs from a single fetch; also the 404 entry point.
 export default function TemplateTitleBinder({
   teamSlug,
   templateId,
 }: TemplateTitleBinderProps) {
   const trpc = useTRPC()
 
-  const { data, error } = useSuspenseQuery(
-    trpc.templates.getTemplate.queryOptions(
-      { teamSlug, templateId },
-      {
-        refetchOnMount: false,
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-        retry: (failureCount, err) => {
-          if (
-            err instanceof TRPCClientError &&
-            err.data?.code === 'NOT_FOUND'
-          ) {
-            return false
-          }
-          return failureCount < 3
-        },
-      }
-    )
+  const { data } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions({ teamSlug, templateId })
   )
 
-  if (error instanceof TRPCClientError && error.data?.code === 'NOT_FOUND') {
-    notFound()
-  }
-
   const template = data.template
 
   const displayName = useMemo(() => {

From 61524672954be15dd836940641ff8d0bddde1023 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 15:42:00 +0200
Subject: [PATCH 40/90] Reset tags table store

---
 src/features/dashboard/templates/tags/stores/table-store.ts | 3 +--
 src/features/dashboard/templates/tags/table.tsx             | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/stores/table-store.ts b/src/features/dashboard/templates/tags/stores/table-store.ts
index 48ab7fd3e..37014c551 100644
--- a/src/features/dashboard/templates/tags/stores/table-store.ts
+++ b/src/features/dashboard/templates/tags/stores/table-store.ts
@@ -62,8 +62,7 @@ export const useTagTableStore = create<Store>()(
       },
 
       resetFilters: () => {
-        set({ globalFilter: '' })
-        trackTagTableInteraction('reset filters')
+        set({ globalFilter: '', expanded: {} })
       },
     }),
     {
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 8c91bb250..b774307ef 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -12,6 +12,7 @@ import {
   type KeyboardEvent,
   type MouseEvent,
   useCallback,
+  useEffect,
   useMemo,
   useState,
 } from 'react'
@@ -105,6 +106,11 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
   const expanded = useTagTableStore((s) => s.expanded)
   const setExpanded = useTagTableStore((s) => s.setExpanded)
+  const resetFilters = useTagTableStore((s) => s.resetFilters)
+
+  useEffect(() => {
+    return () => resetFilters()
+  }, [resetFilters])
 
   const columns = useTagColumns()
 

From c968562840577b8620d4013bb4a9ec1a6374e853 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 15:44:47 +0200
Subject: [PATCH 41/90] Fix active tab from path matching

---
 .../dashboard/templates/detail/tabs.tsx        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/features/dashboard/templates/detail/tabs.tsx b/src/features/dashboard/templates/detail/tabs.tsx
index 17d2a90ee..1352dc635 100644
--- a/src/features/dashboard/templates/detail/tabs.tsx
+++ b/src/features/dashboard/templates/detail/tabs.tsx
@@ -14,15 +14,13 @@ interface TemplateDetailTabsProps {
 
 type DetailTabId = 'overview' | 'builds' | 'tags'
 
-const TAB_PATHS: Record<DetailTabId, (pathname: string) => boolean> = {
-  overview: (p) => /\/overview(\/|$)/.test(p),
-  builds: (p) => /\/builds(\/|$)/.test(p),
-  tags: (p) => /\/tags(\/|$)/.test(p),
-}
-
-function tabFromPath(pathname: string): DetailTabId {
-  if (TAB_PATHS.builds(pathname)) return 'builds'
-  if (TAB_PATHS.tags(pathname)) return 'tags'
+function tabFromPath(pathname: string, templateId: string): DetailTabId {
+  const marker = `/templates/${templateId}/`
+  const idx = pathname.indexOf(marker)
+  if (idx === -1) return 'overview'
+  const segment = pathname.slice(idx + marker.length).split('/')[0]
+  if (segment === 'builds') return 'builds'
+  if (segment === 'tags') return 'tags'
   return 'overview'
 }
 
@@ -31,7 +29,7 @@ export default function TemplateDetailTabs({
   templateId,
 }: TemplateDetailTabsProps) {
   const pathname = usePathname()
-  const activeTab = tabFromPath(pathname)
+  const activeTab = tabFromPath(pathname, templateId)
   const prevTabRef = useRef<DetailTabId | null>(null)
 
   useEffect(() => {

From cbf837b9fa7b7de3b448a95268d1c167c62fbefe Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 15:48:35 +0200
Subject: [PATCH 42/90] Clean up

---
 .../modules/templates/repository.server.ts    | 30 --------------
 src/core/server/api/routers/templates.ts      | 12 ------
 .../dashboard/templates/tags/group.ts         | 41 -------------------
 3 files changed, 83 deletions(-)
 delete mode 100644 src/features/dashboard/templates/tags/group.ts

diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index a519830b5..595cabd78 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -10,7 +10,6 @@ import {
 import type {
   DefaultTemplate,
   Template,
-  TemplateTag,
   TemplateTagAssignment,
   TemplateTagExistsResult,
   TemplateTagGroup,
@@ -38,7 +37,6 @@ type TemplatesRepositoryDeps = {
 export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
   getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
-  getTags(templateId: string): Promise<RepoResult<{ tags: TemplateTag[] }>>
   getTagGroups(
     templateId: string,
     options?: { assignmentLimit?: number }
@@ -106,34 +104,6 @@ export function createTemplatesRepository(
 
       return ok({ template })
     },
-    async getTags(templateId) {
-      if (USE_MOCK_DATA) {
-        return ok({ tags: [] })
-      }
-
-      const res = await deps.infraClient.GET('/templates/{templateID}/tags', {
-        params: {
-          path: {
-            templateID: templateId,
-          },
-        },
-        headers: {
-          ...deps.authHeaders(scope.accessToken, scope.teamId),
-        },
-      })
-
-      if (!res.response.ok || res.error) {
-        return err(
-          repoErrorFromHttp(
-            res.response.status,
-            res.error?.message ?? 'Failed to fetch template tags',
-            res.error
-          )
-        )
-      }
-
-      return ok({ tags: res.data ?? [] })
-    },
     async getTagGroups(templateId, options) {
       if (USE_MOCK_DATA) {
         return ok({ tags: [] })
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index 5fb059dcf..f334eb0c1 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -54,18 +54,6 @@ export const templatesRouter = createTRPCRouter({
       return result.data
     }),
 
-  getTags: teamTemplatesRepositoryProcedure
-    .input(
-      z.object({
-        templateId: z.string(),
-      })
-    )
-    .query(async ({ ctx, input }) => {
-      const result = await ctx.templatesRepository.getTags(input.templateId)
-      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
-      return result.data
-    }),
-
   getTagGroups: teamTemplatesRepositoryProcedure
     .input(
       z.object({
diff --git a/src/features/dashboard/templates/tags/group.ts b/src/features/dashboard/templates/tags/group.ts
deleted file mode 100644
index 7b0eb8928..000000000
--- a/src/features/dashboard/templates/tags/group.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type {
-  TemplateTag,
-  TemplateTagAssignment,
-} from '@/core/modules/templates/models'
-import type { TagGroup } from './types'
-
-export function groupTagsByName(tags: TemplateTag[]): TagGroup[] {
-  const byTag = new Map<string, TemplateTagAssignment[]>()
-
-  for (const tag of tags) {
-    const assignments = byTag.get(tag.tag) ?? []
-    assignments.push(templateTagToAssignment(tag))
-    byTag.set(tag.tag, assignments)
-  }
-
-  const groups: TagGroup[] = []
-  for (const [tag, assignments] of byTag.entries()) {
-    assignments.sort((a, b) => b.assignedAt.localeCompare(a.assignedAt))
-    const primaryAssignment = assignments[0]
-    if (!primaryAssignment) continue
-    groups.push({ tag, primaryAssignment, assignments, hasMore: false })
-  }
-
-  groups.sort((a, b) =>
-    b.primaryAssignment.assignedAt.localeCompare(a.primaryAssignment.assignedAt)
-  )
-
-  return groups
-}
-
-export const injectDevDebugBuilds = (groups: TagGroup[]) => groups
-
-function templateTagToAssignment(tag: TemplateTag): TemplateTagAssignment {
-  return {
-    assignmentId: tag.buildID,
-    buildId: tag.buildID,
-    assignedAt: tag.createdAt,
-    buildCreatedAt: tag.createdAt,
-    buildFinishedAt: null,
-  }
-}

From a1676435dade663f9d7f9dc211571b330d556426 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 16:12:48 +0200
Subject: [PATCH 43/90] Extract and reuse common components for dialog

---
 .../templates/tags/assign-dialog.tsx          | 33 +++-------
 .../dashboard/templates/tags/build-picker.tsx |  2 +-
 .../templates/tags/components/index.ts        |  3 +
 .../tags/components/tag-dialog-build-row.tsx  | 31 ++++++++++
 .../{ => components}/tag-dialog-footer.tsx    |  3 +-
 .../tags/components/tag-dialog-success.tsx    | 32 ++++++++++
 .../{assign-dialog.helpers.ts => helpers.ts}  | 13 ++++
 .../templates/tags/reassign-dialog.tsx        | 60 ++++---------------
 .../templates/tags/rollback-dialog.tsx        | 53 ++++------------
 .../templates/tags/tag-name-field.tsx         |  2 +-
 10 files changed, 110 insertions(+), 122 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/components/index.ts
 create mode 100644 src/features/dashboard/templates/tags/components/tag-dialog-build-row.tsx
 rename src/features/dashboard/templates/tags/{ => components}/tag-dialog-footer.tsx (97%)
 create mode 100644 src/features/dashboard/templates/tags/components/tag-dialog-success.tsx
 rename src/features/dashboard/templates/tags/{assign-dialog.helpers.ts => helpers.ts} (64%)

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 4fe0a964e..9c1180545 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -13,16 +13,17 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/ui/primitives/dialog'
-import { AddIcon, CheckIcon } from '@/ui/primitives/icons'
+import { AddIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
+import BuildPicker, { type BuildSelectionSource } from './build-picker'
+import { TagDialogFooter, TagDialogSuccess } from './components'
 import {
   isValidTagShape,
   normalizeTagInput,
   TAG_MAX_LENGTH,
   TAG_REGEX,
-} from './assign-dialog.helpers'
-import BuildPicker, { type BuildSelectionSource } from './build-picker'
-import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
+  tagDialogStageFromMutation,
+} from './helpers'
 import TagNameField, { type TagNameStatus } from './tag-name-field'
 
 const NAME_DEBOUNCE_MS = 350
@@ -159,14 +160,7 @@ export default function AssignTagDialog({
     })
   }
 
-  const stage: TagDialogStage =
-    mutation.status === 'pending'
-      ? 'pending'
-      : mutation.status === 'error'
-        ? 'error'
-        : mutation.status === 'success'
-          ? 'success'
-          : 'idle'
+  const stage = tagDialogStageFromMutation(mutation)
 
   const successTag =
     existsQuery.data?.normalizedTag ??
@@ -201,7 +195,7 @@ export default function AssignTagDialog({
         </DialogHeader>
 
         {stage === 'success' ? (
-          <SuccessBody tag={successTag} />
+          <TagDialogSuccess tag={successTag} message="assigned successfully" />
         ) : (
           <form
             id={formId}
@@ -253,19 +247,6 @@ export default function AssignTagDialog({
   )
 }
 
-function SuccessBody({ tag }: { tag: string }) {
-  return (
-    <div className="flex flex-col items-center justify-center gap-3 py-8 text-center">
-      <CheckIcon className="size-12 text-accent-positive-highlight" />
-      <p className="prose-headline-small uppercase text-fg">
-        <span className="font-mono">‘{tag}’</span>
-        <br />
-        assigned successfully
-      </p>
-    </div>
-  )
-}
-
 function trackAssign(action: string, properties: Record<string, unknown>) {
   posthog.capture('tag table interacted', {
     action,
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index aba9ded9b..f4a72914d 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -10,8 +10,8 @@ import { Button } from '@/ui/primitives/button'
 import { AlertIcon, BuildIcon, SearchIcon } from '@/ui/primitives/icons'
 import { RadioGroup } from '@/ui/primitives/radio-group'
 import { Skeleton } from '@/ui/primitives/skeleton'
-import { isValidUuid } from './assign-dialog.helpers'
 import { BuildPickerRow } from './build-picker-row'
+import { isValidUuid } from './helpers'
 
 type BuildsQueryResult = {
   data?: { data: ListedBuildModel[]; nextCursor: string | null }
diff --git a/src/features/dashboard/templates/tags/components/index.ts b/src/features/dashboard/templates/tags/components/index.ts
new file mode 100644
index 000000000..ba02e6dc0
--- /dev/null
+++ b/src/features/dashboard/templates/tags/components/index.ts
@@ -0,0 +1,3 @@
+export { TagDialogBuildRow } from './tag-dialog-build-row'
+export { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
+export { TagDialogSuccess } from './tag-dialog-success'
diff --git a/src/features/dashboard/templates/tags/components/tag-dialog-build-row.tsx b/src/features/dashboard/templates/tags/components/tag-dialog-build-row.tsx
new file mode 100644
index 000000000..136d834a4
--- /dev/null
+++ b/src/features/dashboard/templates/tags/components/tag-dialog-build-row.tsx
@@ -0,0 +1,31 @@
+'use client'
+
+import { cn } from '@/lib/utils/ui'
+
+interface TagDialogBuildRowProps {
+  label: string
+  buildId: string
+  dim?: boolean
+}
+
+export function TagDialogBuildRow({
+  label,
+  buildId,
+  dim,
+}: TagDialogBuildRowProps) {
+  return (
+    <div className="flex items-center justify-between">
+      <span className="prose-label-highlight uppercase text-fg-tertiary w-14 shrink-0">
+        {label}
+      </span>
+      <span
+        className={cn(
+          'prose-body font-mono truncate',
+          dim ? 'text-fg-tertiary' : 'text-fg-primary'
+        )}
+      >
+        {buildId}
+      </span>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/tag-dialog-footer.tsx b/src/features/dashboard/templates/tags/components/tag-dialog-footer.tsx
similarity index 97%
rename from src/features/dashboard/templates/tags/tag-dialog-footer.tsx
rename to src/features/dashboard/templates/tags/components/tag-dialog-footer.tsx
index f72ead284..95a71b99e 100644
--- a/src/features/dashboard/templates/tags/tag-dialog-footer.tsx
+++ b/src/features/dashboard/templates/tags/components/tag-dialog-footer.tsx
@@ -5,8 +5,9 @@ import { cn } from '@/lib/utils/ui'
 import { Button } from '@/ui/primitives/button'
 import { DialogFooter } from '@/ui/primitives/dialog'
 import { Loader } from '@/ui/primitives/loader'
+import type { TagDialogStage } from '../helpers'
 
-export type TagDialogStage = 'idle' | 'pending' | 'error' | 'success'
+export type { TagDialogStage }
 
 type BaseProps = {
   stage: TagDialogStage
diff --git a/src/features/dashboard/templates/tags/components/tag-dialog-success.tsx b/src/features/dashboard/templates/tags/components/tag-dialog-success.tsx
new file mode 100644
index 000000000..d963f8bfb
--- /dev/null
+++ b/src/features/dashboard/templates/tags/components/tag-dialog-success.tsx
@@ -0,0 +1,32 @@
+'use client'
+
+import { cn } from '@/lib/utils/ui'
+import { CheckIcon } from '@/ui/primitives/icons'
+
+interface TagDialogSuccessProps {
+  tag: string
+  message: string
+  className?: string
+}
+
+export function TagDialogSuccess({
+  tag,
+  message,
+  className,
+}: TagDialogSuccessProps) {
+  return (
+    <div
+      className={cn(
+        'flex flex-1 flex-col items-center justify-center gap-3 text-center',
+        className
+      )}
+    >
+      <CheckIcon className="size-12 text-accent-positive-highlight" />
+      <p className="prose-headline-small uppercase text-fg">
+        <span className="font-mono">‘{tag}’</span>
+        <br />
+        {message}
+      </p>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/assign-dialog.helpers.ts b/src/features/dashboard/templates/tags/helpers.ts
similarity index 64%
rename from src/features/dashboard/templates/tags/assign-dialog.helpers.ts
rename to src/features/dashboard/templates/tags/helpers.ts
index 67edfc59c..cd4aead34 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.helpers.ts
+++ b/src/features/dashboard/templates/tags/helpers.ts
@@ -23,3 +23,16 @@ export function buildAssignTarget(
 ): string {
   return `${templateName}:${buildId}`
 }
+
+export type TagDialogStage = 'idle' | 'pending' | 'error' | 'success'
+
+export function tagDialogStageFromMutation(mutation: {
+  isPending: boolean
+  isError: boolean
+  isSuccess: boolean
+}): TagDialogStage {
+  if (mutation.isSuccess) return 'success'
+  if (mutation.isPending) return 'pending'
+  if (mutation.isError) return 'error'
+  return 'idle'
+}
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index 35241a8b6..a9707d79e 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -2,7 +2,6 @@
 
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useEffect, useState } from 'react'
-import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
   Dialog,
@@ -11,11 +10,15 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/ui/primitives/dialog'
-import { CheckIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
 import BuildPicker, { type BuildSelectionSource } from './build-picker'
+import {
+  TagDialogBuildRow,
+  TagDialogFooter,
+  TagDialogSuccess,
+} from './components'
+import { tagDialogStageFromMutation } from './helpers'
 import { trackTagTableInteraction } from './table-config'
-import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
 
 export type ReassignSurface = 'tags-tab' | 'history-header'
 
@@ -72,13 +75,7 @@ export default function ReassignTagDialog({
     })
   )
 
-  const stage: TagDialogStage = reassign.isSuccess
-    ? 'success'
-    : reassign.isPending
-      ? 'pending'
-      : reassign.isError
-        ? 'error'
-        : 'idle'
+  const stage = tagDialogStageFromMutation(reassign)
 
   const { reset } = reassign
   useEffect(() => {
@@ -147,12 +144,12 @@ export default function ReassignTagDialog({
         </DialogHeader>
 
         {stage === 'success' ? (
-          <SuccessBody tag={tag} />
+          <TagDialogSuccess tag={tag} message="reassigned successfully" />
         ) : (
           <div className="flex flex-col gap-2">
-            <BuildRow label="Current" buildId={currentBuildId} />
+            <TagDialogBuildRow label="Current" buildId={currentBuildId} />
             <ArrowDivider />
-            <BuildRow
+            <TagDialogBuildRow
               label="Target"
               buildId={selectedBuildId ?? '--'}
               dim={selectedBuildId === null}
@@ -183,40 +180,3 @@ export default function ReassignTagDialog({
     </Dialog>
   )
 }
-
-interface BuildRowProps {
-  label: string
-  buildId: string
-  dim?: boolean
-}
-
-function BuildRow({ label, buildId, dim }: BuildRowProps) {
-  return (
-    <div className="flex items-center gap-3 mb-1">
-      <span className="prose-label-highlight uppercase text-fg-tertiary w-14 shrink-0">
-        {label}
-      </span>
-      <span
-        className={cn(
-          'prose-body font-mono truncate',
-          dim ? 'text-fg-tertiary' : 'text-fg-primary'
-        )}
-      >
-        {buildId}
-      </span>
-    </div>
-  )
-}
-
-function SuccessBody({ tag }: { tag: string }) {
-  return (
-    <div className="flex flex-col items-center justify-center gap-3 text-center">
-      <CheckIcon className="size-12 text-accent-positive-highlight" />
-      <p className="prose-headline-small uppercase text-fg">
-        <span className="font-mono">‘{tag}’</span>
-        <br />
-        reassigned successfully
-      </p>
-    </div>
-  )
-}
diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
index 81e8512af..4257e7860 100644
--- a/src/features/dashboard/templates/tags/rollback-dialog.tsx
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -10,10 +10,14 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/ui/primitives/dialog'
-import { CheckIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
+import {
+  TagDialogBuildRow,
+  TagDialogFooter,
+  TagDialogSuccess,
+} from './components'
+import { tagDialogStageFromMutation } from './helpers'
 import { trackTagTableInteraction } from './table-config'
-import { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
 
 export type RollbackSurface = 'tags-tab' | 'history-header' | 'history-row'
 
@@ -68,13 +72,7 @@ export default function RollbackTagDialog({
     })
   )
 
-  const stage: TagDialogStage = rollback.isSuccess
-    ? 'success'
-    : rollback.isPending
-      ? 'pending'
-      : rollback.isError
-        ? 'error'
-        : 'idle'
+  const stage = tagDialogStageFromMutation(rollback)
 
   const { reset } = rollback
   useEffect(() => {
@@ -125,12 +123,12 @@ export default function RollbackTagDialog({
         </DialogHeader>
 
         {stage === 'success' ? (
-          <SuccessBody tag={tag} />
+          <TagDialogSuccess tag={tag} message="rolled back successfully" />
         ) : (
           <div className="flex flex-col gap-2">
-            <BuildRow label="Current" buildId={currentBuildId} />
+            <TagDialogBuildRow label="Current" buildId={currentBuildId} />
             <ArrowDivider />
-            <BuildRow label="Target" buildId={targetBuildId} />
+            <TagDialogBuildRow label="Target" buildId={targetBuildId} />
           </div>
         )}
 
@@ -148,34 +146,3 @@ export default function RollbackTagDialog({
     </Dialog>
   )
 }
-
-interface BuildRowProps {
-  label: string
-  buildId: string
-}
-
-function BuildRow({ label, buildId }: BuildRowProps) {
-  return (
-    <div className="flex items-center justify-between">
-      <span className="prose-label-highlight uppercase text-fg-tertiary w-14 shrink-0">
-        {label}
-      </span>
-      <span className="prose-body font-mono text-fg-primary truncate">
-        {buildId}
-      </span>
-    </div>
-  )
-}
-
-function SuccessBody({ tag }: { tag: string }) {
-  return (
-    <div className="flex flex-col items-center justify-center gap-3 text-center">
-      <CheckIcon className="size-12 text-accent-positive-highlight" />
-      <p className="prose-headline-small uppercase text-fg">
-        <span className="font-mono">‘{tag}’</span>
-        <br />
-        rolled back successfully
-      </p>
-    </div>
-  )
-}
diff --git a/src/features/dashboard/templates/tags/tag-name-field.tsx b/src/features/dashboard/templates/tags/tag-name-field.tsx
index b1903d031..78ff9ebb6 100644
--- a/src/features/dashboard/templates/tags/tag-name-field.tsx
+++ b/src/features/dashboard/templates/tags/tag-name-field.tsx
@@ -9,7 +9,7 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from '@/ui/primitives/tooltip'
-import { TAG_MAX_LENGTH } from './assign-dialog.helpers'
+import { TAG_MAX_LENGTH } from './helpers'
 
 export type TagNameStatus =
   | 'idle'

From ff30cd854ebf97c463ff33d39e45c02eba3243eb Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 16:28:00 +0200
Subject: [PATCH 44/90] refactor: template display name helper

---
 src/features/dashboard/templates/detail/header.tsx    |  6 ++----
 .../dashboard/templates/detail/title-binder.tsx       |  9 +++++----
 src/features/dashboard/templates/helpers.ts           | 11 +++++++++++
 .../templates/tags/history/tag-history-view.tsx       |  6 ++----
 src/features/dashboard/templates/tags/table.tsx       |  6 ++----
 5 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 src/features/dashboard/templates/helpers.ts

diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
index bac5e4847..6a2ac42ab 100644
--- a/src/features/dashboard/templates/detail/header.tsx
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -6,6 +6,7 @@ import {
   DetailsItem,
   DetailsRow,
 } from '@/features/dashboard/layouts/details-row'
+import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
 import { useTRPC } from '@/trpc/client'
 import { TemplateVisibilityDropdown } from './visibility-dropdown'
@@ -30,10 +31,7 @@ export default function TemplateDetailHeader({
   const template = data.template
   const hasReadyBuild = template.buildID !== NULL_BUILD_ID
 
-  const displayName =
-    template.names.find((n) => !n.includes('/')) ??
-    template.names[0] ??
-    template.templateID
+  const displayName = getTemplateDisplayName(template)
 
   const created = formatLocalLogStyleTimestamp(template.createdAt, {
     includeSeconds: false,
diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
index 7891de8c1..cdac61369 100644
--- a/src/features/dashboard/templates/detail/title-binder.tsx
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -3,6 +3,7 @@
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useMemo } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
+import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { usePageTitle } from '@/lib/hooks/use-page-title'
 import { useTRPC } from '@/trpc/client'
 
@@ -23,10 +24,10 @@ export default function TemplateTitleBinder({
 
   const template = data.template
 
-  const displayName = useMemo(() => {
-    const noSlash = template.names.find((n) => !n.includes('/'))
-    return noSlash ?? template.names[0] ?? template.templateID
-  }, [template.names, template.templateID])
+  const displayName = useMemo(
+    () => getTemplateDisplayName(template),
+    [template]
+  )
 
   usePageTitle(
     [
diff --git a/src/features/dashboard/templates/helpers.ts b/src/features/dashboard/templates/helpers.ts
new file mode 100644
index 000000000..e6baae6c3
--- /dev/null
+++ b/src/features/dashboard/templates/helpers.ts
@@ -0,0 +1,11 @@
+import type { Template } from '@/core/modules/templates/models'
+
+export function getTemplateDisplayName(
+  template: Pick<Template, 'names' | 'templateID'>
+): string {
+  return (
+    template.names.find((n) => !n.includes('/')) ??
+    template.names[0] ??
+    template.templateID
+  )
+}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index e4dfbf6c6..58f1cb276 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -12,6 +12,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { TemplateTagAssignment } from '@/core/modules/templates/models'
 import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cells'
+import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { useTRPC } from '@/trpc/client'
 import { Loader } from '@/ui/primitives/loader'
 import RollbackTagDialog, { type RollbackSurface } from '../rollback-dialog'
@@ -55,10 +56,7 @@ export default function TagHistoryView({
   )
 
   const templateName = useMemo(
-    () =>
-      templateData.template.names.find((n) => !n.includes('/')) ??
-      templateData.template.names[0] ??
-      templateData.template.templateID,
+    () => getTemplateDisplayName(templateData.template),
     [templateData]
   )
 
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index b774307ef..be5e7e9d1 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -18,6 +18,7 @@ import {
 } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
@@ -75,10 +76,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   )
 
   const templateName = useMemo(
-    () =>
-      templateData.template.names.find((n) => !n.includes('/')) ??
-      templateData.template.names[0] ??
-      templateData.template.templateID,
+    () => getTemplateDisplayName(templateData.template),
     [templateData]
   )
 

From 462322a758df7fbf1db1aaf7800832cacec3b05c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 16:31:25 +0200
Subject: [PATCH 45/90] defensive tag assignment

---
 .../templates/tags/assign-dialog.tsx          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 9c1180545..a5f754f30 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -58,7 +58,7 @@ export default function AssignTagDialog({
       { teamSlug, templateId, tag: normalizedDebouncedName },
       {
         enabled: open && hasValidShape,
-        staleTime: 30_000,
+        staleTime: 0,
         refetchOnWindowFocus: false,
       }
     )
@@ -115,8 +115,13 @@ export default function AssignTagDialog({
     if (name !== normalizedDebouncedName) return 'checking'
     if (!hasValidShape) return 'invalid'
     if (existsQuery.isFetching) return 'checking'
-    if (existsQuery.data?.exists) return 'exists'
-    return 'available'
+
+    const data = existsQuery.data
+    if (!data || data.normalizedTag !== normalizedDebouncedName) {
+      return 'checking'
+    }
+
+    return data.exists ? 'exists' : 'available'
   }, [name, normalizedDebouncedName, hasValidShape, existsQuery])
 
   const canSubmit =
@@ -146,8 +151,17 @@ export default function AssignTagDialog({
   const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault()
     if (!canSubmit || !selectedBuildId) return
-    const tagToSubmit =
-      existsQuery.data?.normalizedTag ?? normalizedDebouncedName
+
+    const data = existsQuery.data
+    if (
+      !data ||
+      data.normalizedTag !== normalizedDebouncedName ||
+      data.exists
+    ) {
+      return
+    }
+
+    const tagToSubmit = data.normalizedTag
     trackAssign('assign submitted', {
       via_search: selectionSource === 'search',
     })

From 61a4a33d39cb22b42fb51cf83349d22ce3849419 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 16:46:37 +0200
Subject: [PATCH 46/90] memoize

---
 src/features/dashboard/templates/detail/title-binder.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/features/dashboard/templates/detail/title-binder.tsx b/src/features/dashboard/templates/detail/title-binder.tsx
index cdac61369..a137394cf 100644
--- a/src/features/dashboard/templates/detail/title-binder.tsx
+++ b/src/features/dashboard/templates/detail/title-binder.tsx
@@ -2,6 +2,7 @@
 
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useMemo } from 'react'
+import type { TitleSegment } from '@/configs/layout'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { usePageTitle } from '@/lib/hooks/use-page-title'
@@ -29,16 +30,18 @@ export default function TemplateTitleBinder({
     [template]
   )
 
-  usePageTitle(
-    [
+  const titleSegments = useMemo<TitleSegment[]>(
+    () => [
       {
         label: 'Templates',
         href: PROTECTED_URLS.TEMPLATES_LIST(teamSlug),
       },
       { label: displayName },
     ],
-    displayName
+    [teamSlug, displayName]
   )
 
+  usePageTitle(titleSegments, displayName)
+
   return null
 }

From 9edce3092cd33a0b45aa239a5ae6bb24ed919c83 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Mon, 1 Jun 2026 17:17:04 +0200
Subject: [PATCH 47/90] use dashboard-api get template handler

---
 spec/openapi.dashboard-api.yaml               |  98 +++++++++++++++++
 src/configs/mock-data.ts                      | 103 ------------------
 src/core/modules/templates/models.ts          |   1 -
 .../modules/templates/repository.server.ts    |  42 +++++--
 .../shared/contracts/dashboard-api.types.ts   |  92 ++++++++++++++++
 5 files changed, 224 insertions(+), 112 deletions(-)

diff --git a/spec/openapi.dashboard-api.yaml b/spec/openapi.dashboard-api.yaml
index 94fb9e3e9..0682918ab 100644
--- a/spec/openapi.dashboard-api.yaml
+++ b/spec/openapi.dashboard-api.yaml
@@ -714,6 +714,76 @@ components:
           items:
             $ref: "#/components/schemas/DefaultTemplate"
 
+    TemplateDetail:
+      type: object
+      description: Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders.
+      required:
+        - templateID
+        - buildID
+        - cpuCount
+        - memoryMB
+        - diskSizeMB
+        - public
+        - aliases
+        - names
+        - createdAt
+        - updatedAt
+        - lastSpawnedAt
+        - spawnCount
+        - buildCount
+        - envdVersion
+      properties:
+        templateID:
+          type: string
+          description: Identifier of the template.
+        buildID:
+          type: string
+          description: Identifier of the latest ready build for the template, or the zero UUID when none.
+        cpuCount:
+          $ref: "#/components/schemas/CPUCount"
+        memoryMB:
+          $ref: "#/components/schemas/MemoryMB"
+        diskSizeMB:
+          $ref: "#/components/schemas/DiskSizeMB"
+        public:
+          type: boolean
+          description: Whether the template is public or only accessible by the team.
+        aliases:
+          type: array
+          description: Aliases of the template.
+          deprecated: true
+          items:
+            type: string
+        names:
+          type: array
+          description: Names of the template (namespace/alias format when namespaced).
+          items:
+            type: string
+        createdAt:
+          type: string
+          format: date-time
+          description: Time when the template was created.
+        updatedAt:
+          type: string
+          format: date-time
+          description: Time when the template was last updated.
+        lastSpawnedAt:
+          type: string
+          format: date-time
+          nullable: true
+          description: Time when the template was last used.
+        spawnCount:
+          type: integer
+          format: int64
+          description: Number of times the template was used.
+        buildCount:
+          type: integer
+          format: int32
+          description: Number of times the template was built.
+        envdVersion:
+          type: string
+          description: Envd version of the latest ready build, or an empty string when none.
+
     TemplateTagAssignment:
       type: object
       required:
@@ -1270,6 +1340,34 @@ paths:
         "500":
           $ref: "#/components/responses/500"
 
+  /templates/{templateID}:
+    get:
+      summary: Get template
+      description: Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
+      tags: [templates]
+      security:
+        - Supabase1TokenAuth: []
+          Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
+      parameters:
+        - $ref: "#/components/parameters/templateID"
+      responses:
+        "200":
+          description: Successfully returned the template.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TemplateDetail"
+        "401":
+          $ref: "#/components/responses/401"
+        "403":
+          $ref: "#/components/responses/403"
+        "404":
+          $ref: "#/components/responses/404"
+        "500":
+          $ref: "#/components/responses/500"
+
   /templates/{templateID}/tags/groups:
     get:
       summary: List template tag groups
diff --git a/src/configs/mock-data.ts b/src/configs/mock-data.ts
index bd8d40b57..7c750c8d4 100644
--- a/src/configs/mock-data.ts
+++ b/src/configs/mock-data.ts
@@ -20,10 +20,6 @@ const DEFAULT_TEMPLATES: DefaultTemplate[] = [
     templateID: 'code-interpreter-v1',
     createdAt: '2024-01-01T00:00:00Z',
     updatedAt: '2024-01-01T00:00:00Z',
-    createdBy: {
-      email: 'admin@example.com',
-      id: 'user_001',
-    },
     isDefault: true,
     defaultDescription: 'Code Interpreter',
     lastSpawnedAt: '2024-01-01T00:00:00Z',
@@ -42,7 +38,6 @@ const DEFAULT_TEMPLATES: DefaultTemplate[] = [
     templateID: 'web-starter-v1',
     createdAt: '2024-01-05T00:00:00Z',
     updatedAt: '2024-01-05T00:00:00Z',
-    createdBy: null,
     isDefault: true,
     defaultDescription: 'Web Development Environment',
     lastSpawnedAt: '2024-01-05T00:00:00Z',
@@ -61,10 +56,6 @@ const DEFAULT_TEMPLATES: DefaultTemplate[] = [
     templateID: 'data-science-v1',
     createdAt: '2024-01-06T00:00:00Z',
     updatedAt: '2024-01-06T00:00:00Z',
-    createdBy: {
-      email: 'datascience@example.com',
-      id: 'user_002',
-    },
     isDefault: true,
     defaultDescription: 'Data Science Environment with ML Libraries',
     lastSpawnedAt: '2024-01-06T00:00:00Z',
@@ -86,10 +77,6 @@ const TEMPLATES: Template[] = [
     templateID: 'node-typescript-v1',
     createdAt: '2024-01-01T00:00:00Z',
     updatedAt: '2024-01-01T00:00:00Z',
-    createdBy: {
-      email: 'admin@example.com',
-      id: 'user_001',
-    },
     lastSpawnedAt: '2024-01-01T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -106,7 +93,6 @@ const TEMPLATES: Template[] = [
     templateID: 'react-vite-v2',
     createdAt: '2024-01-02T00:00:00Z',
     updatedAt: '2024-01-02T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-02T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -123,7 +109,6 @@ const TEMPLATES: Template[] = [
     templateID: 'postgres-v15',
     createdAt: '2024-01-03T00:00:00Z',
     updatedAt: '2024-01-03T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-03T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -140,7 +125,6 @@ const TEMPLATES: Template[] = [
     templateID: 'redis-v7',
     createdAt: '2024-01-04T00:00:00Z',
     updatedAt: '2024-01-04T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-04T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -157,7 +141,6 @@ const TEMPLATES: Template[] = [
     templateID: 'python-ml-v1',
     createdAt: '2024-01-05T00:00:00Z',
     updatedAt: '2024-01-05T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-05T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -174,7 +157,6 @@ const TEMPLATES: Template[] = [
     templateID: 'elastic-v8',
     createdAt: '2024-01-06T00:00:00Z',
     updatedAt: '2024-01-06T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-06T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -191,7 +173,6 @@ const TEMPLATES: Template[] = [
     templateID: 'grafana-v9',
     createdAt: '2024-01-07T00:00:00Z',
     updatedAt: '2024-01-07T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-07T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -208,7 +189,6 @@ const TEMPLATES: Template[] = [
     templateID: 'nginx-v1',
     createdAt: '2024-01-08T00:00:00Z',
     updatedAt: '2024-01-08T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-08T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -225,7 +205,6 @@ const TEMPLATES: Template[] = [
     templateID: 'mongodb-v6',
     createdAt: '2024-01-09T00:00:00Z',
     updatedAt: '2024-01-09T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-09T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -242,7 +221,6 @@ const TEMPLATES: Template[] = [
     templateID: 'mysql-v8',
     createdAt: '2024-01-10T00:00:00Z',
     updatedAt: '2024-01-10T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-10T00:00:00Z',
     spawnCount: 10,
     buildCount: 1,
@@ -259,10 +237,6 @@ const TEMPLATES: Template[] = [
     templateID: 'nextjs-v14',
     createdAt: '2024-01-11T00:00:00Z',
     updatedAt: '2024-01-11T00:00:00Z',
-    createdBy: {
-      email: 'frontend@example.com',
-      id: 'user_003',
-    },
     lastSpawnedAt: '2024-01-11T00:00:00Z',
     spawnCount: 15,
     buildCount: 1,
@@ -279,7 +253,6 @@ const TEMPLATES: Template[] = [
     templateID: 'vue-v3',
     createdAt: '2024-01-12T00:00:00Z',
     updatedAt: '2024-01-12T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-12T00:00:00Z',
     spawnCount: 8,
     buildCount: 1,
@@ -296,10 +269,6 @@ const TEMPLATES: Template[] = [
     templateID: 'django-v4',
     createdAt: '2024-01-13T00:00:00Z',
     updatedAt: '2024-01-13T00:00:00Z',
-    createdBy: {
-      email: 'python@example.com',
-      id: 'user_004',
-    },
     lastSpawnedAt: '2024-01-13T00:00:00Z',
     spawnCount: 12,
     buildCount: 1,
@@ -316,7 +285,6 @@ const TEMPLATES: Template[] = [
     templateID: 'flask-v2',
     createdAt: '2024-01-14T00:00:00Z',
     updatedAt: '2024-01-14T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-14T00:00:00Z',
     spawnCount: 6,
     buildCount: 1,
@@ -333,10 +301,6 @@ const TEMPLATES: Template[] = [
     templateID: 'golang-v1.21',
     createdAt: '2024-01-15T00:00:00Z',
     updatedAt: '2024-01-15T00:00:00Z',
-    createdBy: {
-      email: 'go@example.com',
-      id: 'user_005',
-    },
     lastSpawnedAt: '2024-01-15T00:00:00Z',
     spawnCount: 14,
     buildCount: 1,
@@ -353,7 +317,6 @@ const TEMPLATES: Template[] = [
     templateID: 'rust-v1.75',
     createdAt: '2024-01-16T00:00:00Z',
     updatedAt: '2024-01-16T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-16T00:00:00Z',
     spawnCount: 7,
     buildCount: 1,
@@ -370,10 +333,6 @@ const TEMPLATES: Template[] = [
     templateID: 'java-spring-v3',
     createdAt: '2024-01-17T00:00:00Z',
     updatedAt: '2024-01-17T00:00:00Z',
-    createdBy: {
-      email: 'java@example.com',
-      id: 'user_006',
-    },
     lastSpawnedAt: '2024-01-17T00:00:00Z',
     spawnCount: 11,
     buildCount: 1,
@@ -390,7 +349,6 @@ const TEMPLATES: Template[] = [
     templateID: 'dotnet-v8',
     createdAt: '2024-01-18T00:00:00Z',
     updatedAt: '2024-01-18T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-18T00:00:00Z',
     spawnCount: 9,
     buildCount: 1,
@@ -407,10 +365,6 @@ const TEMPLATES: Template[] = [
     templateID: 'php-laravel-v10',
     createdAt: '2024-01-19T00:00:00Z',
     updatedAt: '2024-01-19T00:00:00Z',
-    createdBy: {
-      email: 'php@example.com',
-      id: 'user_007',
-    },
     lastSpawnedAt: '2024-01-19T00:00:00Z',
     spawnCount: 5,
     buildCount: 1,
@@ -427,7 +381,6 @@ const TEMPLATES: Template[] = [
     templateID: 'ruby-rails-v7',
     createdAt: '2024-01-20T00:00:00Z',
     updatedAt: '2024-01-20T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-20T00:00:00Z',
     spawnCount: 4,
     buildCount: 1,
@@ -444,10 +397,6 @@ const TEMPLATES: Template[] = [
     templateID: 'jupyter-v6',
     createdAt: '2024-01-21T00:00:00Z',
     updatedAt: '2024-01-21T00:00:00Z',
-    createdBy: {
-      email: 'datascience@example.com',
-      id: 'user_008',
-    },
     lastSpawnedAt: '2024-01-21T00:00:00Z',
     spawnCount: 13,
     buildCount: 1,
@@ -464,10 +413,6 @@ const TEMPLATES: Template[] = [
     templateID: 'tensorflow-v2.15',
     createdAt: '2024-01-22T00:00:00Z',
     updatedAt: '2024-01-22T00:00:00Z',
-    createdBy: {
-      email: 'ml@example.com',
-      id: 'user_009',
-    },
     lastSpawnedAt: '2024-01-22T00:00:00Z',
     spawnCount: 18,
     buildCount: 1,
@@ -484,10 +429,6 @@ const TEMPLATES: Template[] = [
     templateID: 'pytorch-v2.1',
     createdAt: '2024-01-23T00:00:00Z',
     updatedAt: '2024-01-23T00:00:00Z',
-    createdBy: {
-      email: 'ml@example.com',
-      id: 'user_009',
-    },
     lastSpawnedAt: '2024-01-23T00:00:00Z',
     spawnCount: 16,
     buildCount: 1,
@@ -504,7 +445,6 @@ const TEMPLATES: Template[] = [
     templateID: 'cassandra-v4',
     createdAt: '2024-01-24T00:00:00Z',
     updatedAt: '2024-01-24T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-24T00:00:00Z',
     spawnCount: 3,
     buildCount: 1,
@@ -521,10 +461,6 @@ const TEMPLATES: Template[] = [
     templateID: 'docker-v24',
     createdAt: '2024-01-25T00:00:00Z',
     updatedAt: '2024-01-25T00:00:00Z',
-    createdBy: {
-      email: 'devops@example.com',
-      id: 'user_010',
-    },
     lastSpawnedAt: '2024-01-25T00:00:00Z',
     spawnCount: 20,
     buildCount: 1,
@@ -541,10 +477,6 @@ const TEMPLATES: Template[] = [
     templateID: 'kubernetes-v1.28',
     createdAt: '2024-01-26T00:00:00Z',
     updatedAt: '2024-01-26T00:00:00Z',
-    createdBy: {
-      email: 'devops@example.com',
-      id: 'user_010',
-    },
     lastSpawnedAt: '2024-01-26T00:00:00Z',
     spawnCount: 8,
     buildCount: 1,
@@ -561,7 +493,6 @@ const TEMPLATES: Template[] = [
     templateID: 'terraform-v1.6',
     createdAt: '2024-01-27T00:00:00Z',
     updatedAt: '2024-01-27T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-27T00:00:00Z',
     spawnCount: 6,
     buildCount: 1,
@@ -577,10 +508,6 @@ const TEMPLATES: Template[] = [
     templateID: 'ansible-v2.16',
     createdAt: '2024-01-28T00:00:00Z',
     updatedAt: '2024-01-28T00:00:00Z',
-    createdBy: {
-      email: 'devops@example.com',
-      id: 'user_010',
-    },
     lastSpawnedAt: '2024-01-28T00:00:00Z',
     envdVersion: '0.1.0',
     spawnCount: 4,
@@ -598,7 +525,6 @@ const TEMPLATES: Template[] = [
     envdVersion: '0.1.0',
     createdAt: '2024-01-29T00:00:00Z',
     updatedAt: '2024-01-29T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-29T00:00:00Z',
     spawnCount: 7,
     buildCount: 1,
@@ -615,10 +541,6 @@ const TEMPLATES: Template[] = [
     templateID: 'jenkins-v2.426',
     createdAt: '2024-01-30T00:00:00Z',
     updatedAt: '2024-01-30T00:00:00Z',
-    createdBy: {
-      email: 'ci@example.com',
-      id: 'user_011',
-    },
     lastSpawnedAt: '2024-01-30T00:00:00Z',
     spawnCount: 12,
     buildCount: 1,
@@ -635,7 +557,6 @@ const TEMPLATES: Template[] = [
     templateID: 'gitlab-ci-v16',
     createdAt: '2024-01-31T00:00:00Z',
     updatedAt: '2024-01-31T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-01-31T00:00:00Z',
     spawnCount: 9,
     buildCount: 1,
@@ -652,10 +573,6 @@ const TEMPLATES: Template[] = [
     templateID: 'apache-spark-v3.5',
     createdAt: '2024-02-01T00:00:00Z',
     updatedAt: '2024-02-01T00:00:00Z',
-    createdBy: {
-      email: 'bigdata@example.com',
-      id: 'user_012',
-    },
     lastSpawnedAt: '2024-02-01T00:00:00Z',
     spawnCount: 5,
     buildCount: 1,
@@ -672,7 +589,6 @@ const TEMPLATES: Template[] = [
     templateID: 'kafka-v3.6',
     createdAt: '2024-02-02T00:00:00Z',
     updatedAt: '2024-02-02T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-02-02T00:00:00Z',
     spawnCount: 8,
     buildCount: 1,
@@ -689,10 +605,6 @@ const TEMPLATES: Template[] = [
     templateID: 'rabbitmq-v3.12',
     createdAt: '2024-02-03T00:00:00Z',
     updatedAt: '2024-02-03T00:00:00Z',
-    createdBy: {
-      email: 'messaging@example.com',
-      id: 'user_013',
-    },
     lastSpawnedAt: '2024-02-03T00:00:00Z',
     spawnCount: 6,
     buildCount: 1,
@@ -709,7 +621,6 @@ const TEMPLATES: Template[] = [
     templateID: 'zookeeper-v3.9',
     createdAt: '2024-02-04T00:00:00Z',
     updatedAt: '2024-02-04T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-02-04T00:00:00Z',
     spawnCount: 4,
     buildCount: 1,
@@ -726,10 +637,6 @@ const TEMPLATES: Template[] = [
     templateID: 'solr-v9.4',
     createdAt: '2024-02-05T00:00:00Z',
     updatedAt: '2024-02-05T00:00:00Z',
-    createdBy: {
-      email: 'search@example.com',
-      id: 'user_014',
-    },
     lastSpawnedAt: '2024-02-05T00:00:00Z',
     spawnCount: 3,
     buildCount: 1,
@@ -746,7 +653,6 @@ const TEMPLATES: Template[] = [
     createdAt: '2024-02-06T00:00:00Z',
     envdVersion: '0.1.0',
     updatedAt: '2024-02-06T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-02-06T00:00:00Z',
     spawnCount: 5,
     buildCount: 1,
@@ -762,7 +668,6 @@ const TEMPLATES: Template[] = [
     templateID: 'kibana-v8.11',
     createdAt: '2024-02-07T00:00:00Z',
     updatedAt: '2024-02-07T00:00:00Z',
-    createdBy: null,
     lastSpawnedAt: '2024-02-07T00:00:00Z',
     spawnCount: 7,
     buildCount: 1,
@@ -780,10 +685,6 @@ const TEMPLATES: Template[] = [
     createdAt: '2024-02-08T00:00:00Z',
     envdVersion: '0.1.0',
     updatedAt: '2024-02-08T00:00:00Z',
-    createdBy: {
-      email: 'storage@example.com',
-      id: 'user_015',
-    },
     lastSpawnedAt: '2024-02-08T00:00:00Z',
     spawnCount: 6,
     buildCount: 1,
@@ -800,10 +701,6 @@ const TEMPLATES: Template[] = [
     templateID: 'vault-v1.15',
     createdAt: '2024-02-09T00:00:00Z',
     updatedAt: '2024-02-09T00:00:00Z',
-    createdBy: {
-      email: 'security@example.com',
-      id: 'user_016',
-    },
     lastSpawnedAt: '2024-02-09T00:00:00Z',
     spawnCount: 4,
     buildCount: 1,
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index bed8849cc..03566100c 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -13,7 +13,6 @@ export type Template = Pick<
   | 'names'
   | 'createdAt'
   | 'updatedAt'
-  | 'createdBy'
   | 'lastSpawnedAt'
   | 'spawnCount'
   | 'buildCount'
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 595cabd78..2a4dde0d8 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -88,21 +88,47 @@ export function createTemplatesRepository(
 ): TeamTemplatesRepository {
   return {
     async getTemplate(templateId) {
-      // Filter the list endpoint; infra has no per-template GET that exposes the same shape.
-      const listResult = await this.getTeamTemplates()
-      if (!listResult.ok) return listResult
+      if (USE_MOCK_DATA) {
+        const template = MOCK_TEMPLATES_DATA.find(
+          (t) => t.templateID === templateId
+        )
+        if (!template) {
+          return err(
+            repoErrorFromHttp(404, 'Template not found in this team', undefined)
+          )
+        }
 
-      const template = listResult.data.templates.find(
-        (t) => t.templateID === templateId
-      )
+        return ok({ template })
+      }
+
+      const res = await deps.apiClient.GET('/templates/{templateID}', {
+        params: {
+          path: {
+            templateID: templateId,
+          },
+        },
+        headers: {
+          ...deps.authHeaders(scope.accessToken, scope.teamId),
+        },
+      })
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template',
+            res.error
+          )
+        )
+      }
 
-      if (!template) {
+      if (!res.data) {
         return err(
           repoErrorFromHttp(404, 'Template not found in this team', undefined)
         )
       }
 
-      return ok({ template })
+      return ok({ template: res.data })
     },
     async getTagGroups(templateId, options) {
       if (USE_MOCK_DATA) {
diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index 97ba8e7e0..ecefe6d0f 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -751,6 +751,52 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/templates/{templateID}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Get template
+         * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned the template. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateDetail"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/templates/{templateID}/tags/groups": {
         parameters: {
             query?: never;
@@ -1148,6 +1194,52 @@ export interface components {
         DefaultTemplatesResponse: {
             templates: components["schemas"]["DefaultTemplate"][];
         };
+        /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
+        TemplateDetail: {
+            /** @description Identifier of the template. */
+            templateID: string;
+            /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
+            buildID: string;
+            cpuCount: components["schemas"]["CPUCount"];
+            memoryMB: components["schemas"]["MemoryMB"];
+            diskSizeMB: components["schemas"]["DiskSizeMB"];
+            /** @description Whether the template is public or only accessible by the team. */
+            public: boolean;
+            /**
+             * @deprecated
+             * @description Aliases of the template.
+             */
+            aliases: string[];
+            /** @description Names of the template (namespace/alias format when namespaced). */
+            names: string[];
+            /**
+             * Format: date-time
+             * @description Time when the template was created.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the template was last updated.
+             */
+            updatedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the template was last used.
+             */
+            lastSpawnedAt: string | null;
+            /**
+             * Format: int64
+             * @description Number of times the template was used.
+             */
+            spawnCount: number;
+            /**
+             * Format: int32
+             * @description Number of times the template was built.
+             */
+            buildCount: number;
+            /** @description Envd version of the latest ready build, or an empty string when none. */
+            envdVersion: string;
+        };
         TemplateTagAssignment: {
             /**
              * Format: uuid

From 0de71e7e41ec704fc51ca54ccef31ab4eccd1ed2 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 09:12:22 +0200
Subject: [PATCH 48/90] Server-side builds search per template

---
 .../(detail-tabs)/builds/page.tsx             | 21 ++++++++++++-------
 .../dashboard/templates/builds/table.tsx      | 14 ++++++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
index a1900c750..827348479 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/builds/page.tsx
@@ -5,6 +5,7 @@ import type { ListedBuildModel } from '@/core/modules/builds/models'
 import BuildsTable from '@/features/dashboard/templates/builds/table'
 import { TemplateBuildsHeader } from '@/features/dashboard/templates/builds/template-builds-header'
 import useTemplateBuildsFilters from '@/features/dashboard/templates/builds/use-template-builds-filters'
+import { isValidUuid } from '@/features/dashboard/templates/tags/helpers'
 
 export default function TemplateDetailBuildsPage({
   params,
@@ -12,20 +13,26 @@ export default function TemplateDetailBuildsPage({
   const { templateId } = use(params)
   const { statuses, q } = useTemplateBuildsFilters()
 
+  const trimmed = q?.trim() ?? ''
+  const isSearching = trimmed.length > 0
+  const isValidSearch = !isSearching || isValidUuid(trimmed)
+
   const postFilter = useCallback(
-    (build: ListedBuildModel) => {
-      if (!q) return true
-      return build.id.toLowerCase().includes(q.toLowerCase())
-    },
-    [q]
+    (build: ListedBuildModel) => build.templateId === templateId,
+    [templateId]
   )
 
   return (
     <div className="h-full min-h-0 flex-1 p-3 md:p-6 flex flex-col gap-3">
       <TemplateBuildsHeader />
       <BuildsTable
-        filters={{ statuses, buildIdOrTemplate: templateId }}
-        postFilter={postFilter}
+        filters={{
+          statuses,
+          buildIdOrTemplate:
+            isSearching && isValidSearch ? trimmed : templateId,
+        }}
+        postFilter={isSearching && isValidSearch ? postFilter : undefined}
+        disabled={isSearching && !isValidSearch}
         showTemplateColumn={false}
       />
     </div>
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index d9c6326b9..80828d229 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -59,12 +59,14 @@ interface BuildsTableProps {
   // Optional client-side row filter applied after fetch + live-status merge.
   postFilter?: (build: ListedBuildModel) => boolean
   showTemplateColumn?: boolean
+  disabled?: boolean
 }
 
 const BuildsTable = ({
   filters,
   postFilter,
   showTemplateColumn = true,
+  disabled = false,
 }: BuildsTableProps) => {
   const trpc = useTRPC()
   const queryClient = useQueryClient()
@@ -97,6 +99,7 @@ const BuildsTable = ({
         refetchInterval: BUILDS_REFETCH_INTERVAL_MS,
         refetchIntervalInBackground: false,
         maxPages: MAX_CACHED_PAGES,
+        enabled: !disabled,
       }
     )
   )
@@ -115,6 +118,10 @@ const BuildsTable = ({
     }
   }, [isFetchingBuilds, isFilterRefetching, clearFilterRefetching])
 
+  useEffect(() => {
+    if (disabled) clearFilterRefetching()
+  }, [disabled, clearFilterRefetching])
+
   const runningBuildIds = useMemo(
     () => builds.filter((b) => b.status === 'building').map((b) => b.id),
     [builds]
@@ -165,9 +172,10 @@ const BuildsTable = ({
     }
   }, [queryClient, buildsQueryKey])
 
-  const hasData = visibleBuilds.length > 0
-  const showLoader = isInitialLoad && !hasData
-  const showEmpty = !isInitialLoad && !isFetchingBuilds && !hasData
+  const hasData = !disabled && visibleBuilds.length > 0
+  const showLoader = !disabled && isInitialLoad && !hasData
+  const showEmpty =
+    disabled || (!isInitialLoad && !isFetchingBuilds && !hasData)
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
 
   const visibleColumnCount = showTemplateColumn ? 6 : 5

From 61bfb69a10080644bc6fcb38d5534881eeadcccf Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 09:17:33 +0200
Subject: [PATCH 49/90] Template overview page with default build info

---
 .../(detail-tabs)/overview/page.tsx           |  13 +-
 src/core/modules/templates/models.ts          |  12 ++
 .../modules/templates/repository.server.ts    | 104 ++++++++++
 src/core/server/api/routers/templates.ts      |  14 ++
 .../templates/detail/overview/index.tsx       |  31 +++
 .../detail/overview/latest-build-section.tsx  | 179 ++++++++++++++++++
 .../templates/detail/overview/section.tsx     |  34 ++++
 .../templates/detail/overview/skeleton.tsx    |  24 +++
 .../detail/overview/template-section.tsx      | 111 +++++++++++
 .../detail/overview/template-specs.tsx        |  85 +++++++++
 10 files changed, 602 insertions(+), 5 deletions(-)
 create mode 100644 src/features/dashboard/templates/detail/overview/index.tsx
 create mode 100644 src/features/dashboard/templates/detail/overview/latest-build-section.tsx
 create mode 100644 src/features/dashboard/templates/detail/overview/section.tsx
 create mode 100644 src/features/dashboard/templates/detail/overview/skeleton.tsx
 create mode 100644 src/features/dashboard/templates/detail/overview/template-section.tsx
 create mode 100644 src/features/dashboard/templates/detail/overview/template-specs.tsx

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index 6693a24a1..59c935a72 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -1,16 +1,19 @@
 import { Suspense } from 'react'
-import TemplateDetailHeader from '@/features/dashboard/templates/detail/header'
-import TemplateDetailHeaderSkeleton from '@/features/dashboard/templates/detail/header-skeleton'
+import TemplateOverview from '@/features/dashboard/templates/detail/overview'
+import { TemplateOverviewSkeleton } from '@/features/dashboard/templates/detail/overview/skeleton'
+import { prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateOverviewPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
+  prefetch(trpc.templates.getTemplate.queryOptions({ teamSlug, templateId }))
+
   return (
-    <div className="p-3 md:p-6 flex flex-col gap-6">
-      <Suspense fallback={<TemplateDetailHeaderSkeleton />}>
-        <TemplateDetailHeader teamSlug={teamSlug} templateId={templateId} />
+    <div className="p-3 md:p-6 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
+      <Suspense fallback={<TemplateOverviewSkeleton />}>
+        <TemplateOverview teamSlug={teamSlug} templateId={templateId} />
       </Suspense>
     </div>
   )
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index 03566100c..4a2f46314 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -1,5 +1,6 @@
 import type { components as DashboardComponents } from '@/contracts/dashboard-api'
 import type { components as InfraComponents } from '@/contracts/infra-api'
+import type { BuildStatus } from '@/core/modules/builds/models'
 
 export type Template = Pick<
   InfraComponents['schemas']['Template'],
@@ -26,6 +27,17 @@ export type DefaultTemplate = Template & {
 
 export type TemplateTag = InfraComponents['schemas']['TemplateTag']
 
+export interface TemplateDefaultBuildModel {
+  buildID: string
+  status: BuildStatus
+  createdAt: number
+  finishedAt: number | null
+  cpuCount: number
+  memoryMB: number
+  diskSizeMB: number | null
+  envdVersion: string | null
+}
+
 export type TemplateTagAssignment =
   DashboardComponents['schemas']['TemplateTagAssignment']
 export type TemplateTagGroup =
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 2a4dde0d8..a6ed0f70c 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -7,9 +7,12 @@ import {
   MOCK_DEFAULT_TEMPLATES_DATA,
   MOCK_TEMPLATES_DATA,
 } from '@/configs/mock-data'
+import type { components as InfraComponents } from '@/contracts/infra-api'
+import type { BuildStatus } from '@/core/modules/builds/models'
 import type {
   DefaultTemplate,
   Template,
+  TemplateDefaultBuildModel,
   TemplateTagAssignment,
   TemplateTagExistsResult,
   TemplateTagGroup,
@@ -27,6 +30,18 @@ import type {
 } from '@/core/shared/repository-scope'
 import { err, ok, type RepoResult } from '@/core/shared/result'
 
+const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+
+type InfraBuildStatus = NonNullable<
+  InfraComponents['schemas']['TemplateBuild']
+>['status']
+
+function mapInfraBuildStatus(status: InfraBuildStatus): BuildStatus {
+  if (status === 'ready') return 'success'
+  if (status === 'error') return 'failed'
+  return 'building'
+}
+
 type TemplatesRepositoryDeps = {
   apiClient: typeof api
   infraClient: typeof infra
@@ -37,6 +52,9 @@ type TemplatesRepositoryDeps = {
 export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
   getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
+  getDefaultBuild(
+    templateId: string
+  ): Promise<RepoResult<{ build: TemplateDefaultBuildModel | null }>>
   getTagGroups(
     templateId: string,
     options?: { assignmentLimit?: number }
@@ -130,6 +148,92 @@ export function createTemplatesRepository(
 
       return ok({ template: res.data })
     },
+    async getDefaultBuild(templateId) {
+      if (USE_MOCK_DATA) {
+        const mock = MOCK_TEMPLATES_DATA.find(
+          (t) => t.templateID === templateId
+        )
+        if (!mock || mock.buildID === NULL_BUILD_ID) {
+          return ok({ build: null })
+        }
+        return ok({
+          build: {
+            buildID: mock.buildID,
+            status: 'success' as const,
+            createdAt: new Date(mock.updatedAt).getTime(),
+            finishedAt: new Date(mock.updatedAt).getTime(),
+            cpuCount: mock.cpuCount,
+            memoryMB: mock.memoryMB,
+            diskSizeMB: mock.diskSizeMB,
+            envdVersion: mock.envdVersion || null,
+          },
+        })
+      }
+
+      const tagsRes = await deps.infraClient.GET(
+        '/templates/{templateID}/tags',
+        {
+          params: { path: { templateID: templateId } },
+          headers: {
+            ...deps.authHeaders(scope.accessToken, scope.teamId),
+          },
+        }
+      )
+
+      if (!tagsRes.response.ok || tagsRes.error) {
+        return err(
+          repoErrorFromHttp(
+            tagsRes.response.status,
+            tagsRes.error?.message ?? 'Failed to fetch template tags',
+            tagsRes.error
+          )
+        )
+      }
+
+      const defaultTag = (tagsRes.data ?? []).find((t) => t.tag === 'default')
+      if (!defaultTag) {
+        return ok({ build: null })
+      }
+
+      const buildsRes = await deps.infraClient.GET('/templates/{templateID}', {
+        params: { path: { templateID: templateId } },
+        headers: {
+          ...deps.authHeaders(scope.accessToken, scope.teamId),
+        },
+      })
+
+      if (!buildsRes.response.ok || buildsRes.error) {
+        return err(
+          repoErrorFromHttp(
+            buildsRes.response.status,
+            buildsRes.error?.message ?? 'Failed to fetch template builds',
+            buildsRes.error
+          )
+        )
+      }
+
+      const build = buildsRes.data?.builds.find(
+        (b) => b.buildID === defaultTag.buildID
+      )
+      if (!build) {
+        return ok({ build: null })
+      }
+
+      return ok({
+        build: {
+          buildID: build.buildID,
+          status: mapInfraBuildStatus(build.status),
+          createdAt: new Date(build.createdAt).getTime(),
+          finishedAt: build.finishedAt
+            ? new Date(build.finishedAt).getTime()
+            : null,
+          cpuCount: build.cpuCount,
+          memoryMB: build.memoryMB,
+          diskSizeMB: build.diskSizeMB ?? null,
+          envdVersion: build.envdVersion ?? null,
+        },
+      })
+    },
     async getTagGroups(templateId, options) {
       if (USE_MOCK_DATA) {
         return ok({ tags: [] })
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index f334eb0c1..d8e40e1ce 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -54,6 +54,20 @@ export const templatesRouter = createTRPCRouter({
       return result.data
     }),
 
+  getDefaultBuild: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getDefaultBuild(
+        input.templateId
+      )
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
   getTagGroups: teamTemplatesRepositoryProcedure
     .input(
       z.object({
diff --git a/src/features/dashboard/templates/detail/overview/index.tsx b/src/features/dashboard/templates/detail/overview/index.tsx
new file mode 100644
index 000000000..6c3ca8405
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/index.tsx
@@ -0,0 +1,31 @@
+'use client'
+
+import { useSuspenseQuery } from '@tanstack/react-query'
+import { useTRPC } from '@/trpc/client'
+import { LatestBuildSection } from './latest-build-section'
+import { TemplateSection } from './template-section'
+
+interface TemplateOverviewProps {
+  teamSlug: string
+  templateId: string
+}
+
+export default function TemplateOverview({
+  teamSlug,
+  templateId,
+}: TemplateOverviewProps) {
+  const trpc = useTRPC()
+
+  const { data } = useSuspenseQuery(
+    trpc.templates.getTemplate.queryOptions({ teamSlug, templateId })
+  )
+
+  const template = data.template
+
+  return (
+    <div className="flex flex-col gap-8">
+      <TemplateSection template={template} teamSlug={teamSlug} />
+      <LatestBuildSection templateId={templateId} teamSlug={teamSlug} />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
new file mode 100644
index 000000000..95d5ac67e
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -0,0 +1,179 @@
+'use client'
+
+import { useSuspenseQuery } from '@tanstack/react-query'
+import Link from 'next/link'
+import { useEffect, useState } from 'react'
+import { PROTECTED_URLS } from '@/configs/urls'
+import type { BuildStatus } from '@/core/modules/builds/models'
+import type { TemplateDefaultBuildModel } from '@/core/modules/templates/models'
+import { useClipboard } from '@/lib/hooks/use-clipboard'
+import { formatTimeAgoCompact } from '@/lib/utils/formatting'
+import { cn } from '@/lib/utils/ui'
+import { useTRPC } from '@/trpc/client'
+import { Badge } from '@/ui/primitives/badge'
+import { Button } from '@/ui/primitives/button'
+import { CheckIcon, CloseIcon, CopyIcon } from '@/ui/primitives/icons'
+import { OverviewSection } from './section'
+import { TemplateSpecs } from './template-specs'
+
+interface LatestBuildSectionProps {
+  templateId: string
+  teamSlug: string
+}
+
+export function LatestBuildSection({
+  templateId,
+  teamSlug,
+}: LatestBuildSectionProps) {
+  const trpc = useTRPC()
+
+  const { data } = useSuspenseQuery(
+    trpc.templates.getDefaultBuild.queryOptions({ teamSlug, templateId })
+  )
+
+  if (!data.build) {
+    return (
+      <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
+        <p className="text-fg-tertiary prose-body">
+          No build tagged{' '}
+          <code className="text-fg-secondary font-mono">default</code> yet.
+          Build the template and tag it{' '}
+          <code className="text-fg-secondary font-mono">default</code> to
+          populate this section.
+        </p>
+      </OverviewSection>
+    )
+  }
+
+  const build = data.build
+
+  return (
+    <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
+      <div className="flex flex-col md:flex-row items-start gap-x-8 gap-y-4">
+        <div className="flex flex-col gap-2 min-w-0">
+          <BuildAgo timestamp={build.createdAt} />
+          <BuildStatusBadge status={build.status} />
+        </div>
+        <BuildIdRow
+          teamSlug={teamSlug}
+          templateId={templateId}
+          buildId={build.buildID}
+        />
+      </div>
+      <TemplateSpecs build={build} className="mt-2" />
+    </OverviewSection>
+  )
+}
+
+function DefaultTagBadge() {
+  return (
+    <Badge variant="default" size="sm" className="uppercase font-mono">
+      default
+    </Badge>
+  )
+}
+
+function BuildAgo({ timestamp }: { timestamp: number }) {
+  const [now, setNow] = useState(() => Date.now())
+
+  useEffect(() => {
+    const interval = setInterval(() => setNow(Date.now()), 30_000)
+    return () => clearInterval(interval)
+  }, [])
+
+  return (
+    <span className="prose-value-big font-mono uppercase text-fg whitespace-nowrap">
+      {formatTimeAgoCompact(now - timestamp).toUpperCase()}
+    </span>
+  )
+}
+
+function BuildStatusBadge({ status }: { status: BuildStatus }) {
+  const config: Record<
+    BuildStatus,
+    {
+      label: string
+      variant: 'default' | 'positive' | 'error'
+      icon: React.ReactNode
+    }
+  > = {
+    building: {
+      label: 'Building',
+      variant: 'default',
+      icon: null,
+    },
+    success: {
+      label: 'Success',
+      variant: 'positive',
+      icon: <CheckIcon className="size-3 scale-125" />,
+    },
+    failed: {
+      label: 'Failed',
+      variant: 'error',
+      icon: <CloseIcon className="size-3" />,
+    },
+  }
+
+  const { label, icon, variant } = config[status]
+  return (
+    <Badge
+      variant={variant}
+      size="md"
+      className={cn(
+        'w-fit uppercase',
+        variant === 'default' && 'bg-bg-inverted/10'
+      )}
+    >
+      {icon}
+      {label}
+    </Badge>
+  )
+}
+
+function BuildIdRow({
+  teamSlug,
+  templateId,
+  buildId,
+}: {
+  teamSlug: string
+  templateId: string
+  buildId: string
+}) {
+  const [wasCopied, copy] = useClipboard(2000)
+  const truncated = `${buildId.slice(0, 7)}...${buildId.slice(-5)}`
+
+  return (
+    <div className="flex items-center gap-2 rounded border border-stroke bg-bg pl-3 pr-1 py-1 min-w-0 flex-1">
+      <button
+        type="button"
+        onClick={() => copy(buildId)}
+        aria-label={wasCopied ? 'Copied build ID' : 'Copy build ID'}
+        className="group/copy relative inline-flex min-w-0 flex-1 items-center text-left text-fg-secondary font-mono prose-body-numeric hover:text-fg transition-colors cursor-pointer"
+      >
+        <span className="truncate">{truncated}</span>
+        <span
+          className={cn(
+            'ml-2 opacity-0 group-hover/copy:opacity-100 transition-opacity',
+            wasCopied && 'opacity-100'
+          )}
+          aria-hidden="true"
+        >
+          {wasCopied ? (
+            <CheckIcon className="size-3 text-icon" />
+          ) : (
+            <CopyIcon className="size-3 text-icon-secondary" />
+          )}
+        </span>
+      </button>
+      <Button asChild variant="tertiary" size="none" className="px-3 py-1.5">
+        <Link
+          href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
+        >
+          Open
+        </Link>
+      </Button>
+    </div>
+  )
+}
+
+export type { TemplateDefaultBuildModel }
diff --git a/src/features/dashboard/templates/detail/overview/section.tsx b/src/features/dashboard/templates/detail/overview/section.tsx
new file mode 100644
index 000000000..bd407e258
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/section.tsx
@@ -0,0 +1,34 @@
+import type { ReactNode } from 'react'
+import { cn } from '@/lib/utils/ui'
+
+interface OverviewSectionProps {
+  label: string
+  labelBadge?: ReactNode
+  divider?: boolean
+  children: ReactNode
+  className?: string
+}
+
+export function OverviewSection({
+  label,
+  labelBadge,
+  divider = true,
+  children,
+  className,
+}: OverviewSectionProps) {
+  return (
+    <section
+      className={cn(
+        'flex flex-col gap-4',
+        divider && 'border-t border-stroke pt-8',
+        className
+      )}
+    >
+      <div className="flex items-center gap-2">
+        <span className="text-fg-tertiary prose-label uppercase">{label}</span>
+        {labelBadge}
+      </div>
+      <div className="flex flex-col gap-3">{children}</div>
+    </section>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/overview/skeleton.tsx b/src/features/dashboard/templates/detail/overview/skeleton.tsx
new file mode 100644
index 000000000..16a06e953
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/skeleton.tsx
@@ -0,0 +1,24 @@
+import { Skeleton } from '@/ui/primitives/skeleton'
+import { OverviewSection } from './section'
+
+export function TemplateOverviewSkeleton() {
+  return (
+    <div className="flex flex-col gap-8">
+      <OverviewSection label="Template" divider={false}>
+        <Skeleton className="h-8 w-[28rem] max-w-full" />
+        <Skeleton className="h-5 w-96 max-w-full" />
+      </OverviewSection>
+
+      <OverviewSection label="Latest build">
+        <div className="grid grid-cols-1 md:grid-cols-[minmax(0,1fr)_minmax(0,2fr)] items-start gap-x-8 gap-y-4">
+          <div className="flex flex-col gap-2">
+            <Skeleton className="h-8 w-32" />
+            <Skeleton className="h-5 w-24" />
+          </div>
+          <Skeleton className="h-10 w-full max-w-md" />
+        </div>
+        <Skeleton className="h-5 w-80 mt-2 max-w-full" />
+      </OverviewSection>
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/overview/template-section.tsx b/src/features/dashboard/templates/detail/overview/template-section.tsx
new file mode 100644
index 000000000..002c049ef
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/template-section.tsx
@@ -0,0 +1,111 @@
+'use client'
+
+import type { Template } from '@/core/modules/templates/models'
+import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
+import { useClipboard } from '@/lib/hooks/use-clipboard'
+import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
+import { cn } from '@/lib/utils/ui'
+import { IconButton } from '@/ui/primitives/icon-button'
+import { CheckIcon, CopyIcon } from '@/ui/primitives/icons'
+import { TemplateVisibilityDropdown } from '../visibility-dropdown'
+import { OverviewSection } from './section'
+
+interface TemplateSectionProps {
+  template: Template
+  teamSlug: string
+}
+
+export function TemplateSection({ template, teamSlug }: TemplateSectionProps) {
+  const [wasCopied, copy] = useClipboard(2000)
+  const displayName = getTemplateDisplayName(template)
+
+  const created = formatLocalLogStyleTimestamp(template.createdAt, {
+    includeSeconds: false,
+    includeYear: false,
+  })
+
+  const isModified =
+    template.updatedAt && template.updatedAt !== template.createdAt
+  const modified = isModified
+    ? formatLocalLogStyleTimestamp(template.updatedAt, {
+        includeSeconds: false,
+        includeYear: false,
+      })
+    : null
+
+  return (
+    <OverviewSection label="Template" divider={false}>
+      <div className="flex items-center gap-3">
+        <h2 className="prose-value-big font-mono uppercase tracking-tight break-all">
+          {template.templateID}
+        </h2>
+        <IconButton
+          aria-label={wasCopied ? 'Copied' : 'Copy template ID'}
+          onClick={() => copy(template.templateID)}
+          className="size-7"
+        >
+          {wasCopied ? (
+            <CheckIcon className="size-4 text-icon" />
+          ) : (
+            <CopyIcon className="size-4 text-icon-secondary" />
+          )}
+        </IconButton>
+      </div>
+
+      <div className="flex flex-wrap items-center gap-x-3 gap-y-1 text-fg-secondary prose-body">
+        <MetaItem>
+          <span className="text-fg-tertiary">Created</span>{' '}
+          <span className="font-mono prose-body-numeric">
+            {created?.datePart ?? '--'} {created?.timePart ?? ''}
+          </span>
+        </MetaItem>
+        <Separator />
+        <MetaItem>
+          {modified ? (
+            <>
+              <span className="text-fg-tertiary">Modified</span>{' '}
+              <span className="font-mono prose-body-numeric">
+                {modified.datePart} {modified.timePart}
+              </span>
+            </>
+          ) : (
+            <span className="text-fg-tertiary">Not yet modified</span>
+          )}
+        </MetaItem>
+        <Separator />
+        <MetaItem>
+          <span className="text-fg-tertiary">Visibility</span>{' '}
+          <TemplateVisibilityDropdown
+            teamSlug={teamSlug}
+            templateId={template.templateID}
+            isPublic={template.public}
+            displayName={displayName}
+          />
+        </MetaItem>
+      </div>
+    </OverviewSection>
+  )
+}
+
+function MetaItem({
+  children,
+  className,
+}: {
+  children: React.ReactNode
+  className?: string
+}) {
+  return (
+    <span
+      className={cn(
+        'inline-flex items-center gap-1.5 whitespace-nowrap',
+        className
+      )}
+    >
+      {children}
+    </span>
+  )
+}
+
+function Separator() {
+  return <span className="text-fg-tertiary select-none">·</span>
+}
diff --git a/src/features/dashboard/templates/detail/overview/template-specs.tsx b/src/features/dashboard/templates/detail/overview/template-specs.tsx
new file mode 100644
index 000000000..dff5555dc
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/template-specs.tsx
@@ -0,0 +1,85 @@
+import { formatNumber } from '@/lib/utils/formatting'
+import { cn } from '@/lib/utils/ui'
+import {
+  CodeChevronIcon,
+  CpuIcon,
+  MemoryIcon,
+  StorageIcon,
+} from '@/ui/primitives/icons'
+
+interface TemplateSpecsProps {
+  build: {
+    cpuCount: number
+    memoryMB: number
+    diskSizeMB: number | null
+    envdVersion: string | null
+  }
+  className?: string
+}
+
+export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
+  return (
+    <div
+      className={cn(
+        'flex flex-wrap items-center gap-x-4 gap-y-1 text-fg-secondary prose-body-numeric',
+        className
+      )}
+    >
+      <SpecItem icon={<CpuIcon className="size-3.5" />}>
+        <span className="prose-body-numeric-highlight">
+          {formatNumber(build.cpuCount)}
+        </span>{' '}
+        <span className="text-fg-tertiary">
+          Core{build.cpuCount > 1 ? 's' : ''}
+        </span>
+      </SpecItem>
+      <Separator />
+      <SpecItem icon={<MemoryIcon className="size-3.5" />}>
+        <span className="prose-body-numeric-highlight">
+          {formatNumber(build.memoryMB)}
+        </span>{' '}
+        <span className="text-fg-tertiary">MB</span>
+      </SpecItem>
+      {build.diskSizeMB !== null && (
+        <>
+          <Separator />
+          <SpecItem icon={<StorageIcon className="size-3.5" />}>
+            <span className="prose-body-numeric-highlight">
+              {formatNumber(build.diskSizeMB)}
+            </span>{' '}
+            <span className="text-fg-tertiary">MB</span>
+          </SpecItem>
+        </>
+      )}
+      {build.envdVersion && (
+        <>
+          <Separator />
+          <SpecItem icon={<CodeChevronIcon className="size-3.5" />}>
+            <span className="prose-body-numeric-highlight font-mono">
+              {build.envdVersion}
+            </span>
+          </SpecItem>
+        </>
+      )}
+    </div>
+  )
+}
+
+function SpecItem({
+  icon,
+  children,
+}: {
+  icon: React.ReactNode
+  children: React.ReactNode
+}) {
+  return (
+    <span className="inline-flex items-center gap-1.5 whitespace-nowrap">
+      <span className="text-icon-tertiary">{icon}</span>
+      {children}
+    </span>
+  )
+}
+
+function Separator() {
+  return <span className="text-fg-tertiary select-none">·</span>
+}

From 9aa7b10cd3a5460fa8bf9ad144e24aae62029dec Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 10:12:17 +0200
Subject: [PATCH 50/90] Clean up comments

---
 src/ui/row-hover-frame.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ui/row-hover-frame.tsx b/src/ui/row-hover-frame.tsx
index 3dbdccd9f..cb1252f75 100644
--- a/src/ui/row-hover-frame.tsx
+++ b/src/ui/row-hover-frame.tsx
@@ -4,11 +4,6 @@ interface RowHoverFrameProps {
   className?: string
 }
 
-/**
- * Decorative hover frame for table rows. Parent row must carry `group/row` and `relative`.
- * Corner marks light via `--corner-mark-color` on hover/focus-visible.
- * Override the corner colour for custom triggers with a `!`-prefixed utility so it beats the variant defaults.
- */
 export function RowHoverFrame({ className }: RowHoverFrameProps) {
   return (
     <div

From 2b75df56b5f89477ba44ff1566cbe49e3da2262f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 11:26:33 +0200
Subject: [PATCH 51/90] Paginated tags groups loading

---
 spec/openapi.dashboard-api.yaml               |  97 +++++++++-
 .../modules/templates/repository.server.ts    |  55 +++++-
 src/core/server/api/routers/templates.ts      |  30 +++-
 .../shared/contracts/dashboard-api.types.ts   |  77 +++++++-
 .../dashboard/templates/builds/table.tsx      |  28 +--
 .../templates/tags/assign-dialog.tsx          |  20 ++-
 .../templates/tags/delete-dialog.tsx          |  26 ++-
 .../dashboard/templates/tags/header.tsx       |  74 +++++---
 .../templates/tags/reassign-dialog.tsx        |  18 +-
 .../templates/tags/rollback-dialog.tsx        |  18 +-
 .../dashboard/templates/tags/table-config.tsx |  82 +++++----
 .../dashboard/templates/tags/table.tsx        | 165 +++++++++++++-----
 .../tags/tag-format-invalid-tooltip.tsx       |  52 ++++++
 .../templates/tags/tag-name-field.tsx         |  44 +----
 src/lib/hooks/use-filter-change-tracking.ts   |  26 +++
 tests/unit/assign-tag-dialog-helpers.test.ts  |   2 +-
 tests/unit/tag-groups-helpers.test.ts         | 122 +++++++++++++
 17 files changed, 732 insertions(+), 204 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
 create mode 100644 src/lib/hooks/use-filter-change-tracking.ts
 create mode 100644 tests/unit/tag-groups-helpers.test.ts

diff --git a/spec/openapi.dashboard-api.yaml b/spec/openapi.dashboard-api.yaml
index 0682918ab..eddfddf68 100644
--- a/spec/openapi.dashboard-api.yaml
+++ b/spec/openapi.dashboard-api.yaml
@@ -173,6 +173,42 @@ components:
       description: Cursor returned by the previous list response in `assigned_at|assignment_id` format.
       schema:
         type: string
+    tag_groups_limit:
+      name: tagsLimit
+      in: query
+      required: false
+      description: Maximum number of distinct tags to return per page.
+      schema:
+        type: integer
+        format: int32
+        minimum: 1
+        maximum: 100
+        default: 25
+    tag_groups_cursor:
+      name: tagsCursor
+      in: query
+      required: false
+      description: Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano).
+      schema:
+        type: string
+    tag_groups_search:
+      name: search
+      in: query
+      required: false
+      description: Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`.
+      schema:
+        type: string
+        maxLength: 64
+        pattern: "^[a-z0-9._-]*$"
+    tag_groups_sort:
+      name: sort
+      in: query
+      required: false
+      description: Sort order for the returned tag groups.
+      schema:
+        type: string
+        enum: [latest_desc, latest_asc, name_asc, name_desc]
+        default: latest_desc
 
   responses:
     "400":
@@ -572,12 +608,24 @@ components:
         - email
         - isDefault
         - createdAt
+        - providers
       properties:
         id:
           type: string
           format: uuid
         email:
           type: string
+        name:
+          type: string
+          nullable: true
+        profilePictureUrl:
+          type: string
+          format: uri
+          nullable: true
+        providers:
+          type: array
+          items:
+            type: string
         isDefault:
           type: boolean
         addedBy:
@@ -838,11 +886,26 @@ components:
       type: object
       required:
         - tags
+        - nextCursor
       properties:
         tags:
           type: array
           items:
             $ref: "#/components/schemas/TemplateTagGroup"
+        nextCursor:
+          type: string
+          nullable: true
+          description: Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page.
+
+    TemplateTagsCountResponse:
+      type: object
+      required:
+        - total
+      properties:
+        total:
+          type: integer
+          format: int64
+          description: Total distinct ready tags for the template.
 
     TemplateTagExistsResponse:
       type: object
@@ -1371,7 +1434,7 @@ paths:
   /templates/{templateID}/tags/groups:
     get:
       summary: List template tag groups
-      description: Returns ready template tag assignment groups with bounded per-tag history.
+      description: Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
       tags: [templates]
       security:
         - Supabase1TokenAuth: []
@@ -1381,6 +1444,10 @@ paths:
       parameters:
         - $ref: "#/components/parameters/templateID"
         - $ref: "#/components/parameters/tag_assignment_limit"
+        - $ref: "#/components/parameters/tag_groups_limit"
+        - $ref: "#/components/parameters/tag_groups_cursor"
+        - $ref: "#/components/parameters/tag_groups_search"
+        - $ref: "#/components/parameters/tag_groups_sort"
       responses:
         "200":
           description: Successfully returned template tag groups.
@@ -1399,6 +1466,34 @@ paths:
         "500":
           $ref: "#/components/responses/500"
 
+  /templates/{templateID}/tags/count:
+    get:
+      summary: Count template tags
+      description: Returns the total number of distinct ready tags for the template.
+      tags: [templates]
+      security:
+        - Supabase1TokenAuth: []
+          Supabase2TeamAuth: []
+        - AuthProviderBearerAuth: []
+          AuthProviderTeamAuth: []
+      parameters:
+        - $ref: "#/components/parameters/templateID"
+      responses:
+        "200":
+          description: Successfully returned tag count.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TemplateTagsCountResponse"
+        "401":
+          $ref: "#/components/responses/401"
+        "403":
+          $ref: "#/components/responses/403"
+        "404":
+          $ref: "#/components/responses/404"
+        "500":
+          $ref: "#/components/responses/500"
+
   /templates/{templateID}/tags/exists:
     get:
       summary: Check ready template tag existence
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index a6ed0f70c..18c150687 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -57,8 +57,17 @@ export interface TeamTemplatesRepository {
   ): Promise<RepoResult<{ build: TemplateDefaultBuildModel | null }>>
   getTagGroups(
     templateId: string,
-    options?: { assignmentLimit?: number }
-  ): Promise<RepoResult<{ tags: TemplateTagGroup[] }>>
+    options?: {
+      assignmentLimit?: number
+      tagsLimit?: number
+      tagsCursor?: string
+      search?: string
+      sort?: 'latest_desc' | 'latest_asc' | 'name_asc' | 'name_desc'
+    }
+  ): Promise<
+    RepoResult<{ tags: TemplateTagGroup[]; nextCursor: string | null }>
+  >
+  getTagCount(templateId: string): Promise<RepoResult<{ total: number }>>
   getTagAssignments(
     templateId: string,
     tag: string,
@@ -236,7 +245,7 @@ export function createTemplatesRepository(
     },
     async getTagGroups(templateId, options) {
       if (USE_MOCK_DATA) {
-        return ok({ tags: [] })
+        return ok({ tags: [], nextCursor: null })
       }
 
       const res = await deps.apiClient.GET(
@@ -248,6 +257,10 @@ export function createTemplatesRepository(
             },
             query: {
               assignmentLimit: options?.assignmentLimit,
+              tagsLimit: options?.tagsLimit,
+              tagsCursor: options?.tagsCursor,
+              search: options?.search,
+              sort: options?.sort,
             },
           },
           headers: {
@@ -266,7 +279,41 @@ export function createTemplatesRepository(
         )
       }
 
-      return ok({ tags: res.data?.tags ?? [] })
+      return ok({
+        tags: res.data?.tags ?? [],
+        nextCursor: res.data?.nextCursor ?? null,
+      })
+    },
+    async getTagCount(templateId) {
+      if (USE_MOCK_DATA) {
+        return ok({ total: 0 })
+      }
+
+      const res = await deps.apiClient.GET(
+        '/templates/{templateID}/tags/count',
+        {
+          params: {
+            path: {
+              templateID: templateId,
+            },
+          },
+          headers: {
+            ...deps.authHeaders(scope.accessToken, scope.teamId),
+          },
+        }
+      )
+
+      if (!res.response.ok || res.error) {
+        return err(
+          repoErrorFromHttp(
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template tag count',
+            res.error
+          )
+        )
+      }
+
+      return ok({ total: res.data?.total ?? 0 })
     },
     async getTagAssignments(templateId, tag, options) {
       if (USE_MOCK_DATA) {
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index d8e40e1ce..eacfc1498 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -73,17 +73,45 @@ export const templatesRouter = createTRPCRouter({
       z.object({
         templateId: z.string(),
         assignmentLimit: z.number().int().min(1).max(25).optional(),
+        limit: z.number().int().min(1).max(100).optional(),
+        cursor: z.string().optional(),
+        search: z
+          .string()
+          .max(64)
+          .regex(/^[a-z0-9._-]*$/)
+          .optional(),
+        sort: z
+          .enum(['latest_desc', 'latest_asc', 'name_asc', 'name_desc'])
+          .optional(),
       })
     )
     .query(async ({ ctx, input }) => {
       const result = await ctx.templatesRepository.getTagGroups(
         input.templateId,
-        { assignmentLimit: input.assignmentLimit }
+        {
+          assignmentLimit: input.assignmentLimit,
+          tagsLimit: input.limit,
+          tagsCursor: input.cursor,
+          search: input.search,
+          sort: input.sort,
+        }
       )
       if (!result.ok) throwTRPCErrorFromRepoError(result.error)
       return result.data
     }),
 
+  getTagCount: teamTemplatesRepositoryProcedure
+    .input(
+      z.object({
+        templateId: z.string(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const result = await ctx.templatesRepository.getTagCount(input.templateId)
+      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
+      return result.data
+    }),
+
   getTagAssignments: teamTemplatesRepositoryProcedure
     .input(
       z.object({
diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index ecefe6d0f..fa964c672 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -806,13 +806,21 @@ export interface paths {
         };
         /**
          * List template tag groups
-         * @description Returns ready template tag assignment groups with bounded per-tag history.
+         * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
          */
         get: {
             parameters: {
                 query?: {
                     /** @description Maximum number of ready assignment rows to return per tag. */
                     assignmentLimit?: components["parameters"]["tag_assignment_limit"];
+                    /** @description Maximum number of distinct tags to return per page. */
+                    tagsLimit?: components["parameters"]["tag_groups_limit"];
+                    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+                    tagsCursor?: components["parameters"]["tag_groups_cursor"];
+                    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+                    search?: components["parameters"]["tag_groups_search"];
+                    /** @description Sort order for the returned tag groups. */
+                    sort?: components["parameters"]["tag_groups_sort"];
                 };
                 header?: never;
                 path: {
@@ -847,6 +855,52 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/templates/{templateID}/tags/count": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Count template tags
+         * @description Returns the total number of distinct ready tags for the template.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned tag count. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagsCountResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/templates/{templateID}/tags/exists": {
         parameters: {
             query?: never;
@@ -1141,6 +1195,10 @@ export interface components {
             /** Format: uuid */
             id: string;
             email: string;
+            name?: string | null;
+            /** Format: uri */
+            profilePictureUrl?: string | null;
+            providers: string[];
             isDefault: boolean;
             /** Format: uuid */
             addedBy?: string | null;
@@ -1277,6 +1335,15 @@ export interface components {
         };
         TemplateTagGroupsResponse: {
             tags: components["schemas"]["TemplateTagGroup"][];
+            /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
+        TemplateTagsCountResponse: {
+            /**
+             * Format: int64
+             * @description Total distinct ready tags for the template.
+             */
+            total: number;
         };
         TemplateTagExistsResponse: {
             /** @description Whether the template tag has at least one ready assignment. */
@@ -1385,6 +1452,14 @@ export interface components {
         tag_assignments_limit: number;
         /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
         tag_assignments_cursor: string;
+        /** @description Maximum number of distinct tags to return per page. */
+        tag_groups_limit: number;
+        /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+        tag_groups_cursor: string;
+        /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+        tag_groups_search: string;
+        /** @description Sort order for the returned tag groups. */
+        tag_groups_sort: "latest_desc" | "latest_asc" | "name_asc" | "name_desc";
     };
     requestBodies: never;
     headers: never;
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index 80828d229..e81136434 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -7,13 +7,14 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 import { useRouter } from 'next/navigation'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type {
   BuildStatus,
   ListedBuildModel,
   RunningBuildStatusModel,
 } from '@/core/modules/builds/models'
+import { useFilterChangeTracking } from '@/lib/hooks/use-filter-change-tracking'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
@@ -77,8 +78,7 @@ const BuildsTable = ({
 
   const { statuses, buildIdOrTemplate } = filters
   const { isFilterRefetching, clearFilterRefetching } = useFilterChangeTracking(
-    statuses,
-    buildIdOrTemplate
+    [statuses, buildIdOrTemplate]
   )
 
   const {
@@ -340,28 +340,6 @@ function colStyle(width: number) {
   return { width, minWidth: width, maxWidth: width }
 }
 
-function useFilterChangeTracking(
-  statuses: string[],
-  buildIdOrTemplate: string | undefined
-) {
-  const [isFilterRefetching, setIsFilterRefetching] = useState(false)
-  const isFirstRender = useRef(true)
-
-  useEffect(() => {
-    if (isFirstRender.current) {
-      isFirstRender.current = false
-      return
-    }
-    setIsFilterRefetching(true)
-  }, [statuses, buildIdOrTemplate])
-
-  const clearFilterRefetching = useCallback(() => {
-    setIsFilterRefetching(false)
-  }, [])
-
-  return { isFilterRefetching, clearFilterRefetching }
-}
-
 function mergeBuildsWithLiveStatuses(
   builds: ListedBuildModel[],
   runningStatusesData: RunningBuildStatusModel[] | undefined
diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index a5f754f30..3a5deb857 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -66,7 +66,7 @@ export default function AssignTagDialog({
 
   const mutation = useMutation(
     trpc.templates.assignTag.mutationOptions({
-      onSuccess: (data, variables) => {
+      onSuccess: async (data, variables) => {
         const persistedTag =
           existsQuery.data?.normalizedTag ?? data.tags[0] ?? variables.tag
         queryClient.setQueryData(
@@ -77,12 +77,20 @@ export default function AssignTagDialog({
           }),
           { exists: true, normalizedTag: persistedTag }
         )
-        queryClient.invalidateQueries({
-          queryKey: trpc.templates.getTagGroups.queryKey({
-            teamSlug,
-            templateId,
+        await Promise.all([
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
           }),
-        })
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagCount.queryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
+          }),
+        ])
         trackAssign('assign succeeded', {})
       },
       onError: (error) => {
diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index e65c13be1..241fa8d43 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -41,10 +41,14 @@ export default function TagDeleteDialog({
   const queryClient = useQueryClient()
   const { toast } = useToast()
 
-  const tagsQueryKey = trpc.templates.getTagGroups.queryKey({
+  const tagGroupsQueryKey = trpc.templates.getTagGroups.infiniteQueryOptions({
     teamSlug,
     templateId,
-  })
+  }).queryKey
+  const tagCountQueryKey = trpc.templates.getTagCount.queryOptions({
+    teamSlug,
+    templateId,
+  }).queryKey
 
   const deleteTags = useMutation(
     trpc.templates.deleteTags.mutationOptions({
@@ -59,17 +63,6 @@ export default function TagDeleteDialog({
           )
         )
 
-        await queryClient.cancelQueries({ queryKey: tagsQueryKey })
-
-        queryClient.setQueryData(tagsQueryKey, (old) => {
-          if (!old?.tags) return old
-          const removed = new Set(variables.tags)
-          return {
-            ...old,
-            tags: old.tags.filter((t) => !removed.has(t.tag)),
-          }
-        })
-
         await onDeleted?.()
       },
       onError: (error) => {
@@ -77,9 +70,12 @@ export default function TagDeleteDialog({
           defaultErrorToast(error.message || `Failed to delete tag ${tag}.`)
         )
       },
-      onSettled: () => {
+      onSettled: async () => {
         onOpenChange(false)
-        queryClient.invalidateQueries({ queryKey: tagsQueryKey })
+        await Promise.all([
+          queryClient.invalidateQueries({ queryKey: tagGroupsQueryKey }),
+          queryClient.invalidateQueries({ queryKey: tagCountQueryKey }),
+        ])
       },
     })
   )
diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index 3a5d227ef..d56ac9ad5 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -1,33 +1,35 @@
 'use client'
 
-import type { Table } from '@tanstack/react-table'
-import { useCallback } from 'react'
+import { useCallback, useId } from 'react'
+import { cn } from '@/lib/utils'
 import { SearchIcon } from '@/ui/primitives/icons'
 import { DebouncedInput } from '@/ui/primitives/input'
 import AssignTagDialog from './assign-dialog'
 import { useTagTableStore } from './stores/table-store'
-import type { TagGroup } from './types'
+import { TAG_SEARCH_MAX_LEN } from './table-config'
+import TagFormatInvalidTooltip from './tag-format-invalid-tooltip'
 
 interface TagsHeaderProps {
-  table: Table<TagGroup>
   teamSlug: string
   templateId: string
   templateName: string
+  total: number | undefined
+  hasSearch: boolean
+  searchInvalid: boolean
 }
 
 export default function TagsHeader({
-  table,
   teamSlug,
   templateId,
   templateName,
+  total,
+  hasSearch,
+  searchInvalid,
 }: TagsHeaderProps) {
+  const searchId = useId()
   const globalFilter = useTagTableStore((s) => s.globalFilter)
   const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
 
-  const totalCount = table.options.data.length
-  const visibleCount = table.getFilteredRowModel().rows.length
-  const isFiltered = globalFilter.trim().length > 0
-
   const handleSearchChange = useCallback(
     (value: string | number) => {
       setGlobalFilter(String(value))
@@ -38,15 +40,39 @@ export default function TagsHeader({
   return (
     <div className="flex flex-col gap-3">
       <div className="flex items-center gap-2 justify-between">
-        <div className="relative w-full max-w-70">
-          <SearchIcon className="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-fg-tertiary pointer-events-none" />
-          <DebouncedInput
-            placeholder="Search by name"
-            className="pl-[30px]"
-            value={globalFilter}
-            onChange={handleSearchChange}
-            debounce={200}
-          />
+        <div className="w-full max-w-70">
+          <label
+            htmlFor={searchId}
+            className={cn(
+              'flex h-9 w-full min-w-0 items-center gap-2 border bg-transparent px-3',
+              'transition-colors anim-ease-appear anim-duration-fast',
+              'hover:border-stroke-active',
+              'focus-within:border-stroke-active focus-within:bg-bg-highlight',
+              searchInvalid && 'border-accent-error-highlight'
+            )}
+          >
+            <SearchIcon className="size-4 shrink-0 text-fg-tertiary pointer-events-none" />
+            <DebouncedInput
+              id={searchId}
+              placeholder="Search by name"
+              value={globalFilter}
+              onChange={handleSearchChange}
+              debounce={200}
+              aria-invalid={searchInvalid || undefined}
+              className={cn(
+                'prose-body min-w-0 flex-1 border-0 bg-transparent px-0 py-0 shadow-none outline-none',
+                'placeholder:text-fg-tertiary',
+                'hover:bg-transparent focus:bg-transparent',
+                'focus:[border-bottom:none] focus:outline-none',
+                'disabled:cursor-not-allowed disabled:opacity-50'
+              )}
+            />
+            {searchInvalid ? (
+              <span className="flex shrink-0 items-center">
+                <TagFormatInvalidTooltip maxLength={TAG_SEARCH_MAX_LEN} />
+              </span>
+            ) : null}
+          </label>
         </div>
         <AssignTagDialog
           teamSlug={teamSlug}
@@ -68,13 +94,11 @@ export default function TagsHeader({
           </a>
           .
         </p>
-        <p className="prose-body text-fg-tertiary whitespace-nowrap">
-          {isFiltered
-            ? `${visibleCount} of ${totalCount} ${
-                totalCount === 1 ? 'tag' : 'tags'
-              }`
-            : `${totalCount} ${totalCount === 1 ? 'tag' : 'tags'} in total`}
-        </p>
+        {!hasSearch && (
+          <p className="prose-body text-fg-tertiary whitespace-nowrap">
+            {total} tags in total
+          </p>
+        )}
       </div>
     </div>
   )
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index a9707d79e..e42baf8cc 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -56,12 +56,20 @@ export default function ReassignTagDialog({
     trpc.templates.assignTag.mutationOptions({
       onSuccess: async () => {
         trackTagTableInteraction('reassign succeeded', { surface, tag })
-        await queryClient.invalidateQueries({
-          queryKey: trpc.templates.getTagGroups.queryKey({
-            teamSlug,
-            templateId,
+        await Promise.all([
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
           }),
-        })
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagCount.queryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
+          }),
+        ])
         await onReassigned?.()
       },
       onError: (error) => {
diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
index 4257e7860..6e1a10edb 100644
--- a/src/features/dashboard/templates/tags/rollback-dialog.tsx
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -53,12 +53,20 @@ export default function RollbackTagDialog({
     trpc.templates.assignTag.mutationOptions({
       onSuccess: async () => {
         trackTagTableInteraction('rollback succeeded', { surface, tag })
-        await queryClient.invalidateQueries({
-          queryKey: trpc.templates.getTagGroups.queryKey({
-            teamSlug,
-            templateId,
+        await Promise.all([
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
           }),
-        })
+          queryClient.invalidateQueries({
+            queryKey: trpc.templates.getTagCount.queryOptions({
+              teamSlug,
+              templateId,
+            }).queryKey,
+          }),
+        ])
         await onRolledBack?.()
       },
       onError: (error) => {
diff --git a/src/features/dashboard/templates/tags/table-config.tsx b/src/features/dashboard/templates/tags/table-config.tsx
index c6967c5ef..df89faee7 100644
--- a/src/features/dashboard/templates/tags/table-config.tsx
+++ b/src/features/dashboard/templates/tags/table-config.tsx
@@ -1,13 +1,10 @@
 'use client'
 
-import { rankItem } from '@tanstack/match-sorter-utils'
 import {
   type ColumnDef,
-  type FilterFn,
   getCoreRowModel,
   getExpandedRowModel,
-  getFilteredRowModel,
-  getSortedRowModel,
+  type SortingState,
   type TableOptions,
 } from '@tanstack/react-table'
 import posthog from 'posthog-js'
@@ -15,25 +12,58 @@ import { useMemo } from 'react'
 import { ActionsCell, BuildLinkCell, TagPillCell } from './table-cells'
 import type { TagGroup } from './types'
 
-export const fuzzyFilter: FilterFn<TagGroup> = (
-  row,
-  columnId,
-  value,
-  addMeta
-) => {
-  if (!value || !value.length) return true
+export type TagGroupsServerSort =
+  | 'latest_desc'
+  | 'latest_asc'
+  | 'name_asc'
+  | 'name_desc'
 
-  const searchValue = String(value).toLowerCase()
-  const rowValue = row.getValue(columnId)
+const TAG_SEARCH_CHARSET = /[^a-z0-9._-]/g
+const TAG_SEARCH_INPUT_REGEX = /^[a-zA-Z0-9._-]*$/
+export const TAG_SEARCH_MAX_LEN = 64
 
-  if (rowValue == null) return false
+export function hasInvalidTagSearchInput(raw: string): boolean {
+  if (!raw) return false
+  if (raw.length > TAG_SEARCH_MAX_LEN) return true
+  return !TAG_SEARCH_INPUT_REGEX.test(raw)
+}
 
-  const itemStr = String(rowValue).toLowerCase()
-  const itemRank = rankItem(itemStr, searchValue)
+/** Sanitized search sent to the server; omitted while the input is invalid. */
+export function getActiveTagSearch(raw: string): string | undefined {
+  if (hasInvalidTagSearchInput(raw)) return undefined
+  const sanitized = sanitizeTagSearch(raw)
+  return sanitized || undefined
+}
 
-  addMeta({ itemRank })
+export function sanitizeTagSearch(raw: string): string {
+  if (!raw) return ''
+  return raw
+    .toLowerCase()
+    .replace(TAG_SEARCH_CHARSET, '')
+    .slice(0, TAG_SEARCH_MAX_LEN)
+}
 
-  return itemRank.passed
+export function sortingToServerSort(
+  sorting: SortingState
+): TagGroupsServerSort {
+  const head = sorting[0]
+  if (!head || sorting.length !== 1) return 'latest_desc'
+  if (head.id === 'tag') return head.desc ? 'name_desc' : 'name_asc'
+  if (head.id === 'assignedAt') return head.desc ? 'latest_desc' : 'latest_asc'
+  return 'latest_desc'
+}
+
+export function serverSortToSorting(sort: TagGroupsServerSort): SortingState {
+  switch (sort) {
+    case 'latest_desc':
+      return [{ id: 'assignedAt', desc: true }]
+    case 'latest_asc':
+      return [{ id: 'assignedAt', desc: false }]
+    case 'name_asc':
+      return [{ id: 'tag', desc: false }]
+    case 'name_desc':
+      return [{ id: 'tag', desc: true }]
+  }
 }
 
 export const fallbackData: TagGroup[] = []
@@ -57,8 +87,7 @@ export const useTagColumns = () =>
         header: 'Name',
         cell: TagPillCell,
         enableSorting: true,
-        enableGlobalFilter: true,
-        sortingFn: (a, b) => a.original.tag.localeCompare(b.original.tag),
+        enableGlobalFilter: false,
       },
       {
         accessorFn: (row) => row.primaryAssignment.assignedAt,
@@ -69,10 +98,6 @@ export const useTagColumns = () =>
         enableSorting: true,
         enableGlobalFilter: false,
         sortDescFirst: true,
-        sortingFn: (a, b) =>
-          a.original.primaryAssignment.assignedAt.localeCompare(
-            b.original.primaryAssignment.assignedAt
-          ),
       },
       {
         id: 'actions',
@@ -87,16 +112,13 @@ export const useTagColumns = () =>
 
 export const tagsTableConfig: Partial<TableOptions<TagGroup>> = {
   getRowId: (row) => row.tag,
-  filterFns: { fuzzy: fuzzyFilter },
   getCoreRowModel: getCoreRowModel(),
-  getFilteredRowModel: getFilteredRowModel(),
-  getSortedRowModel: getSortedRowModel(),
   getExpandedRowModel: getExpandedRowModel(),
+  manualSorting: true,
+  manualFiltering: true,
   enableSorting: true,
   enableMultiSort: false,
   enableSortingRemoval: false,
-  enableGlobalFilter: true,
+  enableGlobalFilter: false,
   enableColumnResizing: false,
-  // @ts-expect-error globalFilterFn keyed by string is valid at runtime
-  globalFilterFn: 'fuzzy',
 }
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index be5e7e9d1..a9b1447e6 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -1,6 +1,11 @@
 'use client'
 
-import { useSuspenseQuery } from '@tanstack/react-query'
+import {
+  keepPreviousData,
+  useInfiniteQuery,
+  useQuery,
+  useSuspenseQuery,
+} from '@tanstack/react-query'
 import {
   flexRender,
   type Row,
@@ -18,7 +23,9 @@ import {
 } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { TemplateTagAssignment } from '@/core/modules/templates/models'
+import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cells'
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
+import { useFilterChangeTracking } from '@/lib/hooks/use-filter-change-tracking'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import {
@@ -29,6 +36,7 @@ import {
   DataTableRow,
 } from '@/ui/data-table'
 import { TriangleIcon } from '@/ui/primitives/icons'
+import { Loader } from '@/ui/primitives/loader'
 import { RowHoverFrame } from '@/ui/row-hover-frame'
 import TagsEmpty from './empty'
 import TagsHeader from './header'
@@ -37,12 +45,17 @@ import RollbackTagDialog from './rollback-dialog'
 import { useTagTableStore } from './stores/table-store'
 import {
   fallbackData,
+  getActiveTagSearch,
+  hasInvalidTagSearchInput,
+  sortingToServerSort,
   tagsTableConfig,
   trackTagTableInteraction,
   useTagColumns,
 } from './table-config'
 import type { TagGroup } from './types'
 
+const TAGS_PAGE_LIMIT = 50
+
 interface TagsTableProps {
   teamSlug: string
   templateId: string
@@ -53,17 +66,63 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
 
   const trpc = useTRPC()
 
-  const { data: tagsData } = useSuspenseQuery(
-    trpc.templates.getTagGroups.queryOptions(
-      { teamSlug, templateId },
+  const sorting = useTagTableStore((s) => s.sorting)
+  const setSorting = useTagTableStore((s) => s.setSorting)
+  const globalFilter = useTagTableStore((s) => s.globalFilter)
+  const expanded = useTagTableStore((s) => s.expanded)
+  const setExpanded = useTagTableStore((s) => s.setExpanded)
+  const resetFilters = useTagTableStore((s) => s.resetFilters)
+
+  useEffect(() => {
+    return () => resetFilters()
+  }, [resetFilters])
+
+  const activeSearch = useMemo(
+    () => getActiveTagSearch(globalFilter),
+    [globalFilter]
+  )
+  const serverSort = useMemo(() => sortingToServerSort(sorting), [sorting])
+  const searchInvalid = hasInvalidTagSearchInput(globalFilter)
+
+  const {
+    data: tagsData,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+    isFetching,
+    isPending,
+  } = useInfiniteQuery(
+    trpc.templates.getTagGroups.infiniteQueryOptions(
       {
-        refetchOnMount: false,
+        teamSlug,
+        templateId,
+        limit: TAGS_PAGE_LIMIT,
+        search: activeSearch,
+        sort: serverSort,
+      },
+      {
+        getNextPageParam: (page) => page.nextCursor ?? undefined,
+        initialCursor: undefined,
+        placeholderData: keepPreviousData,
         refetchOnWindowFocus: true,
-        refetchOnReconnect: true,
       }
     )
   )
 
+  const { data: countData } = useQuery(
+    trpc.templates.getTagCount.queryOptions(
+      { teamSlug, templateId },
+      { staleTime: 30_000, refetchOnWindowFocus: false }
+    )
+  )
+
+  const { isFilterRefetching, clearFilterRefetching } = useFilterChangeTracking(
+    [activeSearch, serverSort]
+  )
+  useEffect(() => {
+    if (!isFetching && isFilterRefetching) clearFilterRefetching()
+  }, [isFetching, isFilterRefetching, clearFilterRefetching])
+
   const { data: templateData } = useSuspenseQuery(
     trpc.templates.getTemplate.queryOptions(
       { teamSlug, templateId },
@@ -80,45 +139,32 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
     [templateData]
   )
 
-  const groups = useMemo<TagGroup[]>(
-    () =>
-      tagsData.tags.flatMap((group) => {
+  const groups = useMemo<TagGroup[]>(() => {
+    const pages = tagsData?.pages ?? []
+    const out: TagGroup[] = []
+    for (const page of pages) {
+      for (const group of page.tags) {
         const primaryAssignment = group.assignments[0]
-        if (!primaryAssignment) return []
-
-        return [
-          {
-            tag: group.tag,
-            primaryAssignment,
-            assignments: group.assignments,
-            hasMore: group.hasMore,
-          },
-        ]
-      }),
-    [tagsData.tags]
-  )
-
-  const sorting = useTagTableStore((s) => s.sorting)
-  const setSorting = useTagTableStore((s) => s.setSorting)
-  const globalFilter = useTagTableStore((s) => s.globalFilter)
-  const setGlobalFilter = useTagTableStore((s) => s.setGlobalFilter)
-  const expanded = useTagTableStore((s) => s.expanded)
-  const setExpanded = useTagTableStore((s) => s.setExpanded)
-  const resetFilters = useTagTableStore((s) => s.resetFilters)
-
-  useEffect(() => {
-    return () => resetFilters()
-  }, [resetFilters])
+        if (!primaryAssignment) continue
+        out.push({
+          tag: group.tag,
+          primaryAssignment,
+          assignments: group.assignments,
+          hasMore: group.hasMore,
+        })
+      }
+    }
+    return out
+  }, [tagsData])
 
   const columns = useTagColumns()
 
   const table = useReactTable<TagGroup>({
     ...tagsTableConfig,
-    data: groups ?? fallbackData,
+    data: groups.length > 0 ? groups : fallbackData,
     columns,
-    state: { sorting, globalFilter, expanded },
+    state: { sorting, expanded },
     onSortingChange: setSorting,
-    onGlobalFilterChange: setGlobalFilter,
     onExpandedChange: setExpanded,
     getRowCanExpand: (row) =>
       row.original.assignments.length > 1 || row.original.hasMore,
@@ -126,14 +172,28 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   } as TableOptions<TagGroup>)
 
   const rows = table.getRowModel().rows
+  const hasData = groups.length > 0
+  const showLoader = isPending && !hasData
+  const showEmpty = !isPending && !isFetching && !hasData
+  const showFilterRefetchingOverlay = isFilterRefetching && hasData
+
+  const handleLoadMore = useCallback(() => {
+    fetchNextPage()
+    trackTagTableInteraction('page_fetched', {
+      has_search: activeSearch !== undefined,
+      sort: serverSort,
+    })
+  }, [fetchNextPage, activeSearch, serverSort])
 
   return (
     <div className="flex flex-col gap-6 h-full min-h-0">
       <TagsHeader
-        table={table}
         teamSlug={teamSlug}
         templateId={templateId}
         templateName={templateName}
+        total={countData?.total}
+        hasSearch={activeSearch !== undefined}
+        searchInvalid={searchInvalid}
       />
       <div className="flex-1 min-h-0 overflow-y-auto overflow-x-hidden -mx-8 px-8 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
         <DataTable className="w-full">
@@ -174,10 +234,21 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
             ))}
           </DataTableHeader>
 
-          {rows.length === 0 ? (
-            <TagsEmpty hasSearch={globalFilter.trim().length > 0} />
-          ) : (
-            <div className="flex flex-col divide-y divide-stroke/80">
+          {showLoader && (
+            <div className="h-[35svh] w-full flex items-center justify-center">
+              <Loader variant="slash" size="lg" />
+            </div>
+          )}
+
+          {showEmpty && <TagsEmpty hasSearch={activeSearch !== undefined} />}
+
+          {hasData && (
+            <div
+              className={cn(
+                'flex flex-col divide-y divide-stroke/80',
+                showFilterRefetchingOverlay && 'opacity-70 transition-opacity'
+              )}
+            >
               {rows.map((row) => (
                 <GroupSection
                   key={row.id}
@@ -189,6 +260,15 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
               ))}
             </div>
           )}
+
+          {hasNextPage && (
+            <div className="flex w-full items-center justify-center py-3">
+              <LoadMoreButton
+                isLoading={isFetchingNextPage}
+                onLoadMore={handleLoadMore}
+              />
+            </div>
+          )}
         </DataTable>
       </div>
     </div>
@@ -271,7 +351,6 @@ function GroupSection({
         )}
       >
         {canExpand && (
-          // increase hit box size
           <span
             aria-hidden
             className={cn(
diff --git a/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx b/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
new file mode 100644
index 000000000..a5eda1ee0
--- /dev/null
+++ b/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import { TAG_MAX_LENGTH } from './helpers'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/ui/primitives/tooltip'
+
+interface TagFormatInvalidTooltipProps {
+  maxLength?: number
+}
+
+export default function TagFormatInvalidTooltip({
+  maxLength = TAG_MAX_LENGTH,
+}: TagFormatInvalidTooltipProps) {
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <span className="prose-body whitespace-nowrap text-accent-error-highlight decoration-dotted underline-offset-2">
+          Invalid format
+        </span>
+      </TooltipTrigger>
+      <TooltipContent
+        side="bottom"
+        align="end"
+        alignOffset={-13}
+        sideOffset={12}
+        className="max-w-[260px]"
+      >
+        <p className="prose-body font-mono text-fg-secondary">
+          <span className="font-sans text-fg-tertiary">Allowed: </span>
+          <span className="text-fg">a-z</span>,
+          <span className="text-fg">0-9</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">.</span>
+          <span className="text-fg-tertiary">)</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">_</span>
+          <span className="text-fg-tertiary">)</span>
+          <span className="text-fg-tertiary">,(</span>
+          <span className="text-fg">-</span>
+          <span className="text-fg-tertiary">)</span>
+          <br />
+          <span className="font-sans text-fg-tertiary">
+            Max {maxLength} characters
+          </span>
+        </p>
+      </TooltipContent>
+    </Tooltip>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/tag-name-field.tsx b/src/features/dashboard/templates/tags/tag-name-field.tsx
index 78ff9ebb6..c78a880cb 100644
--- a/src/features/dashboard/templates/tags/tag-name-field.tsx
+++ b/src/features/dashboard/templates/tags/tag-name-field.tsx
@@ -2,14 +2,8 @@
 
 import { type ReactElement, useId } from 'react'
 import { cn } from '@/lib/utils'
-import { SearchIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@/ui/primitives/tooltip'
-import { TAG_MAX_LENGTH } from './helpers'
+import TagFormatInvalidTooltip from './tag-format-invalid-tooltip'
 
 export type TagNameStatus =
   | 'idle'
@@ -33,41 +27,7 @@ const STATUS_INDICATOR: Partial<Record<TagNameStatus, ReactElement>> = {
       Already exists
     </span>
   ),
-  invalid: (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <span className="prose-body whitespace-nowrap text-accent-error-highlight decoration-dotted underline-offset-2">
-          Invalid format
-        </span>
-      </TooltipTrigger>
-      <TooltipContent
-        side="bottom"
-        align="end"
-        alignOffset={-13}
-        sideOffset={12}
-        className="max-w-[260px]"
-      >
-        <p className="prose-body font-mono text-fg-secondary">
-          <span className="font-sans text-fg-tertiary">Allowed: </span>
-          <span className="text-fg">a-z</span>,
-          <span className="text-fg">0-9</span>
-          <span className="text-fg-tertiary">,(</span>
-          <span className="text-fg">.</span>
-          <span className="text-fg-tertiary">)</span>
-          <span className="text-fg-tertiary">,(</span>
-          <span className="text-fg">_</span>
-          <span className="text-fg-tertiary">)</span>
-          <span className="text-fg-tertiary">,(</span>
-          <span className="text-fg">-</span>
-          <span className="text-fg-tertiary">)</span>
-          <br />
-          <span className="font-sans text-fg-tertiary">
-            Max {TAG_MAX_LENGTH} characters
-          </span>
-        </p>
-      </TooltipContent>
-    </Tooltip>
-  ),
+  invalid: <TagFormatInvalidTooltip />,
 }
 
 export default function TagNameField({
diff --git a/src/lib/hooks/use-filter-change-tracking.ts b/src/lib/hooks/use-filter-change-tracking.ts
new file mode 100644
index 000000000..f130cf722
--- /dev/null
+++ b/src/lib/hooks/use-filter-change-tracking.ts
@@ -0,0 +1,26 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+/**
+ * Tracks when any value in `deps` changes after the first render and exposes a
+ * `isFilterRefetching` flag that callers clear once their underlying fetch
+ * settles. Use to drive a refetch overlay on tables that paginate via
+ * server-side filters/sort.
+ */
+export function useFilterChangeTracking(deps: unknown[]) {
+  const [isFilterRefetching, setIsFilterRefetching] = useState(false)
+  const isFirstRender = useRef(true)
+
+  useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false
+      return
+    }
+    setIsFilterRefetching(true)
+  }, deps)
+
+  const clearFilterRefetching = useCallback(() => {
+    setIsFilterRefetching(false)
+  }, [])
+
+  return { isFilterRefetching, clearFilterRefetching }
+}
diff --git a/tests/unit/assign-tag-dialog-helpers.test.ts b/tests/unit/assign-tag-dialog-helpers.test.ts
index 6d5937f2c..10a6885d0 100644
--- a/tests/unit/assign-tag-dialog-helpers.test.ts
+++ b/tests/unit/assign-tag-dialog-helpers.test.ts
@@ -5,7 +5,7 @@ import {
   isValidUuid,
   normalizeTagInput,
   TAG_MAX_LENGTH,
-} from '@/features/dashboard/templates/tags/assign-dialog.helpers'
+} from '@/features/dashboard/templates/tags/helpers'
 
 describe('normalizeTagInput', () => {
   it('lowercases ASCII letters so user input matches the server normalization', () => {
diff --git a/tests/unit/tag-groups-helpers.test.ts b/tests/unit/tag-groups-helpers.test.ts
new file mode 100644
index 000000000..674399523
--- /dev/null
+++ b/tests/unit/tag-groups-helpers.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from 'vitest'
+import {
+  getActiveTagSearch,
+  hasInvalidTagSearchInput,
+  sanitizeTagSearch,
+  serverSortToSorting,
+  sortingToServerSort,
+} from '@/features/dashboard/templates/tags/table-config'
+
+describe('sanitizeTagSearch', () => {
+  it('returns empty for empty input', () => {
+    expect(sanitizeTagSearch('')).toBe('')
+  })
+
+  it('lowercases ASCII letters', () => {
+    expect(sanitizeTagSearch('PROD')).toBe('prod')
+  })
+
+  it('keeps dots, underscores, hyphens', () => {
+    expect(sanitizeTagSearch('a_b-c.d')).toBe('a_b-c.d')
+  })
+
+  it('strips disallowed characters', () => {
+    expect(sanitizeTagSearch('prod@v1!')).toBe('prodv1')
+    expect(sanitizeTagSearch('%')).toBe('')
+    expect(sanitizeTagSearch('a b c')).toBe('abc')
+  })
+
+  it('caps length at 64 characters', () => {
+    const long = 'a'.repeat(80)
+    expect(sanitizeTagSearch(long)).toHaveLength(64)
+  })
+
+  it('treats all-invalid input as empty', () => {
+    expect(sanitizeTagSearch('@@@')).toBe('')
+  })
+})
+
+describe('getActiveTagSearch', () => {
+  it('returns undefined for empty input', () => {
+    expect(getActiveTagSearch('')).toBeUndefined()
+  })
+
+  it('returns sanitized value for valid input', () => {
+    expect(getActiveTagSearch('PROD')).toBe('prod')
+  })
+
+  it('returns undefined while input is invalid', () => {
+    expect(getActiveTagSearch('${}1')).toBeUndefined()
+    expect(getActiveTagSearch('@@@')).toBeUndefined()
+  })
+})
+
+describe('hasInvalidTagSearchInput', () => {
+  it('returns false for empty input', () => {
+    expect(hasInvalidTagSearchInput('')).toBe(false)
+  })
+
+  it('returns false for allowed characters only', () => {
+    expect(hasInvalidTagSearchInput('prod_v1')).toBe(false)
+    expect(hasInvalidTagSearchInput('PROD')).toBe(false)
+  })
+
+  it('returns true when any disallowed character is present', () => {
+    expect(hasInvalidTagSearchInput('${}1')).toBe(true)
+    expect(hasInvalidTagSearchInput('prod@v1')).toBe(true)
+    expect(hasInvalidTagSearchInput('a b')).toBe(true)
+  })
+
+  it('returns true when input exceeds max length', () => {
+    expect(hasInvalidTagSearchInput('a'.repeat(65))).toBe(true)
+  })
+})
+
+describe('sortingToServerSort', () => {
+  it('returns latest_desc for empty sorting', () => {
+    expect(sortingToServerSort([])).toBe('latest_desc')
+  })
+
+  it('returns latest_desc for multi-column sorting (server only supports single)', () => {
+    expect(
+      sortingToServerSort([
+        { id: 'tag', desc: false },
+        { id: 'assignedAt', desc: true },
+      ])
+    ).toBe('latest_desc')
+  })
+
+  it('maps assignedAt desc/asc', () => {
+    expect(sortingToServerSort([{ id: 'assignedAt', desc: true }])).toBe(
+      'latest_desc'
+    )
+    expect(sortingToServerSort([{ id: 'assignedAt', desc: false }])).toBe(
+      'latest_asc'
+    )
+  })
+
+  it('maps tag asc/desc', () => {
+    expect(sortingToServerSort([{ id: 'tag', desc: false }])).toBe('name_asc')
+    expect(sortingToServerSort([{ id: 'tag', desc: true }])).toBe('name_desc')
+  })
+
+  it('defaults unknown column id to latest_desc', () => {
+    expect(sortingToServerSort([{ id: 'unknown', desc: false }])).toBe(
+      'latest_desc'
+    )
+  })
+})
+
+describe('serverSortToSorting', () => {
+  it('round-trips with sortingToServerSort for every variant', () => {
+    const variants = [
+      'latest_desc',
+      'latest_asc',
+      'name_asc',
+      'name_desc',
+    ] as const
+    for (const v of variants) {
+      expect(sortingToServerSort(serverSortToSorting(v))).toBe(v)
+    }
+  })
+})

From 10c064044832400892a071d72a400688729c320e Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 11:30:08 +0200
Subject: [PATCH 52/90] fix max width for dialgos

---
 src/features/dashboard/templates/tags/assign-dialog.tsx   | 2 +-
 src/features/dashboard/templates/tags/reassign-dialog.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 3a5deb857..79e6ceb2d 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -200,7 +200,7 @@ export default function AssignTagDialog({
 
       <DialogContent
         hideClose={stage === 'pending'}
-        className="sm:max-w-[430px] sm:h-[422px] gap-4"
+        className="sm:max-w-[440px] sm:h-[422px] gap-4"
         onPointerDownOutside={(e) => {
           if (stage === 'pending') e.preventDefault()
         }}
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index e42baf8cc..3b3e608ef 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -130,7 +130,7 @@ export default function ReassignTagDialog({
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogContent
         hideClose={stage === 'pending'}
-        className="sm:max-w-[430px] sm:h-[406px]"
+        className="sm:max-w-[440px] sm:h-[406px]"
         onPointerDownOutside={(e) => {
           if (stage === 'pending') e.preventDefault()
         }}

From 09f2e842501f245e2a42d68e8ba8859d7ea5c77b Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:11:01 +0200
Subject: [PATCH 53/90] Fix assign dialog tag field state

---
 .../templates/tags/assign-dialog.tsx          | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 79e6ceb2d..3ea4622e4 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -2,7 +2,7 @@
 
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import posthog from 'posthog-js'
-import { type FormEvent, useEffect, useId, useMemo, useState } from 'react'
+import { type FormEvent, useEffect, useId, useState } from 'react'
 import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
 import { useTRPC } from '@/trpc/client'
 import { Button } from '@/ui/primitives/button'
@@ -66,17 +66,7 @@ export default function AssignTagDialog({
 
   const mutation = useMutation(
     trpc.templates.assignTag.mutationOptions({
-      onSuccess: async (data, variables) => {
-        const persistedTag =
-          existsQuery.data?.normalizedTag ?? data.tags[0] ?? variables.tag
-        queryClient.setQueryData(
-          trpc.templates.checkTagExists.queryKey({
-            teamSlug,
-            templateId,
-            tag: persistedTag,
-          }),
-          { exists: true, normalizedTag: persistedTag }
-        )
+      onSuccess: async () => {
         await Promise.all([
           queryClient.invalidateQueries({
             queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
@@ -115,22 +105,21 @@ export default function AssignTagDialog({
     if (mutation.isError) mutation.reset()
   }
 
-  const nameStatus: TagNameStatus = useMemo(() => {
+  const nameStatus = computeNameStatus()
+
+  function computeNameStatus(): TagNameStatus {
     if (name.trim() === '') return 'idle'
-    if (name.length > TAG_MAX_LENGTH || !TAG_REGEX.test(name)) {
-      return 'invalid'
-    }
+    if (name.length > TAG_MAX_LENGTH || !TAG_REGEX.test(name)) return 'invalid'
     if (name !== normalizedDebouncedName) return 'checking'
     if (!hasValidShape) return 'invalid'
     if (existsQuery.isFetching) return 'checking'
 
     const data = existsQuery.data
-    if (!data || data.normalizedTag !== normalizedDebouncedName) {
+    if (!data || data.normalizedTag !== normalizedDebouncedName)
       return 'checking'
-    }
 
     return data.exists ? 'exists' : 'available'
-  }, [name, normalizedDebouncedName, hasValidShape, existsQuery])
+  }
 
   const canSubmit =
     nameStatus === 'available' &&

From f7eea337b86cdbb52560f8f9e242eab081d3ede3 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:25:09 +0200
Subject: [PATCH 54/90] Polish ui

---
 .../templates/[templateId]/(detail-tabs)/overview/page.tsx    | 2 +-
 .../templates/[templateId]/(detail-tabs)/tags/page.tsx        | 2 +-
 .../dashboard/templates/detail/overview/template-section.tsx  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index 59c935a72..7fe8ed28c 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -11,7 +11,7 @@ export default async function TemplateOverviewPage({
   prefetch(trpc.templates.getTemplate.queryOptions({ teamSlug, templateId }))
 
   return (
-    <div className="p-3 md:p-6 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
+    <div className="p-6 md:p-10 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
       <Suspense fallback={<TemplateOverviewSkeleton />}>
         <TemplateOverview teamSlug={teamSlug} templateId={templateId} />
       </Suspense>
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
index 8d64dc753..d1227464d 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
@@ -8,7 +8,7 @@ export default async function TemplateTagsPage({
   const { teamSlug, templateId } = await params
 
   return (
-    <div className="h-full min-h-0 flex-1 py-6 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
+    <div className="h-full min-h-0 flex-1 py-6 md:py-10 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
       <Suspense fallback={<LoadingLayout />}>
         <TagsTable teamSlug={teamSlug} templateId={templateId} />
       </Suspense>
diff --git a/src/features/dashboard/templates/detail/overview/template-section.tsx b/src/features/dashboard/templates/detail/overview/template-section.tsx
index 002c049ef..2ed668c5b 100644
--- a/src/features/dashboard/templates/detail/overview/template-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-section.tsx
@@ -55,7 +55,7 @@ export function TemplateSection({ template, teamSlug }: TemplateSectionProps) {
       <div className="flex flex-wrap items-center gap-x-3 gap-y-1 text-fg-secondary prose-body">
         <MetaItem>
           <span className="text-fg-tertiary">Created</span>{' '}
-          <span className="font-mono prose-body-numeric">
+          <span className="prose-body-regular">
             {created?.datePart ?? '--'} {created?.timePart ?? ''}
           </span>
         </MetaItem>
@@ -64,7 +64,7 @@ export function TemplateSection({ template, teamSlug }: TemplateSectionProps) {
           {modified ? (
             <>
               <span className="text-fg-tertiary">Modified</span>{' '}
-              <span className="font-mono prose-body-numeric">
+              <span className="prose-body-regular">
                 {modified.datePart} {modified.timePart}
               </span>
             </>

From 7337c8f7d314729854561ef6d17749a080377c8e Mon Sep 17 00:00:00 2001
From: drankou <25752851+drankou@users.noreply.github.com>
Date: Tue, 2 Jun 2026 10:31:51 +0000
Subject: [PATCH 55/90] style: apply biome formatting

---
 .../shared/contracts/dashboard-api.types.ts   | 2920 ++++++++---------
 .../tags/tag-format-invalid-tooltip.tsx       |    2 +-
 2 files changed, 1461 insertions(+), 1461 deletions(-)

diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index fa964c672..2e120cb6b 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -4,1466 +4,1466 @@
  */
 
 export interface paths {
-    "/health": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Health check */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Health check successful */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["HealthResponse"];
-                    };
-                };
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** List team builds */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Optional filter by build identifier, template identifier, or template alias. */
-                    build_id_or_template?: components["parameters"]["build_id_or_template"];
-                    /** @description Comma-separated list of build statuses to include. */
-                    statuses?: components["parameters"]["build_statuses"];
-                    /** @description Maximum number of items to return per page. */
-                    limit?: components["parameters"]["builds_limit"];
-                    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-                    cursor?: components["parameters"]["builds_cursor"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned paginated builds. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildsListResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds/statuses": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get build statuses */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Comma-separated list of build IDs to get statuses for. */
-                    build_ids: components["parameters"]["build_ids"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned build statuses */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildsStatusesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds/{build_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get build details */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the build. */
-                    build_id: components["parameters"]["build_id"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned build details. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildInfo"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/sandboxes/{sandboxID}/record": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get sandbox record */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the sandbox. */
-                    sandboxID: components["parameters"]["sandboxID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned sandbox details. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SandboxRecord"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List user teams
-         * @description Returns all teams the authenticated user belongs to, with limits and default flag.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned user teams. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["UserTeamsResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        /** Create team */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["CreateTeamRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully created team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/users/{userId}/bootstrap": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Bootstrap user */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully bootstrapped user. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/teams/bootstrap": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /**
-         * Bootstrap team
-         * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
-         */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminTeamBootstrapRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully bootstrapped team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-                502: components["responses"]["502"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/resolve": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Resolve user profiles */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminAuthProviderProfilesResolveRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully resolved profiles. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/by-email": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Lookup user profiles by email */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminAuthProviderProfilesLookupEmailRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully found matching profiles. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get user profile */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully found profile. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/resolve": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Resolve team identity
-         * @description Resolves a team slug to the team's identity, validating the user is a member.
-         */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Team slug to resolve. */
-                    slug: components["parameters"]["teamSlug"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully resolved team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/{teamID}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        /** Update team */
-        patch: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["UpdateTeamRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully updated team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["UpdateTeamResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        trace?: never;
-    };
-    "/teams/{teamID}/members": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** List team members */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned team members. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamMembersResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        /** Add team member */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AddTeamMemberRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully added team member. */
-                201: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content?: never;
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/{teamID}/members/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        post?: never;
-        /** Remove team member */
-        delete: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully removed team member. */
-                204: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content?: never;
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/defaults": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List default templates
-         * @description Returns the list of default templates with their latest build info and aliases.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned default templates. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["DefaultTemplatesResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Get template
-         * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned the template. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateDetail"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/groups": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List template tag groups
-         * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
-         */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Maximum number of ready assignment rows to return per tag. */
-                    assignmentLimit?: components["parameters"]["tag_assignment_limit"];
-                    /** @description Maximum number of distinct tags to return per page. */
-                    tagsLimit?: components["parameters"]["tag_groups_limit"];
-                    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-                    tagsCursor?: components["parameters"]["tag_groups_cursor"];
-                    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-                    search?: components["parameters"]["tag_groups_search"];
-                    /** @description Sort order for the returned tag groups. */
-                    sort?: components["parameters"]["tag_groups_sort"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned template tag groups. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagGroupsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/count": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Count template tags
-         * @description Returns the total number of distinct ready tags for the template.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned tag count. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagsCountResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/exists": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Check ready template tag existence
-         * @description Checks whether a template tag has at least one ready assignment.
-         */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Template tag name to check. */
-                    tag: components["parameters"]["tag"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully checked template tag existence. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagExistsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/{tag}/assignments": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List ready assignments for a single template tag
-         * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
-         */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-                    cursor?: components["parameters"]["tag_assignments_cursor"];
-                    /** @description Maximum number of assignment rows to return per page. */
-                    limit?: components["parameters"]["tag_assignments_limit"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                    /** @description Template tag name. */
-                    tag: components["parameters"]["tag_path"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned tag assignment page. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagAssignmentsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
+  '/health': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Health check */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Health check successful */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['HealthResponse']
+          }
+        }
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** List team builds */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Optional filter by build identifier, template identifier, or template alias. */
+          build_id_or_template?: components['parameters']['build_id_or_template']
+          /** @description Comma-separated list of build statuses to include. */
+          statuses?: components['parameters']['build_statuses']
+          /** @description Maximum number of items to return per page. */
+          limit?: components['parameters']['builds_limit']
+          /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+          cursor?: components['parameters']['builds_cursor']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned paginated builds. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildsListResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds/statuses': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get build statuses */
+    get: {
+      parameters: {
+        query: {
+          /** @description Comma-separated list of build IDs to get statuses for. */
+          build_ids: components['parameters']['build_ids']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned build statuses */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildsStatusesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds/{build_id}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get build details */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the build. */
+          build_id: components['parameters']['build_id']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned build details. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildInfo']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/sandboxes/{sandboxID}/record': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get sandbox record */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the sandbox. */
+          sandboxID: components['parameters']['sandboxID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned sandbox details. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['SandboxRecord']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List user teams
+     * @description Returns all teams the authenticated user belongs to, with limits and default flag.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned user teams. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['UserTeamsResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    /** Create team */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['CreateTeamRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully created team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/users/{userId}/bootstrap': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Bootstrap user */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully bootstrapped user. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/teams/bootstrap': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /**
+     * Bootstrap team
+     * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
+     */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminTeamBootstrapRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully bootstrapped team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+        502: components['responses']['502']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/resolve': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Resolve user profiles */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminAuthProviderProfilesResolveRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully resolved profiles. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/by-email': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Lookup user profiles by email */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminAuthProviderProfilesLookupEmailRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully found matching profiles. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/{userId}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get user profile */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully found profile. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/resolve': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Resolve team identity
+     * @description Resolves a team slug to the team's identity, validating the user is a member.
+     */
+    get: {
+      parameters: {
+        query: {
+          /** @description Team slug to resolve. */
+          slug: components['parameters']['teamSlug']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully resolved team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/{teamID}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    /** Update team */
+    patch: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['UpdateTeamRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully updated team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['UpdateTeamResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    trace?: never
+  }
+  '/teams/{teamID}/members': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** List team members */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned team members. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamMembersResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    /** Add team member */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AddTeamMemberRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully added team member. */
+        201: {
+          headers: {
+            [name: string]: unknown
+          }
+          content?: never
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/{teamID}/members/{userId}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    post?: never
+    /** Remove team member */
+    delete: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully removed team member. */
+        204: {
+          headers: {
+            [name: string]: unknown
+          }
+          content?: never
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/defaults': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List default templates
+     * @description Returns the list of default templates with their latest build info and aliases.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned default templates. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['DefaultTemplatesResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Get template
+     * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned the template. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateDetail']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/groups': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List template tag groups
+     * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
+     */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Maximum number of ready assignment rows to return per tag. */
+          assignmentLimit?: components['parameters']['tag_assignment_limit']
+          /** @description Maximum number of distinct tags to return per page. */
+          tagsLimit?: components['parameters']['tag_groups_limit']
+          /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+          tagsCursor?: components['parameters']['tag_groups_cursor']
+          /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+          search?: components['parameters']['tag_groups_search']
+          /** @description Sort order for the returned tag groups. */
+          sort?: components['parameters']['tag_groups_sort']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned template tag groups. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagGroupsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/count': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Count template tags
+     * @description Returns the total number of distinct ready tags for the template.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned tag count. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagsCountResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/exists': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Check ready template tag existence
+     * @description Checks whether a template tag has at least one ready assignment.
+     */
+    get: {
+      parameters: {
+        query: {
+          /** @description Template tag name to check. */
+          tag: components['parameters']['tag']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully checked template tag existence. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagExistsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/{tag}/assignments': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List ready assignments for a single template tag
+     * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
+     */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+          cursor?: components['parameters']['tag_assignments_cursor']
+          /** @description Maximum number of assignment rows to return per page. */
+          limit?: components['parameters']['tag_assignments_limit']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+          /** @description Template tag name. */
+          tag: components['parameters']['tag_path']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned tag assignment page. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagAssignmentsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
 }
-export type webhooks = Record<string, never>;
+export type webhooks = Record<string, never>
 export interface components {
-    schemas: {
-        Error: {
-            /**
-             * Format: int32
-             * @description Error code.
-             */
-            code: number;
-            /** @description Error message. */
-            message: string;
-        };
-        AdminAuthProviderProfile: {
-            /**
-             * Format: uuid
-             * @description Internal E2B user identifier.
-             */
-            userId: string;
-            /** @description Email address from the configured auth provider. */
-            email: string | null;
-        };
-        AdminAuthProviderProfilesResponse: {
-            profiles: components["schemas"]["AdminAuthProviderProfile"][];
-        };
-        AdminAuthProviderProfilesResolveRequest: {
-            userIds: string[];
-        };
-        AdminAuthProviderProfilesLookupEmailRequest: {
-            /** Format: email */
-            email: string;
-        };
-        AdminTeamBootstrapRequest: {
-            /** @description Team name. */
-            name: string;
-            /**
-             * Format: email
-             * @description Billing/contact email for the team.
-             */
-            email: string;
-        };
-        /**
-         * @description Build status mapped for dashboard clients.
-         * @enum {string}
-         */
-        BuildStatus: "building" | "failed" | "success";
-        ListedBuild: {
-            /**
-             * Format: uuid
-             * @description Identifier of the build.
-             */
-            id: string;
-            /** @description Template alias when present, otherwise template ID. */
-            template: string;
-            /** @description Identifier of the template. */
-            templateId: string;
-            status: components["schemas"]["BuildStatus"];
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-            /**
-             * Format: date-time
-             * @description Build creation timestamp in RFC3339 format.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-        };
-        BuildsListResponse: {
-            data: components["schemas"]["ListedBuild"][];
-            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        BuildStatusItem: {
-            /**
-             * Format: uuid
-             * @description Identifier of the build.
-             */
-            id: string;
-            status: components["schemas"]["BuildStatus"];
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-        };
-        BuildsStatusesResponse: {
-            /** @description List of build statuses */
-            buildStatuses: components["schemas"]["BuildStatusItem"][];
-        };
-        BuildInfo: {
-            /** @description Template names related to this build, if available. */
-            names?: string[] | null;
-            /**
-             * Format: date-time
-             * @description Build creation timestamp in RFC3339 format.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-            status: components["schemas"]["BuildStatus"];
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-        };
-        /**
-         * Format: int64
-         * @description CPU cores for the sandbox
-         */
-        CPUCount: number;
-        /**
-         * Format: int64
-         * @description Memory for the sandbox in MiB
-         */
-        MemoryMB: number;
-        /**
-         * Format: int64
-         * @description Disk size for the sandbox in MiB
-         */
-        DiskSizeMB: number;
-        SandboxRecord: {
-            /** @description Identifier of the template from which is the sandbox created */
-            templateID: string;
-            /** @description Alias of the template */
-            alias?: string;
-            /** @description Identifier of the sandbox */
-            sandboxID: string;
-            /**
-             * Format: date-time
-             * @description Time when the sandbox was started
-             */
-            startedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the sandbox was stopped
-             */
-            stoppedAt?: string | null;
-            /** @description Base domain where the sandbox traffic is accessible */
-            domain?: string | null;
-            cpuCount: components["schemas"]["CPUCount"];
-            memoryMB: components["schemas"]["MemoryMB"];
-            diskSizeMB: components["schemas"]["DiskSizeMB"];
-        };
-        HealthResponse: {
-            /** @description Human-readable health check result. */
-            message: string;
-        };
-        UserTeamLimits: {
-            /** Format: int64 */
-            maxLengthHours: number;
-            /** Format: int32 */
-            concurrentSandboxes: number;
-            /** Format: int32 */
-            concurrentTemplateBuilds: number;
-            /** Format: int32 */
-            maxVcpu: number;
-            /** Format: int32 */
-            maxRamMb: number;
-            /** Format: int32 */
-            diskMb: number;
-        };
-        UserTeam: {
-            /** Format: uuid */
-            id: string;
-            name: string;
-            slug: string;
-            tier: string;
-            email: string;
-            profilePictureUrl: string | null;
-            isBlocked: boolean;
-            isBanned: boolean;
-            blockedReason: string | null;
-            isDefault: boolean;
-            limits: components["schemas"]["UserTeamLimits"];
-            /** Format: date-time */
-            createdAt: string;
-        };
-        UserTeamsResponse: {
-            teams: components["schemas"]["UserTeam"][];
-        };
-        TeamMember: {
-            /** Format: uuid */
-            id: string;
-            email: string;
-            name?: string | null;
-            /** Format: uri */
-            profilePictureUrl?: string | null;
-            providers: string[];
-            isDefault: boolean;
-            /** Format: uuid */
-            addedBy?: string | null;
-            /** Format: date-time */
-            createdAt: string | null;
-        };
-        TeamMembersResponse: {
-            members: components["schemas"]["TeamMember"][];
-        };
-        UpdateTeamRequest: {
-            name?: string;
-            profilePictureUrl?: string | null;
-        };
-        UpdateTeamResponse: {
-            /** Format: uuid */
-            id: string;
-            name: string;
-            profilePictureUrl?: string | null;
-        };
-        AddTeamMemberRequest: {
-            /** Format: email */
-            email: string;
-        };
-        CreateTeamRequest: {
-            name: string;
-        };
-        DefaultTemplateAlias: {
-            alias: string;
-            namespace?: string | null;
-        };
-        DefaultTemplate: {
-            id: string;
-            aliases: components["schemas"]["DefaultTemplateAlias"][];
-            /** Format: uuid */
-            buildId: string;
-            /** Format: int64 */
-            ramMb: number;
-            /** Format: int64 */
-            vcpu: number;
-            /** Format: int64 */
-            totalDiskSizeMb: number | null;
-            envdVersion?: string | null;
-            /** Format: date-time */
-            createdAt: string;
-            public: boolean;
-            /** Format: int32 */
-            buildCount: number;
-            /** Format: int64 */
-            spawnCount: number;
-        };
-        DefaultTemplatesResponse: {
-            templates: components["schemas"]["DefaultTemplate"][];
-        };
-        /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
-        TemplateDetail: {
-            /** @description Identifier of the template. */
-            templateID: string;
-            /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
-            buildID: string;
-            cpuCount: components["schemas"]["CPUCount"];
-            memoryMB: components["schemas"]["MemoryMB"];
-            diskSizeMB: components["schemas"]["DiskSizeMB"];
-            /** @description Whether the template is public or only accessible by the team. */
-            public: boolean;
-            /**
-             * @deprecated
-             * @description Aliases of the template.
-             */
-            aliases: string[];
-            /** @description Names of the template (namespace/alias format when namespaced). */
-            names: string[];
-            /**
-             * Format: date-time
-             * @description Time when the template was created.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the template was last updated.
-             */
-            updatedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the template was last used.
-             */
-            lastSpawnedAt: string | null;
-            /**
-             * Format: int64
-             * @description Number of times the template was used.
-             */
-            spawnCount: number;
-            /**
-             * Format: int32
-             * @description Number of times the template was built.
-             */
-            buildCount: number;
-            /** @description Envd version of the latest ready build, or an empty string when none. */
-            envdVersion: string;
-        };
-        TemplateTagAssignment: {
-            /**
-             * Format: uuid
-             * @description Identifier of the tag assignment event.
-             */
-            assignmentId: string;
-            /**
-             * Format: uuid
-             * @description Identifier of the assigned build.
-             */
-            buildId: string;
-            /**
-             * Format: date-time
-             * @description Time when the tag was assigned to the build.
-             */
-            assignedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the assigned build was created.
-             */
-            buildCreatedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the assigned build finished.
-             */
-            buildFinishedAt: string | null;
-        };
-        TemplateTagGroup: {
-            /** @description Template tag name. */
-            tag: string;
-            /** @description Ready assignment events for this tag, sorted latest first. */
-            assignments: components["schemas"]["TemplateTagAssignment"][];
-            /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
-            hasMore: boolean;
-        };
-        TemplateTagGroupsResponse: {
-            tags: components["schemas"]["TemplateTagGroup"][];
-            /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        TemplateTagsCountResponse: {
-            /**
-             * Format: int64
-             * @description Total distinct ready tags for the template.
-             */
-            total: number;
-        };
-        TemplateTagExistsResponse: {
-            /** @description Whether the template tag has at least one ready assignment. */
-            exists: boolean;
-            /** @description Normalized template tag name. */
-            normalizedTag: string;
-        };
-        TemplateTagAssignmentsResponse: {
-            /** @description Ready assignment events for the tag, sorted latest first. */
-            data: components["schemas"]["TemplateTagAssignment"][];
-            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        TeamResolveResponse: {
-            /** Format: uuid */
-            id: string;
-            slug: string;
-        };
-    };
-    responses: {
-        /** @description Bad request */
-        400: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Authentication error */
-        401: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Forbidden */
-        403: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Not found */
-        404: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Server error */
-        500: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Upstream error */
-        502: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-    };
-    parameters: {
-        /** @description Identifier of the build. */
-        build_id: string;
-        /** @description Identifier of the sandbox. */
-        sandboxID: string;
-        /** @description Maximum number of items to return per page. */
-        builds_limit: number;
-        /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-        builds_cursor: string;
-        /** @description Optional filter by build identifier, template identifier, or template alias. */
-        build_id_or_template: string;
-        /** @description Comma-separated list of build statuses to include. */
-        build_statuses: components["schemas"]["BuildStatus"][];
-        /** @description Comma-separated list of build IDs to get statuses for. */
-        build_ids: string[];
-        /** @description Identifier of the team. */
-        teamID: string;
-        /** @description Identifier of the user. */
-        userId: string;
-        /** @description Team slug to resolve. */
-        teamSlug: string;
-        /** @description Identifier of the template. */
-        templateID: string;
-        /** @description Template tag name to check. */
-        tag: string;
-        /** @description Maximum number of ready assignment rows to return per tag. */
-        tag_assignment_limit: number;
-        /** @description Template tag name. */
-        tag_path: string;
-        /** @description Maximum number of assignment rows to return per page. */
-        tag_assignments_limit: number;
-        /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-        tag_assignments_cursor: string;
-        /** @description Maximum number of distinct tags to return per page. */
-        tag_groups_limit: number;
-        /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-        tag_groups_cursor: string;
-        /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-        tag_groups_search: string;
-        /** @description Sort order for the returned tag groups. */
-        tag_groups_sort: "latest_desc" | "latest_asc" | "name_asc" | "name_desc";
-    };
-    requestBodies: never;
-    headers: never;
-    pathItems: never;
+  schemas: {
+    Error: {
+      /**
+       * Format: int32
+       * @description Error code.
+       */
+      code: number
+      /** @description Error message. */
+      message: string
+    }
+    AdminAuthProviderProfile: {
+      /**
+       * Format: uuid
+       * @description Internal E2B user identifier.
+       */
+      userId: string
+      /** @description Email address from the configured auth provider. */
+      email: string | null
+    }
+    AdminAuthProviderProfilesResponse: {
+      profiles: components['schemas']['AdminAuthProviderProfile'][]
+    }
+    AdminAuthProviderProfilesResolveRequest: {
+      userIds: string[]
+    }
+    AdminAuthProviderProfilesLookupEmailRequest: {
+      /** Format: email */
+      email: string
+    }
+    AdminTeamBootstrapRequest: {
+      /** @description Team name. */
+      name: string
+      /**
+       * Format: email
+       * @description Billing/contact email for the team.
+       */
+      email: string
+    }
+    /**
+     * @description Build status mapped for dashboard clients.
+     * @enum {string}
+     */
+    BuildStatus: 'building' | 'failed' | 'success'
+    ListedBuild: {
+      /**
+       * Format: uuid
+       * @description Identifier of the build.
+       */
+      id: string
+      /** @description Template alias when present, otherwise template ID. */
+      template: string
+      /** @description Identifier of the template. */
+      templateId: string
+      status: components['schemas']['BuildStatus']
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+      /**
+       * Format: date-time
+       * @description Build creation timestamp in RFC3339 format.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+    }
+    BuildsListResponse: {
+      data: components['schemas']['ListedBuild'][]
+      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    BuildStatusItem: {
+      /**
+       * Format: uuid
+       * @description Identifier of the build.
+       */
+      id: string
+      status: components['schemas']['BuildStatus']
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+    }
+    BuildsStatusesResponse: {
+      /** @description List of build statuses */
+      buildStatuses: components['schemas']['BuildStatusItem'][]
+    }
+    BuildInfo: {
+      /** @description Template names related to this build, if available. */
+      names?: string[] | null
+      /**
+       * Format: date-time
+       * @description Build creation timestamp in RFC3339 format.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+      status: components['schemas']['BuildStatus']
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+    }
+    /**
+     * Format: int64
+     * @description CPU cores for the sandbox
+     */
+    CPUCount: number
+    /**
+     * Format: int64
+     * @description Memory for the sandbox in MiB
+     */
+    MemoryMB: number
+    /**
+     * Format: int64
+     * @description Disk size for the sandbox in MiB
+     */
+    DiskSizeMB: number
+    SandboxRecord: {
+      /** @description Identifier of the template from which is the sandbox created */
+      templateID: string
+      /** @description Alias of the template */
+      alias?: string
+      /** @description Identifier of the sandbox */
+      sandboxID: string
+      /**
+       * Format: date-time
+       * @description Time when the sandbox was started
+       */
+      startedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the sandbox was stopped
+       */
+      stoppedAt?: string | null
+      /** @description Base domain where the sandbox traffic is accessible */
+      domain?: string | null
+      cpuCount: components['schemas']['CPUCount']
+      memoryMB: components['schemas']['MemoryMB']
+      diskSizeMB: components['schemas']['DiskSizeMB']
+    }
+    HealthResponse: {
+      /** @description Human-readable health check result. */
+      message: string
+    }
+    UserTeamLimits: {
+      /** Format: int64 */
+      maxLengthHours: number
+      /** Format: int32 */
+      concurrentSandboxes: number
+      /** Format: int32 */
+      concurrentTemplateBuilds: number
+      /** Format: int32 */
+      maxVcpu: number
+      /** Format: int32 */
+      maxRamMb: number
+      /** Format: int32 */
+      diskMb: number
+    }
+    UserTeam: {
+      /** Format: uuid */
+      id: string
+      name: string
+      slug: string
+      tier: string
+      email: string
+      profilePictureUrl: string | null
+      isBlocked: boolean
+      isBanned: boolean
+      blockedReason: string | null
+      isDefault: boolean
+      limits: components['schemas']['UserTeamLimits']
+      /** Format: date-time */
+      createdAt: string
+    }
+    UserTeamsResponse: {
+      teams: components['schemas']['UserTeam'][]
+    }
+    TeamMember: {
+      /** Format: uuid */
+      id: string
+      email: string
+      name?: string | null
+      /** Format: uri */
+      profilePictureUrl?: string | null
+      providers: string[]
+      isDefault: boolean
+      /** Format: uuid */
+      addedBy?: string | null
+      /** Format: date-time */
+      createdAt: string | null
+    }
+    TeamMembersResponse: {
+      members: components['schemas']['TeamMember'][]
+    }
+    UpdateTeamRequest: {
+      name?: string
+      profilePictureUrl?: string | null
+    }
+    UpdateTeamResponse: {
+      /** Format: uuid */
+      id: string
+      name: string
+      profilePictureUrl?: string | null
+    }
+    AddTeamMemberRequest: {
+      /** Format: email */
+      email: string
+    }
+    CreateTeamRequest: {
+      name: string
+    }
+    DefaultTemplateAlias: {
+      alias: string
+      namespace?: string | null
+    }
+    DefaultTemplate: {
+      id: string
+      aliases: components['schemas']['DefaultTemplateAlias'][]
+      /** Format: uuid */
+      buildId: string
+      /** Format: int64 */
+      ramMb: number
+      /** Format: int64 */
+      vcpu: number
+      /** Format: int64 */
+      totalDiskSizeMb: number | null
+      envdVersion?: string | null
+      /** Format: date-time */
+      createdAt: string
+      public: boolean
+      /** Format: int32 */
+      buildCount: number
+      /** Format: int64 */
+      spawnCount: number
+    }
+    DefaultTemplatesResponse: {
+      templates: components['schemas']['DefaultTemplate'][]
+    }
+    /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
+    TemplateDetail: {
+      /** @description Identifier of the template. */
+      templateID: string
+      /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
+      buildID: string
+      cpuCount: components['schemas']['CPUCount']
+      memoryMB: components['schemas']['MemoryMB']
+      diskSizeMB: components['schemas']['DiskSizeMB']
+      /** @description Whether the template is public or only accessible by the team. */
+      public: boolean
+      /**
+       * @deprecated
+       * @description Aliases of the template.
+       */
+      aliases: string[]
+      /** @description Names of the template (namespace/alias format when namespaced). */
+      names: string[]
+      /**
+       * Format: date-time
+       * @description Time when the template was created.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Time when the template was last updated.
+       */
+      updatedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the template was last used.
+       */
+      lastSpawnedAt: string | null
+      /**
+       * Format: int64
+       * @description Number of times the template was used.
+       */
+      spawnCount: number
+      /**
+       * Format: int32
+       * @description Number of times the template was built.
+       */
+      buildCount: number
+      /** @description Envd version of the latest ready build, or an empty string when none. */
+      envdVersion: string
+    }
+    TemplateTagAssignment: {
+      /**
+       * Format: uuid
+       * @description Identifier of the tag assignment event.
+       */
+      assignmentId: string
+      /**
+       * Format: uuid
+       * @description Identifier of the assigned build.
+       */
+      buildId: string
+      /**
+       * Format: date-time
+       * @description Time when the tag was assigned to the build.
+       */
+      assignedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the assigned build was created.
+       */
+      buildCreatedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the assigned build finished.
+       */
+      buildFinishedAt: string | null
+    }
+    TemplateTagGroup: {
+      /** @description Template tag name. */
+      tag: string
+      /** @description Ready assignment events for this tag, sorted latest first. */
+      assignments: components['schemas']['TemplateTagAssignment'][]
+      /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
+      hasMore: boolean
+    }
+    TemplateTagGroupsResponse: {
+      tags: components['schemas']['TemplateTagGroup'][]
+      /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    TemplateTagsCountResponse: {
+      /**
+       * Format: int64
+       * @description Total distinct ready tags for the template.
+       */
+      total: number
+    }
+    TemplateTagExistsResponse: {
+      /** @description Whether the template tag has at least one ready assignment. */
+      exists: boolean
+      /** @description Normalized template tag name. */
+      normalizedTag: string
+    }
+    TemplateTagAssignmentsResponse: {
+      /** @description Ready assignment events for the tag, sorted latest first. */
+      data: components['schemas']['TemplateTagAssignment'][]
+      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    TeamResolveResponse: {
+      /** Format: uuid */
+      id: string
+      slug: string
+    }
+  }
+  responses: {
+    /** @description Bad request */
+    400: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Authentication error */
+    401: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Forbidden */
+    403: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Not found */
+    404: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Server error */
+    500: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Upstream error */
+    502: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+  }
+  parameters: {
+    /** @description Identifier of the build. */
+    build_id: string
+    /** @description Identifier of the sandbox. */
+    sandboxID: string
+    /** @description Maximum number of items to return per page. */
+    builds_limit: number
+    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+    builds_cursor: string
+    /** @description Optional filter by build identifier, template identifier, or template alias. */
+    build_id_or_template: string
+    /** @description Comma-separated list of build statuses to include. */
+    build_statuses: components['schemas']['BuildStatus'][]
+    /** @description Comma-separated list of build IDs to get statuses for. */
+    build_ids: string[]
+    /** @description Identifier of the team. */
+    teamID: string
+    /** @description Identifier of the user. */
+    userId: string
+    /** @description Team slug to resolve. */
+    teamSlug: string
+    /** @description Identifier of the template. */
+    templateID: string
+    /** @description Template tag name to check. */
+    tag: string
+    /** @description Maximum number of ready assignment rows to return per tag. */
+    tag_assignment_limit: number
+    /** @description Template tag name. */
+    tag_path: string
+    /** @description Maximum number of assignment rows to return per page. */
+    tag_assignments_limit: number
+    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+    tag_assignments_cursor: string
+    /** @description Maximum number of distinct tags to return per page. */
+    tag_groups_limit: number
+    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+    tag_groups_cursor: string
+    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+    tag_groups_search: string
+    /** @description Sort order for the returned tag groups. */
+    tag_groups_sort: 'latest_desc' | 'latest_asc' | 'name_asc' | 'name_desc'
+  }
+  requestBodies: never
+  headers: never
+  pathItems: never
 }
-export type $defs = Record<string, never>;
-export type operations = Record<string, never>;
+export type $defs = Record<string, never>
+export type operations = Record<string, never>
diff --git a/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx b/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
index a5eda1ee0..ae0971998 100644
--- a/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
+++ b/src/features/dashboard/templates/tags/tag-format-invalid-tooltip.tsx
@@ -1,11 +1,11 @@
 'use client'
 
-import { TAG_MAX_LENGTH } from './helpers'
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
 } from '@/ui/primitives/tooltip'
+import { TAG_MAX_LENGTH } from './helpers'
 
 interface TagFormatInvalidTooltipProps {
   maxLength?: number

From 6ea77c4eebf7dd636c1bb2e88ea6f18d5637a13c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:56:04 +0200
Subject: [PATCH 56/90] chore(tags): extract shared constants

---
 src/features/dashboard/templates/detail/header.tsx             | 3 +--
 src/features/dashboard/templates/tags/build-link.tsx           | 3 +--
 src/features/dashboard/templates/tags/constants.ts             | 2 ++
 .../dashboard/templates/tags/history/tag-history-header.tsx    | 3 +--
 src/features/dashboard/templates/tags/table-cells.tsx          | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/constants.ts

diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
index 6a2ac42ab..c171c6b03 100644
--- a/src/features/dashboard/templates/detail/header.tsx
+++ b/src/features/dashboard/templates/detail/header.tsx
@@ -7,6 +7,7 @@ import {
   DetailsRow,
 } from '@/features/dashboard/layouts/details-row'
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
+import { NULL_BUILD_ID } from '@/features/dashboard/templates/tags/constants'
 import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
 import { useTRPC } from '@/trpc/client'
 import { TemplateVisibilityDropdown } from './visibility-dropdown'
@@ -16,8 +17,6 @@ interface TemplateDetailHeaderProps {
   templateId: string
 }
 
-const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
-
 export default function TemplateDetailHeader({
   teamSlug,
   templateId,
diff --git a/src/features/dashboard/templates/tags/build-link.tsx b/src/features/dashboard/templates/tags/build-link.tsx
index 54ff07dbc..0a37c24e9 100644
--- a/src/features/dashboard/templates/tags/build-link.tsx
+++ b/src/features/dashboard/templates/tags/build-link.tsx
@@ -5,8 +5,7 @@ import { useMemo } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { formatRelativeAgo } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
-
-const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+import { NULL_BUILD_ID } from './constants'
 
 interface BuildLinkProps {
   teamSlug: string
diff --git a/src/features/dashboard/templates/tags/constants.ts b/src/features/dashboard/templates/tags/constants.ts
new file mode 100644
index 000000000..4accf9925
--- /dev/null
+++ b/src/features/dashboard/templates/tags/constants.ts
@@ -0,0 +1,2 @@
+export const DEFAULT_TAG_NAME = 'default'
+export const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index e11458e10..c153c4f59 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -15,13 +15,12 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { MiddleTruncate } from '@/ui/primitives/middle-truncate'
 import { BuildLink } from '../build-link'
+import { DEFAULT_TAG_NAME } from '../constants'
 import TagDeleteDialog from '../delete-dialog'
 import ReassignTagDialog from '../reassign-dialog'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
 
-const DEFAULT_TAG_NAME = 'default'
-
 interface TagHistoryHeaderProps {
   tag: string
   teamSlug: string
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index f7bb59ec7..1c02320c5 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -15,6 +15,7 @@ import { IconButton } from '@/ui/primitives/icon-button'
 import { MoreActionsIcon, TrashIcon } from '@/ui/primitives/icons'
 import { MiddleTruncate } from '@/ui/primitives/middle-truncate'
 import { BuildLink } from './build-link'
+import { DEFAULT_TAG_NAME } from './constants'
 import TagDeleteDialog from './delete-dialog'
 import ReassignTagDialog from './reassign-dialog'
 import RollbackTagDialog from './rollback-dialog'
@@ -22,8 +23,6 @@ import type { TagGroup } from './types'
 
 const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
 
-const DEFAULT_TAG_NAME = 'default'
-
 export interface TagTableMeta {
   teamSlug: string
   templateId: string

From 5f1fe4283aa84164e3f66d6a4e4cf58052608f85 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:56:17 +0200
Subject: [PATCH 57/90] chore(templates): drop duplicate getTemplate prefetch

---
 .../templates/[templateId]/(detail-tabs)/overview/page.tsx     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index 7fe8ed28c..c084a46ec 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -1,15 +1,12 @@
 import { Suspense } from 'react'
 import TemplateOverview from '@/features/dashboard/templates/detail/overview'
 import { TemplateOverviewSkeleton } from '@/features/dashboard/templates/detail/overview/skeleton'
-import { prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateOverviewPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
-  prefetch(trpc.templates.getTemplate.queryOptions({ teamSlug, templateId }))
-
   return (
     <div className="p-6 md:p-10 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
       <Suspense fallback={<TemplateOverviewSkeleton />}>

From 55e0c00ee71208c76492de133bc680cfdd350d3f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:57:10 +0200
Subject: [PATCH 58/90] refactor(tags): decouple table store from analytics

---
 src/features/dashboard/templates/tags/header.tsx    | 13 ++++++++++---
 .../dashboard/templates/tags/stores/table-store.ts  |  8 --------
 src/features/dashboard/templates/tags/table.tsx     | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/features/dashboard/templates/tags/header.tsx b/src/features/dashboard/templates/tags/header.tsx
index d56ac9ad5..f106fcc8b 100644
--- a/src/features/dashboard/templates/tags/header.tsx
+++ b/src/features/dashboard/templates/tags/header.tsx
@@ -6,7 +6,7 @@ import { SearchIcon } from '@/ui/primitives/icons'
 import { DebouncedInput } from '@/ui/primitives/input'
 import AssignTagDialog from './assign-dialog'
 import { useTagTableStore } from './stores/table-store'
-import { TAG_SEARCH_MAX_LEN } from './table-config'
+import { TAG_SEARCH_MAX_LEN, trackTagTableInteraction } from './table-config'
 import TagFormatInvalidTooltip from './tag-format-invalid-tooltip'
 
 interface TagsHeaderProps {
@@ -32,9 +32,16 @@ export default function TagsHeader({
 
   const handleSearchChange = useCallback(
     (value: string | number) => {
-      setGlobalFilter(String(value))
+      const next = String(value)
+      if (next !== globalFilter) {
+        trackTagTableInteraction('searched', {
+          has_query: Boolean(next),
+          query: next,
+        })
+      }
+      setGlobalFilter(next)
     },
-    [setGlobalFilter]
+    [globalFilter, setGlobalFilter]
   )
 
   return (
diff --git a/src/features/dashboard/templates/tags/stores/table-store.ts b/src/features/dashboard/templates/tags/stores/table-store.ts
index 37014c551..68079e33e 100644
--- a/src/features/dashboard/templates/tags/stores/table-store.ts
+++ b/src/features/dashboard/templates/tags/stores/table-store.ts
@@ -6,7 +6,6 @@ import type {
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
 import { createHashStorage } from '@/lib/utils/store'
-import { trackTagTableInteraction } from '../table-config'
 
 interface TagTableState {
   sorting: SortingState
@@ -38,7 +37,6 @@ export const useTagTableStore = create<Store>()(
         const next =
           typeof sorting === 'function' ? sorting(get().sorting) : sorting
         set({ sorting: next })
-        trackTagTableInteraction('sorted', { column_count: next.length })
       },
 
       setGlobalFilter: (globalFilter) => {
@@ -46,12 +44,6 @@ export const useTagTableStore = create<Store>()(
           typeof globalFilter === 'function'
             ? globalFilter(get().globalFilter)
             : globalFilter
-        if (next !== get().globalFilter) {
-          trackTagTableInteraction('searched', {
-            has_query: Boolean(next),
-            query: next,
-          })
-        }
         set({ globalFilter: next })
       },
 
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index a9b1447e6..ee4e27d94 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -8,7 +8,9 @@ import {
 } from '@tanstack/react-query'
 import {
   flexRender,
+  type OnChangeFn,
   type Row,
+  type SortingState,
   type TableOptions,
   useReactTable,
 } from '@tanstack/react-table'
@@ -73,6 +75,15 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   const setExpanded = useTagTableStore((s) => s.setExpanded)
   const resetFilters = useTagTableStore((s) => s.resetFilters)
 
+  const handleSortingChange: OnChangeFn<SortingState> = useCallback(
+    (updater) => {
+      const next = typeof updater === 'function' ? updater(sorting) : updater
+      trackTagTableInteraction('sorted', { column_count: next.length })
+      setSorting(next)
+    },
+    [sorting, setSorting]
+  )
+
   useEffect(() => {
     return () => resetFilters()
   }, [resetFilters])
@@ -164,7 +175,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
     data: groups.length > 0 ? groups : fallbackData,
     columns,
     state: { sorting, expanded },
-    onSortingChange: setSorting,
+    onSortingChange: handleSortingChange,
     onExpandedChange: setExpanded,
     getRowCanExpand: (row) =>
       row.original.assignments.length > 1 || row.original.hasMore,

From 29b4f5c07cd9185ae4f56315f5593470da48d42f Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:57:39 +0200
Subject: [PATCH 59/90] feat(tags): add useTagAssignmentMutation hook

---
 .../tags/use-tag-assignment-mutation.ts       | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts

diff --git a/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts b/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts
new file mode 100644
index 000000000..c8fca35a2
--- /dev/null
+++ b/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts
@@ -0,0 +1,69 @@
+'use client'
+
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { useCallback } from 'react'
+import { useTRPC } from '@/trpc/client'
+import { type TagDialogStage, tagDialogStageFromMutation } from './helpers'
+import { trackTagTableInteraction } from './table-config'
+
+export type TagOperation = 'assign' | 'reassign' | 'rollback'
+
+interface UseTagAssignmentMutationOptions {
+  teamSlug: string
+  templateId: string
+  operation: TagOperation
+  analyticsContext?: Record<string, unknown>
+  onSuccess?: () => void | Promise<void>
+}
+
+export function useTagAssignmentMutation({
+  teamSlug,
+  templateId,
+  operation,
+  analyticsContext,
+  onSuccess,
+}: UseTagAssignmentMutationOptions) {
+  const trpc = useTRPC()
+  const queryClient = useQueryClient()
+
+  const invalidate = useCallback(async () => {
+    await Promise.all([
+      queryClient.invalidateQueries({
+        queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
+          teamSlug,
+          templateId,
+        }).queryKey,
+      }),
+      queryClient.invalidateQueries({
+        queryKey: trpc.templates.getTagCount.queryOptions({
+          teamSlug,
+          templateId,
+        }).queryKey,
+      }),
+    ])
+  }, [queryClient, trpc, teamSlug, templateId])
+
+  const mutation = useMutation(
+    trpc.templates.assignTag.mutationOptions({
+      onSuccess: async () => {
+        await invalidate()
+        trackTagTableInteraction(
+          `${operation} succeeded`,
+          analyticsContext ?? {}
+        )
+        await onSuccess?.()
+      },
+      onError: (error) => {
+        trackTagTableInteraction(`${operation} failed`, {
+          ...analyticsContext,
+          error_status: error.data?.httpStatus ?? null,
+          error_code: error.data?.code ?? null,
+        })
+      },
+    })
+  )
+
+  const stage: TagDialogStage = tagDialogStageFromMutation(mutation)
+
+  return { mutation, stage }
+}

From cc3ac690a3d13a68f163b99309f622589588225e Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:58:04 +0200
Subject: [PATCH 60/90] refactor(tags): migrate rollback dialog to
 useTagAssignmentMutation

---
 .../templates/tags/rollback-dialog.tsx        | 46 ++++---------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
index 6e1a10edb..983846aa1 100644
--- a/src/features/dashboard/templates/tags/rollback-dialog.tsx
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -1,8 +1,6 @@
 'use client'
 
-import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useEffect } from 'react'
-import { useTRPC } from '@/trpc/client'
 import {
   Dialog,
   DialogContent,
@@ -16,8 +14,8 @@ import {
   TagDialogFooter,
   TagDialogSuccess,
 } from './components'
-import { tagDialogStageFromMutation } from './helpers'
 import { trackTagTableInteraction } from './table-config'
+import { useTagAssignmentMutation } from './use-tag-assignment-mutation'
 
 export type RollbackSurface = 'tags-tab' | 'history-header' | 'history-row'
 
@@ -46,41 +44,13 @@ export default function RollbackTagDialog({
   surface,
   onRolledBack,
 }: RollbackTagDialogProps) {
-  const trpc = useTRPC()
-  const queryClient = useQueryClient()
-
-  const rollback = useMutation(
-    trpc.templates.assignTag.mutationOptions({
-      onSuccess: async () => {
-        trackTagTableInteraction('rollback succeeded', { surface, tag })
-        await Promise.all([
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagCount.queryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-        ])
-        await onRolledBack?.()
-      },
-      onError: (error) => {
-        trackTagTableInteraction('rollback failed', {
-          surface,
-          tag,
-          error_status: error.data?.httpStatus ?? null,
-          error_code: error.data?.code ?? null,
-        })
-      },
-    })
-  )
-
-  const stage = tagDialogStageFromMutation(rollback)
+  const { mutation: rollback, stage } = useTagAssignmentMutation({
+    teamSlug,
+    templateId,
+    operation: 'rollback',
+    analyticsContext: { surface, tag },
+    onSuccess: onRolledBack,
+  })
 
   const { reset } = rollback
   useEffect(() => {

From 88460f450ffaeaca263808c64765455affdcfb5d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:58:30 +0200
Subject: [PATCH 61/90] refactor(tags): migrate reassign dialog to
 useTagAssignmentMutation

---
 .../templates/tags/reassign-dialog.tsx        | 46 ++++---------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index 3b3e608ef..a4aa58b6e 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -1,8 +1,6 @@
 'use client'
 
-import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useEffect, useState } from 'react'
-import { useTRPC } from '@/trpc/client'
 import {
   Dialog,
   DialogContent,
@@ -17,8 +15,8 @@ import {
   TagDialogFooter,
   TagDialogSuccess,
 } from './components'
-import { tagDialogStageFromMutation } from './helpers'
 import { trackTagTableInteraction } from './table-config'
+import { useTagAssignmentMutation } from './use-tag-assignment-mutation'
 
 export type ReassignSurface = 'tags-tab' | 'history-header'
 
@@ -45,45 +43,17 @@ export default function ReassignTagDialog({
   surface,
   onReassigned,
 }: ReassignTagDialogProps) {
-  const trpc = useTRPC()
-  const queryClient = useQueryClient()
-
   const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
   const [selectionSource, setSelectionSource] =
     useState<BuildSelectionSource | null>(null)
 
-  const reassign = useMutation(
-    trpc.templates.assignTag.mutationOptions({
-      onSuccess: async () => {
-        trackTagTableInteraction('reassign succeeded', { surface, tag })
-        await Promise.all([
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagCount.queryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-        ])
-        await onReassigned?.()
-      },
-      onError: (error) => {
-        trackTagTableInteraction('reassign failed', {
-          surface,
-          tag,
-          error_status: error.data?.httpStatus ?? null,
-          error_code: error.data?.code ?? null,
-        })
-      },
-    })
-  )
-
-  const stage = tagDialogStageFromMutation(reassign)
+  const { mutation: reassign, stage } = useTagAssignmentMutation({
+    teamSlug,
+    templateId,
+    operation: 'reassign',
+    analyticsContext: { surface, tag },
+    onSuccess: onReassigned,
+  })
 
   const { reset } = reassign
   useEffect(() => {

From 3a299527cdca4573a946c97b94ef88f811d5e47c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 12:59:07 +0200
Subject: [PATCH 62/90] refactor(tags): migrate assign dialog to
 useTagAssignmentMutation and unify analytics

---
 .../templates/tags/assign-dialog.tsx          | 52 ++++---------------
 1 file changed, 10 insertions(+), 42 deletions(-)

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 3ea4622e4..68cf8b60d 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -1,7 +1,6 @@
 'use client'
 
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import posthog from 'posthog-js'
+import { useQuery } from '@tanstack/react-query'
 import { type FormEvent, useEffect, useId, useState } from 'react'
 import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
 import { useTRPC } from '@/trpc/client'
@@ -22,9 +21,10 @@ import {
   normalizeTagInput,
   TAG_MAX_LENGTH,
   TAG_REGEX,
-  tagDialogStageFromMutation,
 } from './helpers'
+import { trackTagTableInteraction } from './table-config'
 import TagNameField, { type TagNameStatus } from './tag-name-field'
+import { useTagAssignmentMutation } from './use-tag-assignment-mutation'
 
 const NAME_DEBOUNCE_MS = 350
 
@@ -40,7 +40,6 @@ export default function AssignTagDialog({
   templateName,
 }: AssignTagDialogProps) {
   const trpc = useTRPC()
-  const queryClient = useQueryClient()
 
   const formId = useId()
   const [open, setOpen] = useState(false)
@@ -64,33 +63,11 @@ export default function AssignTagDialog({
     )
   )
 
-  const mutation = useMutation(
-    trpc.templates.assignTag.mutationOptions({
-      onSuccess: async () => {
-        await Promise.all([
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-          queryClient.invalidateQueries({
-            queryKey: trpc.templates.getTagCount.queryOptions({
-              teamSlug,
-              templateId,
-            }).queryKey,
-          }),
-        ])
-        trackAssign('assign succeeded', {})
-      },
-      onError: (error) => {
-        trackAssign('assign failed', {
-          error_status: error.data?.httpStatus ?? null,
-          error_code: error.data?.code ?? null,
-        })
-      },
-    })
-  )
+  const { mutation, stage } = useTagAssignmentMutation({
+    teamSlug,
+    templateId,
+    operation: 'assign',
+  })
 
   const setName = (raw: string) => {
     setNameRaw(normalizeTagInput(raw))
@@ -128,7 +105,7 @@ export default function AssignTagDialog({
 
   useEffect(() => {
     if (!open) return
-    trackAssign('assign opened', { template_id: templateId })
+    trackTagTableInteraction('assign opened', { template_id: templateId })
   }, [open, templateId])
 
   const resetState = () => {
@@ -159,7 +136,7 @@ export default function AssignTagDialog({
     }
 
     const tagToSubmit = data.normalizedTag
-    trackAssign('assign submitted', {
+    trackTagTableInteraction('assign submitted', {
       via_search: selectionSource === 'search',
     })
     mutation.mutate({
@@ -171,8 +148,6 @@ export default function AssignTagDialog({
     })
   }
 
-  const stage = tagDialogStageFromMutation(mutation)
-
   const successTag =
     existsQuery.data?.normalizedTag ??
     mutation.data?.tags[0] ??
@@ -257,10 +232,3 @@ export default function AssignTagDialog({
     </Dialog>
   )
 }
-
-function trackAssign(action: string, properties: Record<string, unknown>) {
-  posthog.capture('tag table interacted', {
-    action,
-    ...properties,
-  })
-}

From b71f77d8579a5ea3c16a5c1125f1be6f64a52a6a Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 13:00:46 +0200
Subject: [PATCH 63/90] refactor(time): extract useNow hook

---
 .../dashboard/templates/builds/table-cells.tsx    | 14 ++------------
 .../detail/overview/latest-build-section.tsx      |  9 ++-------
 src/lib/hooks/use-now.ts                          | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 src/lib/hooks/use-now.ts

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 0d9787963..10121437a 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -1,12 +1,12 @@
 'use client'
 
 import Link from 'next/link'
-import { useEffect, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type {
   BuildStatus,
   ListedBuildModel,
 } from '@/core/modules/builds/models'
+import { useNow } from '@/lib/hooks/use-now'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
 import { cn } from '@/lib/utils'
 import {
@@ -103,17 +103,7 @@ export function Duration({
   finishedAt: number | null
   isBuilding: boolean
 }) {
-  const [now, setNow] = useState(() => Date.now())
-
-  useEffect(() => {
-    if (!isBuilding) return
-
-    const interval = setInterval(() => {
-      setNow(Date.now())
-    }, 1000)
-
-    return () => clearInterval(interval)
-  }, [isBuilding])
+  const now = useNow(1000, isBuilding)
 
   const duration = isBuilding
     ? now - createdAt
diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
index 95d5ac67e..139ba4bf6 100644
--- a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -2,11 +2,11 @@
 
 import { useSuspenseQuery } from '@tanstack/react-query'
 import Link from 'next/link'
-import { useEffect, useState } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { BuildStatus } from '@/core/modules/builds/models'
 import type { TemplateDefaultBuildModel } from '@/core/modules/templates/models'
 import { useClipboard } from '@/lib/hooks/use-clipboard'
+import { useNow } from '@/lib/hooks/use-now'
 import { formatTimeAgoCompact } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
@@ -74,12 +74,7 @@ function DefaultTagBadge() {
 }
 
 function BuildAgo({ timestamp }: { timestamp: number }) {
-  const [now, setNow] = useState(() => Date.now())
-
-  useEffect(() => {
-    const interval = setInterval(() => setNow(Date.now()), 30_000)
-    return () => clearInterval(interval)
-  }, [])
+  const now = useNow(30_000)
 
   return (
     <span className="prose-value-big font-mono uppercase text-fg whitespace-nowrap">
diff --git a/src/lib/hooks/use-now.ts b/src/lib/hooks/use-now.ts
new file mode 100644
index 000000000..aed640395
--- /dev/null
+++ b/src/lib/hooks/use-now.ts
@@ -0,0 +1,15 @@
+'use client'
+
+import { useEffect, useState } from 'react'
+
+export function useNow(intervalMs: number, enabled = true): number {
+  const [now, setNow] = useState(() => Date.now())
+
+  useEffect(() => {
+    if (!enabled) return
+    const id = setInterval(() => setNow(Date.now()), intervalMs)
+    return () => clearInterval(id)
+  }, [intervalMs, enabled])
+
+  return now
+}

From 898b78a067ab3f25baa81e3c4cb88fb9e5736d2d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 13:06:15 +0200
Subject: [PATCH 64/90] fix caret color

---
 src/styles/globals.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/globals.css b/src/styles/globals.css
index 8bd22b6cf..3b536c73e 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -10,7 +10,7 @@
   border-radius: 2px;
 }
 
-:root {
+html {
   caret-color: var(--accent-main-highlight);
 }
 

From 53bf6520ff460cd714ee45047f7535fbe570621c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 14:33:01 +0200
Subject: [PATCH 65/90] add started sandboxes count

---
 .../templates/detail/overview/index.tsx        |  2 ++
 .../overview/sandboxes-started-section.tsx     | 18 ++++++++++++++++++
 .../templates/detail/overview/section.tsx      |  2 +-
 .../templates/detail/overview/skeleton.tsx     |  4 ++++
 .../detail/overview/template-specs.tsx         | 12 ++++++------
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 src/features/dashboard/templates/detail/overview/sandboxes-started-section.tsx

diff --git a/src/features/dashboard/templates/detail/overview/index.tsx b/src/features/dashboard/templates/detail/overview/index.tsx
index 6c3ca8405..91bc3bec8 100644
--- a/src/features/dashboard/templates/detail/overview/index.tsx
+++ b/src/features/dashboard/templates/detail/overview/index.tsx
@@ -3,6 +3,7 @@
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useTRPC } from '@/trpc/client'
 import { LatestBuildSection } from './latest-build-section'
+import { SandboxesStartedSection } from './sandboxes-started-section'
 import { TemplateSection } from './template-section'
 
 interface TemplateOverviewProps {
@@ -26,6 +27,7 @@ export default function TemplateOverview({
     <div className="flex flex-col gap-8">
       <TemplateSection template={template} teamSlug={teamSlug} />
       <LatestBuildSection templateId={templateId} teamSlug={teamSlug} />
+      <SandboxesStartedSection spawnCount={template.spawnCount} />
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/detail/overview/sandboxes-started-section.tsx b/src/features/dashboard/templates/detail/overview/sandboxes-started-section.tsx
new file mode 100644
index 000000000..146d4f0ef
--- /dev/null
+++ b/src/features/dashboard/templates/detail/overview/sandboxes-started-section.tsx
@@ -0,0 +1,18 @@
+import { formatNumber } from '@/lib/utils/formatting'
+import { OverviewSection } from './section'
+
+interface SandboxesStartedSectionProps {
+  spawnCount: number
+}
+
+export function SandboxesStartedSection({
+  spawnCount,
+}: SandboxesStartedSectionProps) {
+  return (
+    <OverviewSection label="Sandboxes started">
+      <span className="prose-value-big font-mono uppercase text-fg whitespace-nowrap">
+        {formatNumber(spawnCount)}
+      </span>
+    </OverviewSection>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/overview/section.tsx b/src/features/dashboard/templates/detail/overview/section.tsx
index bd407e258..553da7955 100644
--- a/src/features/dashboard/templates/detail/overview/section.tsx
+++ b/src/features/dashboard/templates/detail/overview/section.tsx
@@ -25,7 +25,7 @@ export function OverviewSection({
       )}
     >
       <div className="flex items-center gap-2">
-        <span className="text-fg-tertiary prose-label uppercase">{label}</span>
+        <span className="text-fg prose-label-highlight uppercase">{label}</span>
         {labelBadge}
       </div>
       <div className="flex flex-col gap-3">{children}</div>
diff --git a/src/features/dashboard/templates/detail/overview/skeleton.tsx b/src/features/dashboard/templates/detail/overview/skeleton.tsx
index 16a06e953..d47e552fc 100644
--- a/src/features/dashboard/templates/detail/overview/skeleton.tsx
+++ b/src/features/dashboard/templates/detail/overview/skeleton.tsx
@@ -19,6 +19,10 @@ export function TemplateOverviewSkeleton() {
         </div>
         <Skeleton className="h-5 w-80 mt-2 max-w-full" />
       </OverviewSection>
+
+      <OverviewSection label="Sandboxes started">
+        <Skeleton className="h-8 w-20" />
+      </OverviewSection>
     </div>
   )
 }
diff --git a/src/features/dashboard/templates/detail/overview/template-specs.tsx b/src/features/dashboard/templates/detail/overview/template-specs.tsx
index dff5555dc..b62ff62a3 100644
--- a/src/features/dashboard/templates/detail/overview/template-specs.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-specs.tsx
@@ -1,9 +1,9 @@
 import { formatNumber } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
 import {
-  CodeChevronIcon,
   CpuIcon,
   MemoryIcon,
+  MetadataIcon,
   StorageIcon,
 } from '@/ui/primitives/icons'
 
@@ -21,11 +21,11 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
   return (
     <div
       className={cn(
-        'flex flex-wrap items-center gap-x-4 gap-y-1 text-fg-secondary prose-body-numeric',
+        'flex flex-wrap items-center gap-x-2 gap-y-1 text-fg-secondary prose-body-numeric',
         className
       )}
     >
-      <SpecItem icon={<CpuIcon className="size-3.5" />}>
+      <SpecItem icon={<CpuIcon className="size-3" />}>
         <span className="prose-body-numeric-highlight">
           {formatNumber(build.cpuCount)}
         </span>{' '}
@@ -34,7 +34,7 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
         </span>
       </SpecItem>
       <Separator />
-      <SpecItem icon={<MemoryIcon className="size-3.5" />}>
+      <SpecItem icon={<MemoryIcon className="size-3" />}>
         <span className="prose-body-numeric-highlight">
           {formatNumber(build.memoryMB)}
         </span>{' '}
@@ -43,7 +43,7 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
       {build.diskSizeMB !== null && (
         <>
           <Separator />
-          <SpecItem icon={<StorageIcon className="size-3.5" />}>
+          <SpecItem icon={<StorageIcon className="size-3" />}>
             <span className="prose-body-numeric-highlight">
               {formatNumber(build.diskSizeMB)}
             </span>{' '}
@@ -54,7 +54,7 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
       {build.envdVersion && (
         <>
           <Separator />
-          <SpecItem icon={<CodeChevronIcon className="size-3.5" />}>
+          <SpecItem icon={<MetadataIcon className="size-3" />}>
             <span className="prose-body-numeric-highlight font-mono">
               {build.envdVersion}
             </span>

From d01c07c10a8eaa79ea25a528f7e95237f02a964c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 14:41:55 +0200
Subject: [PATCH 66/90] Update tab icon

---
 src/features/dashboard/templates/detail/tabs.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/detail/tabs.tsx b/src/features/dashboard/templates/detail/tabs.tsx
index 1352dc635..4545593d6 100644
--- a/src/features/dashboard/templates/detail/tabs.tsx
+++ b/src/features/dashboard/templates/detail/tabs.tsx
@@ -5,7 +5,7 @@ import posthog from 'posthog-js'
 import { useEffect, useRef } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { DashboardTabsList } from '@/ui/dashboard-tabs'
-import { BuildIcon, DashboardIcon, TagIcon } from '@/ui/primitives/icons'
+import { BuildIcon, TagIcon, TrendIcon } from '@/ui/primitives/icons'
 
 interface TemplateDetailTabsProps {
   teamSlug: string
@@ -56,7 +56,7 @@ export default function TemplateDetailTabs({
           id: 'overview',
           label: 'Overview',
           href: PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, templateId),
-          icon: <DashboardIcon className="size-4" />,
+          icon: <TrendIcon className="size-4" />,
         },
         {
           id: 'builds',

From c81b2fcb7043972e269aa11f61cb38284c3268ad Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 14:51:48 +0200
Subject: [PATCH 67/90] overview fixes

---
 .../templates/detail/overview/latest-build-section.tsx        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
index 139ba4bf6..a2f999d58 100644
--- a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -138,12 +138,12 @@ function BuildIdRow({
   const truncated = `${buildId.slice(0, 7)}...${buildId.slice(-5)}`
 
   return (
-    <div className="flex items-center gap-2 rounded border border-stroke bg-bg pl-3 pr-1 py-1 min-w-0 flex-1">
+    <div className="flex items-center gap-2 border border-stroke bg-bg px-2.5 h-[36px] min-w-0 flex-1">
       <button
         type="button"
         onClick={() => copy(buildId)}
         aria-label={wasCopied ? 'Copied build ID' : 'Copy build ID'}
-        className="group/copy relative inline-flex min-w-0 flex-1 items-center text-left text-fg-secondary font-mono prose-body-numeric hover:text-fg transition-colors cursor-pointer"
+        className="group/copy relative inline-flex min-w-0 flex-1 items-center text-left text-fg-primary font-mono prose-body-numeric hover:text-fg transition-colors cursor-pointer"
       >
         <span className="truncate">{truncated}</span>
         <span

From d2d5b04b5620fbecd2829c40f7721e075859a5a2 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 14:58:06 +0200
Subject: [PATCH 68/90] cleanup

---
 .../dashboard/templates/builds/template-builds-header.tsx | 1 -
 src/features/dashboard/templates/tags/build-picker.tsx    | 3 +--
 .../templates/tags/history/tag-history-header.tsx         | 8 ++------
 .../dashboard/templates/tags/history/tag-history-row.tsx  | 2 --
 .../dashboard/templates/tags/stores/table-store.ts        | 1 -
 src/features/dashboard/templates/tags/table-cells.tsx     | 8 ++------
 src/ui/primitives/button.tsx                              | 1 +
 7 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/features/dashboard/templates/builds/template-builds-header.tsx b/src/features/dashboard/templates/builds/template-builds-header.tsx
index d068d0669..38ac0cf8d 100644
--- a/src/features/dashboard/templates/builds/template-builds-header.tsx
+++ b/src/features/dashboard/templates/builds/template-builds-header.tsx
@@ -5,7 +5,6 @@ import { DebouncedInput } from '@/ui/primitives/input'
 import { BuildsStatusFilter } from './status-filter'
 import useTemplateBuildsFilters from './use-template-builds-filters'
 
-// 'q' filters client-side over the templateID-scoped backend results (see BuildsTable).
 export function TemplateBuildsHeader() {
   const { statuses, setStatuses, q, setQ } = useTemplateBuildsFilters()
 
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index f4a72914d..671ccc1f9 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -23,7 +23,6 @@ type BuildsQueryResult = {
 export type BuildSelectionSource = 'default' | 'search'
 
 const DEFAULT_LIMIT = 5
-const PICKER_REGION_MIN_HEIGHT = 'min-h-[128px]'
 
 interface BuildPickerProps {
   open: boolean
@@ -130,7 +129,7 @@ export default function BuildPicker({
         disabled={disabled}
       />
 
-      <div className={cn('flex flex-col', PICKER_REGION_MIN_HEIGHT)}>
+      <div className="flex flex-col min-h-[128px]">
         <PickerBody
           isSearchMode={isSearchMode}
           defaultQuery={defaultQuery}
diff --git a/src/features/dashboard/templates/tags/history/tag-history-header.tsx b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
index c153c4f59..8c94aeedc 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-header.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-header.tsx
@@ -19,8 +19,6 @@ import { DEFAULT_TAG_NAME } from '../constants'
 import TagDeleteDialog from '../delete-dialog'
 import ReassignTagDialog from '../reassign-dialog'
 
-const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
-
 interface TagHistoryHeaderProps {
   tag: string
   teamSlug: string
@@ -79,8 +77,7 @@ export function TagHistoryHeader({
         <div className="flex items-center gap-1 max-sm:hidden">
           <Button
             variant="primary"
-            size="none"
-            className={SMALL_BUTTON}
+            size="small"
             aria-label={`Reassign tag ${tag} to a different build`}
             onClick={() => setReassignOpen(true)}
           >
@@ -88,8 +85,7 @@ export function TagHistoryHeader({
           </Button>
           <Button
             variant="secondary"
-            size="none"
-            className={SMALL_BUTTON}
+            size="small"
             disabled={!canRollback}
             aria-label={
               canRollback
diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
index 04b815a8f..8fff8a9a0 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-row.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -21,8 +21,6 @@ export function TagHistoryRow({
   templateId,
   onRequestRollback,
 }: TagHistoryRowProps) {
-  'use no memo'
-
   const isCurrentBuild = assignment.buildId === primaryAssignment.buildId
 
   const buildSummary = (
diff --git a/src/features/dashboard/templates/tags/stores/table-store.ts b/src/features/dashboard/templates/tags/stores/table-store.ts
index 68079e33e..af1bad181 100644
--- a/src/features/dashboard/templates/tags/stores/table-store.ts
+++ b/src/features/dashboard/templates/tags/stores/table-store.ts
@@ -60,7 +60,6 @@ export const useTagTableStore = create<Store>()(
     {
       name: 'tags-table',
       storage: createJSONStorage(() => createHashStorage(initialState)),
-      // `expanded` is transient UI state — don't pollute the URL with it.
       partialize: ({ sorting, globalFilter }) => ({ sorting, globalFilter }),
     }
   )
diff --git a/src/features/dashboard/templates/tags/table-cells.tsx b/src/features/dashboard/templates/tags/table-cells.tsx
index 1c02320c5..d4c1c44b9 100644
--- a/src/features/dashboard/templates/tags/table-cells.tsx
+++ b/src/features/dashboard/templates/tags/table-cells.tsx
@@ -21,8 +21,6 @@ import ReassignTagDialog from './reassign-dialog'
 import RollbackTagDialog from './rollback-dialog'
 import type { TagGroup } from './types'
 
-const SMALL_BUTTON = 'h-7 px-2.5 py-1.5'
-
 export interface TagTableMeta {
   teamSlug: string
   templateId: string
@@ -81,8 +79,7 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
       >
         <Button
           variant="primary"
-          size="none"
-          className={SMALL_BUTTON}
+          size="small"
           aria-label={`Reassign tag ${group.tag} to a different build`}
           onClick={(e) => {
             e.stopPropagation()
@@ -93,8 +90,7 @@ export function ActionsCell(ctx: CellContext<TagGroup, unknown>) {
         </Button>
         <Button
           variant="secondary"
-          size="none"
-          className={SMALL_BUTTON}
+          size="small"
           disabled={!canRollback}
           aria-label={
             canRollback
diff --git a/src/ui/primitives/button.tsx b/src/ui/primitives/button.tsx
index 25219ab5d..2f370fb71 100644
--- a/src/ui/primitives/button.tsx
+++ b/src/ui/primitives/button.tsx
@@ -72,6 +72,7 @@ const buttonVariants = cva(
       size: {
         default:
           '[&_svg]:size-4 h-9 py-1.5 gap-1 [&:has(svg)]:pr-3 [&:has(svg)]:pl-2.5 px-4',
+        small: 'h-7 py-1.5 gap-1 [&_svg]:size-4 px-2.5',
         none: 'gap-1 [&_svg]:size-4',
       },
     },

From 5c3f79cd0ea4b2d6eae07c00589715069cd2b6d2 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 16:20:20 +0200
Subject: [PATCH 69/90] fix virtualizer

---
 .../dashboard/templates/tags/history/tag-history-view.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index 58f1cb276..c0f178234 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -184,7 +184,7 @@ export default function TagHistoryView({
         <div
           className="relative"
           style={{
-            height: `${virtualizer.getTotalSize() - HEADER_SCROLL_MARGIN_PX}px`,
+            height: `${virtualizer.getTotalSize()}px`,
           }}
         >
           {virtualItems.map((virtualRow) => {

From 422cd2b930396d2fc42dfde630e2f45dfad806c4 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 16:23:30 +0200
Subject: [PATCH 70/90] cleanup

---
 .../templates/detail/header-skeleton.tsx      | 30 ------
 .../dashboard/templates/detail/header.tsx     | 97 -------------------
 src/ui/primitives/table.tsx                   |  2 +-
 3 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 src/features/dashboard/templates/detail/header-skeleton.tsx
 delete mode 100644 src/features/dashboard/templates/detail/header.tsx

diff --git a/src/features/dashboard/templates/detail/header-skeleton.tsx b/src/features/dashboard/templates/detail/header-skeleton.tsx
deleted file mode 100644
index 4026f0848..000000000
--- a/src/features/dashboard/templates/detail/header-skeleton.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  DetailsItem,
-  DetailsRow,
-} from '@/features/dashboard/layouts/details-row'
-import { Skeleton } from '@/ui/primitives/skeleton'
-
-export default function TemplateDetailHeaderSkeleton() {
-  return (
-    <DetailsRow>
-      <DetailsItem label="Memory">
-        <Skeleton className="w-20 h-5" />
-      </DetailsItem>
-      <DetailsItem label="CPU">
-        <Skeleton className="w-16 h-5" />
-      </DetailsItem>
-      <DetailsItem label="Envd">
-        <Skeleton className="w-14 h-5" />
-      </DetailsItem>
-      <DetailsItem label="Created">
-        <Skeleton className="w-36 h-5" />
-      </DetailsItem>
-      <DetailsItem label="Updated">
-        <Skeleton className="w-36 h-5" />
-      </DetailsItem>
-      <DetailsItem label="Visibility">
-        <Skeleton className="w-20 h-5" />
-      </DetailsItem>
-    </DetailsRow>
-  )
-}
diff --git a/src/features/dashboard/templates/detail/header.tsx b/src/features/dashboard/templates/detail/header.tsx
deleted file mode 100644
index c171c6b03..000000000
--- a/src/features/dashboard/templates/detail/header.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-'use client'
-
-import { useSuspenseQuery } from '@tanstack/react-query'
-import ResourceUsage from '@/features/dashboard/common/resource-usage'
-import {
-  DetailsItem,
-  DetailsRow,
-} from '@/features/dashboard/layouts/details-row'
-import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
-import { NULL_BUILD_ID } from '@/features/dashboard/templates/tags/constants'
-import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
-import { useTRPC } from '@/trpc/client'
-import { TemplateVisibilityDropdown } from './visibility-dropdown'
-
-interface TemplateDetailHeaderProps {
-  teamSlug: string
-  templateId: string
-}
-
-export default function TemplateDetailHeader({
-  teamSlug,
-  templateId,
-}: TemplateDetailHeaderProps) {
-  const trpc = useTRPC()
-
-  const { data } = useSuspenseQuery(
-    trpc.templates.getTemplate.queryOptions({ teamSlug, templateId })
-  )
-
-  const template = data.template
-  const hasReadyBuild = template.buildID !== NULL_BUILD_ID
-
-  const displayName = getTemplateDisplayName(template)
-
-  const created = formatLocalLogStyleTimestamp(template.createdAt, {
-    includeSeconds: false,
-    includeYear: true,
-  })
-  const updated = formatLocalLogStyleTimestamp(template.updatedAt, {
-    includeSeconds: false,
-    includeYear: true,
-  })
-
-  return (
-    <DetailsRow>
-      <DetailsItem label="Memory">
-        {hasReadyBuild ? (
-          <ResourceUsage type="mem" total={template.memoryMB} mode="simple" />
-        ) : (
-          <span className="text-fg-tertiary font-mono">--</span>
-        )}
-      </DetailsItem>
-      <DetailsItem label="CPU">
-        {hasReadyBuild ? (
-          <ResourceUsage type="cpu" total={template.cpuCount} mode="simple" />
-        ) : (
-          <span className="text-fg-tertiary font-mono">--</span>
-        )}
-      </DetailsItem>
-      <DetailsItem label="Envd">
-        {hasReadyBuild ? (
-          <span className="font-mono whitespace-nowrap">
-            {template.envdVersion}
-          </span>
-        ) : (
-          <span className="text-fg-tertiary font-mono">--</span>
-        )}
-      </DetailsItem>
-      <DetailsItem label="Created">
-        <span className="font-mono whitespace-nowrap prose-body-numeric">
-          <span className="text-fg-tertiary">{created?.datePart ?? '--'}</span>{' '}
-          {created?.timePart ?? '--'}{' '}
-          <span className="text-fg-tertiary">
-            {created?.timezonePart ?? ''}
-          </span>
-        </span>
-      </DetailsItem>
-      <DetailsItem label="Updated">
-        <span className="font-mono whitespace-nowrap prose-body-numeric">
-          <span className="text-fg-tertiary">{updated?.datePart ?? '--'}</span>{' '}
-          {updated?.timePart ?? '--'}{' '}
-          <span className="text-fg-tertiary">
-            {updated?.timezonePart ?? ''}
-          </span>
-        </span>
-      </DetailsItem>
-      <DetailsItem label="Visibility">
-        <TemplateVisibilityDropdown
-          teamSlug={teamSlug}
-          templateId={template.templateID}
-          isPublic={template.public}
-          displayName={displayName}
-        />
-      </DetailsItem>
-    </DetailsRow>
-  )
-}
diff --git a/src/ui/primitives/table.tsx b/src/ui/primitives/table.tsx
index 6d5224dd3..99f16420b 100644
--- a/src/ui/primitives/table.tsx
+++ b/src/ui/primitives/table.tsx
@@ -33,7 +33,7 @@ const TableBody = React.forwardRef<
     ref={ref}
     className={cn(
       '[&_tr:last-child]:border-0',
-      '[&_tr]:border-b [&_tr]:border-b-stroke/80',
+      '[&_tr]:border-b [&_tr]:border-stroke/80',
       className
     )}
     {...props}

From 478a8fe6716a87c35733a75e7e8806e8fb0331df Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 16:44:56 +0200
Subject: [PATCH 71/90] Prefetch improvements

---
 .../(detail-tabs)/overview/page.tsx           | 17 +++++++---
 .../(detail-tabs)/tags/[tag]/page.tsx         | 31 +++++++++++++------
 .../[templateId]/(detail-tabs)/tags/page.tsx  | 25 ++++++++++++---
 src/features/dashboard/build/header-cells.tsx |  2 +-
 .../dashboard/sandboxes/list/table-cells.tsx  |  2 +-
 .../templates/builds/table-cells.tsx          |  2 +-
 .../detail/overview/latest-build-section.tsx  |  6 ++--
 .../dashboard/templates/tags/build-link.tsx   |  6 ++--
 .../dashboard/templates/tags/constants.ts     |  3 ++
 .../tags/history/tag-history-view.tsx         |  3 +-
 .../dashboard/templates/tags/table.tsx        |  9 +++---
 src/ui/hover-prefetch-link.tsx                | 11 +++++--
 12 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index c084a46ec..74804d1bb 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -1,17 +1,24 @@
 import { Suspense } from 'react'
 import TemplateOverview from '@/features/dashboard/templates/detail/overview'
 import { TemplateOverviewSkeleton } from '@/features/dashboard/templates/detail/overview/skeleton'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateOverviewPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
+  prefetch(
+    trpc.templates.getDefaultBuild.queryOptions({ teamSlug, templateId })
+  )
+
   return (
-    <div className="p-6 md:p-10 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
-      <Suspense fallback={<TemplateOverviewSkeleton />}>
-        <TemplateOverview teamSlug={teamSlug} templateId={templateId} />
-      </Suspense>
-    </div>
+    <HydrateClient>
+      <div className="p-6 md:p-10 flex flex-col gap-6 w-full max-w-[600px] mx-auto">
+        <Suspense fallback={<TemplateOverviewSkeleton />}>
+          <TemplateOverview teamSlug={teamSlug} templateId={templateId} />
+        </Suspense>
+      </div>
+    </HydrateClient>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
index 4192ef2cb..88399092f 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/[tag]/page.tsx
@@ -1,6 +1,8 @@
 import { Suspense } from 'react'
 import LoadingLayout from '@/features/dashboard/loading-layout'
+import { TAG_HISTORY_PAGE_LIMIT } from '@/features/dashboard/templates/tags/constants'
 import TagHistoryView from '@/features/dashboard/templates/tags/history/tag-history-view'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateTagHistoryPage({
   params,
@@ -8,15 +10,26 @@ export default async function TemplateTagHistoryPage({
   const { teamSlug, templateId, tag } = await params
   const decodedTag = decodeURIComponent(tag)
 
+  prefetch(
+    trpc.templates.getTagAssignments.infiniteQueryOptions({
+      teamSlug,
+      templateId,
+      tag: decodedTag,
+      limit: TAG_HISTORY_PAGE_LIMIT,
+    })
+  )
+
   return (
-    <div className="h-full min-h-0 flex-1 py-6 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
-      <Suspense fallback={<LoadingLayout />}>
-        <TagHistoryView
-          teamSlug={teamSlug}
-          templateId={templateId}
-          tag={decodedTag}
-        />
-      </Suspense>
-    </div>
+    <HydrateClient>
+      <div className="h-full min-h-0 flex-1 py-6 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
+        <Suspense fallback={<LoadingLayout />}>
+          <TagHistoryView
+            teamSlug={teamSlug}
+            templateId={templateId}
+            tag={decodedTag}
+          />
+        </Suspense>
+      </div>
+    </HydrateClient>
   )
 }
diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
index d1227464d..8d5aa3c79 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
@@ -1,17 +1,32 @@
 import { Suspense } from 'react'
 import LoadingLayout from '@/features/dashboard/loading-layout'
+import { TAGS_PAGE_LIMIT } from '@/features/dashboard/templates/tags/constants'
 import TagsTable from '@/features/dashboard/templates/tags/table'
+import { HydrateClient, prefetch, trpc } from '@/trpc/server'
 
 export default async function TemplateTagsPage({
   params,
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
+  prefetch(
+    trpc.templates.getTagGroups.infiniteQueryOptions({
+      teamSlug,
+      templateId,
+      limit: TAGS_PAGE_LIMIT,
+      search: undefined,
+      sort: undefined,
+    })
+  )
+  prefetch(trpc.templates.getTagCount.queryOptions({ teamSlug, templateId }))
+
   return (
-    <div className="h-full min-h-0 flex-1 py-6 md:py-10 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
-      <Suspense fallback={<LoadingLayout />}>
-        <TagsTable teamSlug={teamSlug} templateId={templateId} />
-      </Suspense>
-    </div>
+    <HydrateClient>
+      <div className="h-full min-h-0 flex-1 py-6 md:py-10 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
+        <Suspense fallback={<LoadingLayout />}>
+          <TagsTable teamSlug={teamSlug} templateId={templateId} />
+        </Suspense>
+      </div>
+    </HydrateClient>
   )
 }
diff --git a/src/features/dashboard/build/header-cells.tsx b/src/features/dashboard/build/header-cells.tsx
index a072653fb..5e9418ac4 100644
--- a/src/features/dashboard/build/header-cells.tsx
+++ b/src/features/dashboard/build/header-cells.tsx
@@ -30,7 +30,7 @@ export function Template({
       className={cn('max-w-full', className)}
     >
       <Link
-        href={PROTECTED_URLS.TEMPLATE_DETAIL(teamSlug, templateId)}
+        href={PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, templateId)}
         onClick={(e) => e.stopPropagation()}
       >
         <p className="truncate">{template}</p>
diff --git a/src/features/dashboard/sandboxes/list/table-cells.tsx b/src/features/dashboard/sandboxes/list/table-cells.tsx
index c56ef3295..8cc5e4983 100644
--- a/src/features/dashboard/sandboxes/list/table-cells.tsx
+++ b/src/features/dashboard/sandboxes/list/table-cells.tsx
@@ -127,7 +127,7 @@ export function TemplateCell({
   return (
     <Button asChild variant="link-table" size="none">
       <Link
-        href={PROTECTED_URLS.TEMPLATE_DETAIL(team.slug, templateId)}
+        href={PROTECTED_URLS.TEMPLATE_OVERVIEW(team.slug, templateId)}
         onClick={(e) => e.stopPropagation()}
       >
         <span className="min-w-0 truncate">{templateIdentifier}</span>
diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 10121437a..48517adac 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -49,7 +49,7 @@ export function Template({
       className={cn('max-w-full', className)}
     >
       <Link
-        href={PROTECTED_URLS.TEMPLATE_DETAIL(teamSlug, templateId)}
+        href={PROTECTED_URLS.TEMPLATE_OVERVIEW(teamSlug, templateId)}
         onClick={(e) => e.stopPropagation()}
       >
         <p className="truncate">{template}</p>
diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
index a2f999d58..06febc717 100644
--- a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -1,7 +1,6 @@
 'use client'
 
 import { useSuspenseQuery } from '@tanstack/react-query'
-import Link from 'next/link'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { BuildStatus } from '@/core/modules/builds/models'
 import type { TemplateDefaultBuildModel } from '@/core/modules/templates/models'
@@ -10,6 +9,7 @@ import { useNow } from '@/lib/hooks/use-now'
 import { formatTimeAgoCompact } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
+import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { Badge } from '@/ui/primitives/badge'
 import { Button } from '@/ui/primitives/button'
 import { CheckIcon, CloseIcon, CopyIcon } from '@/ui/primitives/icons'
@@ -161,11 +161,11 @@ function BuildIdRow({
         </span>
       </button>
       <Button asChild variant="tertiary" size="none" className="px-3 py-1.5">
-        <Link
+        <HoverPrefetchLink
           href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
         >
           Open
-        </Link>
+        </HoverPrefetchLink>
       </Button>
     </div>
   )
diff --git a/src/features/dashboard/templates/tags/build-link.tsx b/src/features/dashboard/templates/tags/build-link.tsx
index 0a37c24e9..c79dd7d61 100644
--- a/src/features/dashboard/templates/tags/build-link.tsx
+++ b/src/features/dashboard/templates/tags/build-link.tsx
@@ -1,10 +1,10 @@
 'use client'
 
-import Link from 'next/link'
 import { useMemo } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
 import { formatRelativeAgo } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
+import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { NULL_BUILD_ID } from './constants'
 
 interface BuildLinkProps {
@@ -48,12 +48,12 @@ export function BuildLink({
   return (
     <div className="flex items-center gap-2 min-w-0">
       {isLinkable ? (
-        <Link
+        <HoverPrefetchLink
           href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
           className="group/build text-fg hover:text-fg"
         >
           {inner}
-        </Link>
+        </HoverPrefetchLink>
       ) : (
         <span className="text-fg-tertiary">{inner}</span>
       )}
diff --git a/src/features/dashboard/templates/tags/constants.ts b/src/features/dashboard/templates/tags/constants.ts
index 4accf9925..07ae2db0e 100644
--- a/src/features/dashboard/templates/tags/constants.ts
+++ b/src/features/dashboard/templates/tags/constants.ts
@@ -1,2 +1,5 @@
 export const DEFAULT_TAG_NAME = 'default'
 export const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
+
+export const TAGS_PAGE_LIMIT = 50
+export const TAG_HISTORY_PAGE_LIMIT = 50
diff --git a/src/features/dashboard/templates/tags/history/tag-history-view.tsx b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
index c0f178234..2f5474865 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-view.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-view.tsx
@@ -15,6 +15,7 @@ import { LoadMoreButton } from '@/features/dashboard/templates/builds/table-cell
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { useTRPC } from '@/trpc/client'
 import { Loader } from '@/ui/primitives/loader'
+import { TAG_HISTORY_PAGE_LIMIT } from '../constants'
 import RollbackTagDialog, { type RollbackSurface } from '../rollback-dialog'
 import { TagHistoryEmpty } from './tag-history-empty'
 import { TagHistoryHeader } from './tag-history-header'
@@ -63,7 +64,7 @@ export default function TagHistoryView({
   const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isPending } =
     useInfiniteQuery(
       trpc.templates.getTagAssignments.infiniteQueryOptions(
-        { teamSlug, templateId, tag, limit: 50 },
+        { teamSlug, templateId, tag, limit: TAG_HISTORY_PAGE_LIMIT },
         {
           getNextPageParam: (page) => page.nextCursor ?? undefined,
           initialCursor: undefined,
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index ee4e27d94..10c8932b0 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -14,7 +14,6 @@ import {
   type TableOptions,
   useReactTable,
 } from '@tanstack/react-table'
-import Link from 'next/link'
 import {
   type KeyboardEvent,
   type MouseEvent,
@@ -37,9 +36,11 @@ import {
   DataTableHeader,
   DataTableRow,
 } from '@/ui/data-table'
+import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { TriangleIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
 import { RowHoverFrame } from '@/ui/row-hover-frame'
+import { TAGS_PAGE_LIMIT } from './constants'
 import TagsEmpty from './empty'
 import TagsHeader from './header'
 import { TagHistoryRow } from './history/tag-history-row'
@@ -56,8 +57,6 @@ import {
 } from './table-config'
 import type { TagGroup } from './types'
 
-const TAGS_PAGE_LIMIT = 50
-
 interface TagsTableProps {
   teamSlug: string
   templateId: string
@@ -461,7 +460,7 @@ function ShowFullHistoryRow({
   templateId,
 }: ShowFullHistoryRowProps) {
   return (
-    <Link
+    <HoverPrefetchLink
       href={PROTECTED_URLS.TEMPLATE_TAG_HISTORY(teamSlug, templateId, tag)}
       onClick={() =>
         trackTagTableInteraction('show_full_history_clicked', { tag })
@@ -472,6 +471,6 @@ function ShowFullHistoryRow({
       )}
     >
       Show full history
-    </Link>
+    </HoverPrefetchLink>
   )
 }
diff --git a/src/ui/hover-prefetch-link.tsx b/src/ui/hover-prefetch-link.tsx
index 80e7f6176..00e8d1754 100644
--- a/src/ui/hover-prefetch-link.tsx
+++ b/src/ui/hover-prefetch-link.tsx
@@ -1,11 +1,16 @@
 'use client'
 
-import Link, { type LinkProps } from 'next/link'
-import { forwardRef, useState } from 'react'
+import Link from 'next/link'
+import { type ComponentPropsWithoutRef, forwardRef, useState } from 'react'
+
+type HoverPrefetchLinkProps = Omit<
+  ComponentPropsWithoutRef<typeof Link>,
+  'prefetch' | 'onMouseEnter'
+>
 
 export const HoverPrefetchLink = forwardRef<
   HTMLAnchorElement,
-  Omit<LinkProps, 'prefetch' | 'onMouseEnter'> & { children: React.ReactNode }
+  HoverPrefetchLinkProps
 >(function HoverPrefetchLink({ href, children, ...props }, ref) {
   const [active, setActive] = useState(false)
 

From cf382e8fb5ec5bd195475a9a3a7a315f6acb8d70 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 18:14:50 +0200
Subject: [PATCH 72/90] clean up

---
 src/configs/urls.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/configs/urls.ts b/src/configs/urls.ts
index 1332ffc5b..da6de8a26 100644
--- a/src/configs/urls.ts
+++ b/src/configs/urls.ts
@@ -44,8 +44,6 @@ export const PROTECTED_URLS = {
   TEMPLATES_LIST: (teamSlug: string) => `/dashboard/${teamSlug}/templates/list`,
   TEMPLATES_BUILDS: (teamSlug: string) =>
     `/dashboard/${teamSlug}/templates/builds`,
-  TEMPLATE_DETAIL: (teamSlug: string, templateId: string) =>
-    `/dashboard/${teamSlug}/templates/${templateId}/overview`,
   TEMPLATE_OVERVIEW: (teamSlug: string, templateId: string) =>
     `/dashboard/${teamSlug}/templates/${templateId}/overview`,
   TEMPLATE_DETAIL_BUILDS: (teamSlug: string, templateId: string) =>

From d5f7f0666314b7ca5a179d0ca45fff96a268f8c8 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 18:29:44 +0200
Subject: [PATCH 73/90] fix tailwind class

---
 src/features/dashboard/templates/detail/visibility-dropdown.tsx | 2 +-
 src/features/dashboard/templates/list/table-cells.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/detail/visibility-dropdown.tsx b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
index 975f1df80..458e5b674 100644
--- a/src/features/dashboard/templates/detail/visibility-dropdown.tsx
+++ b/src/features/dashboard/templates/detail/visibility-dropdown.tsx
@@ -132,7 +132,7 @@ export function TemplateVisibilityDropdown({
           <Badge
             variant="default"
             size="sm"
-            className={cn('uppercase bg-fill', !isPublic && 'pl-[3]')}
+            className={cn('uppercase bg-fill', !isPublic && 'pl-[3px]')}
           >
             {!isPublic && <PrivateIcon className="size-3 text-fg-tertiary" />}
             {isPublic ? 'Public' : 'Internal'}
diff --git a/src/features/dashboard/templates/list/table-cells.tsx b/src/features/dashboard/templates/list/table-cells.tsx
index 9c8ec61e7..c33be5e1a 100644
--- a/src/features/dashboard/templates/list/table-cells.tsx
+++ b/src/features/dashboard/templates/list/table-cells.tsx
@@ -489,7 +489,7 @@ export function VisibilityCell({
     <Badge
       variant="default"
       size="sm"
-      className={cn('uppercase bg-fill', !isPublic && 'pl-[3]')}
+      className={cn('uppercase bg-fill', !isPublic && 'pl-[3px]')}
     >
       {!isPublic && <PrivateIcon className="size-3 text-fg-tertiary" />}
       {isPublic ? 'Public' : 'Internal'}

From d04c559ba15d9ed56797fec4446bfd07833f3d63 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 19:07:13 +0200
Subject: [PATCH 74/90] simplify default template overview data fetch

---
 .../modules/templates/repository.server.ts    | 71 ++++---------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 18c150687..8110b0d18 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -7,8 +7,6 @@ import {
   MOCK_DEFAULT_TEMPLATES_DATA,
   MOCK_TEMPLATES_DATA,
 } from '@/configs/mock-data'
-import type { components as InfraComponents } from '@/contracts/infra-api'
-import type { BuildStatus } from '@/core/modules/builds/models'
 import type {
   DefaultTemplate,
   Template,
@@ -32,16 +30,6 @@ import { err, ok, type RepoResult } from '@/core/shared/result'
 
 const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
 
-type InfraBuildStatus = NonNullable<
-  InfraComponents['schemas']['TemplateBuild']
->['status']
-
-function mapInfraBuildStatus(status: InfraBuildStatus): BuildStatus {
-  if (status === 'ready') return 'success'
-  if (status === 'error') return 'failed'
-  return 'building'
-}
-
 type TemplatesRepositoryDeps = {
   apiClient: typeof api
   infraClient: typeof infra
@@ -179,67 +167,38 @@ export function createTemplatesRepository(
         })
       }
 
-      const tagsRes = await deps.infraClient.GET(
-        '/templates/{templateID}/tags',
-        {
-          params: { path: { templateID: templateId } },
-          headers: {
-            ...deps.authHeaders(scope.accessToken, scope.teamId),
-          },
-        }
-      )
-
-      if (!tagsRes.response.ok || tagsRes.error) {
-        return err(
-          repoErrorFromHttp(
-            tagsRes.response.status,
-            tagsRes.error?.message ?? 'Failed to fetch template tags',
-            tagsRes.error
-          )
-        )
-      }
-
-      const defaultTag = (tagsRes.data ?? []).find((t) => t.tag === 'default')
-      if (!defaultTag) {
-        return ok({ build: null })
-      }
-
-      const buildsRes = await deps.infraClient.GET('/templates/{templateID}', {
+      const res = await deps.apiClient.GET('/templates/{templateID}', {
         params: { path: { templateID: templateId } },
         headers: {
           ...deps.authHeaders(scope.accessToken, scope.teamId),
         },
       })
 
-      if (!buildsRes.response.ok || buildsRes.error) {
+      if (!res.response.ok || res.error) {
         return err(
           repoErrorFromHttp(
-            buildsRes.response.status,
-            buildsRes.error?.message ?? 'Failed to fetch template builds',
-            buildsRes.error
+            res.response.status,
+            res.error?.message ?? 'Failed to fetch template',
+            res.error
           )
         )
       }
 
-      const build = buildsRes.data?.builds.find(
-        (b) => b.buildID === defaultTag.buildID
-      )
-      if (!build) {
+      if (!res.data || res.data.buildID === NULL_BUILD_ID) {
         return ok({ build: null })
       }
 
+      const updatedAtMs = new Date(res.data.updatedAt).getTime()
       return ok({
         build: {
-          buildID: build.buildID,
-          status: mapInfraBuildStatus(build.status),
-          createdAt: new Date(build.createdAt).getTime(),
-          finishedAt: build.finishedAt
-            ? new Date(build.finishedAt).getTime()
-            : null,
-          cpuCount: build.cpuCount,
-          memoryMB: build.memoryMB,
-          diskSizeMB: build.diskSizeMB ?? null,
-          envdVersion: build.envdVersion ?? null,
+          buildID: res.data.buildID,
+          status: 'success' as const,
+          createdAt: updatedAtMs,
+          finishedAt: updatedAtMs,
+          cpuCount: res.data.cpuCount,
+          memoryMB: res.data.memoryMB,
+          diskSizeMB: res.data.diskSizeMB,
+          envdVersion: res.data.envdVersion || null,
         },
       })
     },

From bb1b506e802025006ffaf26835221ec44b27a76c Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 19:07:21 +0200
Subject: [PATCH 75/90] fix reassign dialog retry

---
 src/features/dashboard/templates/tags/reassign-dialog.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index a4aa58b6e..e5e5a950b 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -77,8 +77,7 @@ export default function ReassignTagDialog({
 
   const isSameAsCurrent =
     selectedBuildId !== null && selectedBuildId === currentBuildId
-  const canSubmit =
-    stage === 'idle' && selectedBuildId !== null && !isSameAsCurrent
+  const canSubmit = selectedBuildId !== null && !isSameAsCurrent
 
   const submit = () => {
     if (!canSubmit || !selectedBuildId) return

From 3e2cd7e6377f1f2dd46332c6855aa9981cdf06e9 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 19:20:30 +0200
Subject: [PATCH 76/90] Remove getDefaultTemplate handler

---
 .../(detail-tabs)/overview/page.tsx           |  4 +-
 src/core/modules/templates/models.ts          | 12 ----
 .../modules/templates/repository.server.ts    | 63 -------------------
 src/core/server/api/routers/templates.ts      | 14 -----
 .../detail/overview/latest-build-section.tsx  | 20 +++---
 5 files changed, 10 insertions(+), 103 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
index 74804d1bb..65ed5fd48 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/overview/page.tsx
@@ -8,9 +8,7 @@ export default async function TemplateOverviewPage({
 }: PageProps<'/dashboard/[teamSlug]/templates/[templateId]'>) {
   const { teamSlug, templateId } = await params
 
-  prefetch(
-    trpc.templates.getDefaultBuild.queryOptions({ teamSlug, templateId })
-  )
+  prefetch(trpc.templates.getTemplate.queryOptions({ teamSlug, templateId }))
 
   return (
     <HydrateClient>
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index 4a2f46314..03566100c 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -1,6 +1,5 @@
 import type { components as DashboardComponents } from '@/contracts/dashboard-api'
 import type { components as InfraComponents } from '@/contracts/infra-api'
-import type { BuildStatus } from '@/core/modules/builds/models'
 
 export type Template = Pick<
   InfraComponents['schemas']['Template'],
@@ -27,17 +26,6 @@ export type DefaultTemplate = Template & {
 
 export type TemplateTag = InfraComponents['schemas']['TemplateTag']
 
-export interface TemplateDefaultBuildModel {
-  buildID: string
-  status: BuildStatus
-  createdAt: number
-  finishedAt: number | null
-  cpuCount: number
-  memoryMB: number
-  diskSizeMB: number | null
-  envdVersion: string | null
-}
-
 export type TemplateTagAssignment =
   DashboardComponents['schemas']['TemplateTagAssignment']
 export type TemplateTagGroup =
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 8110b0d18..4ad2fd9e5 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -10,7 +10,6 @@ import {
 import type {
   DefaultTemplate,
   Template,
-  TemplateDefaultBuildModel,
   TemplateTagAssignment,
   TemplateTagExistsResult,
   TemplateTagGroup,
@@ -28,8 +27,6 @@ import type {
 } from '@/core/shared/repository-scope'
 import { err, ok, type RepoResult } from '@/core/shared/result'
 
-const NULL_BUILD_ID = '00000000-0000-0000-0000-000000000000'
-
 type TemplatesRepositoryDeps = {
   apiClient: typeof api
   infraClient: typeof infra
@@ -40,9 +37,6 @@ type TemplatesRepositoryDeps = {
 export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
   getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
-  getDefaultBuild(
-    templateId: string
-  ): Promise<RepoResult<{ build: TemplateDefaultBuildModel | null }>>
   getTagGroups(
     templateId: string,
     options?: {
@@ -145,63 +139,6 @@ export function createTemplatesRepository(
 
       return ok({ template: res.data })
     },
-    async getDefaultBuild(templateId) {
-      if (USE_MOCK_DATA) {
-        const mock = MOCK_TEMPLATES_DATA.find(
-          (t) => t.templateID === templateId
-        )
-        if (!mock || mock.buildID === NULL_BUILD_ID) {
-          return ok({ build: null })
-        }
-        return ok({
-          build: {
-            buildID: mock.buildID,
-            status: 'success' as const,
-            createdAt: new Date(mock.updatedAt).getTime(),
-            finishedAt: new Date(mock.updatedAt).getTime(),
-            cpuCount: mock.cpuCount,
-            memoryMB: mock.memoryMB,
-            diskSizeMB: mock.diskSizeMB,
-            envdVersion: mock.envdVersion || null,
-          },
-        })
-      }
-
-      const res = await deps.apiClient.GET('/templates/{templateID}', {
-        params: { path: { templateID: templateId } },
-        headers: {
-          ...deps.authHeaders(scope.accessToken, scope.teamId),
-        },
-      })
-
-      if (!res.response.ok || res.error) {
-        return err(
-          repoErrorFromHttp(
-            res.response.status,
-            res.error?.message ?? 'Failed to fetch template',
-            res.error
-          )
-        )
-      }
-
-      if (!res.data || res.data.buildID === NULL_BUILD_ID) {
-        return ok({ build: null })
-      }
-
-      const updatedAtMs = new Date(res.data.updatedAt).getTime()
-      return ok({
-        build: {
-          buildID: res.data.buildID,
-          status: 'success' as const,
-          createdAt: updatedAtMs,
-          finishedAt: updatedAtMs,
-          cpuCount: res.data.cpuCount,
-          memoryMB: res.data.memoryMB,
-          diskSizeMB: res.data.diskSizeMB,
-          envdVersion: res.data.envdVersion || null,
-        },
-      })
-    },
     async getTagGroups(templateId, options) {
       if (USE_MOCK_DATA) {
         return ok({ tags: [], nextCursor: null })
diff --git a/src/core/server/api/routers/templates.ts b/src/core/server/api/routers/templates.ts
index eacfc1498..09cb262f1 100644
--- a/src/core/server/api/routers/templates.ts
+++ b/src/core/server/api/routers/templates.ts
@@ -54,20 +54,6 @@ export const templatesRouter = createTRPCRouter({
       return result.data
     }),
 
-  getDefaultBuild: teamTemplatesRepositoryProcedure
-    .input(
-      z.object({
-        templateId: z.string(),
-      })
-    )
-    .query(async ({ ctx, input }) => {
-      const result = await ctx.templatesRepository.getDefaultBuild(
-        input.templateId
-      )
-      if (!result.ok) throwTRPCErrorFromRepoError(result.error)
-      return result.data
-    }),
-
   getTagGroups: teamTemplatesRepositoryProcedure
     .input(
       z.object({
diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
index 06febc717..98514575c 100644
--- a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -3,7 +3,6 @@
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { BuildStatus } from '@/core/modules/builds/models'
-import type { TemplateDefaultBuildModel } from '@/core/modules/templates/models'
 import { useClipboard } from '@/lib/hooks/use-clipboard'
 import { useNow } from '@/lib/hooks/use-now'
 import { formatTimeAgoCompact } from '@/lib/utils/formatting'
@@ -13,6 +12,7 @@ import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { Badge } from '@/ui/primitives/badge'
 import { Button } from '@/ui/primitives/button'
 import { CheckIcon, CloseIcon, CopyIcon } from '@/ui/primitives/icons'
+import { NULL_BUILD_ID } from '../../tags/constants'
 import { OverviewSection } from './section'
 import { TemplateSpecs } from './template-specs'
 
@@ -28,10 +28,12 @@ export function LatestBuildSection({
   const trpc = useTRPC()
 
   const { data } = useSuspenseQuery(
-    trpc.templates.getDefaultBuild.queryOptions({ teamSlug, templateId })
+    trpc.templates.getTemplate.queryOptions({ teamSlug, templateId })
   )
 
-  if (!data.build) {
+  const template = data.template
+
+  if (template.buildID === NULL_BUILD_ID) {
     return (
       <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
         <p className="text-fg-tertiary prose-body">
@@ -45,22 +47,20 @@ export function LatestBuildSection({
     )
   }
 
-  const build = data.build
-
   return (
     <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
       <div className="flex flex-col md:flex-row items-start gap-x-8 gap-y-4">
         <div className="flex flex-col gap-2 min-w-0">
-          <BuildAgo timestamp={build.createdAt} />
-          <BuildStatusBadge status={build.status} />
+          <BuildAgo timestamp={new Date(template.updatedAt).getTime()} />
+          <BuildStatusBadge status="success" />
         </div>
         <BuildIdRow
           teamSlug={teamSlug}
           templateId={templateId}
-          buildId={build.buildID}
+          buildId={template.buildID}
         />
       </div>
-      <TemplateSpecs build={build} className="mt-2" />
+      <TemplateSpecs build={template} className="mt-2" />
     </OverviewSection>
   )
 }
@@ -170,5 +170,3 @@ function BuildIdRow({
     </div>
   )
 }
-
-export type { TemplateDefaultBuildModel }

From 1f1467fae8579941b24a1d5771f4a77c376615b3 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 22:16:24 +0200
Subject: [PATCH 77/90] Handle TemplateDetail model

---
 spec/openapi.dashboard-api.yaml               |   18 +-
 src/configs/mock-data.ts                      |   11 +-
 src/core/modules/templates/models.ts          |   16 +
 .../modules/templates/repository.server.ts    |    5 +-
 .../shared/contracts/dashboard-api.types.ts   | 2973 +++++++++--------
 .../detail/overview/template-specs.tsx        |   10 +-
 6 files changed, 1558 insertions(+), 1475 deletions(-)

diff --git a/spec/openapi.dashboard-api.yaml b/spec/openapi.dashboard-api.yaml
index eddfddf68..465226803 100644
--- a/spec/openapi.dashboard-api.yaml
+++ b/spec/openapi.dashboard-api.yaml
@@ -788,11 +788,20 @@ components:
           type: string
           description: Identifier of the latest ready build for the template, or the zero UUID when none.
         cpuCount:
-          $ref: "#/components/schemas/CPUCount"
+          allOf:
+            - $ref: "#/components/schemas/CPUCount"
+          nullable: true
+          description: vCPU count of the latest ready default build, or `null` when none.
         memoryMB:
-          $ref: "#/components/schemas/MemoryMB"
+          allOf:
+            - $ref: "#/components/schemas/MemoryMB"
+          nullable: true
+          description: Memory in MiB of the latest ready default build, or `null` when none.
         diskSizeMB:
-          $ref: "#/components/schemas/DiskSizeMB"
+          allOf:
+            - $ref: "#/components/schemas/DiskSizeMB"
+          nullable: true
+          description: Disk size in MiB of the latest ready default build, or `null` when none.
         public:
           type: boolean
           description: Whether the template is public or only accessible by the team.
@@ -830,7 +839,8 @@ components:
           description: Number of times the template was built.
         envdVersion:
           type: string
-          description: Envd version of the latest ready build, or an empty string when none.
+          nullable: true
+          description: envd version of the latest ready default build, or `null` when none.
 
     TemplateTagAssignment:
       type: object
diff --git a/src/configs/mock-data.ts b/src/configs/mock-data.ts
index 7c750c8d4..4d886d6b3 100644
--- a/src/configs/mock-data.ts
+++ b/src/configs/mock-data.ts
@@ -733,9 +733,10 @@ function generateMockSandboxes(count: number): Sandboxes {
     const startDate = subHours(baseDate, Math.floor(Math.random() * 30))
     const endDate = addHours(startDate, 24)
 
-    // Random memory and CPU from template's allowed values
-    const memory = template.memoryMB
-    const cpu = template.cpuCount
+    // Random memory and CPU from template's allowed values; mock templates
+    // always carry real specs, so default the (now-nullable) fields here.
+    const memory = template.memoryMB ?? 2048
+    const cpu = template.cpuCount ?? 2
 
     sandboxes.push({
       alias: `${env}-${component}-${nanoid(4)}`,
@@ -743,8 +744,8 @@ function generateMockSandboxes(count: number): Sandboxes {
       cpuCount: cpu,
       endAt: endDate.toISOString(),
       memoryMB: memory,
-      diskSizeMB: template.diskSizeMB,
-      envdVersion: template.envdVersion,
+      diskSizeMB: template.diskSizeMB ?? 1024,
+      envdVersion: template.envdVersion ?? '0.1.0',
       metadata: {
         lastUpdate: new Date(
           startDate.getTime() + 2 * 60 * 60 * 1000
diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index 03566100c..8cb6a1891 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -19,6 +19,22 @@ export type Template = Pick<
   | 'envdVersion'
 >
 
+export type TemplateDetail = Pick<
+  DashboardComponents['schemas']['TemplateDetail'],
+  | 'templateID'
+  | 'buildID'
+  | 'cpuCount'
+  | 'memoryMB'
+  | 'diskSizeMB'
+  | 'public'
+  | 'createdAt'
+  | 'updatedAt'
+  | 'lastSpawnedAt'
+  | 'spawnCount'
+  | 'buildCount'
+  | 'envdVersion'
+>
+
 export type DefaultTemplate = Template & {
   isDefault: true
   defaultDescription?: string
diff --git a/src/core/modules/templates/repository.server.ts b/src/core/modules/templates/repository.server.ts
index 4ad2fd9e5..7f50815af 100644
--- a/src/core/modules/templates/repository.server.ts
+++ b/src/core/modules/templates/repository.server.ts
@@ -10,6 +10,7 @@ import {
 import type {
   DefaultTemplate,
   Template,
+  TemplateDetail,
   TemplateTagAssignment,
   TemplateTagExistsResult,
   TemplateTagGroup,
@@ -36,7 +37,9 @@ type TemplatesRepositoryDeps = {
 
 export interface TeamTemplatesRepository {
   getTeamTemplates(): Promise<RepoResult<{ templates: Template[] }>>
-  getTemplate(templateId: string): Promise<RepoResult<{ template: Template }>>
+  getTemplate(
+    templateId: string
+  ): Promise<RepoResult<{ template: TemplateDetail }>>
   getTagGroups(
     templateId: string,
     options?: {
diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index 2e120cb6b..924a197a1 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -4,1466 +4,1519 @@
  */
 
 export interface paths {
-  '/health': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Health check */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Health check successful */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['HealthResponse']
-          }
-        }
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** List team builds */
-    get: {
-      parameters: {
-        query?: {
-          /** @description Optional filter by build identifier, template identifier, or template alias. */
-          build_id_or_template?: components['parameters']['build_id_or_template']
-          /** @description Comma-separated list of build statuses to include. */
-          statuses?: components['parameters']['build_statuses']
-          /** @description Maximum number of items to return per page. */
-          limit?: components['parameters']['builds_limit']
-          /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-          cursor?: components['parameters']['builds_cursor']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned paginated builds. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildsListResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds/statuses': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get build statuses */
-    get: {
-      parameters: {
-        query: {
-          /** @description Comma-separated list of build IDs to get statuses for. */
-          build_ids: components['parameters']['build_ids']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned build statuses */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildsStatusesResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/builds/{build_id}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get build details */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the build. */
-          build_id: components['parameters']['build_id']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned build details. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['BuildInfo']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/sandboxes/{sandboxID}/record': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get sandbox record */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the sandbox. */
-          sandboxID: components['parameters']['sandboxID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned sandbox details. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['SandboxRecord']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List user teams
-     * @description Returns all teams the authenticated user belongs to, with limits and default flag.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned user teams. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['UserTeamsResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    /** Create team */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['CreateTeamRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully created team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/users/{userId}/bootstrap': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Bootstrap user */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the user. */
-          userId: components['parameters']['userId']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully bootstrapped user. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/teams/bootstrap': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /**
-     * Bootstrap team
-     * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
-     */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['AdminTeamBootstrapRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully bootstrapped team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-        502: components['responses']['502']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/user-profiles/resolve': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Resolve user profiles */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['AdminAuthProviderProfilesResolveRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully resolved profiles. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/user-profiles/by-email': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Lookup user profiles by email */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['AdminAuthProviderProfilesLookupEmailRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully found matching profiles. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/admin/user-profiles/{userId}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Get user profile */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the user. */
-          userId: components['parameters']['userId']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully found profile. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/resolve': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Resolve team identity
-     * @description Resolves a team slug to the team's identity, validating the user is a member.
-     */
-    get: {
-      parameters: {
-        query: {
-          /** @description Team slug to resolve. */
-          slug: components['parameters']['teamSlug']
-        }
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully resolved team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamResolveResponse']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/{teamID}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    /** Update team */
-    patch: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['UpdateTeamRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully updated team. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['UpdateTeamResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    trace?: never
-  }
-  '/teams/{teamID}/members': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** List team members */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned team members. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TeamMembersResponse']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    /** Add team member */
-    post: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-        }
-        cookie?: never
-      }
-      requestBody: {
-        content: {
-          'application/json': components['schemas']['AddTeamMemberRequest']
-        }
-      }
-      responses: {
-        /** @description Successfully added team member. */
-        201: {
-          headers: {
-            [name: string]: unknown
-          }
-          content?: never
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/teams/{teamID}/members/{userId}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    post?: never
-    /** Remove team member */
-    delete: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the team. */
-          teamID: components['parameters']['teamID']
-          /** @description Identifier of the user. */
-          userId: components['parameters']['userId']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully removed team member. */
-        204: {
-          headers: {
-            [name: string]: unknown
-          }
-          content?: never
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        500: components['responses']['500']
-      }
-    }
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/defaults': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List default templates
-     * @description Returns the list of default templates with their latest build info and aliases.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path?: never
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned default templates. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['DefaultTemplatesResponse']
-          }
-        }
-        401: components['responses']['401']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/{templateID}': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Get template
-     * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the template. */
-          templateID: components['parameters']['templateID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned the template. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TemplateDetail']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/{templateID}/tags/groups': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List template tag groups
-     * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
-     */
-    get: {
-      parameters: {
-        query?: {
-          /** @description Maximum number of ready assignment rows to return per tag. */
-          assignmentLimit?: components['parameters']['tag_assignment_limit']
-          /** @description Maximum number of distinct tags to return per page. */
-          tagsLimit?: components['parameters']['tag_groups_limit']
-          /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-          tagsCursor?: components['parameters']['tag_groups_cursor']
-          /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-          search?: components['parameters']['tag_groups_search']
-          /** @description Sort order for the returned tag groups. */
-          sort?: components['parameters']['tag_groups_sort']
-        }
-        header?: never
-        path: {
-          /** @description Identifier of the template. */
-          templateID: components['parameters']['templateID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned template tag groups. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TemplateTagGroupsResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/{templateID}/tags/count': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Count template tags
-     * @description Returns the total number of distinct ready tags for the template.
-     */
-    get: {
-      parameters: {
-        query?: never
-        header?: never
-        path: {
-          /** @description Identifier of the template. */
-          templateID: components['parameters']['templateID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned tag count. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TemplateTagsCountResponse']
-          }
-        }
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/{templateID}/tags/exists': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Check ready template tag existence
-     * @description Checks whether a template tag has at least one ready assignment.
-     */
-    get: {
-      parameters: {
-        query: {
-          /** @description Template tag name to check. */
-          tag: components['parameters']['tag']
-        }
-        header?: never
-        path: {
-          /** @description Identifier of the template. */
-          templateID: components['parameters']['templateID']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully checked template tag existence. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TemplateTagExistsResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/templates/{templateID}/tags/{tag}/assignments': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * List ready assignments for a single template tag
-     * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
-     */
-    get: {
-      parameters: {
-        query?: {
-          /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-          cursor?: components['parameters']['tag_assignments_cursor']
-          /** @description Maximum number of assignment rows to return per page. */
-          limit?: components['parameters']['tag_assignments_limit']
-        }
-        header?: never
-        path: {
-          /** @description Identifier of the template. */
-          templateID: components['parameters']['templateID']
-          /** @description Template tag name. */
-          tag: components['parameters']['tag_path']
-        }
-        cookie?: never
-      }
-      requestBody?: never
-      responses: {
-        /** @description Successfully returned tag assignment page. */
-        200: {
-          headers: {
-            [name: string]: unknown
-          }
-          content: {
-            'application/json': components['schemas']['TemplateTagAssignmentsResponse']
-          }
-        }
-        400: components['responses']['400']
-        401: components['responses']['401']
-        403: components['responses']['403']
-        404: components['responses']['404']
-        500: components['responses']['500']
-      }
-    }
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
+    "/health": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Health check */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Health check successful */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["HealthResponse"];
+                    };
+                };
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** List team builds */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Optional filter by build identifier, template identifier, or template alias. */
+                    build_id_or_template?: components["parameters"]["build_id_or_template"];
+                    /** @description Comma-separated list of build statuses to include. */
+                    statuses?: components["parameters"]["build_statuses"];
+                    /** @description Maximum number of items to return per page. */
+                    limit?: components["parameters"]["builds_limit"];
+                    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+                    cursor?: components["parameters"]["builds_cursor"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned paginated builds. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildsListResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds/statuses": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get build statuses */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Comma-separated list of build IDs to get statuses for. */
+                    build_ids: components["parameters"]["build_ids"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned build statuses */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildsStatusesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/builds/{build_id}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get build details */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the build. */
+                    build_id: components["parameters"]["build_id"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned build details. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["BuildInfo"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/sandboxes/{sandboxID}/record": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get sandbox record */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the sandbox. */
+                    sandboxID: components["parameters"]["sandboxID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned sandbox details. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SandboxRecord"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List user teams
+         * @description Returns all teams the authenticated user belongs to, with limits and default flag.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned user teams. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["UserTeamsResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        /** Create team */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["CreateTeamRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully created team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/users/{userId}/bootstrap": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Bootstrap user */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully bootstrapped user. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/users/bootstrap": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Bootstrap auth provider user */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminAuthProviderUserBootstrapRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully bootstrapped user. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/teams/bootstrap": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Bootstrap team
+         * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
+         */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminTeamBootstrapRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully bootstrapped team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+                502: components["responses"]["502"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/resolve": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Resolve user profiles */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminAuthProviderProfilesResolveRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully resolved profiles. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/by-email": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /** Lookup user profiles by email */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AdminAuthProviderProfilesLookupEmailRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully found matching profiles. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/admin/user-profiles/{userId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Get user profile */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully found profile. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/resolve": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Resolve team identity
+         * @description Resolves a team slug to the team's identity, validating the user is a member.
+         */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Team slug to resolve. */
+                    slug: components["parameters"]["teamSlug"];
+                };
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully resolved team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamResolveResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/{teamID}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        /** Update team */
+        patch: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["UpdateTeamRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully updated team. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["UpdateTeamResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        trace?: never;
+    };
+    "/teams/{teamID}/members": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** List team members */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned team members. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TeamMembersResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        /** Add team member */
+        post: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                };
+                cookie?: never;
+            };
+            requestBody: {
+                content: {
+                    "application/json": components["schemas"]["AddTeamMemberRequest"];
+                };
+            };
+            responses: {
+                /** @description Successfully added team member. */
+                201: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content?: never;
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/teams/{teamID}/members/{userId}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        post?: never;
+        /** Remove team member */
+        delete: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the team. */
+                    teamID: components["parameters"]["teamID"];
+                    /** @description Identifier of the user. */
+                    userId: components["parameters"]["userId"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully removed team member. */
+                204: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content?: never;
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                500: components["responses"]["500"];
+            };
+        };
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/defaults": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List default templates
+         * @description Returns the list of default templates with their latest build info and aliases.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path?: never;
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned default templates. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["DefaultTemplatesResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Get template
+         * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned the template. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateDetail"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/groups": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List template tag groups
+         * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
+         */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Maximum number of ready assignment rows to return per tag. */
+                    assignmentLimit?: components["parameters"]["tag_assignment_limit"];
+                    /** @description Maximum number of distinct tags to return per page. */
+                    tagsLimit?: components["parameters"]["tag_groups_limit"];
+                    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+                    tagsCursor?: components["parameters"]["tag_groups_cursor"];
+                    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+                    search?: components["parameters"]["tag_groups_search"];
+                    /** @description Sort order for the returned tag groups. */
+                    sort?: components["parameters"]["tag_groups_sort"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned template tag groups. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagGroupsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/count": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Count template tags
+         * @description Returns the total number of distinct ready tags for the template.
+         */
+        get: {
+            parameters: {
+                query?: never;
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned tag count. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagsCountResponse"];
+                    };
+                };
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/exists": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * Check ready template tag existence
+         * @description Checks whether a template tag has at least one ready assignment.
+         */
+        get: {
+            parameters: {
+                query: {
+                    /** @description Template tag name to check. */
+                    tag: components["parameters"]["tag"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully checked template tag existence. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagExistsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
+    "/templates/{templateID}/tags/{tag}/assignments": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /**
+         * List ready assignments for a single template tag
+         * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
+         */
+        get: {
+            parameters: {
+                query?: {
+                    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+                    cursor?: components["parameters"]["tag_assignments_cursor"];
+                    /** @description Maximum number of assignment rows to return per page. */
+                    limit?: components["parameters"]["tag_assignments_limit"];
+                };
+                header?: never;
+                path: {
+                    /** @description Identifier of the template. */
+                    templateID: components["parameters"]["templateID"];
+                    /** @description Template tag name. */
+                    tag: components["parameters"]["tag_path"];
+                };
+                cookie?: never;
+            };
+            requestBody?: never;
+            responses: {
+                /** @description Successfully returned tag assignment page. */
+                200: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["TemplateTagAssignmentsResponse"];
+                    };
+                };
+                400: components["responses"]["400"];
+                401: components["responses"]["401"];
+                403: components["responses"]["403"];
+                404: components["responses"]["404"];
+                500: components["responses"]["500"];
+            };
+        };
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
 }
-export type webhooks = Record<string, never>
+export type webhooks = Record<string, never>;
 export interface components {
-  schemas: {
-    Error: {
-      /**
-       * Format: int32
-       * @description Error code.
-       */
-      code: number
-      /** @description Error message. */
-      message: string
-    }
-    AdminAuthProviderProfile: {
-      /**
-       * Format: uuid
-       * @description Internal E2B user identifier.
-       */
-      userId: string
-      /** @description Email address from the configured auth provider. */
-      email: string | null
-    }
-    AdminAuthProviderProfilesResponse: {
-      profiles: components['schemas']['AdminAuthProviderProfile'][]
-    }
-    AdminAuthProviderProfilesResolveRequest: {
-      userIds: string[]
-    }
-    AdminAuthProviderProfilesLookupEmailRequest: {
-      /** Format: email */
-      email: string
-    }
-    AdminTeamBootstrapRequest: {
-      /** @description Team name. */
-      name: string
-      /**
-       * Format: email
-       * @description Billing/contact email for the team.
-       */
-      email: string
-    }
-    /**
-     * @description Build status mapped for dashboard clients.
-     * @enum {string}
-     */
-    BuildStatus: 'building' | 'failed' | 'success'
-    ListedBuild: {
-      /**
-       * Format: uuid
-       * @description Identifier of the build.
-       */
-      id: string
-      /** @description Template alias when present, otherwise template ID. */
-      template: string
-      /** @description Identifier of the template. */
-      templateId: string
-      status: components['schemas']['BuildStatus']
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-      /**
-       * Format: date-time
-       * @description Build creation timestamp in RFC3339 format.
-       */
-      createdAt: string
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-    }
-    BuildsListResponse: {
-      data: components['schemas']['ListedBuild'][]
-      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-      nextCursor: string | null
-    }
-    BuildStatusItem: {
-      /**
-       * Format: uuid
-       * @description Identifier of the build.
-       */
-      id: string
-      status: components['schemas']['BuildStatus']
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-    }
-    BuildsStatusesResponse: {
-      /** @description List of build statuses */
-      buildStatuses: components['schemas']['BuildStatusItem'][]
-    }
-    BuildInfo: {
-      /** @description Template names related to this build, if available. */
-      names?: string[] | null
-      /**
-       * Format: date-time
-       * @description Build creation timestamp in RFC3339 format.
-       */
-      createdAt: string
-      /**
-       * Format: date-time
-       * @description Build completion timestamp in RFC3339 format, if finished.
-       */
-      finishedAt: string | null
-      status: components['schemas']['BuildStatus']
-      /** @description Failure message when status is `failed`, otherwise `null`. */
-      statusMessage: string | null
-    }
-    /**
-     * Format: int64
-     * @description CPU cores for the sandbox
-     */
-    CPUCount: number
-    /**
-     * Format: int64
-     * @description Memory for the sandbox in MiB
-     */
-    MemoryMB: number
-    /**
-     * Format: int64
-     * @description Disk size for the sandbox in MiB
-     */
-    DiskSizeMB: number
-    SandboxRecord: {
-      /** @description Identifier of the template from which is the sandbox created */
-      templateID: string
-      /** @description Alias of the template */
-      alias?: string
-      /** @description Identifier of the sandbox */
-      sandboxID: string
-      /**
-       * Format: date-time
-       * @description Time when the sandbox was started
-       */
-      startedAt: string
-      /**
-       * Format: date-time
-       * @description Time when the sandbox was stopped
-       */
-      stoppedAt?: string | null
-      /** @description Base domain where the sandbox traffic is accessible */
-      domain?: string | null
-      cpuCount: components['schemas']['CPUCount']
-      memoryMB: components['schemas']['MemoryMB']
-      diskSizeMB: components['schemas']['DiskSizeMB']
-    }
-    HealthResponse: {
-      /** @description Human-readable health check result. */
-      message: string
-    }
-    UserTeamLimits: {
-      /** Format: int64 */
-      maxLengthHours: number
-      /** Format: int32 */
-      concurrentSandboxes: number
-      /** Format: int32 */
-      concurrentTemplateBuilds: number
-      /** Format: int32 */
-      maxVcpu: number
-      /** Format: int32 */
-      maxRamMb: number
-      /** Format: int32 */
-      diskMb: number
-    }
-    UserTeam: {
-      /** Format: uuid */
-      id: string
-      name: string
-      slug: string
-      tier: string
-      email: string
-      profilePictureUrl: string | null
-      isBlocked: boolean
-      isBanned: boolean
-      blockedReason: string | null
-      isDefault: boolean
-      limits: components['schemas']['UserTeamLimits']
-      /** Format: date-time */
-      createdAt: string
-    }
-    UserTeamsResponse: {
-      teams: components['schemas']['UserTeam'][]
-    }
-    TeamMember: {
-      /** Format: uuid */
-      id: string
-      email: string
-      name?: string | null
-      /** Format: uri */
-      profilePictureUrl?: string | null
-      providers: string[]
-      isDefault: boolean
-      /** Format: uuid */
-      addedBy?: string | null
-      /** Format: date-time */
-      createdAt: string | null
-    }
-    TeamMembersResponse: {
-      members: components['schemas']['TeamMember'][]
-    }
-    UpdateTeamRequest: {
-      name?: string
-      profilePictureUrl?: string | null
-    }
-    UpdateTeamResponse: {
-      /** Format: uuid */
-      id: string
-      name: string
-      profilePictureUrl?: string | null
-    }
-    AddTeamMemberRequest: {
-      /** Format: email */
-      email: string
-    }
-    CreateTeamRequest: {
-      name: string
-    }
-    DefaultTemplateAlias: {
-      alias: string
-      namespace?: string | null
-    }
-    DefaultTemplate: {
-      id: string
-      aliases: components['schemas']['DefaultTemplateAlias'][]
-      /** Format: uuid */
-      buildId: string
-      /** Format: int64 */
-      ramMb: number
-      /** Format: int64 */
-      vcpu: number
-      /** Format: int64 */
-      totalDiskSizeMb: number | null
-      envdVersion?: string | null
-      /** Format: date-time */
-      createdAt: string
-      public: boolean
-      /** Format: int32 */
-      buildCount: number
-      /** Format: int64 */
-      spawnCount: number
-    }
-    DefaultTemplatesResponse: {
-      templates: components['schemas']['DefaultTemplate'][]
-    }
-    /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
-    TemplateDetail: {
-      /** @description Identifier of the template. */
-      templateID: string
-      /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
-      buildID: string
-      cpuCount: components['schemas']['CPUCount']
-      memoryMB: components['schemas']['MemoryMB']
-      diskSizeMB: components['schemas']['DiskSizeMB']
-      /** @description Whether the template is public or only accessible by the team. */
-      public: boolean
-      /**
-       * @deprecated
-       * @description Aliases of the template.
-       */
-      aliases: string[]
-      /** @description Names of the template (namespace/alias format when namespaced). */
-      names: string[]
-      /**
-       * Format: date-time
-       * @description Time when the template was created.
-       */
-      createdAt: string
-      /**
-       * Format: date-time
-       * @description Time when the template was last updated.
-       */
-      updatedAt: string
-      /**
-       * Format: date-time
-       * @description Time when the template was last used.
-       */
-      lastSpawnedAt: string | null
-      /**
-       * Format: int64
-       * @description Number of times the template was used.
-       */
-      spawnCount: number
-      /**
-       * Format: int32
-       * @description Number of times the template was built.
-       */
-      buildCount: number
-      /** @description Envd version of the latest ready build, or an empty string when none. */
-      envdVersion: string
-    }
-    TemplateTagAssignment: {
-      /**
-       * Format: uuid
-       * @description Identifier of the tag assignment event.
-       */
-      assignmentId: string
-      /**
-       * Format: uuid
-       * @description Identifier of the assigned build.
-       */
-      buildId: string
-      /**
-       * Format: date-time
-       * @description Time when the tag was assigned to the build.
-       */
-      assignedAt: string
-      /**
-       * Format: date-time
-       * @description Time when the assigned build was created.
-       */
-      buildCreatedAt: string
-      /**
-       * Format: date-time
-       * @description Time when the assigned build finished.
-       */
-      buildFinishedAt: string | null
-    }
-    TemplateTagGroup: {
-      /** @description Template tag name. */
-      tag: string
-      /** @description Ready assignment events for this tag, sorted latest first. */
-      assignments: components['schemas']['TemplateTagAssignment'][]
-      /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
-      hasMore: boolean
-    }
-    TemplateTagGroupsResponse: {
-      tags: components['schemas']['TemplateTagGroup'][]
-      /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
-      nextCursor: string | null
-    }
-    TemplateTagsCountResponse: {
-      /**
-       * Format: int64
-       * @description Total distinct ready tags for the template.
-       */
-      total: number
-    }
-    TemplateTagExistsResponse: {
-      /** @description Whether the template tag has at least one ready assignment. */
-      exists: boolean
-      /** @description Normalized template tag name. */
-      normalizedTag: string
-    }
-    TemplateTagAssignmentsResponse: {
-      /** @description Ready assignment events for the tag, sorted latest first. */
-      data: components['schemas']['TemplateTagAssignment'][]
-      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-      nextCursor: string | null
-    }
-    TeamResolveResponse: {
-      /** Format: uuid */
-      id: string
-      slug: string
-    }
-  }
-  responses: {
-    /** @description Bad request */
-    400: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Authentication error */
-    401: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Forbidden */
-    403: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Not found */
-    404: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Server error */
-    500: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-    /** @description Upstream error */
-    502: {
-      headers: {
-        [name: string]: unknown
-      }
-      content: {
-        'application/json': components['schemas']['Error']
-      }
-    }
-  }
-  parameters: {
-    /** @description Identifier of the build. */
-    build_id: string
-    /** @description Identifier of the sandbox. */
-    sandboxID: string
-    /** @description Maximum number of items to return per page. */
-    builds_limit: number
-    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-    builds_cursor: string
-    /** @description Optional filter by build identifier, template identifier, or template alias. */
-    build_id_or_template: string
-    /** @description Comma-separated list of build statuses to include. */
-    build_statuses: components['schemas']['BuildStatus'][]
-    /** @description Comma-separated list of build IDs to get statuses for. */
-    build_ids: string[]
-    /** @description Identifier of the team. */
-    teamID: string
-    /** @description Identifier of the user. */
-    userId: string
-    /** @description Team slug to resolve. */
-    teamSlug: string
-    /** @description Identifier of the template. */
-    templateID: string
-    /** @description Template tag name to check. */
-    tag: string
-    /** @description Maximum number of ready assignment rows to return per tag. */
-    tag_assignment_limit: number
-    /** @description Template tag name. */
-    tag_path: string
-    /** @description Maximum number of assignment rows to return per page. */
-    tag_assignments_limit: number
-    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-    tag_assignments_cursor: string
-    /** @description Maximum number of distinct tags to return per page. */
-    tag_groups_limit: number
-    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-    tag_groups_cursor: string
-    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-    tag_groups_search: string
-    /** @description Sort order for the returned tag groups. */
-    tag_groups_sort: 'latest_desc' | 'latest_asc' | 'name_asc' | 'name_desc'
-  }
-  requestBodies: never
-  headers: never
-  pathItems: never
+    schemas: {
+        Error: {
+            /**
+             * Format: int32
+             * @description Error code.
+             */
+            code: number;
+            /** @description Error message. */
+            message: string;
+        };
+        AdminAuthProviderProfile: {
+            /**
+             * Format: uuid
+             * @description Internal E2B user identifier.
+             */
+            userId: string;
+            /** @description Email address from the configured auth provider. */
+            email: string | null;
+        };
+        AdminAuthProviderProfilesResponse: {
+            profiles: components["schemas"]["AdminAuthProviderProfile"][];
+        };
+        AdminAuthProviderProfilesResolveRequest: {
+            userIds: string[];
+        };
+        AdminAuthProviderProfilesLookupEmailRequest: {
+            /** Format: email */
+            email: string;
+        };
+        AdminAuthProviderUserBootstrapRequest: {
+            oidc_issuer: string;
+            oidc_user_id: string;
+            /** Format: email */
+            oidc_user_email: string;
+            oidc_user_name?: string | null;
+        };
+        AdminTeamBootstrapRequest: {
+            /** @description Team name. */
+            name: string;
+            /**
+             * Format: email
+             * @description Billing/contact email for the team.
+             */
+            email: string;
+        };
+        /**
+         * @description Build status mapped for dashboard clients.
+         * @enum {string}
+         */
+        BuildStatus: "building" | "failed" | "success";
+        ListedBuild: {
+            /**
+             * Format: uuid
+             * @description Identifier of the build.
+             */
+            id: string;
+            /** @description Template alias when present, otherwise template ID. */
+            template: string;
+            /** @description Identifier of the template. */
+            templateId: string;
+            status: components["schemas"]["BuildStatus"];
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+            /**
+             * Format: date-time
+             * @description Build creation timestamp in RFC3339 format.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+        };
+        BuildsListResponse: {
+            data: components["schemas"]["ListedBuild"][];
+            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
+        BuildStatusItem: {
+            /**
+             * Format: uuid
+             * @description Identifier of the build.
+             */
+            id: string;
+            status: components["schemas"]["BuildStatus"];
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+        };
+        BuildsStatusesResponse: {
+            /** @description List of build statuses */
+            buildStatuses: components["schemas"]["BuildStatusItem"][];
+        };
+        BuildInfo: {
+            /** @description Template names related to this build, if available. */
+            names?: string[] | null;
+            /**
+             * Format: date-time
+             * @description Build creation timestamp in RFC3339 format.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Build completion timestamp in RFC3339 format, if finished.
+             */
+            finishedAt: string | null;
+            status: components["schemas"]["BuildStatus"];
+            /** @description Failure message when status is `failed`, otherwise `null`. */
+            statusMessage: string | null;
+        };
+        /**
+         * Format: int64
+         * @description CPU cores for the sandbox
+         */
+        CPUCount: number;
+        /**
+         * Format: int64
+         * @description Memory for the sandbox in MiB
+         */
+        MemoryMB: number;
+        /**
+         * Format: int64
+         * @description Disk size for the sandbox in MiB
+         */
+        DiskSizeMB: number;
+        SandboxRecord: {
+            /** @description Identifier of the template from which is the sandbox created */
+            templateID: string;
+            /** @description Alias of the template */
+            alias?: string;
+            /** @description Identifier of the sandbox */
+            sandboxID: string;
+            /**
+             * Format: date-time
+             * @description Time when the sandbox was started
+             */
+            startedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the sandbox was stopped
+             */
+            stoppedAt?: string | null;
+            /** @description Base domain where the sandbox traffic is accessible */
+            domain?: string | null;
+            cpuCount: components["schemas"]["CPUCount"];
+            memoryMB: components["schemas"]["MemoryMB"];
+            diskSizeMB: components["schemas"]["DiskSizeMB"];
+        };
+        HealthResponse: {
+            /** @description Human-readable health check result. */
+            message: string;
+        };
+        UserTeamLimits: {
+            /** Format: int64 */
+            maxLengthHours: number;
+            /** Format: int32 */
+            concurrentSandboxes: number;
+            /** Format: int32 */
+            concurrentTemplateBuilds: number;
+            /** Format: int32 */
+            maxVcpu: number;
+            /** Format: int32 */
+            maxRamMb: number;
+            /** Format: int32 */
+            diskMb: number;
+        };
+        UserTeam: {
+            /** Format: uuid */
+            id: string;
+            name: string;
+            slug: string;
+            tier: string;
+            email: string;
+            profilePictureUrl: string | null;
+            isBlocked: boolean;
+            isBanned: boolean;
+            blockedReason: string | null;
+            isDefault: boolean;
+            limits: components["schemas"]["UserTeamLimits"];
+            /** Format: date-time */
+            createdAt: string;
+        };
+        UserTeamsResponse: {
+            teams: components["schemas"]["UserTeam"][];
+        };
+        TeamMember: {
+            /** Format: uuid */
+            id: string;
+            email: string;
+            name?: string | null;
+            /** Format: uri */
+            profilePictureUrl?: string | null;
+            providers: string[];
+            isDefault: boolean;
+            /** Format: uuid */
+            addedBy?: string | null;
+            /** Format: date-time */
+            createdAt: string | null;
+        };
+        TeamMembersResponse: {
+            members: components["schemas"]["TeamMember"][];
+        };
+        UpdateTeamRequest: {
+            name?: string;
+            profilePictureUrl?: string | null;
+        };
+        UpdateTeamResponse: {
+            /** Format: uuid */
+            id: string;
+            name: string;
+            profilePictureUrl?: string | null;
+        };
+        AddTeamMemberRequest: {
+            /** Format: email */
+            email: string;
+        };
+        CreateTeamRequest: {
+            name: string;
+        };
+        DefaultTemplateAlias: {
+            alias: string;
+            namespace?: string | null;
+        };
+        DefaultTemplate: {
+            id: string;
+            aliases: components["schemas"]["DefaultTemplateAlias"][];
+            /** Format: uuid */
+            buildId: string;
+            /** Format: int64 */
+            ramMb: number;
+            /** Format: int64 */
+            vcpu: number;
+            /** Format: int64 */
+            totalDiskSizeMb: number | null;
+            envdVersion?: string | null;
+            /** Format: date-time */
+            createdAt: string;
+            public: boolean;
+            /** Format: int32 */
+            buildCount: number;
+            /** Format: int64 */
+            spawnCount: number;
+        };
+        DefaultTemplatesResponse: {
+            templates: components["schemas"]["DefaultTemplate"][];
+        };
+        /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
+        TemplateDetail: {
+            /** @description Identifier of the template. */
+            templateID: string;
+            /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
+            buildID: string;
+            /** @description vCPU count of the latest ready default build, or `null` when none. */
+            cpuCount: components["schemas"]["CPUCount"] | null;
+            /** @description Memory in MiB of the latest ready default build, or `null` when none. */
+            memoryMB: components["schemas"]["MemoryMB"] | null;
+            /** @description Disk size in MiB of the latest ready default build, or `null` when none. */
+            diskSizeMB: components["schemas"]["DiskSizeMB"] | null;
+            /** @description Whether the template is public or only accessible by the team. */
+            public: boolean;
+            /**
+             * @deprecated
+             * @description Aliases of the template.
+             */
+            aliases: string[];
+            /** @description Names of the template (namespace/alias format when namespaced). */
+            names: string[];
+            /**
+             * Format: date-time
+             * @description Time when the template was created.
+             */
+            createdAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the template was last updated.
+             */
+            updatedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the template was last used.
+             */
+            lastSpawnedAt: string | null;
+            /**
+             * Format: int64
+             * @description Number of times the template was used.
+             */
+            spawnCount: number;
+            /**
+             * Format: int32
+             * @description Number of times the template was built.
+             */
+            buildCount: number;
+            /** @description envd version of the latest ready default build, or `null` when none. */
+            envdVersion: string | null;
+        };
+        TemplateTagAssignment: {
+            /**
+             * Format: uuid
+             * @description Identifier of the tag assignment event.
+             */
+            assignmentId: string;
+            /**
+             * Format: uuid
+             * @description Identifier of the assigned build.
+             */
+            buildId: string;
+            /**
+             * Format: date-time
+             * @description Time when the tag was assigned to the build.
+             */
+            assignedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the assigned build was created.
+             */
+            buildCreatedAt: string;
+            /**
+             * Format: date-time
+             * @description Time when the assigned build finished.
+             */
+            buildFinishedAt: string | null;
+        };
+        TemplateTagGroup: {
+            /** @description Template tag name. */
+            tag: string;
+            /** @description Ready assignment events for this tag, sorted latest first. */
+            assignments: components["schemas"]["TemplateTagAssignment"][];
+            /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
+            hasMore: boolean;
+        };
+        TemplateTagGroupsResponse: {
+            tags: components["schemas"]["TemplateTagGroup"][];
+            /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
+        TemplateTagsCountResponse: {
+            /**
+             * Format: int64
+             * @description Total distinct ready tags for the template.
+             */
+            total: number;
+        };
+        TemplateTagExistsResponse: {
+            /** @description Whether the template tag has at least one ready assignment. */
+            exists: boolean;
+            /** @description Normalized template tag name. */
+            normalizedTag: string;
+        };
+        TemplateTagAssignmentsResponse: {
+            /** @description Ready assignment events for the tag, sorted latest first. */
+            data: components["schemas"]["TemplateTagAssignment"][];
+            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+            nextCursor: string | null;
+        };
+        TeamResolveResponse: {
+            /** Format: uuid */
+            id: string;
+            slug: string;
+        };
+    };
+    responses: {
+        /** @description Bad request */
+        400: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Authentication error */
+        401: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Forbidden */
+        403: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Not found */
+        404: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Server error */
+        500: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+        /** @description Upstream error */
+        502: {
+            headers: {
+                [name: string]: unknown;
+            };
+            content: {
+                "application/json": components["schemas"]["Error"];
+            };
+        };
+    };
+    parameters: {
+        /** @description Identifier of the build. */
+        build_id: string;
+        /** @description Identifier of the sandbox. */
+        sandboxID: string;
+        /** @description Maximum number of items to return per page. */
+        builds_limit: number;
+        /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+        builds_cursor: string;
+        /** @description Optional filter by build identifier, template identifier, or template alias. */
+        build_id_or_template: string;
+        /** @description Comma-separated list of build statuses to include. */
+        build_statuses: components["schemas"]["BuildStatus"][];
+        /** @description Comma-separated list of build IDs to get statuses for. */
+        build_ids: string[];
+        /** @description Identifier of the team. */
+        teamID: string;
+        /** @description Identifier of the user. */
+        userId: string;
+        /** @description Team slug to resolve. */
+        teamSlug: string;
+        /** @description Identifier of the template. */
+        templateID: string;
+        /** @description Template tag name to check. */
+        tag: string;
+        /** @description Maximum number of ready assignment rows to return per tag. */
+        tag_assignment_limit: number;
+        /** @description Template tag name. */
+        tag_path: string;
+        /** @description Maximum number of assignment rows to return per page. */
+        tag_assignments_limit: number;
+        /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+        tag_assignments_cursor: string;
+        /** @description Maximum number of distinct tags to return per page. */
+        tag_groups_limit: number;
+        /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+        tag_groups_cursor: string;
+        /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+        tag_groups_search: string;
+        /** @description Sort order for the returned tag groups. */
+        tag_groups_sort: "latest_desc" | "latest_asc" | "name_asc" | "name_desc";
+    };
+    requestBodies: never;
+    headers: never;
+    pathItems: never;
 }
-export type $defs = Record<string, never>
-export type operations = Record<string, never>
+export type $defs = Record<string, never>;
+export type operations = Record<string, never>;
diff --git a/src/features/dashboard/templates/detail/overview/template-specs.tsx b/src/features/dashboard/templates/detail/overview/template-specs.tsx
index b62ff62a3..17732fadf 100644
--- a/src/features/dashboard/templates/detail/overview/template-specs.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-specs.tsx
@@ -9,8 +9,8 @@ import {
 
 interface TemplateSpecsProps {
   build: {
-    cpuCount: number
-    memoryMB: number
+    cpuCount: number | null
+    memoryMB: number | null
     diskSizeMB: number | null
     envdVersion: string | null
   }
@@ -27,16 +27,16 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
     >
       <SpecItem icon={<CpuIcon className="size-3" />}>
         <span className="prose-body-numeric-highlight">
-          {formatNumber(build.cpuCount)}
+          {build.cpuCount === null ? '—' : formatNumber(build.cpuCount)}
         </span>{' '}
         <span className="text-fg-tertiary">
-          Core{build.cpuCount > 1 ? 's' : ''}
+          Core{build.cpuCount !== null && build.cpuCount > 1 ? 's' : ''}
         </span>
       </SpecItem>
       <Separator />
       <SpecItem icon={<MemoryIcon className="size-3" />}>
         <span className="prose-body-numeric-highlight">
-          {formatNumber(build.memoryMB)}
+          {build.memoryMB === null ? '—' : formatNumber(build.memoryMB)}
         </span>{' '}
         <span className="text-fg-tertiary">MB</span>
       </SpecItem>

From 11205246fc0d30ad0ad6a9f05a9afc9d768bc91a Mon Sep 17 00:00:00 2001
From: drankou <25752851+drankou@users.noreply.github.com>
Date: Tue, 2 Jun 2026 20:16:58 +0000
Subject: [PATCH 78/90] style: apply biome formatting

---
 .../shared/contracts/dashboard-api.types.ts   | 3026 ++++++++---------
 1 file changed, 1513 insertions(+), 1513 deletions(-)

diff --git a/src/core/shared/contracts/dashboard-api.types.ts b/src/core/shared/contracts/dashboard-api.types.ts
index 924a197a1..eadf97843 100644
--- a/src/core/shared/contracts/dashboard-api.types.ts
+++ b/src/core/shared/contracts/dashboard-api.types.ts
@@ -4,1519 +4,1519 @@
  */
 
 export interface paths {
-    "/health": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Health check */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Health check successful */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["HealthResponse"];
-                    };
-                };
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** List team builds */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Optional filter by build identifier, template identifier, or template alias. */
-                    build_id_or_template?: components["parameters"]["build_id_or_template"];
-                    /** @description Comma-separated list of build statuses to include. */
-                    statuses?: components["parameters"]["build_statuses"];
-                    /** @description Maximum number of items to return per page. */
-                    limit?: components["parameters"]["builds_limit"];
-                    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-                    cursor?: components["parameters"]["builds_cursor"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned paginated builds. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildsListResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds/statuses": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get build statuses */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Comma-separated list of build IDs to get statuses for. */
-                    build_ids: components["parameters"]["build_ids"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned build statuses */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildsStatusesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/builds/{build_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get build details */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the build. */
-                    build_id: components["parameters"]["build_id"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned build details. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["BuildInfo"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/sandboxes/{sandboxID}/record": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get sandbox record */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the sandbox. */
-                    sandboxID: components["parameters"]["sandboxID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned sandbox details. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SandboxRecord"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List user teams
-         * @description Returns all teams the authenticated user belongs to, with limits and default flag.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned user teams. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["UserTeamsResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        /** Create team */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["CreateTeamRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully created team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/users/{userId}/bootstrap": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Bootstrap user */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully bootstrapped user. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/users/bootstrap": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Bootstrap auth provider user */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminAuthProviderUserBootstrapRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully bootstrapped user. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/teams/bootstrap": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /**
-         * Bootstrap team
-         * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
-         */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminTeamBootstrapRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully bootstrapped team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-                502: components["responses"]["502"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/resolve": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Resolve user profiles */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminAuthProviderProfilesResolveRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully resolved profiles. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/by-email": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /** Lookup user profiles by email */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AdminAuthProviderProfilesLookupEmailRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully found matching profiles. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/admin/user-profiles/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Get user profile */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully found profile. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["AdminAuthProviderProfilesResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/resolve": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Resolve team identity
-         * @description Resolves a team slug to the team's identity, validating the user is a member.
-         */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Team slug to resolve. */
-                    slug: components["parameters"]["teamSlug"];
-                };
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully resolved team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamResolveResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/{teamID}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        /** Update team */
-        patch: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["UpdateTeamRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully updated team. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["UpdateTeamResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        trace?: never;
-    };
-    "/teams/{teamID}/members": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** List team members */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned team members. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TeamMembersResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        /** Add team member */
-        post: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["AddTeamMemberRequest"];
-                };
-            };
-            responses: {
-                /** @description Successfully added team member. */
-                201: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content?: never;
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/teams/{teamID}/members/{userId}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        post?: never;
-        /** Remove team member */
-        delete: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the team. */
-                    teamID: components["parameters"]["teamID"];
-                    /** @description Identifier of the user. */
-                    userId: components["parameters"]["userId"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully removed team member. */
-                204: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content?: never;
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                500: components["responses"]["500"];
-            };
-        };
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/defaults": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List default templates
-         * @description Returns the list of default templates with their latest build info and aliases.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned default templates. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["DefaultTemplatesResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Get template
-         * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned the template. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateDetail"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/groups": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List template tag groups
-         * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
-         */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Maximum number of ready assignment rows to return per tag. */
-                    assignmentLimit?: components["parameters"]["tag_assignment_limit"];
-                    /** @description Maximum number of distinct tags to return per page. */
-                    tagsLimit?: components["parameters"]["tag_groups_limit"];
-                    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-                    tagsCursor?: components["parameters"]["tag_groups_cursor"];
-                    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-                    search?: components["parameters"]["tag_groups_search"];
-                    /** @description Sort order for the returned tag groups. */
-                    sort?: components["parameters"]["tag_groups_sort"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned template tag groups. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagGroupsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/count": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Count template tags
-         * @description Returns the total number of distinct ready tags for the template.
-         */
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned tag count. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagsCountResponse"];
-                    };
-                };
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/exists": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * Check ready template tag existence
-         * @description Checks whether a template tag has at least one ready assignment.
-         */
-        get: {
-            parameters: {
-                query: {
-                    /** @description Template tag name to check. */
-                    tag: components["parameters"]["tag"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully checked template tag existence. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagExistsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/templates/{templateID}/tags/{tag}/assignments": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /**
-         * List ready assignments for a single template tag
-         * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
-         */
-        get: {
-            parameters: {
-                query?: {
-                    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-                    cursor?: components["parameters"]["tag_assignments_cursor"];
-                    /** @description Maximum number of assignment rows to return per page. */
-                    limit?: components["parameters"]["tag_assignments_limit"];
-                };
-                header?: never;
-                path: {
-                    /** @description Identifier of the template. */
-                    templateID: components["parameters"]["templateID"];
-                    /** @description Template tag name. */
-                    tag: components["parameters"]["tag_path"];
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description Successfully returned tag assignment page. */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["TemplateTagAssignmentsResponse"];
-                    };
-                };
-                400: components["responses"]["400"];
-                401: components["responses"]["401"];
-                403: components["responses"]["403"];
-                404: components["responses"]["404"];
-                500: components["responses"]["500"];
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
+  '/health': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Health check */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Health check successful */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['HealthResponse']
+          }
+        }
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** List team builds */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Optional filter by build identifier, template identifier, or template alias. */
+          build_id_or_template?: components['parameters']['build_id_or_template']
+          /** @description Comma-separated list of build statuses to include. */
+          statuses?: components['parameters']['build_statuses']
+          /** @description Maximum number of items to return per page. */
+          limit?: components['parameters']['builds_limit']
+          /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+          cursor?: components['parameters']['builds_cursor']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned paginated builds. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildsListResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds/statuses': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get build statuses */
+    get: {
+      parameters: {
+        query: {
+          /** @description Comma-separated list of build IDs to get statuses for. */
+          build_ids: components['parameters']['build_ids']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned build statuses */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildsStatusesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/builds/{build_id}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get build details */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the build. */
+          build_id: components['parameters']['build_id']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned build details. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['BuildInfo']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/sandboxes/{sandboxID}/record': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get sandbox record */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the sandbox. */
+          sandboxID: components['parameters']['sandboxID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned sandbox details. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['SandboxRecord']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List user teams
+     * @description Returns all teams the authenticated user belongs to, with limits and default flag.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned user teams. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['UserTeamsResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    /** Create team */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['CreateTeamRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully created team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/users/{userId}/bootstrap': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Bootstrap user */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully bootstrapped user. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/users/bootstrap': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Bootstrap auth provider user */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminAuthProviderUserBootstrapRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully bootstrapped user. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/teams/bootstrap': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /**
+     * Bootstrap team
+     * @description Creates and provisions a team for an admin-authenticated bootstrap workflow.
+     */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminTeamBootstrapRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully bootstrapped team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+        502: components['responses']['502']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/resolve': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Resolve user profiles */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminAuthProviderProfilesResolveRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully resolved profiles. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/by-email': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Lookup user profiles by email */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AdminAuthProviderProfilesLookupEmailRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully found matching profiles. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/admin/user-profiles/{userId}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get user profile */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully found profile. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['AdminAuthProviderProfilesResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/resolve': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Resolve team identity
+     * @description Resolves a team slug to the team's identity, validating the user is a member.
+     */
+    get: {
+      parameters: {
+        query: {
+          /** @description Team slug to resolve. */
+          slug: components['parameters']['teamSlug']
+        }
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully resolved team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamResolveResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/{teamID}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    /** Update team */
+    patch: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['UpdateTeamRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully updated team. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['UpdateTeamResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    trace?: never
+  }
+  '/teams/{teamID}/members': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** List team members */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned team members. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TeamMembersResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    /** Add team member */
+    post: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+        }
+        cookie?: never
+      }
+      requestBody: {
+        content: {
+          'application/json': components['schemas']['AddTeamMemberRequest']
+        }
+      }
+      responses: {
+        /** @description Successfully added team member. */
+        201: {
+          headers: {
+            [name: string]: unknown
+          }
+          content?: never
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/teams/{teamID}/members/{userId}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    post?: never
+    /** Remove team member */
+    delete: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the team. */
+          teamID: components['parameters']['teamID']
+          /** @description Identifier of the user. */
+          userId: components['parameters']['userId']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully removed team member. */
+        204: {
+          headers: {
+            [name: string]: unknown
+          }
+          content?: never
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        500: components['responses']['500']
+      }
+    }
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/defaults': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List default templates
+     * @description Returns the list of default templates with their latest build info and aliases.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path?: never
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned default templates. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['DefaultTemplatesResponse']
+          }
+        }
+        401: components['responses']['401']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Get template
+     * @description Returns a single template owned by the current team. Dashboard-shaped read, indexed by template ID.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned the template. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateDetail']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/groups': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List template tag groups
+     * @description Returns ready template tag assignment groups with bounded per-tag history, paginated over tags with keyset cursor.
+     */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Maximum number of ready assignment rows to return per tag. */
+          assignmentLimit?: components['parameters']['tag_assignment_limit']
+          /** @description Maximum number of distinct tags to return per page. */
+          tagsLimit?: components['parameters']['tag_groups_limit']
+          /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+          tagsCursor?: components['parameters']['tag_groups_cursor']
+          /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+          search?: components['parameters']['tag_groups_search']
+          /** @description Sort order for the returned tag groups. */
+          sort?: components['parameters']['tag_groups_sort']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned template tag groups. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagGroupsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/count': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Count template tags
+     * @description Returns the total number of distinct ready tags for the template.
+     */
+    get: {
+      parameters: {
+        query?: never
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned tag count. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagsCountResponse']
+          }
+        }
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/exists': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Check ready template tag existence
+     * @description Checks whether a template tag has at least one ready assignment.
+     */
+    get: {
+      parameters: {
+        query: {
+          /** @description Template tag name to check. */
+          tag: components['parameters']['tag']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully checked template tag existence. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagExistsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/templates/{templateID}/tags/{tag}/assignments': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * List ready assignments for a single template tag
+     * @description Returns ready tag assignment events for a single tag, ordered newest first, with keyset cursor pagination.
+     */
+    get: {
+      parameters: {
+        query?: {
+          /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+          cursor?: components['parameters']['tag_assignments_cursor']
+          /** @description Maximum number of assignment rows to return per page. */
+          limit?: components['parameters']['tag_assignments_limit']
+        }
+        header?: never
+        path: {
+          /** @description Identifier of the template. */
+          templateID: components['parameters']['templateID']
+          /** @description Template tag name. */
+          tag: components['parameters']['tag_path']
+        }
+        cookie?: never
+      }
+      requestBody?: never
+      responses: {
+        /** @description Successfully returned tag assignment page. */
+        200: {
+          headers: {
+            [name: string]: unknown
+          }
+          content: {
+            'application/json': components['schemas']['TemplateTagAssignmentsResponse']
+          }
+        }
+        400: components['responses']['400']
+        401: components['responses']['401']
+        403: components['responses']['403']
+        404: components['responses']['404']
+        500: components['responses']['500']
+      }
+    }
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
 }
-export type webhooks = Record<string, never>;
+export type webhooks = Record<string, never>
 export interface components {
-    schemas: {
-        Error: {
-            /**
-             * Format: int32
-             * @description Error code.
-             */
-            code: number;
-            /** @description Error message. */
-            message: string;
-        };
-        AdminAuthProviderProfile: {
-            /**
-             * Format: uuid
-             * @description Internal E2B user identifier.
-             */
-            userId: string;
-            /** @description Email address from the configured auth provider. */
-            email: string | null;
-        };
-        AdminAuthProviderProfilesResponse: {
-            profiles: components["schemas"]["AdminAuthProviderProfile"][];
-        };
-        AdminAuthProviderProfilesResolveRequest: {
-            userIds: string[];
-        };
-        AdminAuthProviderProfilesLookupEmailRequest: {
-            /** Format: email */
-            email: string;
-        };
-        AdminAuthProviderUserBootstrapRequest: {
-            oidc_issuer: string;
-            oidc_user_id: string;
-            /** Format: email */
-            oidc_user_email: string;
-            oidc_user_name?: string | null;
-        };
-        AdminTeamBootstrapRequest: {
-            /** @description Team name. */
-            name: string;
-            /**
-             * Format: email
-             * @description Billing/contact email for the team.
-             */
-            email: string;
-        };
-        /**
-         * @description Build status mapped for dashboard clients.
-         * @enum {string}
-         */
-        BuildStatus: "building" | "failed" | "success";
-        ListedBuild: {
-            /**
-             * Format: uuid
-             * @description Identifier of the build.
-             */
-            id: string;
-            /** @description Template alias when present, otherwise template ID. */
-            template: string;
-            /** @description Identifier of the template. */
-            templateId: string;
-            status: components["schemas"]["BuildStatus"];
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-            /**
-             * Format: date-time
-             * @description Build creation timestamp in RFC3339 format.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-        };
-        BuildsListResponse: {
-            data: components["schemas"]["ListedBuild"][];
-            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        BuildStatusItem: {
-            /**
-             * Format: uuid
-             * @description Identifier of the build.
-             */
-            id: string;
-            status: components["schemas"]["BuildStatus"];
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-        };
-        BuildsStatusesResponse: {
-            /** @description List of build statuses */
-            buildStatuses: components["schemas"]["BuildStatusItem"][];
-        };
-        BuildInfo: {
-            /** @description Template names related to this build, if available. */
-            names?: string[] | null;
-            /**
-             * Format: date-time
-             * @description Build creation timestamp in RFC3339 format.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Build completion timestamp in RFC3339 format, if finished.
-             */
-            finishedAt: string | null;
-            status: components["schemas"]["BuildStatus"];
-            /** @description Failure message when status is `failed`, otherwise `null`. */
-            statusMessage: string | null;
-        };
-        /**
-         * Format: int64
-         * @description CPU cores for the sandbox
-         */
-        CPUCount: number;
-        /**
-         * Format: int64
-         * @description Memory for the sandbox in MiB
-         */
-        MemoryMB: number;
-        /**
-         * Format: int64
-         * @description Disk size for the sandbox in MiB
-         */
-        DiskSizeMB: number;
-        SandboxRecord: {
-            /** @description Identifier of the template from which is the sandbox created */
-            templateID: string;
-            /** @description Alias of the template */
-            alias?: string;
-            /** @description Identifier of the sandbox */
-            sandboxID: string;
-            /**
-             * Format: date-time
-             * @description Time when the sandbox was started
-             */
-            startedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the sandbox was stopped
-             */
-            stoppedAt?: string | null;
-            /** @description Base domain where the sandbox traffic is accessible */
-            domain?: string | null;
-            cpuCount: components["schemas"]["CPUCount"];
-            memoryMB: components["schemas"]["MemoryMB"];
-            diskSizeMB: components["schemas"]["DiskSizeMB"];
-        };
-        HealthResponse: {
-            /** @description Human-readable health check result. */
-            message: string;
-        };
-        UserTeamLimits: {
-            /** Format: int64 */
-            maxLengthHours: number;
-            /** Format: int32 */
-            concurrentSandboxes: number;
-            /** Format: int32 */
-            concurrentTemplateBuilds: number;
-            /** Format: int32 */
-            maxVcpu: number;
-            /** Format: int32 */
-            maxRamMb: number;
-            /** Format: int32 */
-            diskMb: number;
-        };
-        UserTeam: {
-            /** Format: uuid */
-            id: string;
-            name: string;
-            slug: string;
-            tier: string;
-            email: string;
-            profilePictureUrl: string | null;
-            isBlocked: boolean;
-            isBanned: boolean;
-            blockedReason: string | null;
-            isDefault: boolean;
-            limits: components["schemas"]["UserTeamLimits"];
-            /** Format: date-time */
-            createdAt: string;
-        };
-        UserTeamsResponse: {
-            teams: components["schemas"]["UserTeam"][];
-        };
-        TeamMember: {
-            /** Format: uuid */
-            id: string;
-            email: string;
-            name?: string | null;
-            /** Format: uri */
-            profilePictureUrl?: string | null;
-            providers: string[];
-            isDefault: boolean;
-            /** Format: uuid */
-            addedBy?: string | null;
-            /** Format: date-time */
-            createdAt: string | null;
-        };
-        TeamMembersResponse: {
-            members: components["schemas"]["TeamMember"][];
-        };
-        UpdateTeamRequest: {
-            name?: string;
-            profilePictureUrl?: string | null;
-        };
-        UpdateTeamResponse: {
-            /** Format: uuid */
-            id: string;
-            name: string;
-            profilePictureUrl?: string | null;
-        };
-        AddTeamMemberRequest: {
-            /** Format: email */
-            email: string;
-        };
-        CreateTeamRequest: {
-            name: string;
-        };
-        DefaultTemplateAlias: {
-            alias: string;
-            namespace?: string | null;
-        };
-        DefaultTemplate: {
-            id: string;
-            aliases: components["schemas"]["DefaultTemplateAlias"][];
-            /** Format: uuid */
-            buildId: string;
-            /** Format: int64 */
-            ramMb: number;
-            /** Format: int64 */
-            vcpu: number;
-            /** Format: int64 */
-            totalDiskSizeMb: number | null;
-            envdVersion?: string | null;
-            /** Format: date-time */
-            createdAt: string;
-            public: boolean;
-            /** Format: int32 */
-            buildCount: number;
-            /** Format: int64 */
-            spawnCount: number;
-        };
-        DefaultTemplatesResponse: {
-            templates: components["schemas"]["DefaultTemplate"][];
-        };
-        /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
-        TemplateDetail: {
-            /** @description Identifier of the template. */
-            templateID: string;
-            /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
-            buildID: string;
-            /** @description vCPU count of the latest ready default build, or `null` when none. */
-            cpuCount: components["schemas"]["CPUCount"] | null;
-            /** @description Memory in MiB of the latest ready default build, or `null` when none. */
-            memoryMB: components["schemas"]["MemoryMB"] | null;
-            /** @description Disk size in MiB of the latest ready default build, or `null` when none. */
-            diskSizeMB: components["schemas"]["DiskSizeMB"] | null;
-            /** @description Whether the template is public or only accessible by the team. */
-            public: boolean;
-            /**
-             * @deprecated
-             * @description Aliases of the template.
-             */
-            aliases: string[];
-            /** @description Names of the template (namespace/alias format when namespaced). */
-            names: string[];
-            /**
-             * Format: date-time
-             * @description Time when the template was created.
-             */
-            createdAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the template was last updated.
-             */
-            updatedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the template was last used.
-             */
-            lastSpawnedAt: string | null;
-            /**
-             * Format: int64
-             * @description Number of times the template was used.
-             */
-            spawnCount: number;
-            /**
-             * Format: int32
-             * @description Number of times the template was built.
-             */
-            buildCount: number;
-            /** @description envd version of the latest ready default build, or `null` when none. */
-            envdVersion: string | null;
-        };
-        TemplateTagAssignment: {
-            /**
-             * Format: uuid
-             * @description Identifier of the tag assignment event.
-             */
-            assignmentId: string;
-            /**
-             * Format: uuid
-             * @description Identifier of the assigned build.
-             */
-            buildId: string;
-            /**
-             * Format: date-time
-             * @description Time when the tag was assigned to the build.
-             */
-            assignedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the assigned build was created.
-             */
-            buildCreatedAt: string;
-            /**
-             * Format: date-time
-             * @description Time when the assigned build finished.
-             */
-            buildFinishedAt: string | null;
-        };
-        TemplateTagGroup: {
-            /** @description Template tag name. */
-            tag: string;
-            /** @description Ready assignment events for this tag, sorted latest first. */
-            assignments: components["schemas"]["TemplateTagAssignment"][];
-            /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
-            hasMore: boolean;
-        };
-        TemplateTagGroupsResponse: {
-            tags: components["schemas"]["TemplateTagGroup"][];
-            /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        TemplateTagsCountResponse: {
-            /**
-             * Format: int64
-             * @description Total distinct ready tags for the template.
-             */
-            total: number;
-        };
-        TemplateTagExistsResponse: {
-            /** @description Whether the template tag has at least one ready assignment. */
-            exists: boolean;
-            /** @description Normalized template tag name. */
-            normalizedTag: string;
-        };
-        TemplateTagAssignmentsResponse: {
-            /** @description Ready assignment events for the tag, sorted latest first. */
-            data: components["schemas"]["TemplateTagAssignment"][];
-            /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
-            nextCursor: string | null;
-        };
-        TeamResolveResponse: {
-            /** Format: uuid */
-            id: string;
-            slug: string;
-        };
-    };
-    responses: {
-        /** @description Bad request */
-        400: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Authentication error */
-        401: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Forbidden */
-        403: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Not found */
-        404: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Server error */
-        500: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-        /** @description Upstream error */
-        502: {
-            headers: {
-                [name: string]: unknown;
-            };
-            content: {
-                "application/json": components["schemas"]["Error"];
-            };
-        };
-    };
-    parameters: {
-        /** @description Identifier of the build. */
-        build_id: string;
-        /** @description Identifier of the sandbox. */
-        sandboxID: string;
-        /** @description Maximum number of items to return per page. */
-        builds_limit: number;
-        /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
-        builds_cursor: string;
-        /** @description Optional filter by build identifier, template identifier, or template alias. */
-        build_id_or_template: string;
-        /** @description Comma-separated list of build statuses to include. */
-        build_statuses: components["schemas"]["BuildStatus"][];
-        /** @description Comma-separated list of build IDs to get statuses for. */
-        build_ids: string[];
-        /** @description Identifier of the team. */
-        teamID: string;
-        /** @description Identifier of the user. */
-        userId: string;
-        /** @description Team slug to resolve. */
-        teamSlug: string;
-        /** @description Identifier of the template. */
-        templateID: string;
-        /** @description Template tag name to check. */
-        tag: string;
-        /** @description Maximum number of ready assignment rows to return per tag. */
-        tag_assignment_limit: number;
-        /** @description Template tag name. */
-        tag_path: string;
-        /** @description Maximum number of assignment rows to return per page. */
-        tag_assignments_limit: number;
-        /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
-        tag_assignments_cursor: string;
-        /** @description Maximum number of distinct tags to return per page. */
-        tag_groups_limit: number;
-        /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
-        tag_groups_cursor: string;
-        /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
-        tag_groups_search: string;
-        /** @description Sort order for the returned tag groups. */
-        tag_groups_sort: "latest_desc" | "latest_asc" | "name_asc" | "name_desc";
-    };
-    requestBodies: never;
-    headers: never;
-    pathItems: never;
+  schemas: {
+    Error: {
+      /**
+       * Format: int32
+       * @description Error code.
+       */
+      code: number
+      /** @description Error message. */
+      message: string
+    }
+    AdminAuthProviderProfile: {
+      /**
+       * Format: uuid
+       * @description Internal E2B user identifier.
+       */
+      userId: string
+      /** @description Email address from the configured auth provider. */
+      email: string | null
+    }
+    AdminAuthProviderProfilesResponse: {
+      profiles: components['schemas']['AdminAuthProviderProfile'][]
+    }
+    AdminAuthProviderProfilesResolveRequest: {
+      userIds: string[]
+    }
+    AdminAuthProviderProfilesLookupEmailRequest: {
+      /** Format: email */
+      email: string
+    }
+    AdminAuthProviderUserBootstrapRequest: {
+      oidc_issuer: string
+      oidc_user_id: string
+      /** Format: email */
+      oidc_user_email: string
+      oidc_user_name?: string | null
+    }
+    AdminTeamBootstrapRequest: {
+      /** @description Team name. */
+      name: string
+      /**
+       * Format: email
+       * @description Billing/contact email for the team.
+       */
+      email: string
+    }
+    /**
+     * @description Build status mapped for dashboard clients.
+     * @enum {string}
+     */
+    BuildStatus: 'building' | 'failed' | 'success'
+    ListedBuild: {
+      /**
+       * Format: uuid
+       * @description Identifier of the build.
+       */
+      id: string
+      /** @description Template alias when present, otherwise template ID. */
+      template: string
+      /** @description Identifier of the template. */
+      templateId: string
+      status: components['schemas']['BuildStatus']
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+      /**
+       * Format: date-time
+       * @description Build creation timestamp in RFC3339 format.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+    }
+    BuildsListResponse: {
+      data: components['schemas']['ListedBuild'][]
+      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    BuildStatusItem: {
+      /**
+       * Format: uuid
+       * @description Identifier of the build.
+       */
+      id: string
+      status: components['schemas']['BuildStatus']
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+    }
+    BuildsStatusesResponse: {
+      /** @description List of build statuses */
+      buildStatuses: components['schemas']['BuildStatusItem'][]
+    }
+    BuildInfo: {
+      /** @description Template names related to this build, if available. */
+      names?: string[] | null
+      /**
+       * Format: date-time
+       * @description Build creation timestamp in RFC3339 format.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Build completion timestamp in RFC3339 format, if finished.
+       */
+      finishedAt: string | null
+      status: components['schemas']['BuildStatus']
+      /** @description Failure message when status is `failed`, otherwise `null`. */
+      statusMessage: string | null
+    }
+    /**
+     * Format: int64
+     * @description CPU cores for the sandbox
+     */
+    CPUCount: number
+    /**
+     * Format: int64
+     * @description Memory for the sandbox in MiB
+     */
+    MemoryMB: number
+    /**
+     * Format: int64
+     * @description Disk size for the sandbox in MiB
+     */
+    DiskSizeMB: number
+    SandboxRecord: {
+      /** @description Identifier of the template from which is the sandbox created */
+      templateID: string
+      /** @description Alias of the template */
+      alias?: string
+      /** @description Identifier of the sandbox */
+      sandboxID: string
+      /**
+       * Format: date-time
+       * @description Time when the sandbox was started
+       */
+      startedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the sandbox was stopped
+       */
+      stoppedAt?: string | null
+      /** @description Base domain where the sandbox traffic is accessible */
+      domain?: string | null
+      cpuCount: components['schemas']['CPUCount']
+      memoryMB: components['schemas']['MemoryMB']
+      diskSizeMB: components['schemas']['DiskSizeMB']
+    }
+    HealthResponse: {
+      /** @description Human-readable health check result. */
+      message: string
+    }
+    UserTeamLimits: {
+      /** Format: int64 */
+      maxLengthHours: number
+      /** Format: int32 */
+      concurrentSandboxes: number
+      /** Format: int32 */
+      concurrentTemplateBuilds: number
+      /** Format: int32 */
+      maxVcpu: number
+      /** Format: int32 */
+      maxRamMb: number
+      /** Format: int32 */
+      diskMb: number
+    }
+    UserTeam: {
+      /** Format: uuid */
+      id: string
+      name: string
+      slug: string
+      tier: string
+      email: string
+      profilePictureUrl: string | null
+      isBlocked: boolean
+      isBanned: boolean
+      blockedReason: string | null
+      isDefault: boolean
+      limits: components['schemas']['UserTeamLimits']
+      /** Format: date-time */
+      createdAt: string
+    }
+    UserTeamsResponse: {
+      teams: components['schemas']['UserTeam'][]
+    }
+    TeamMember: {
+      /** Format: uuid */
+      id: string
+      email: string
+      name?: string | null
+      /** Format: uri */
+      profilePictureUrl?: string | null
+      providers: string[]
+      isDefault: boolean
+      /** Format: uuid */
+      addedBy?: string | null
+      /** Format: date-time */
+      createdAt: string | null
+    }
+    TeamMembersResponse: {
+      members: components['schemas']['TeamMember'][]
+    }
+    UpdateTeamRequest: {
+      name?: string
+      profilePictureUrl?: string | null
+    }
+    UpdateTeamResponse: {
+      /** Format: uuid */
+      id: string
+      name: string
+      profilePictureUrl?: string | null
+    }
+    AddTeamMemberRequest: {
+      /** Format: email */
+      email: string
+    }
+    CreateTeamRequest: {
+      name: string
+    }
+    DefaultTemplateAlias: {
+      alias: string
+      namespace?: string | null
+    }
+    DefaultTemplate: {
+      id: string
+      aliases: components['schemas']['DefaultTemplateAlias'][]
+      /** Format: uuid */
+      buildId: string
+      /** Format: int64 */
+      ramMb: number
+      /** Format: int64 */
+      vcpu: number
+      /** Format: int64 */
+      totalDiskSizeMb: number | null
+      envdVersion?: string | null
+      /** Format: date-time */
+      createdAt: string
+      public: boolean
+      /** Format: int32 */
+      buildCount: number
+      /** Format: int64 */
+      spawnCount: number
+    }
+    DefaultTemplatesResponse: {
+      templates: components['schemas']['DefaultTemplate'][]
+    }
+    /** @description Dashboard-shaped single-template read. Mirrors the infra-api `Template` schema fields the dashboard renders. */
+    TemplateDetail: {
+      /** @description Identifier of the template. */
+      templateID: string
+      /** @description Identifier of the latest ready build for the template, or the zero UUID when none. */
+      buildID: string
+      /** @description vCPU count of the latest ready default build, or `null` when none. */
+      cpuCount: components['schemas']['CPUCount'] | null
+      /** @description Memory in MiB of the latest ready default build, or `null` when none. */
+      memoryMB: components['schemas']['MemoryMB'] | null
+      /** @description Disk size in MiB of the latest ready default build, or `null` when none. */
+      diskSizeMB: components['schemas']['DiskSizeMB'] | null
+      /** @description Whether the template is public or only accessible by the team. */
+      public: boolean
+      /**
+       * @deprecated
+       * @description Aliases of the template.
+       */
+      aliases: string[]
+      /** @description Names of the template (namespace/alias format when namespaced). */
+      names: string[]
+      /**
+       * Format: date-time
+       * @description Time when the template was created.
+       */
+      createdAt: string
+      /**
+       * Format: date-time
+       * @description Time when the template was last updated.
+       */
+      updatedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the template was last used.
+       */
+      lastSpawnedAt: string | null
+      /**
+       * Format: int64
+       * @description Number of times the template was used.
+       */
+      spawnCount: number
+      /**
+       * Format: int32
+       * @description Number of times the template was built.
+       */
+      buildCount: number
+      /** @description envd version of the latest ready default build, or `null` when none. */
+      envdVersion: string | null
+    }
+    TemplateTagAssignment: {
+      /**
+       * Format: uuid
+       * @description Identifier of the tag assignment event.
+       */
+      assignmentId: string
+      /**
+       * Format: uuid
+       * @description Identifier of the assigned build.
+       */
+      buildId: string
+      /**
+       * Format: date-time
+       * @description Time when the tag was assigned to the build.
+       */
+      assignedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the assigned build was created.
+       */
+      buildCreatedAt: string
+      /**
+       * Format: date-time
+       * @description Time when the assigned build finished.
+       */
+      buildFinishedAt: string | null
+    }
+    TemplateTagGroup: {
+      /** @description Template tag name. */
+      tag: string
+      /** @description Ready assignment events for this tag, sorted latest first. */
+      assignments: components['schemas']['TemplateTagAssignment'][]
+      /** @description Whether more ready assignment events exist beyond the requested assignment limit. */
+      hasMore: boolean
+    }
+    TemplateTagGroupsResponse: {
+      tags: components['schemas']['TemplateTagGroup'][]
+      /** @description Cursor to pass as `tagsCursor` for the next page, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    TemplateTagsCountResponse: {
+      /**
+       * Format: int64
+       * @description Total distinct ready tags for the template.
+       */
+      total: number
+    }
+    TemplateTagExistsResponse: {
+      /** @description Whether the template tag has at least one ready assignment. */
+      exists: boolean
+      /** @description Normalized template tag name. */
+      normalizedTag: string
+    }
+    TemplateTagAssignmentsResponse: {
+      /** @description Ready assignment events for the tag, sorted latest first. */
+      data: components['schemas']['TemplateTagAssignment'][]
+      /** @description Cursor to pass to the next list request, or `null` if there is no next page. */
+      nextCursor: string | null
+    }
+    TeamResolveResponse: {
+      /** Format: uuid */
+      id: string
+      slug: string
+    }
+  }
+  responses: {
+    /** @description Bad request */
+    400: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Authentication error */
+    401: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Forbidden */
+    403: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Not found */
+    404: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Server error */
+    500: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+    /** @description Upstream error */
+    502: {
+      headers: {
+        [name: string]: unknown
+      }
+      content: {
+        'application/json': components['schemas']['Error']
+      }
+    }
+  }
+  parameters: {
+    /** @description Identifier of the build. */
+    build_id: string
+    /** @description Identifier of the sandbox. */
+    sandboxID: string
+    /** @description Maximum number of items to return per page. */
+    builds_limit: number
+    /** @description Cursor returned by the previous list response in `created_at|build_id` format. */
+    builds_cursor: string
+    /** @description Optional filter by build identifier, template identifier, or template alias. */
+    build_id_or_template: string
+    /** @description Comma-separated list of build statuses to include. */
+    build_statuses: components['schemas']['BuildStatus'][]
+    /** @description Comma-separated list of build IDs to get statuses for. */
+    build_ids: string[]
+    /** @description Identifier of the team. */
+    teamID: string
+    /** @description Identifier of the user. */
+    userId: string
+    /** @description Team slug to resolve. */
+    teamSlug: string
+    /** @description Identifier of the template. */
+    templateID: string
+    /** @description Template tag name to check. */
+    tag: string
+    /** @description Maximum number of ready assignment rows to return per tag. */
+    tag_assignment_limit: number
+    /** @description Template tag name. */
+    tag_path: string
+    /** @description Maximum number of assignment rows to return per page. */
+    tag_assignments_limit: number
+    /** @description Cursor returned by the previous list response in `assigned_at|assignment_id` format. */
+    tag_assignments_cursor: string
+    /** @description Maximum number of distinct tags to return per page. */
+    tag_groups_limit: number
+    /** @description Cursor returned by the previous list response in `{sort}|{latest_assigned_at}|{tag}` format (sort-tagged, RFC3339Nano). */
+    tag_groups_cursor: string
+    /** @description Case-insensitive substring filter on tag name. Allowed characters are `a-z`, `0-9`, `.`, `_`, `-`. */
+    tag_groups_search: string
+    /** @description Sort order for the returned tag groups. */
+    tag_groups_sort: 'latest_desc' | 'latest_asc' | 'name_asc' | 'name_desc'
+  }
+  requestBodies: never
+  headers: never
+  pathItems: never
 }
-export type $defs = Record<string, never>;
-export type operations = Record<string, never>;
+export type $defs = Record<string, never>
+export type operations = Record<string, never>

From f67cc9bd5458885026a9d9b0a5e2080547f11b5b Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 23:19:34 +0200
Subject: [PATCH 79/90] fix type

---
 src/core/modules/templates/models.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/modules/templates/models.ts b/src/core/modules/templates/models.ts
index 8cb6a1891..085adb116 100644
--- a/src/core/modules/templates/models.ts
+++ b/src/core/modules/templates/models.ts
@@ -27,6 +27,8 @@ export type TemplateDetail = Pick<
   | 'memoryMB'
   | 'diskSizeMB'
   | 'public'
+  | 'aliases'
+  | 'names'
   | 'createdAt'
   | 'updatedAt'
   | 'lastSpawnedAt'

From c027b40df5c728cf71b692c485ea3774b07a3723 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Tue, 2 Jun 2026 23:25:48 +0200
Subject: [PATCH 80/90] fix type

---
 .../dashboard/templates/detail/overview/template-section.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/templates/detail/overview/template-section.tsx b/src/features/dashboard/templates/detail/overview/template-section.tsx
index 2ed668c5b..3e8adf114 100644
--- a/src/features/dashboard/templates/detail/overview/template-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-section.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import type { Template } from '@/core/modules/templates/models'
+import type { TemplateDetail } from '@/core/modules/templates/models'
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { useClipboard } from '@/lib/hooks/use-clipboard'
 import { formatLocalLogStyleTimestamp } from '@/lib/utils/formatting'
@@ -11,7 +11,7 @@ import { TemplateVisibilityDropdown } from '../visibility-dropdown'
 import { OverviewSection } from './section'
 
 interface TemplateSectionProps {
-  template: Template
+  template: TemplateDetail
   teamSlug: string
 }
 

From 119ecb2841a9ae51fbd677e1c7e566bb969ec418 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 10:52:41 +0200
Subject: [PATCH 81/90] Fix inline button truncation

---
 src/features/dashboard/templates/builds/table-cells.tsx | 1 +
 src/ui/copy-button-inline.tsx                           | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 48517adac..88582b520 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -23,6 +23,7 @@ export function BuildId({ id }: { id: string }) {
   return (
     <CopyButtonInline
       value={id}
+      truncate={false}
       className="w-full text-left text-fg-secondary font-mono prose-table-numeric"
     >
       {id.slice(0, 6)}...{id.slice(-6)}
diff --git a/src/ui/copy-button-inline.tsx b/src/ui/copy-button-inline.tsx
index 3e5771bb0..5f4959cc4 100644
--- a/src/ui/copy-button-inline.tsx
+++ b/src/ui/copy-button-inline.tsx
@@ -10,12 +10,14 @@ export default function CopyButtonInline({
   children,
   className,
   iconPosition = 'right',
+  truncate = true,
   'aria-label': ariaLabel,
 }: {
   value: string
   children: React.ReactNode
   className?: string
   iconPosition?: 'left' | 'right'
+  truncate?: boolean
   'aria-label'?: string
 }) {
   const [wasCopied, copy] = useClipboard(1000)
@@ -72,7 +74,9 @@ export default function CopyButtonInline({
       )}
     >
       {iconPosition === 'left' && icon}
-      <span className="truncate">{children}</span>
+      <span className={truncate ? 'truncate' : 'whitespace-nowrap'}>
+        {children}
+      </span>
       {iconPosition === 'right' && icon}
     </button>
   )

From 7e3ee38329b49641c407330a1b85378c871580bb Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 10:54:35 +0200
Subject: [PATCH 82/90] correct id column truncation

---
 src/features/dashboard/templates/builds/table-cells.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 88582b520..20fd1e480 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -26,7 +26,7 @@ export function BuildId({ id }: { id: string }) {
       truncate={false}
       className="w-full text-left text-fg-secondary font-mono prose-table-numeric"
     >
-      {id.slice(0, 6)}...{id.slice(-6)}
+      {id.slice(0, 7)}...{id.slice(-5)}
     </CopyButtonInline>
   )
 }

From 1c3063d7dd13049c796261f0da978df60d3dee71 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 11:04:22 +0200
Subject: [PATCH 83/90] Set min width for delete dialog button

---
 src/features/dashboard/templates/tags/delete-dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/dashboard/templates/tags/delete-dialog.tsx b/src/features/dashboard/templates/tags/delete-dialog.tsx
index 241fa8d43..77775691c 100644
--- a/src/features/dashboard/templates/tags/delete-dialog.tsx
+++ b/src/features/dashboard/templates/tags/delete-dialog.tsx
@@ -115,7 +115,7 @@ export default function TagDeleteDialog({
               variant="error"
               loading={isDeleting ? 'Deleting' : undefined}
               disabled={isDeleting}
-              className="font-sans normal-case"
+              className="font-sans normal-case min-w-[98px]"
               onClick={() => {
                 deleteTags.mutate({
                   teamSlug,

From 9426e2f4d3a8801e3cab7a995b7f3a05f346414e Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 11:05:47 +0200
Subject: [PATCH 84/90] Fix build id column position

---
 .../templates/builds/table-cells.tsx          | 13 +++++++--
 .../dashboard/templates/builds/table.tsx      | 28 +++++++++++++------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 20fd1e480..742daedff 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -19,12 +19,21 @@ import { Button } from '@/ui/primitives/button'
 import { CheckIcon, CloseIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
 
-export function BuildId({ id }: { id: string }) {
+export function BuildId({
+  id,
+  className,
+}: {
+  id: string
+  className?: string
+}) {
   return (
     <CopyButtonInline
       value={id}
       truncate={false}
-      className="w-full text-left text-fg-secondary font-mono prose-table-numeric"
+      className={cn(
+        'w-full text-left text-fg-secondary font-mono prose-table-numeric',
+        className
+      )}
     >
       {id.slice(0, 7)}...{id.slice(-5)}
     </CopyButtonInline>
diff --git a/src/features/dashboard/templates/builds/table.tsx b/src/features/dashboard/templates/builds/table.tsx
index e81136434..28a8acc03 100644
--- a/src/features/dashboard/templates/builds/table.tsx
+++ b/src/features/dashboard/templates/builds/table.tsx
@@ -189,19 +189,20 @@ const BuildsTable = ({
         <Table suppressHydrationWarning>
           <colgroup>
             <col style={colStyle(COLUMN_WIDTHS.status)} />
-            <col style={colStyle(COLUMN_WIDTHS.id)} />
+            {!showTemplateColumn && <col style={colStyle(COLUMN_WIDTHS.id)} />}
             {showTemplateColumn && (
               <col style={colStyle(COLUMN_WIDTHS.template)} />
             )}
             <col style={colStyle(COLUMN_WIDTHS.started)} />
             <col style={colStyle(COLUMN_WIDTHS.duration)} />
+            {showTemplateColumn && <col style={colStyle(COLUMN_WIDTHS.id)} />}
             <col className="max-lg:min-w-[500px]" />
           </colgroup>
 
           <TableHeader className="sticky top-0 z-10 bg-bg">
             <TableRow>
               <TableHead>Status</TableHead>
-              <TableHead>ID</TableHead>
+              {!showTemplateColumn && <TableHead>ID</TableHead>}
               {showTemplateColumn && <TableHead>Template</TableHead>}
               <TableHead>
                 <span className="inline-flex items-center gap-1 text-fg">
@@ -210,6 +211,7 @@ const BuildsTable = ({
                 </span>
               </TableHead>
               <TableHead className="text-end">Duration</TableHead>
+              {showTemplateColumn && <TableHead>ID</TableHead>}
               <th />
             </TableRow>
           </TableHeader>
@@ -253,6 +255,20 @@ const BuildsTable = ({
                 {visibleBuilds.map((build) => {
                   const isBuilding = build.status === 'building'
 
+                  const idCell = (
+                    <TableCell
+                      className="py-1.5 overflow-hidden"
+                      style={{ maxWidth: COLUMN_WIDTHS.id }}
+                    >
+                      <BuildId
+                        id={build.id}
+                        className={
+                          showTemplateColumn ? 'text-fg-tertiary' : undefined
+                        }
+                      />
+                    </TableCell>
+                  )
+
                   return (
                     <TableRow
                       key={build.id}
@@ -278,12 +294,7 @@ const BuildsTable = ({
                       >
                         <Status status={build.status} />
                       </TableCell>
-                      <TableCell
-                        className="py-1.5 overflow-hidden"
-                        style={{ maxWidth: COLUMN_WIDTHS.id }}
-                      >
-                        <BuildId id={build.id} />
-                      </TableCell>
+                      {!showTemplateColumn && idCell}
                       {showTemplateColumn && (
                         <TableCell
                           className="py-1.5 overflow-hidden"
@@ -305,6 +316,7 @@ const BuildsTable = ({
                           isBuilding={isBuilding}
                         />
                       </TableCell>
+                      {showTemplateColumn && idCell}
                       <TableCell className="py-1.5 w-full">
                         <Reason statusMessage={build.statusMessage} />
                       </TableCell>

From 6cff7b2efb562252192ec5aa6d1402f8c8bfe911 Mon Sep 17 00:00:00 2001
From: drankou <25752851+drankou@users.noreply.github.com>
Date: Thu, 4 Jun 2026 09:12:23 +0000
Subject: [PATCH 85/90] style: apply biome formatting

---
 src/features/dashboard/templates/builds/table-cells.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/features/dashboard/templates/builds/table-cells.tsx b/src/features/dashboard/templates/builds/table-cells.tsx
index 742daedff..eb67a3bf5 100644
--- a/src/features/dashboard/templates/builds/table-cells.tsx
+++ b/src/features/dashboard/templates/builds/table-cells.tsx
@@ -19,13 +19,7 @@ import { Button } from '@/ui/primitives/button'
 import { CheckIcon, CloseIcon } from '@/ui/primitives/icons'
 import { Loader } from '@/ui/primitives/loader'
 
-export function BuildId({
-  id,
-  className,
-}: {
-  id: string
-  className?: string
-}) {
+export function BuildId({ id, className }: { id: string; className?: string }) {
   return (
     <CopyButtonInline
       value={id}

From c9409d4b301608cae0603bc078f72adea01f8e5d Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 13:34:18 +0200
Subject: [PATCH 86/90] update template overview page

---
 .../detail/overview/latest-build-section.tsx  | 63 +++---------
 .../templates/detail/overview/skeleton.tsx    | 30 ++++--
 .../detail/overview/template-section.tsx      | 96 +++++++++----------
 .../detail/overview/template-specs.tsx        | 26 ++---
 4 files changed, 90 insertions(+), 125 deletions(-)

diff --git a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
index 98514575c..7a1a71cd8 100644
--- a/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/latest-build-section.tsx
@@ -3,15 +3,13 @@
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { PROTECTED_URLS } from '@/configs/urls'
 import type { BuildStatus } from '@/core/modules/builds/models'
-import { useClipboard } from '@/lib/hooks/use-clipboard'
 import { useNow } from '@/lib/hooks/use-now'
 import { formatTimeAgoCompact } from '@/lib/utils/formatting'
 import { cn } from '@/lib/utils/ui'
 import { useTRPC } from '@/trpc/client'
 import { HoverPrefetchLink } from '@/ui/hover-prefetch-link'
 import { Badge } from '@/ui/primitives/badge'
-import { Button } from '@/ui/primitives/button'
-import { CheckIcon, CloseIcon, CopyIcon } from '@/ui/primitives/icons'
+import { CheckIcon, ChevronRightIcon, CloseIcon } from '@/ui/primitives/icons'
 import { NULL_BUILD_ID } from '../../tags/constants'
 import { OverviewSection } from './section'
 import { TemplateSpecs } from './template-specs'
@@ -35,7 +33,7 @@ export function LatestBuildSection({
 
   if (template.buildID === NULL_BUILD_ID) {
     return (
-      <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
+      <OverviewSection label="Latest build">
         <p className="text-fg-tertiary prose-body">
           No build tagged{' '}
           <code className="text-fg-secondary font-mono">default</code> yet.
@@ -48,13 +46,13 @@ export function LatestBuildSection({
   }
 
   return (
-    <OverviewSection label="Latest build" labelBadge={<DefaultTagBadge />}>
-      <div className="flex flex-col md:flex-row items-start gap-x-8 gap-y-4">
-        <div className="flex flex-col gap-2 min-w-0">
+    <OverviewSection label="Latest build">
+      <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-3">
+        <div className="flex items-center gap-3 min-w-0">
           <BuildAgo timestamp={new Date(template.updatedAt).getTime()} />
           <BuildStatusBadge status="success" />
         </div>
-        <BuildIdRow
+        <BuildIdLink
           teamSlug={teamSlug}
           templateId={templateId}
           buildId={template.buildID}
@@ -65,14 +63,6 @@ export function LatestBuildSection({
   )
 }
 
-function DefaultTagBadge() {
-  return (
-    <Badge variant="default" size="sm" className="uppercase font-mono">
-      default
-    </Badge>
-  )
-}
-
 function BuildAgo({ timestamp }: { timestamp: number }) {
   const now = useNow(30_000)
 
@@ -125,7 +115,7 @@ function BuildStatusBadge({ status }: { status: BuildStatus }) {
   )
 }
 
-function BuildIdRow({
+function BuildIdLink({
   teamSlug,
   templateId,
   buildId,
@@ -134,39 +124,16 @@ function BuildIdRow({
   templateId: string
   buildId: string
 }) {
-  const [wasCopied, copy] = useClipboard(2000)
   const truncated = `${buildId.slice(0, 7)}...${buildId.slice(-5)}`
 
   return (
-    <div className="flex items-center gap-2 border border-stroke bg-bg px-2.5 h-[36px] min-w-0 flex-1">
-      <button
-        type="button"
-        onClick={() => copy(buildId)}
-        aria-label={wasCopied ? 'Copied build ID' : 'Copy build ID'}
-        className="group/copy relative inline-flex min-w-0 flex-1 items-center text-left text-fg-primary font-mono prose-body-numeric hover:text-fg transition-colors cursor-pointer"
-      >
-        <span className="truncate">{truncated}</span>
-        <span
-          className={cn(
-            'ml-2 opacity-0 group-hover/copy:opacity-100 transition-opacity',
-            wasCopied && 'opacity-100'
-          )}
-          aria-hidden="true"
-        >
-          {wasCopied ? (
-            <CheckIcon className="size-3 text-icon" />
-          ) : (
-            <CopyIcon className="size-3 text-icon-secondary" />
-          )}
-        </span>
-      </button>
-      <Button asChild variant="tertiary" size="none" className="px-3 py-1.5">
-        <HoverPrefetchLink
-          href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
-        >
-          Open
-        </HoverPrefetchLink>
-      </Button>
-    </div>
+    <HoverPrefetchLink
+      href={PROTECTED_URLS.TEMPLATE_BUILD(teamSlug, templateId, buildId)}
+      aria-label="Open build"
+      className="group/build inline-flex items-center gap-1 text-fg-secondary font-mono prose-body-numeric hover:text-fg transition-colors"
+    >
+      <span className="truncate">{truncated}</span>
+      <ChevronRightIcon className="size-4 text-fg-tertiary group-hover/build:text-fg transition-colors" />
+    </HoverPrefetchLink>
   )
 }
diff --git a/src/features/dashboard/templates/detail/overview/skeleton.tsx b/src/features/dashboard/templates/detail/overview/skeleton.tsx
index d47e552fc..40f49fbf8 100644
--- a/src/features/dashboard/templates/detail/overview/skeleton.tsx
+++ b/src/features/dashboard/templates/detail/overview/skeleton.tsx
@@ -5,17 +5,24 @@ export function TemplateOverviewSkeleton() {
   return (
     <div className="flex flex-col gap-8">
       <OverviewSection label="Template" divider={false}>
-        <Skeleton className="h-8 w-[28rem] max-w-full" />
-        <Skeleton className="h-5 w-96 max-w-full" />
+        <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-2">
+          <Skeleton className="h-8 w-40" />
+          <Skeleton className="h-5 w-56" />
+        </div>
+        <div className="flex flex-wrap items-start gap-x-8 gap-y-4">
+          <MetaCellSkeleton />
+          <MetaCellSkeleton />
+          <MetaCellSkeleton className="ml-auto items-end" />
+        </div>
       </OverviewSection>
 
       <OverviewSection label="Latest build">
-        <div className="grid grid-cols-1 md:grid-cols-[minmax(0,1fr)_minmax(0,2fr)] items-start gap-x-8 gap-y-4">
-          <div className="flex flex-col gap-2">
-            <Skeleton className="h-8 w-32" />
-            <Skeleton className="h-5 w-24" />
+        <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-3">
+          <div className="flex items-center gap-3">
+            <Skeleton className="h-8 w-28" />
+            <Skeleton className="h-5 w-20" />
           </div>
-          <Skeleton className="h-10 w-full max-w-md" />
+          <Skeleton className="h-5 w-32" />
         </div>
         <Skeleton className="h-5 w-80 mt-2 max-w-full" />
       </OverviewSection>
@@ -26,3 +33,12 @@ export function TemplateOverviewSkeleton() {
     </div>
   )
 }
+
+function MetaCellSkeleton({ className }: { className?: string }) {
+  return (
+    <div className={`flex flex-col gap-1.5 ${className ?? ''}`}>
+      <Skeleton className="h-3 w-16" />
+      <Skeleton className="h-4 w-28" />
+    </div>
+  )
+}
diff --git a/src/features/dashboard/templates/detail/overview/template-section.tsx b/src/features/dashboard/templates/detail/overview/template-section.tsx
index 3e8adf114..87bc781b1 100644
--- a/src/features/dashboard/templates/detail/overview/template-section.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-section.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import type { TemplateDetail } from '@/core/modules/templates/models'
 import { getTemplateDisplayName } from '@/features/dashboard/templates/helpers'
 import { useClipboard } from '@/lib/hooks/use-clipboard'
@@ -16,7 +17,6 @@ interface TemplateSectionProps {
 }
 
 export function TemplateSection({ template, teamSlug }: TemplateSectionProps) {
-  const [wasCopied, copy] = useClipboard(2000)
   const displayName = getTemplateDisplayName(template)
 
   const created = formatLocalLogStyleTimestamp(template.createdAt, {
@@ -35,77 +35,71 @@ export function TemplateSection({ template, teamSlug }: TemplateSectionProps) {
 
   return (
     <OverviewSection label="Template" divider={false}>
-      <div className="flex items-center gap-3">
+      <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-2">
         <h2 className="prose-value-big font-mono uppercase tracking-tight break-all">
-          {template.templateID}
+          {displayName}
         </h2>
-        <IconButton
-          aria-label={wasCopied ? 'Copied' : 'Copy template ID'}
-          onClick={() => copy(template.templateID)}
-          className="size-7"
-        >
-          {wasCopied ? (
-            <CheckIcon className="size-4 text-icon" />
-          ) : (
-            <CopyIcon className="size-4 text-icon-secondary" />
-          )}
-        </IconButton>
+        <TemplateIdCopy templateID={template.templateID} />
       </div>
 
-      <div className="flex flex-wrap items-center gap-x-3 gap-y-1 text-fg-secondary prose-body">
-        <MetaItem>
-          <span className="text-fg-tertiary">Created</span>{' '}
-          <span className="prose-body-regular">
-            {created?.datePart ?? '--'} {created?.timePart ?? ''}
-          </span>
-        </MetaItem>
-        <Separator />
-        <MetaItem>
-          {modified ? (
-            <>
-              <span className="text-fg-tertiary">Modified</span>{' '}
-              <span className="prose-body-regular">
-                {modified.datePart} {modified.timePart}
-              </span>
-            </>
-          ) : (
-            <span className="text-fg-tertiary">Not yet modified</span>
-          )}
-        </MetaItem>
-        <Separator />
-        <MetaItem>
-          <span className="text-fg-tertiary">Visibility</span>{' '}
+      <div className="flex flex-wrap items-start gap-x-8 gap-y-4">
+        <MetaCell label="Created">
+          {created ? `${created.datePart} ${created.timePart}` : '--'}
+        </MetaCell>
+        <MetaCell label="Modified">
+          {modified ? `${modified.datePart} ${modified.timePart}` : 'Not yet'}
+        </MetaCell>
+        <MetaCell label="Visibility" className="ml-auto items-end">
           <TemplateVisibilityDropdown
             teamSlug={teamSlug}
             templateId={template.templateID}
             isPublic={template.public}
             displayName={displayName}
           />
-        </MetaItem>
+        </MetaCell>
       </div>
     </OverviewSection>
   )
 }
 
-function MetaItem({
-  children,
+function MetaCell({
+  label,
   className,
+  children,
 }: {
-  children: React.ReactNode
+  label: string
   className?: string
+  children: ReactNode
 }) {
   return (
-    <span
-      className={cn(
-        'inline-flex items-center gap-1.5 whitespace-nowrap',
-        className
-      )}
-    >
-      {children}
-    </span>
+    <div className={cn('flex flex-col gap-1.5', className)}>
+      <span className="text-fg-tertiary prose-label-highlight uppercase">
+        {label}
+      </span>
+      <div className="text-fg-secondary prose-body">{children}</div>
+    </div>
   )
 }
 
-function Separator() {
-  return <span className="text-fg-tertiary select-none">·</span>
+function TemplateIdCopy({ templateID }: { templateID: string }) {
+  const [wasCopied, copy] = useClipboard(2000)
+
+  return (
+    <div className="flex items-center gap-1">
+      <span className="text-fg-secondary font-mono prose-body-numeric break-all">
+        {templateID}
+      </span>
+      <IconButton
+        aria-label={wasCopied ? 'Copied' : 'Copy template ID'}
+        onClick={() => copy(templateID)}
+        className="size-6"
+      >
+        {wasCopied ? (
+          <CheckIcon className="size-3.5 text-icon" />
+        ) : (
+          <CopyIcon className="size-3.5 text-icon-secondary" />
+        )}
+      </IconButton>
+    </div>
+  )
 }
diff --git a/src/features/dashboard/templates/detail/overview/template-specs.tsx b/src/features/dashboard/templates/detail/overview/template-specs.tsx
index 17732fadf..82ada460c 100644
--- a/src/features/dashboard/templates/detail/overview/template-specs.tsx
+++ b/src/features/dashboard/templates/detail/overview/template-specs.tsx
@@ -21,33 +21,23 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
   return (
     <div
       className={cn(
-        'flex flex-wrap items-center gap-x-2 gap-y-1 text-fg-secondary prose-body-numeric',
+        'flex flex-wrap items-center gap-x-2 gap-y-1 text-fg-tertiary prose-body-numeric',
         className
       )}
     >
       <SpecItem icon={<CpuIcon className="size-3" />}>
-        <span className="prose-body-numeric-highlight">
-          {build.cpuCount === null ? '—' : formatNumber(build.cpuCount)}
-        </span>{' '}
-        <span className="text-fg-tertiary">
-          Core{build.cpuCount !== null && build.cpuCount > 1 ? 's' : ''}
-        </span>
+        {build.cpuCount === null ? '—' : formatNumber(build.cpuCount)} Core
+        {build.cpuCount !== null && build.cpuCount > 1 ? 's' : ''}
       </SpecItem>
       <Separator />
       <SpecItem icon={<MemoryIcon className="size-3" />}>
-        <span className="prose-body-numeric-highlight">
-          {build.memoryMB === null ? '—' : formatNumber(build.memoryMB)}
-        </span>{' '}
-        <span className="text-fg-tertiary">MB</span>
+        {build.memoryMB === null ? '—' : formatNumber(build.memoryMB)} MB
       </SpecItem>
       {build.diskSizeMB !== null && (
         <>
           <Separator />
           <SpecItem icon={<StorageIcon className="size-3" />}>
-            <span className="prose-body-numeric-highlight">
-              {formatNumber(build.diskSizeMB)}
-            </span>{' '}
-            <span className="text-fg-tertiary">MB</span>
+            {formatNumber(build.diskSizeMB)} MB
           </SpecItem>
         </>
       )}
@@ -55,9 +45,7 @@ export function TemplateSpecs({ build, className }: TemplateSpecsProps) {
         <>
           <Separator />
           <SpecItem icon={<MetadataIcon className="size-3" />}>
-            <span className="prose-body-numeric-highlight font-mono">
-              {build.envdVersion}
-            </span>
+            <span className="font-mono">{build.envdVersion}</span>
           </SpecItem>
         </>
       )}
@@ -81,5 +69,5 @@ function SpecItem({
 }
 
 function Separator() {
-  return <span className="text-fg-tertiary select-none">·</span>
+  return <span className="select-none">·</span>
 }

From dc104eef1fc572295569a1e942e1a6f17dc8a989 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 15:28:33 +0200
Subject: [PATCH 87/90] add success animation in dialog

---
 .../templates/tags/assign-dialog.tsx          | 228 ++++++++++--------
 .../templates/tags/components/index.ts        |   1 +
 .../tag-dialog-stage-transition.tsx           |  37 +++
 .../templates/tags/reassign-dialog.tsx        | 179 ++++++++------
 .../templates/tags/rollback-dialog.tsx        | 140 ++++++-----
 .../tags/use-tag-assignment-mutation.ts       |  34 ++-
 src/lib/utils/ui.ts                           |   1 +
 7 files changed, 370 insertions(+), 250 deletions(-)
 create mode 100644 src/features/dashboard/templates/tags/components/tag-dialog-stage-transition.tsx

diff --git a/src/features/dashboard/templates/tags/assign-dialog.tsx b/src/features/dashboard/templates/tags/assign-dialog.tsx
index 68cf8b60d..1ed675ff0 100644
--- a/src/features/dashboard/templates/tags/assign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/assign-dialog.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useQuery } from '@tanstack/react-query'
-import { type FormEvent, useEffect, useId, useState } from 'react'
+import { type FormEvent, useEffect, useId, useRef, useState } from 'react'
 import { useDebouncedValue } from '@/lib/hooks/use-debounced-value'
 import { useTRPC } from '@/trpc/client'
 import { Button } from '@/ui/primitives/button'
@@ -15,7 +15,11 @@ import {
 import { AddIcon } from '@/ui/primitives/icons'
 import { ArrowDivider } from './arrow-divider'
 import BuildPicker, { type BuildSelectionSource } from './build-picker'
-import { TagDialogFooter, TagDialogSuccess } from './components'
+import {
+  TagDialogFooter,
+  TagDialogStageTransition,
+  TagDialogSuccess,
+} from './components'
 import {
   isValidTagShape,
   normalizeTagInput,
@@ -34,15 +38,64 @@ interface AssignTagDialogProps {
   templateName: string
 }
 
-export default function AssignTagDialog({
+export default function AssignTagDialog(props: AssignTagDialogProps) {
+  const [open, setOpen] = useState(false)
+  const [isPending, setIsPending] = useState(false)
+  const isPendingRef = useRef(false)
+  isPendingRef.current = isPending
+
+  const handleOpenChange = (next: boolean) => {
+    if (!next && isPendingRef.current) return
+    setOpen(next)
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>
+        <Button variant="primary">
+          <AddIcon />
+          Assign new tag
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent
+        hideClose={isPending}
+        className="sm:max-w-[440px] sm:h-[422px] flex flex-col"
+        onPointerDownOutside={(e) => {
+          if (isPendingRef.current) e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (isPendingRef.current) e.preventDefault()
+        }}
+      >
+        <AssignTagDialogBody
+          {...props}
+          open={open}
+          onClose={() => setOpen(false)}
+          onPendingChange={setIsPending}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+interface AssignTagDialogBodyProps extends AssignTagDialogProps {
+  open: boolean
+  onClose: () => void
+  onPendingChange: (pending: boolean) => void
+}
+
+function AssignTagDialogBody({
+  open,
   teamSlug,
   templateId,
   templateName,
-}: AssignTagDialogProps) {
+  onClose,
+  onPendingChange,
+}: AssignTagDialogBodyProps) {
   const trpc = useTRPC()
-
   const formId = useId()
-  const [open, setOpen] = useState(false)
+
   const [name, setNameRaw] = useState('')
   const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
   const [selectionSource, setSelectionSource] =
@@ -69,10 +122,19 @@ export default function AssignTagDialog({
     operation: 'assign',
   })
 
+  useEffect(() => {
+    onPendingChange(mutation.isPending)
+  }, [mutation.isPending, onPendingChange])
+
+  useEffect(() => {
+    trackTagTableInteraction('assign opened', { template_id: templateId })
+  }, [templateId])
+
   const setName = (raw: string) => {
     setNameRaw(normalizeTagInput(raw))
     if (mutation.isError) mutation.reset()
   }
+
   const handleSetSelectedBuildId = (
     id: string | null,
     source: BuildSelectionSource
@@ -103,25 +165,6 @@ export default function AssignTagDialog({
     selectedBuildId !== null &&
     !mutation.isPending
 
-  useEffect(() => {
-    if (!open) return
-    trackTagTableInteraction('assign opened', { template_id: templateId })
-  }, [open, templateId])
-
-  const resetState = () => {
-    setNameRaw('')
-    setSelectedBuildId(null)
-    setSelectionSource(null)
-    mutation.reset()
-  }
-
-  const handleOpenChange = (next: boolean) => {
-    if (mutation.isPending) return
-    // Reset on open only; resetting on close would flicker through the exit animation.
-    if (next && !open) resetState()
-    setOpen(next)
-  }
-
   const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault()
     if (!canSubmit || !selectedBuildId) return
@@ -154,81 +197,66 @@ export default function AssignTagDialog({
     normalizedDebouncedName
 
   return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogTrigger asChild>
-        <Button variant="primary">
-          <AddIcon />
-          Assign new tag
-        </Button>
-      </DialogTrigger>
+    <TagDialogStageTransition
+      phase={stage === 'success' ? 'success' : 'form'}
+      className="gap-4"
+    >
+      <DialogHeader>
+        <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+          {stage === 'success'
+            ? `‘${successTag}’ assigned successfully`
+            : 'Assign new tag'}
+        </DialogTitle>
+      </DialogHeader>
 
-      <DialogContent
-        hideClose={stage === 'pending'}
-        className="sm:max-w-[440px] sm:h-[422px] gap-4"
-        onPointerDownOutside={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-        onEscapeKeyDown={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-      >
-        <DialogHeader>
-          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
-            {stage === 'success'
-              ? `‘${successTag}’ assigned successfully`
-              : 'Assign new tag'}
-          </DialogTitle>
-        </DialogHeader>
-
-        {stage === 'success' ? (
-          <TagDialogSuccess tag={successTag} message="assigned successfully" />
-        ) : (
-          <form
-            id={formId}
-            onSubmit={handleSubmit}
-            className="flex flex-col gap-2"
-          >
-            <TagNameField
-              value={name}
-              onChange={setName}
-              status={nameStatus}
-              disabled={stage === 'pending'}
-              autoFocus
-            />
-
-            <ArrowDivider />
-
-            <div className="flex items-center gap-3 mb-1">
-              <span className="prose-label-highlight uppercase text-fg-tertiary">
-                Target
-              </span>
-              <span className="prose-body font-mono text-fg-primary">
-                {selectedBuildId ? selectedBuildId : '--'}
-              </span>
-            </div>
-
-            <BuildPicker
-              open={open}
-              teamSlug={teamSlug}
-              templateId={templateId}
-              selectedBuildId={selectedBuildId}
-              onSelect={handleSetSelectedBuildId}
-              disabled={stage === 'pending'}
-            />
-          </form>
-        )}
-
-        <TagDialogFooter
-          stage={stage}
-          canSubmit={canSubmit}
-          errorMessage={mutation.error?.message ?? null}
-          submitLabel="Assign"
-          pendingLabel="Assigning"
-          formId={formId}
-          onCancel={() => handleOpenChange(false)}
-          onDismiss={() => handleOpenChange(false)}
-        />
-      </DialogContent>
-    </Dialog>
+      {stage === 'success' ? (
+        <TagDialogSuccess tag={successTag} message="assigned successfully" />
+      ) : (
+        <form
+          id={formId}
+          onSubmit={handleSubmit}
+          className="flex flex-col gap-2"
+        >
+          <TagNameField
+            value={name}
+            onChange={setName}
+            status={nameStatus}
+            disabled={stage === 'pending'}
+            autoFocus
+          />
+
+          <ArrowDivider />
+
+          <div className="flex items-center gap-3 mb-1">
+            <span className="prose-label-highlight uppercase text-fg-tertiary">
+              Target
+            </span>
+            <span className="prose-body font-mono text-fg-primary">
+              {selectedBuildId ? selectedBuildId : '--'}
+            </span>
+          </div>
+
+          <BuildPicker
+            open={open}
+            teamSlug={teamSlug}
+            templateId={templateId}
+            selectedBuildId={selectedBuildId}
+            onSelect={handleSetSelectedBuildId}
+            disabled={stage === 'pending'}
+          />
+        </form>
+      )}
+
+      <TagDialogFooter
+        stage={stage}
+        canSubmit={canSubmit}
+        errorMessage={mutation.error?.message ?? null}
+        submitLabel="Assign"
+        pendingLabel="Assigning"
+        formId={formId}
+        onCancel={onClose}
+        onDismiss={onClose}
+      />
+    </TagDialogStageTransition>
   )
 }
diff --git a/src/features/dashboard/templates/tags/components/index.ts b/src/features/dashboard/templates/tags/components/index.ts
index ba02e6dc0..52e92a507 100644
--- a/src/features/dashboard/templates/tags/components/index.ts
+++ b/src/features/dashboard/templates/tags/components/index.ts
@@ -1,3 +1,4 @@
 export { TagDialogBuildRow } from './tag-dialog-build-row'
 export { TagDialogFooter, type TagDialogStage } from './tag-dialog-footer'
+export { TagDialogStageTransition } from './tag-dialog-stage-transition'
 export { TagDialogSuccess } from './tag-dialog-success'
diff --git a/src/features/dashboard/templates/tags/components/tag-dialog-stage-transition.tsx b/src/features/dashboard/templates/tags/components/tag-dialog-stage-transition.tsx
new file mode 100644
index 000000000..db7dda126
--- /dev/null
+++ b/src/features/dashboard/templates/tags/components/tag-dialog-stage-transition.tsx
@@ -0,0 +1,37 @@
+'use client'
+
+import { AnimatePresence, motion, useReducedMotion } from 'motion/react'
+import type { ReactNode } from 'react'
+import { cn, EASE_IN_OUT_QUART } from '@/lib/utils/ui'
+
+interface TagDialogStageTransitionProps {
+  phase: string
+  className?: string
+  children: ReactNode
+}
+
+export function TagDialogStageTransition({
+  phase,
+  className,
+  children,
+}: TagDialogStageTransitionProps) {
+  const reduceMotion = useReducedMotion()
+
+  return (
+    <AnimatePresence mode="popLayout" initial={false}>
+      <motion.div
+        key={phase}
+        initial={{ opacity: 0, scale: 0.97 }}
+        animate={{ opacity: 1, scale: 1 }}
+        exit={{ opacity: 0, scale: 0.97 }}
+        transition={{
+          duration: reduceMotion ? 0 : 0.23,
+          ease: EASE_IN_OUT_QUART,
+        }}
+        className={cn('flex flex-1 flex-col gap-3', className)}
+      >
+        {children}
+      </motion.div>
+    </AnimatePresence>
+  )
+}
diff --git a/src/features/dashboard/templates/tags/reassign-dialog.tsx b/src/features/dashboard/templates/tags/reassign-dialog.tsx
index e5e5a950b..df4b1a4ce 100644
--- a/src/features/dashboard/templates/tags/reassign-dialog.tsx
+++ b/src/features/dashboard/templates/tags/reassign-dialog.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import {
   Dialog,
   DialogContent,
@@ -13,6 +13,7 @@ import BuildPicker, { type BuildSelectionSource } from './build-picker'
 import {
   TagDialogBuildRow,
   TagDialogFooter,
+  TagDialogStageTransition,
   TagDialogSuccess,
 } from './components'
 import { trackTagTableInteraction } from './table-config'
@@ -35,6 +36,49 @@ interface ReassignTagDialogProps {
 export default function ReassignTagDialog({
   open,
   onOpenChange,
+  ...rest
+}: ReassignTagDialogProps) {
+  const [isPending, setIsPending] = useState(false)
+  const isPendingRef = useRef(false)
+  isPendingRef.current = isPending
+
+  const handleOpenChange = (next: boolean) => {
+    if (!next && isPendingRef.current) return
+    onOpenChange(next)
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent
+        hideClose={isPending}
+        className="sm:max-w-[440px] sm:h-[406px] flex flex-col"
+        onPointerDownOutside={(e) => {
+          if (isPendingRef.current) e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (isPendingRef.current) e.preventDefault()
+        }}
+      >
+        <ReassignTagDialogBody
+          {...rest}
+          open={open}
+          onClose={() => onOpenChange(false)}
+          onPendingChange={setIsPending}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+interface ReassignTagDialogBodyProps
+  extends Omit<ReassignTagDialogProps, 'open' | 'onOpenChange'> {
+  open: boolean
+  onClose: () => void
+  onPendingChange: (pending: boolean) => void
+}
+
+function ReassignTagDialogBody({
+  open,
   tag,
   currentBuildId,
   teamSlug,
@@ -42,12 +86,14 @@ export default function ReassignTagDialog({
   templateName,
   surface,
   onReassigned,
-}: ReassignTagDialogProps) {
+  onClose,
+  onPendingChange,
+}: ReassignTagDialogBodyProps) {
   const [selectedBuildId, setSelectedBuildId] = useState<string | null>(null)
   const [selectionSource, setSelectionSource] =
     useState<BuildSelectionSource | null>(null)
 
-  const { mutation: reassign, stage } = useTagAssignmentMutation({
+  const { mutation, stage } = useTagAssignmentMutation({
     teamSlug,
     templateId,
     operation: 'reassign',
@@ -55,24 +101,18 @@ export default function ReassignTagDialog({
     onSuccess: onReassigned,
   })
 
-  const { reset } = reassign
   useEffect(() => {
-    if (!open) return
-    trackTagTableInteraction('reassign opened', { surface, tag })
-    setSelectedBuildId(null)
-    setSelectionSource(null)
-    reset()
-  }, [open, surface, tag, reset])
+    onPendingChange(mutation.isPending)
+  }, [mutation.isPending, onPendingChange])
 
-  const handleOpenChange = (next: boolean) => {
-    if (reassign.isPending) return
-    onOpenChange(next)
-  }
+  useEffect(() => {
+    trackTagTableInteraction('reassign opened', { surface, tag })
+  }, [surface, tag])
 
   const handleSelect = (id: string | null, source: BuildSelectionSource) => {
     setSelectedBuildId(id)
     setSelectionSource(id ? source : null)
-    if (reassign.isError) reassign.reset()
+    if (mutation.isError) mutation.reset()
   }
 
   const isSameAsCurrent =
@@ -86,7 +126,7 @@ export default function ReassignTagDialog({
       tag,
       via_search: selectionSource === 'search',
     })
-    reassign.mutate({
+    mutation.mutate({
       teamSlug,
       templateId,
       templateName,
@@ -96,64 +136,53 @@ export default function ReassignTagDialog({
   }
 
   return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogContent
-        hideClose={stage === 'pending'}
-        className="sm:max-w-[440px] sm:h-[406px]"
-        onPointerDownOutside={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-        onEscapeKeyDown={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-      >
-        <DialogHeader>
-          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
-            {stage === 'success'
-              ? `‘${tag}’ reassigned successfully`
-              : `reassign ‘${tag}’`}
-          </DialogTitle>
-          <DialogDescription className="sr-only">
-            {stage === 'success'
-              ? `Tag ${tag} reassigned.`
-              : `Reassign tag ${tag} from the current build to a different build.`}
-          </DialogDescription>
-        </DialogHeader>
-
-        {stage === 'success' ? (
-          <TagDialogSuccess tag={tag} message="reassigned successfully" />
-        ) : (
-          <div className="flex flex-col gap-2">
-            <TagDialogBuildRow label="Current" buildId={currentBuildId} />
-            <ArrowDivider />
-            <TagDialogBuildRow
-              label="Target"
-              buildId={selectedBuildId ?? '--'}
-              dim={selectedBuildId === null}
-            />
-            <BuildPicker
-              open={open}
-              teamSlug={teamSlug}
-              templateId={templateId}
-              currentBuildId={currentBuildId}
-              selectedBuildId={selectedBuildId}
-              onSelect={handleSelect}
-              disabled={stage === 'pending'}
-            />
-          </div>
-        )}
-
-        <TagDialogFooter
-          stage={stage}
-          canSubmit={canSubmit}
-          errorMessage={reassign.error?.message ?? null}
-          submitLabel="Reassign"
-          pendingLabel="Reassigning"
-          onSubmit={submit}
-          onCancel={() => handleOpenChange(false)}
-          onDismiss={() => handleOpenChange(false)}
-        />
-      </DialogContent>
-    </Dialog>
+    <TagDialogStageTransition phase={stage === 'success' ? 'success' : 'form'}>
+      <DialogHeader>
+        <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+          {stage === 'success'
+            ? `‘${tag}’ reassigned successfully`
+            : `reassign ‘${tag}’`}
+        </DialogTitle>
+        <DialogDescription className="sr-only">
+          {stage === 'success'
+            ? `Tag ${tag} reassigned.`
+            : `Reassign tag ${tag} from the current build to a different build.`}
+        </DialogDescription>
+      </DialogHeader>
+
+      {stage === 'success' ? (
+        <TagDialogSuccess tag={tag} message="reassigned successfully" />
+      ) : (
+        <div className="flex flex-col gap-2">
+          <TagDialogBuildRow label="Current" buildId={currentBuildId} />
+          <ArrowDivider />
+          <TagDialogBuildRow
+            label="Target"
+            buildId={selectedBuildId ?? '--'}
+            dim={selectedBuildId === null}
+          />
+          <BuildPicker
+            open={open}
+            teamSlug={teamSlug}
+            templateId={templateId}
+            currentBuildId={currentBuildId}
+            selectedBuildId={selectedBuildId}
+            onSelect={handleSelect}
+            disabled={stage === 'pending'}
+          />
+        </div>
+      )}
+
+      <TagDialogFooter
+        stage={stage}
+        canSubmit={canSubmit}
+        errorMessage={mutation.error?.message ?? null}
+        submitLabel="Reassign"
+        pendingLabel="Reassigning"
+        onSubmit={submit}
+        onCancel={onClose}
+        onDismiss={onClose}
+      />
+    </TagDialogStageTransition>
   )
 }
diff --git a/src/features/dashboard/templates/tags/rollback-dialog.tsx b/src/features/dashboard/templates/tags/rollback-dialog.tsx
index 983846aa1..488e7e071 100644
--- a/src/features/dashboard/templates/tags/rollback-dialog.tsx
+++ b/src/features/dashboard/templates/tags/rollback-dialog.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import {
   Dialog,
   DialogContent,
@@ -12,6 +12,7 @@ import { ArrowDivider } from './arrow-divider'
 import {
   TagDialogBuildRow,
   TagDialogFooter,
+  TagDialogStageTransition,
   TagDialogSuccess,
 } from './components'
 import { trackTagTableInteraction } from './table-config'
@@ -35,6 +36,44 @@ interface RollbackTagDialogProps {
 export default function RollbackTagDialog({
   open,
   onOpenChange,
+  ...rest
+}: RollbackTagDialogProps) {
+  const [isPending, setIsPending] = useState(false)
+
+  const handleOpenChange = (next: boolean) => {
+    if (!next && isPending) return
+    onOpenChange(next)
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent
+        hideClose={isPending}
+        className="sm:max-w-[413px] sm:min-h-[224px] sm:h-[224px] flex flex-col"
+        onPointerDownOutside={(e) => {
+          if (isPending) e.preventDefault()
+        }}
+        onEscapeKeyDown={(e) => {
+          if (isPending) e.preventDefault()
+        }}
+      >
+        <RollbackTagDialogBody
+          {...rest}
+          onClose={() => onOpenChange(false)}
+          onPendingChange={setIsPending}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+interface RollbackTagDialogBodyProps
+  extends Omit<RollbackTagDialogProps, 'open' | 'onOpenChange'> {
+  onClose: () => void
+  onPendingChange: (pending: boolean) => void
+}
+
+function RollbackTagDialogBody({
   tag,
   currentBuildId,
   targetBuildId,
@@ -43,8 +82,10 @@ export default function RollbackTagDialog({
   templateName,
   surface,
   onRolledBack,
-}: RollbackTagDialogProps) {
-  const { mutation: rollback, stage } = useTagAssignmentMutation({
+  onClose,
+  onPendingChange,
+}: RollbackTagDialogBodyProps) {
+  const { mutation, stage } = useTagAssignmentMutation({
     teamSlug,
     templateId,
     operation: 'rollback',
@@ -52,21 +93,17 @@ export default function RollbackTagDialog({
     onSuccess: onRolledBack,
   })
 
-  const { reset } = rollback
   useEffect(() => {
-    if (!open) return
-    trackTagTableInteraction('rollback opened', { surface, tag })
-    reset()
-  }, [open, surface, tag, reset])
+    onPendingChange(mutation.isPending)
+  }, [mutation.isPending, onPendingChange])
 
-  const handleOpenChange = (next: boolean) => {
-    if (rollback.isPending) return
-    onOpenChange(next)
-  }
+  useEffect(() => {
+    trackTagTableInteraction('rollback opened', { surface, tag })
+  }, [surface, tag])
 
   const submit = () => {
     trackTagTableInteraction('rollback submitted', { surface, tag })
-    rollback.mutate({
+    mutation.mutate({
       teamSlug,
       templateId,
       templateName,
@@ -76,51 +113,40 @@ export default function RollbackTagDialog({
   }
 
   return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogContent
-        hideClose={stage === 'pending'}
-        className="sm:max-w-[413px] sm:min-h-[224px] sm:h-[224px]"
-        onPointerDownOutside={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-        onEscapeKeyDown={(e) => {
-          if (stage === 'pending') e.preventDefault()
-        }}
-      >
-        <DialogHeader>
-          <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
-            {stage === 'success'
-              ? `Rollback ‘${tag}’ succeeded`
-              : `Rollback ‘${tag}’`}
-          </DialogTitle>
-          <DialogDescription className="sr-only">
-            {stage === 'success'
-              ? `Tag ${tag} rolled back to build ${targetBuildId}.`
-              : `Reassign tag ${tag} from the current build to the target build.`}
-          </DialogDescription>
-        </DialogHeader>
+    <TagDialogStageTransition phase={stage === 'success' ? 'success' : 'form'}>
+      <DialogHeader>
+        <DialogTitle className={stage === 'success' ? 'sr-only' : undefined}>
+          {stage === 'success'
+            ? `Rollback ‘${tag}’ succeeded`
+            : `Rollback ‘${tag}’`}
+        </DialogTitle>
+        <DialogDescription className="sr-only">
+          {stage === 'success'
+            ? `Tag ${tag} rolled back to build ${targetBuildId}.`
+            : `Reassign tag ${tag} from the current build to the target build.`}
+        </DialogDescription>
+      </DialogHeader>
 
-        {stage === 'success' ? (
-          <TagDialogSuccess tag={tag} message="rolled back successfully" />
-        ) : (
-          <div className="flex flex-col gap-2">
-            <TagDialogBuildRow label="Current" buildId={currentBuildId} />
-            <ArrowDivider />
-            <TagDialogBuildRow label="Target" buildId={targetBuildId} />
-          </div>
-        )}
+      {stage === 'success' ? (
+        <TagDialogSuccess tag={tag} message="rolled back successfully" />
+      ) : (
+        <div className="flex flex-col gap-2">
+          <TagDialogBuildRow label="Current" buildId={currentBuildId} />
+          <ArrowDivider />
+          <TagDialogBuildRow label="Target" buildId={targetBuildId} />
+        </div>
+      )}
 
-        <TagDialogFooter
-          stage={stage}
-          canSubmit
-          errorMessage={rollback.error?.message ?? null}
-          submitLabel="Rollback"
-          pendingLabel="Rolling back"
-          onSubmit={submit}
-          onCancel={() => handleOpenChange(false)}
-          onDismiss={() => handleOpenChange(false)}
-        />
-      </DialogContent>
-    </Dialog>
+      <TagDialogFooter
+        stage={stage}
+        canSubmit
+        errorMessage={mutation.error?.message ?? null}
+        submitLabel="Rollback"
+        pendingLabel="Rolling back"
+        onSubmit={submit}
+        onCancel={onClose}
+        onDismiss={onClose}
+      />
+    </TagDialogStageTransition>
   )
 }
diff --git a/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts b/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts
index c8fca35a2..1c7ba8a8a 100644
--- a/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts
+++ b/src/features/dashboard/templates/tags/use-tag-assignment-mutation.ts
@@ -26,32 +26,30 @@ export function useTagAssignmentMutation({
   const trpc = useTRPC()
   const queryClient = useQueryClient()
 
-  const invalidate = useCallback(async () => {
-    await Promise.all([
-      queryClient.invalidateQueries({
-        queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
-          teamSlug,
-          templateId,
-        }).queryKey,
-      }),
-      queryClient.invalidateQueries({
-        queryKey: trpc.templates.getTagCount.queryOptions({
-          teamSlug,
-          templateId,
-        }).queryKey,
-      }),
-    ])
+  const invalidate = useCallback(() => {
+    queryClient.invalidateQueries({
+      queryKey: trpc.templates.getTagGroups.infiniteQueryOptions({
+        teamSlug,
+        templateId,
+      }).queryKey,
+    })
+    queryClient.invalidateQueries({
+      queryKey: trpc.templates.getTagCount.queryOptions({
+        teamSlug,
+        templateId,
+      }).queryKey,
+    })
   }, [queryClient, trpc, teamSlug, templateId])
 
   const mutation = useMutation(
     trpc.templates.assignTag.mutationOptions({
-      onSuccess: async () => {
-        await invalidate()
+      onSuccess: () => {
+        invalidate()
         trackTagTableInteraction(
           `${operation} succeeded`,
           analyticsContext ?? {}
         )
-        await onSuccess?.()
+        void onSuccess?.()
       },
       onError: (error) => {
         trackTagTableInteraction(`${operation} failed`, {
diff --git a/src/lib/utils/ui.ts b/src/lib/utils/ui.ts
index 42118a71a..4a753aee7 100644
--- a/src/lib/utils/ui.ts
+++ b/src/lib/utils/ui.ts
@@ -11,4 +11,5 @@ export function cn(...inputs: ClassValue[]) {
  */
 export const EASE_APPEAR = [0.23, 1, 0.32, 1] as const // ease-out-quint
 export const EASE_TRANSFORM = [0.79, 0.14, 0.15, 0.86] as const // ease-in-out-circ
+export const EASE_IN_OUT_QUART = [0.77, 0, 0.18, 1] as const // ease-in-out-quart
 export const EASE_IN_OUT_QUINT = [0.83, 0, 0.17, 1] as const // ease-in-out-quint

From d4ffd0d8913ec67a04d8a5968f13f4088d973fcc Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Thu, 4 Jun 2026 15:58:05 +0200
Subject: [PATCH 88/90] Polish build picker row

---
 .../templates/tags/build-picker-row.tsx       | 21 ++++++++++++-------
 .../dashboard/templates/tags/build-picker.tsx |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/features/dashboard/templates/tags/build-picker-row.tsx b/src/features/dashboard/templates/tags/build-picker-row.tsx
index 1698ff903..ddd98c823 100644
--- a/src/features/dashboard/templates/tags/build-picker-row.tsx
+++ b/src/features/dashboard/templates/tags/build-picker-row.tsx
@@ -1,6 +1,7 @@
 'use client'
 
 import { memo } from 'react'
+import { cn } from '@/lib/utils'
 import { formatTimeAgoCompact } from '@/lib/utils/formatting'
 import { Label } from '@/ui/primitives/label'
 import { RadioGroupItem } from '@/ui/primitives/radio-group'
@@ -9,28 +10,34 @@ interface BuildPickerRowProps {
   buildId: string
   createdAt: number
   disabled?: boolean
+  dimmed?: boolean
 }
 
 function BuildPickerRowComponent({
   buildId,
   createdAt,
   disabled,
+  dimmed,
 }: BuildPickerRowProps) {
   const id = `build-row-${buildId}`
 
   return (
-    <div className="flex items-center gap-2 hover:bg-bg-hover py-0.5">
+    <Label
+      htmlFor={id}
+      className={cn(
+        'flex cursor-pointer items-center gap-2 py-0.5 normal-case hover:bg-bg-hover',
+        'transition-opacity anim-ease-appear anim-duration-fast',
+        dimmed && 'opacity-50'
+      )}
+    >
       <RadioGroupItem id={id} value={buildId} disabled={disabled} />
-      <Label
-        htmlFor={id}
-        className="prose-table-numeric min-w-0 flex-1 cursor-pointer select-none truncate font-mono normal-case text-fg-secondary"
-      >
+      <span className="prose-table-numeric min-w-0 flex-1 truncate font-mono text-fg-secondary">
         {buildId}
-      </Label>
+      </span>
       <span className="prose-body whitespace-nowrap text-fg-tertiary">
         {formatTimeAgoCompact(Date.now() - createdAt)}
       </span>
-    </div>
+    </Label>
   )
 }
 
diff --git a/src/features/dashboard/templates/tags/build-picker.tsx b/src/features/dashboard/templates/tags/build-picker.tsx
index 671ccc1f9..f6f155287 100644
--- a/src/features/dashboard/templates/tags/build-picker.tsx
+++ b/src/features/dashboard/templates/tags/build-picker.tsx
@@ -252,6 +252,7 @@ function PickerBody({
           buildId={build.id}
           createdAt={build.createdAt}
           disabled={disabled}
+          dimmed={!!selectedBuildId && selectedBuildId !== build.id}
         />
       ))}
     </RadioGroup>

From 53f60feadc8e103f67107da59a1de4ce52eb25cd Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 5 Jun 2026 11:07:51 +0200
Subject: [PATCH 89/90] improve vertical paddign

---
 .../templates/[templateId]/(detail-tabs)/tags/page.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
index 8d5aa3c79..2ada92047 100644
--- a/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
+++ b/src/app/dashboard/[teamSlug]/templates/[templateId]/(detail-tabs)/tags/page.tsx
@@ -22,7 +22,7 @@ export default async function TemplateTagsPage({
 
   return (
     <HydrateClient>
-      <div className="h-full min-h-0 flex-1 py-6 md:py-10 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
+      <div className="h-full min-h-0 flex-1 pt-6 pb-2 md:pt-10 md:pb-4 px-8 md:px-11 flex flex-col gap-3 max-w-[924px] mx-auto w-full">
         <Suspense fallback={<LoadingLayout />}>
           <TagsTable teamSlug={teamSlug} templateId={templateId} />
         </Suspense>

From e3135e049fc47c74d686ed89710a211dabeff224 Mon Sep 17 00:00:00 2001
From: Alex Drankou <alex@e2b.dev>
Date: Fri, 5 Jun 2026 11:25:27 +0200
Subject: [PATCH 90/90] virtualize tag groups list

---
 .../tags/history/tag-history-row.tsx          |  4 +-
 .../dashboard/templates/tags/table.tsx        | 72 +++++++++++++++----
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/features/dashboard/templates/tags/history/tag-history-row.tsx b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
index 8fff8a9a0..29b5a45cd 100644
--- a/src/features/dashboard/templates/tags/history/tag-history-row.tsx
+++ b/src/features/dashboard/templates/tags/history/tag-history-row.tsx
@@ -37,7 +37,7 @@ export function TagHistoryRow({
 
   if (isCurrentBuild) {
     return (
-      <div className="group/childRow flex w-full items-center justify-between gap-4 bg-bg py-2">
+      <div className="group/childRow flex w-full items-center justify-between gap-4 bg-bg py-1.5">
         {buildSummary}
         <span
           className={cn(
@@ -76,7 +76,7 @@ export function TagHistoryRow({
       onKeyDown={handleKeyDown}
       className={cn(
         'group/childRow flex w-full items-center justify-between gap-4',
-        'bg-bg py-2 cursor-pointer',
+        'bg-bg py-1.5 cursor-pointer',
         'focus-visible:outline-none'
       )}
     >
diff --git a/src/features/dashboard/templates/tags/table.tsx b/src/features/dashboard/templates/tags/table.tsx
index 10c8932b0..4549d5f7d 100644
--- a/src/features/dashboard/templates/tags/table.tsx
+++ b/src/features/dashboard/templates/tags/table.tsx
@@ -14,12 +14,14 @@ import {
   type TableOptions,
   useReactTable,
 } from '@tanstack/react-table'
+import { useVirtualizer } from '@tanstack/react-virtual'
 import {
   type KeyboardEvent,
   type MouseEvent,
   useCallback,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from 'react'
 import { PROTECTED_URLS } from '@/configs/urls'
@@ -57,6 +59,10 @@ import {
 } from './table-config'
 import type { TagGroup } from './types'
 
+const ESTIMATED_ROW_HEIGHT_PX = 44
+const VIRTUAL_OVERSCAN = 8
+const HEADER_SCROLL_MARGIN_PX = 21
+
 interface TagsTableProps {
   teamSlug: string
   templateId: string
@@ -66,6 +72,7 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   'use no memo'
 
   const trpc = useTRPC()
+  const scrollRef = useRef<HTMLDivElement>(null)
 
   const sorting = useTagTableStore((s) => s.sorting)
   const setSorting = useTagTableStore((s) => s.setSorting)
@@ -187,6 +194,21 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
   const showEmpty = !isPending && !isFetching && !hasData
   const showFilterRefetchingOverlay = isFilterRefetching && hasData
 
+  const virtualizer = useVirtualizer({
+    count: rows.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => ESTIMATED_ROW_HEIGHT_PX,
+    overscan: VIRTUAL_OVERSCAN,
+    scrollMargin: HEADER_SCROLL_MARGIN_PX,
+    getItemKey: (index) => rows[index]?.id ?? index,
+  })
+  const virtualItems = virtualizer.getVirtualItems()
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: activeSearch / serverSort are intentional triggers, not values read inside the effect.
+  useEffect(() => {
+    virtualizer.scrollToOffset(0)
+  }, [activeSearch, serverSort, virtualizer])
+
   const handleLoadMore = useCallback(() => {
     fetchNextPage()
     trackTagTableInteraction('page_fetched', {
@@ -205,9 +227,12 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
         hasSearch={activeSearch !== undefined}
         searchInvalid={searchInvalid}
       />
-      <div className="flex-1 min-h-0 overflow-y-auto overflow-x-hidden -mx-8 px-8 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
+      <div
+        ref={scrollRef}
+        className="flex-1 min-h-0 overflow-y-auto overflow-x-hidden -mx-8 px-8 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
+      >
         <DataTable className="w-full">
-          <DataTableHeader className="sticky top-0 z-10 bg-bg border-b-0 mb-px">
+          <DataTableHeader className="sticky top-0 z-30 bg-bg border-b-0 mb-px">
             {table.getHeaderGroups().map((headerGroup) => (
               <DataTableRow
                 key={headerGroup.id}
@@ -255,19 +280,40 @@ export default function TagsTable({ teamSlug, templateId }: TagsTableProps) {
           {hasData && (
             <div
               className={cn(
-                'flex flex-col divide-y divide-stroke/80',
+                'relative',
                 showFilterRefetchingOverlay && 'opacity-70 transition-opacity'
               )}
+              style={{ height: `${virtualizer.getTotalSize()}px` }}
             >
-              {rows.map((row) => (
-                <GroupSection
-                  key={row.id}
-                  row={row}
-                  teamSlug={teamSlug}
-                  templateId={templateId}
-                  templateName={templateName}
-                />
-              ))}
+              {virtualItems.map((virtualRow) => {
+                const row = rows[virtualRow.index]
+                if (!row) return null
+                return (
+                  <div
+                    key={virtualRow.key}
+                    data-index={virtualRow.index}
+                    ref={(node) => virtualizer.measureElement(node)}
+                    className={cn(
+                      'absolute left-0 right-0',
+                      'hover:z-20 focus-within:z-10',
+                      'border-b border-stroke/80',
+                      'has-[button[aria-haspopup=menu][data-state=open]]:z-10'
+                    )}
+                    style={{
+                      transform: `translateY(${
+                        virtualRow.start - HEADER_SCROLL_MARGIN_PX
+                      }px)`,
+                    }}
+                  >
+                    <GroupSection
+                      row={row}
+                      teamSlug={teamSlug}
+                      templateId={templateId}
+                      templateName={templateName}
+                    />
+                  </div>
+                )
+              })}
             </div>
           )}
 
@@ -466,7 +512,7 @@ function ShowFullHistoryRow({
         trackTagTableInteraction('show_full_history_clicked', { tag })
       }
       className={cn(
-        'flex w-full items-center justify-center bg-bg py-2 cursor-pointer',
+        'flex w-full items-center justify-center bg-bg py-1.5 cursor-pointer',
         'prose-body-highlight text-fg-tertiary hover:text-fg transition-colors'
       )}
     >