diff --git a/apps/e2e/src/pages/AppPage.ts b/apps/e2e/src/pages/AppPage.ts
index 41212692..eb5006fa 100644
--- a/apps/e2e/src/pages/AppPage.ts
+++ b/apps/e2e/src/pages/AppPage.ts
@@ -36,9 +36,36 @@ export class AppPage {
     await waitFor(this.page, '[data-testid="toolbar"]', 20_000);
   }
 
+  /**
+   * Put the Sync workspace on screen.
+   *
+   * The app lands on Home now, not Sync, so the compare controls are not
+   * mounted when a spec starts. Reaching straight for them failed as a 15s
+   * `page.click` timeout on every dialect at once — which reads like the app is
+   * broken rather than like the test is on the wrong screen.
+   *
+   * Idempotent: already on Sync, the rail button is a no-op.
+   */
+  async gotoSync(): Promise<void> {
+    const rail = this.page.locator('[data-testid="view-sync-btn"]');
+    if (await rail.isVisible().catch(() => false)) {
+      await clickWhen(this.page, '[data-testid="view-sync-btn"]');
+    }
+    // Two conditions, not one. TopToolbar gates the connection chips on
+    // `activeView === 'sync' && syncPane === 'compare'`, and Sync can open on
+    // the Snapshots pane — so selecting the workspace alone leaves the compare
+    // controls unmounted and every click on them times out.
+    const compare = this.page.locator('[data-testid="sync-pane-compare-btn"]');
+    if (await compare.isVisible().catch(() => false)) {
+      await clickWhen(this.page, '[data-testid="sync-pane-compare-btn"]');
+    }
+    await waitFor(this.page, '[data-testid="source-config-btn"]', 15_000);
+  }
+
   // ── Source side ─────────────────────────────────────────────────────────
 
   async openSourceModal(): Promise<void> {
+    await this.gotoSync();
     await clickWhen(this.page, '[data-testid="source-config-btn"]');
     await waitFor(this.page, '[data-testid="conn-modal"]');
   }
@@ -54,6 +81,7 @@ export class AppPage {
   // ── Target side ─────────────────────────────────────────────────────────
 
   async openTargetModal(): Promise<void> {
+    await this.gotoSync();
     await clickWhen(this.page, '[data-testid="target-config-btn"]');
     await waitFor(this.page, '[data-testid="conn-modal"]');
   }
diff --git a/apps/web/src/frontend/App.tsx b/apps/web/src/frontend/App.tsx
index 94e565b2..93d3de6f 100644
--- a/apps/web/src/frontend/App.tsx
+++ b/apps/web/src/frontend/App.tsx
@@ -1,7 +1,10 @@
 import React, { Suspense, lazy, useEffect } from 'react';
 import { TopToolbar } from '@/app/shell/TopToolbar';
 import { ActivityRail } from '@/app/shell/ActivityRail';
-import { SchemaTreePanel } from '@/features/sql-editor';
+// Deep import, not the feature barrel: the barrel re-exports the editor,
+// which pulls Monaco (2.6 MB) into the eager graph and makes the lazy() below
+// decorative. Rolldown said so — INEFFECTIVE_DYNAMIC_IMPORT.
+import { SchemaTreePanel } from '@/features/sql-editor/components/SchemaTreePanel';
 import { ObjectDetailPanel } from '@/features/object-detail';
 import { ErrorBoundary } from '@/app/shell/ErrorBoundary';
 import { LoadingScreen } from '@/app/shell/LoadingScreen';
@@ -21,7 +24,9 @@ const AccessView = lazy(() =>
   import('@/features/access').then((m) => ({ default: m.AccessView }))
 );
 const SqlEditorView = lazy(() =>
-  import('@/features/sql-editor').then((m) => ({ default: m.SqlEditorView }))
+  import('@/features/sql-editor/components/SqlEditorView').then((m) => ({
+    default: m.SqlEditorView,
+  }))
 );
 const UtilitiesView = lazy(() =>
   import('@/features/utilities').then((m) => ({ default: m.UtilitiesView }))
diff --git a/apps/web/src/frontend/app/shell/ConnectionChips.tsx b/apps/web/src/frontend/app/shell/ConnectionChips.tsx
index 82fa88fc..332e85ff 100644
--- a/apps/web/src/frontend/app/shell/ConnectionChips.tsx
+++ b/apps/web/src/frontend/app/shell/ConnectionChips.tsx
@@ -68,7 +68,12 @@ export function ConnectionChip({
   return (
     <div
       data-testid={`connection-chip-${side}`}
-      className={`flex min-w-0 max-w-xl flex-1 items-center gap-1.5 rounded-full border px-2 py-1 ${tone.ring}`}
+      // A width floor, not min-w-0. The toolbar is flex-wrap, so a chip that
+      // cannot fit its label, picker and buttons should push itself onto the
+      // next row rather than collapse to 95px and paint its controls across its
+      // neighbours — which is what put the edit button under the "Same DB" pill
+      // and made it unclickable.
+      className={`flex min-w-[15rem] max-w-xl flex-1 items-center gap-1.5 rounded-full border px-2 py-1 ${tone.ring}`}
     >
       <span className={`shrink-0 text-[10px] font-bold uppercase tracking-wider ${tone.label}`}>
         {label}
@@ -79,7 +84,14 @@ export function ConnectionChip({
           value={selectedId ?? ''}
           onChange={(e) => e.target.value && onSelect(e.target.value)}
           title="Saved connections"
-          className="min-w-0 max-w-[11rem] shrink-0 truncate rounded-full border border-slate-700/60 bg-slate-950 px-2 py-0.5 text-[11px] text-slate-200 accent-focus focus:outline-none"
+          // No shrink-0: the chip itself is `min-w-0 flex-1`, so a crowded toolbar
+        // collapses its box while its children keep their intrinsic width. The
+        // label and the buttons genuinely cannot shrink, so with this select
+        // refusing too, ~210px of content sat in a 95px box and spilled across
+        // the toolbar — far enough that the "Same DB" pill covered the edit
+        // button and swallowed the click. This select already truncates, so it
+        // is the one that can give ground.
+        className="min-w-0 max-w-[11rem] truncate rounded-full border border-slate-700/60 bg-slate-950 px-2 py-0.5 text-[11px] text-slate-200 accent-focus focus:outline-none"
         >
           <option value="">— Saved —</option>
           {connections.map((c) => (
diff --git a/apps/web/src/frontend/app/shell/TopToolbar.tsx b/apps/web/src/frontend/app/shell/TopToolbar.tsx
index 89408469..e2d5f149 100644
--- a/apps/web/src/frontend/app/shell/TopToolbar.tsx
+++ b/apps/web/src/frontend/app/shell/TopToolbar.tsx
@@ -7,17 +7,17 @@ import { ArrowRight, ArrowLeftRight, RefreshCw, AlertCircle, Zap, Settings, KeyR
 import ProfileMenuDefault, { ProfileMenu as ProfileMenuNamed } from './ProfileMenu';
 import { CredentialManager } from '@/features/connections';
 import { MigrationHistory } from '@/features/migrations';
-import { TYPE_META, TYPE_ORDER } from '@/features/sql-editor';
+import { TYPE_META, TYPE_ORDER } from '@/features/sql-editor/components/SchemaTreePanel';
 import type { DbObjectType } from '@/shared/lib/types';
 import { connectionNeedsSecret } from '@/shared/lib/provider-settings';
 import { schemaCompareBlocker } from '@/shared/lib/dialect-features';
 import { ConnectionModal } from '@/features/connections';
 import { PasswordInput } from '@/shared/components/PasswordInput';
 import { useAuthStore } from '@/app/store/authStore';
-import { captureSchema } from '@/features/lokee-weave';
+import { captureSchema } from '@/features/lokee-weave/api/lokeeApi';
 import { toast } from '@/app/store/toastStore';
 import { getSessionPassword, setSessionPassword } from '@/shared/lib/sessionPasswords';
-import { HistoryCompareBar } from '@/features/lokee-weave';
+import { HistoryCompareBar } from '@/features/lokee-weave/components/HistoryCompareBar';
 import { BrowseBar } from '@/features/object-detail';
 import { ActivityIndicator } from './ActivityIndicator';
 import { DiffBriefingChips } from '@/features/schema-diff';
diff --git a/apps/web/src/frontend/features/access/components/AccessGrantsStage.tsx b/apps/web/src/frontend/features/access/components/AccessGrantsStage.tsx
index d53fe116..7e01deec 100644
--- a/apps/web/src/frontend/features/access/components/AccessGrantsStage.tsx
+++ b/apps/web/src/frontend/features/access/components/AccessGrantsStage.tsx
@@ -27,6 +27,7 @@ import {
   type DbAccessConfirmRequest,
 } from './DbAccessPermissionSections';
 import type { DbPrincipal } from '@foxschema/sql';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 const PRESET_LABEL: Record<Exclude<AccessPreset, 'custom'>, string> = {
   'read-only': 'Read only',
@@ -184,7 +185,7 @@ export const AccessGrantsStage: React.FC<{
       ) : (
         <>
           <div className="flex flex-wrap items-center gap-1.5" data-testid="access-grants-presets">
-            <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+            <span className={sectionLabelCls}>
               Presets
             </span>
             {(Object.keys(PRESET_LABEL) as Exclude<AccessPreset, 'custom'>[]).map((p) => (
diff --git a/apps/web/src/frontend/features/access/components/DbAccessPermissionSections.tsx b/apps/web/src/frontend/features/access/components/DbAccessPermissionSections.tsx
index 294ee06a..44a6a0e8 100644
--- a/apps/web/src/frontend/features/access/components/DbAccessPermissionSections.tsx
+++ b/apps/web/src/frontend/features/access/components/DbAccessPermissionSections.tsx
@@ -44,6 +44,7 @@ import {
   type PermissionRequest,
 } from '@/features/access/lib/access';
 import { useAllSchemaObjects } from '@/features/access/lib/useAllSchemaObjects';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 type ActionMode = 'grant' | 'revoke';
 
@@ -435,7 +436,7 @@ export const DbAccessPermissionSections: React.FC<Props> = ({
   return (
     <div className="space-y-2" data-testid="db-access-permission-sections">
       <div className="flex items-center justify-between gap-2">
-        <div className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+        <div className={sectionLabelCls}>
           Permissions
         </div>
         <span className="text-[10px] text-slate-500 truncate">
diff --git a/apps/web/src/frontend/features/access/components/PermissionBuilder.tsx b/apps/web/src/frontend/features/access/components/PermissionBuilder.tsx
index 7aaf7122..61e451ef 100644
--- a/apps/web/src/frontend/features/access/components/PermissionBuilder.tsx
+++ b/apps/web/src/frontend/features/access/components/PermissionBuilder.tsx
@@ -27,6 +27,7 @@ import { useAllSchemaObjects } from '../lib/useAllSchemaObjects';
 import { useSyncStore } from '@/app/store/useSyncStore';
 import { dialectFeatureReason } from '@/shared/lib/dialect-features';
 import type { AccessPrincipalDraft } from '../lib/access-draft';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 const PRESET_LABEL: Record<AccessPreset, string> = {
   'read-only': 'Read only',
@@ -450,7 +451,7 @@ export const PermissionBuilder: React.FC<{
                   * have in mind.
                   */}
                 <div className="mb-3 flex flex-wrap items-center gap-1.5">
-                  <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+                  <span className={sectionLabelCls}>
                     Apply to all
                   </span>
                   {(Object.keys(PRESET_LABEL) as AccessPreset[])
diff --git a/apps/web/src/frontend/features/admin/components/AdminAccessPanel.tsx b/apps/web/src/frontend/features/admin/components/AdminAccessPanel.tsx
index 290c61aa..b5720d2b 100644
--- a/apps/web/src/frontend/features/admin/components/AdminAccessPanel.tsx
+++ b/apps/web/src/frontend/features/admin/components/AdminAccessPanel.tsx
@@ -33,6 +33,7 @@ import {
 import { useAuthStore } from '@/app/store/authStore';
 import { PasswordInput } from '@/shared/components/PasswordInput';
 import { AccessReport } from '@/features/access/components/AccessReport';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 type Tab = 'users' | 'roles' | 'users-roles';
 
@@ -610,7 +611,7 @@ export const AdminAccessPanel: React.FC<{ open: boolean; onClose: () => void }>
                     ) : (
                       <ChevronRight className="w-3 h-3 shrink-0 text-slate-500" />
                     )}
-                    <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+                    <span className={sectionLabelCls}>
                       {group}
                     </span>
                     {/* The count is the point of collapsing: it answers "what
diff --git a/apps/web/src/frontend/features/auth/components/SignupWizard.tsx b/apps/web/src/frontend/features/auth/components/SignupWizard.tsx
index 3fb4a6c0..3ced620a 100644
--- a/apps/web/src/frontend/features/auth/components/SignupWizard.tsx
+++ b/apps/web/src/frontend/features/auth/components/SignupWizard.tsx
@@ -10,6 +10,7 @@ import React, { useState } from 'react';
 import { Loader2, AlertCircle, Mail, Sparkles } from 'lucide-react';
 import { submitSignup, skipSignup } from '../api/signupApi';
 import { Brand } from '@/app/shell/Brand';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 /**
  * One-time, skippable first-run prompt: collect a subscriber email when the
@@ -76,7 +77,7 @@ export const SignupWizard: React.FC<{ onDone: () => void }> = ({ onDone }) => {
 
           <div className="px-6 py-5 flex flex-col gap-3.5">
             <label className="block">
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Email
               </span>
               <input
diff --git a/apps/web/src/frontend/features/migrations/components/MigrationHistory.tsx b/apps/web/src/frontend/features/migrations/components/MigrationHistory.tsx
index b064abb1..3e1fae7b 100644
--- a/apps/web/src/frontend/features/migrations/components/MigrationHistory.tsx
+++ b/apps/web/src/frontend/features/migrations/components/MigrationHistory.tsx
@@ -12,7 +12,9 @@ import {
   type MigrationRunStatus,
 } from '../api/migrationApi';
 
-const SqlEditor = lazy(() => import('@/features/sql-editor').then((m) => ({ default: m.SqlEditor })));
+const SqlEditor = lazy(() =>
+  import('@/features/sql-editor/components/SqlEditor').then((m) => ({ default: m.SqlEditor }))
+);
 
 interface Props {
   open: boolean;
diff --git a/apps/web/src/frontend/features/object-detail/components/ObjectDetailPanel.tsx b/apps/web/src/frontend/features/object-detail/components/ObjectDetailPanel.tsx
index e0edf4ff..990ebab0 100644
--- a/apps/web/src/frontend/features/object-detail/components/ObjectDetailPanel.tsx
+++ b/apps/web/src/frontend/features/object-detail/components/ObjectDetailPanel.tsx
@@ -20,8 +20,12 @@ import { DependencyWarningDialog } from '@/features/object-detail/components/Dep
 import { ValidationWarningsDialog } from '@/features/object-detail/components/ValidationWarningsDialog';
 import { CrossDialectReadinessDialog } from '@/features/object-detail/components/CrossDialectReadinessDialog';
 // Monaco is heavy — load it only when a SQL surface is actually shown
-const SqlEditor = lazy(() => import('@/features/sql-editor').then((m) => ({ default: m.SqlEditor })));
-const SqlDiffEditor = lazy(() => import('@/features/sql-editor').then((m) => ({ default: m.SqlDiffEditor })));
+const SqlEditor = lazy(() =>
+  import('@/features/sql-editor/components/SqlEditor').then((m) => ({ default: m.SqlEditor }))
+);
+const SqlDiffEditor = lazy(() =>
+  import('@/features/sql-editor/components/SqlEditor').then((m) => ({ default: m.SqlDiffEditor }))
+);
 
 const EditorFallback: React.FC = () => (
   <div className="flex-1 flex items-center justify-center text-slate-500 text-xs gap-2">
diff --git a/apps/web/src/frontend/features/sql-editor/index.ts b/apps/web/src/frontend/features/sql-editor/index.ts
index e2753c65..6ae56638 100644
--- a/apps/web/src/frontend/features/sql-editor/index.ts
+++ b/apps/web/src/frontend/features/sql-editor/index.ts
@@ -16,7 +16,13 @@ export { scrubRemovedFileConnections } from './lib/fileQueryEditorHelpers';
 export { getCaretOffset, getSelectedSql, insertAtCursor } from './lib/sqlEditorBridge';
 export type { SchemaCacheEntry } from './lib/sqlEditorBridge';
 export { dialectFkConstraintSupport, dialectIndexSupport, executableSqlStatements, findInboundForeignKeyTables, generateCloneTableSql } from './lib/tableBlueprintSql';
-export { SqlDiffEditor } from './components/SqlEditor';
-export { SqlEditor } from './components/SqlEditor';
-export { SqlEditorView } from './components/SqlEditorView';
-export { FileImportsPanel } from './components/FileImportsPanel';
+// The editor views are deliberately NOT re-exported here.
+//
+// A barrel is one module: re-exporting them made every consumer of any symbol
+// above pull Monaco (2.6 MB) into the eager graph, which is what turned the
+// `lazy()` calls in App.tsx and elsewhere into decoration. Rolldown had been
+// saying so all along — INEFFECTIVE_DYNAMIC_IMPORT.
+//
+// Every consumer of these loads them through `lazy(() => import(...))`, so
+// importing the component module directly costs them nothing and keeps the
+// editor out of first paint.
diff --git a/apps/web/src/frontend/features/utilities/components/DatabaseAccessModal.tsx b/apps/web/src/frontend/features/utilities/components/DatabaseAccessModal.tsx
index 1d8f7a1c..27a235dd 100644
--- a/apps/web/src/frontend/features/utilities/components/DatabaseAccessModal.tsx
+++ b/apps/web/src/frontend/features/utilities/components/DatabaseAccessModal.tsx
@@ -35,6 +35,7 @@ import { useSqlEditorStore } from '@/app/store/useSqlEditorStore';
 import { useAuthStore } from '@/app/store/authStore';
 import { PROVIDER_SETTINGS, connectionNeedsSecret } from '@/shared/lib/provider-settings';
 import { DbAccessPermissionSections } from '@/features/access/components/DbAccessPermissionSections';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 interface Props {
   open: boolean;
@@ -267,7 +268,7 @@ export const DatabaseAccessModal: React.FC<Props> = ({
         <div className="flex flex-wrap items-end gap-2">
           {!lockedConnectionId && (
           <label className="flex flex-col gap-1 min-w-[14rem] flex-1">
-            <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+            <span className={sectionLabelCls}>
               Credential
             </span>
             <select
@@ -300,7 +301,7 @@ export const DatabaseAccessModal: React.FC<Props> = ({
           )}
           {needsPassword && (
             <label className="flex flex-col gap-1 min-w-[10rem]">
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Session password
               </span>
               <div className="flex gap-1">
@@ -600,7 +601,7 @@ export const DatabaseAccessModal: React.FC<Props> = ({
                 data-testid="db-access-grant-form"
                 className="rounded-lg border border-slate-800 p-3 space-y-2"
               >
-                <div className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+                <div className={sectionLabelCls}>
                   Grant
                 </div>
                 {!canGrant && (
diff --git a/apps/web/src/frontend/features/utilities/components/IndexManagementModal.tsx b/apps/web/src/frontend/features/utilities/components/IndexManagementModal.tsx
index 688ad4d5..ffceddd2 100644
--- a/apps/web/src/frontend/features/utilities/components/IndexManagementModal.tsx
+++ b/apps/web/src/frontend/features/utilities/components/IndexManagementModal.tsx
@@ -62,6 +62,7 @@ import {
   type IndexMgmtSort,
   type IndexMgmtSortKey,
 } from '@/features/utilities/lib/indexManagementGrid';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 interface Props {
   open: boolean;
@@ -771,7 +772,7 @@ export const IndexManagementModal: React.FC<Props> = ({
           <div className="flex flex-wrap items-end gap-2">
             {!lockedConnectionId && (
             <label className="flex flex-col gap-1 min-w-[14rem] flex-1">
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Credential
               </span>
               <select
@@ -802,7 +803,7 @@ export const IndexManagementModal: React.FC<Props> = ({
             )}
             {needsPassword && (
               <label className="flex flex-col gap-1 min-w-[10rem]">
-                <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+                <span className={sectionLabelCls}>
                   Session password
                 </span>
                 <div className="flex gap-1">
@@ -871,7 +872,7 @@ export const IndexManagementModal: React.FC<Props> = ({
               className="flex flex-col gap-1 min-w-[12rem] flex-1"
               data-testid={embedded ? 'server-insights-size-filter' : undefined}
             >
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Filter table / index
               </span>
               <input
@@ -883,7 +884,7 @@ export const IndexManagementModal: React.FC<Props> = ({
               />
             </label>
             <label className="flex flex-col gap-1 w-36">
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Min frag %
               </span>
               <input
diff --git a/apps/web/src/frontend/features/utilities/components/ServerInsightsModal.tsx b/apps/web/src/frontend/features/utilities/components/ServerInsightsModal.tsx
index fbc4095c..b2c79914 100644
--- a/apps/web/src/frontend/features/utilities/components/ServerInsightsModal.tsx
+++ b/apps/web/src/frontend/features/utilities/components/ServerInsightsModal.tsx
@@ -28,6 +28,7 @@ import { useSyncStore } from '@/app/store/useSyncStore';
 import { useSqlEditorStore } from '@/app/store/useSqlEditorStore';
 import { PROVIDER_SETTINGS, connectionNeedsSecret } from '@/shared/lib/provider-settings';
 import { IndexManagementModal } from './IndexManagementModal';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 export type ServerInsightsTab = DbaUtilityKind;
 
@@ -206,7 +207,7 @@ export const ServerInsightsModal: React.FC<Props> = ({
         <div className="flex flex-wrap items-end gap-2 border-b border-slate-800 bg-slate-950/30 px-5 py-3 shrink-0">
           {!lockedConnectionId && (
           <label className="flex min-w-[14rem] flex-1 flex-col gap-1">
-            <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+            <span className={sectionLabelCls}>
               Credential
             </span>
             <select
@@ -235,7 +236,7 @@ export const ServerInsightsModal: React.FC<Props> = ({
           )}
           {needsPassword && (
             <label className="flex flex-col gap-1 min-w-[10rem]">
-              <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+              <span className={sectionLabelCls}>
                 Session password
               </span>
               <div className="flex gap-1">
diff --git a/apps/web/src/frontend/features/utilities/components/UtilitiesView.tsx b/apps/web/src/frontend/features/utilities/components/UtilitiesView.tsx
index 613e0284..07dba0e4 100644
--- a/apps/web/src/frontend/features/utilities/components/UtilitiesView.tsx
+++ b/apps/web/src/frontend/features/utilities/components/UtilitiesView.tsx
@@ -30,6 +30,7 @@ import { DatabaseAccessModal } from './DatabaseAccessModal';
 import { FileQueryModal } from './FileQueryModal';
 import { IndexManagementModal } from './IndexManagementModal';
 import { ServerInsightsModal, type ServerInsightsTab } from './ServerInsightsModal';
+import { sectionLabelCls } from '@/shared/components/surfaces';
 
 export type UtilityTool =
   | 'indexes'
@@ -239,7 +240,7 @@ export const UtilitiesView: React.FC = () => {
             <p className="mt-0.5 text-[11px] text-slate-500">{active.blurb}</p>
           </div>
           <label className="flex min-w-[16rem] max-w-md flex-1 flex-col gap-1">
-            <span className="text-[10px] font-bold uppercase tracking-wide text-slate-500">
+            <span className={sectionLabelCls}>
               Credential
             </span>
             <select
diff --git a/apps/web/src/frontend/shared/components/surfaces.guard.test.ts b/apps/web/src/frontend/shared/components/surfaces.guard.test.ts
new file mode 100644
index 00000000..b8a9fe64
--- /dev/null
+++ b/apps/web/src/frontend/shared/components/surfaces.guard.test.ts
@@ -0,0 +1,50 @@
+/**
+ * Fox Schema (foxschema)
+ * Copyright 2024-2026 Huy Phan <huyplb@gmail.com>
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Keeps the shared surfaces shared.
+ *
+ * `surfaces.tsx` was extracted because the same uppercase micro-label had been
+ * written eight different ways across the frontend. An extraction alone does
+ * not fix that — the next person writes the ninth spelling, and the module
+ * becomes one more variant rather than the one definition. This fails the
+ * build instead, the way naming.test.ts already guards file naming here.
+ */
+import { describe, expect, it } from 'vitest';
+import { readdirSync, readFileSync, statSync } from 'node:fs';
+import path from 'node:path';
+import { sectionLabelCls } from './surfaces';
+
+const FRONTEND = path.resolve(__dirname, '..', '..');
+const OWN_FILE = 'surfaces.tsx';
+
+function tsxFiles(dir: string): string[] {
+  return readdirSync(dir).flatMap((entry) => {
+    const full = path.join(dir, entry);
+    if (statSync(full).isDirectory()) return tsxFiles(full);
+    return entry.endsWith('.tsx') && !entry.includes('.test.') ? [full] : [];
+  });
+}
+
+describe('shared surfaces stay shared', () => {
+  it('nobody re-spells the section label as a literal', () => {
+    // The exact string, as a bare className. Anything importing sectionLabelCls
+    // is fine; this only catches a fresh copy of the literal.
+    const literal = `className="${sectionLabelCls}"`;
+    const offenders = tsxFiles(FRONTEND)
+      .filter((f) => path.basename(f) !== OWN_FILE)
+      .filter((f) => readFileSync(f, 'utf8').includes(literal))
+      .map((f) => path.relative(FRONTEND, f));
+    expect(offenders, 'use sectionLabelCls or <SectionLabel> from @/shared/components/surfaces').toEqual([]);
+  });
+
+  it('is worth guarding — the label is used widely enough to drift', () => {
+    // If this ever drops to a handful, the guard above is protecting nothing
+    // and the extraction should be reconsidered rather than defended.
+    const users = tsxFiles(FRONTEND).filter((f) =>
+      /sectionLabelCls|<SectionLabel/.test(readFileSync(f, 'utf8'))
+    );
+    expect(users.length).toBeGreaterThan(8);
+  });
+});