✅ fix: Wave 2 Integration, Verification Fixes and Schema Coverage Guarantees

e2e/a11y/config.spec.ts

@@ -102,6 +102,21 @@ for (const theme of THEMES) {
       expect(await dialogViolations(page)).toEqual([]);
     });
 
+    test('the change review of a spec list taking over librechat.yaml (its warning text)', async ({
+      page,
+    }) => {
+      await openConfigTab(page, 'specs');
+      const card = page.locator('[data-entry-card]').first();
+      test.skip((await card.count()) === 0, 'No model specs');
+      await card.locator('button[aria-expanded]').first().click();
+      const label = page.locator('#modelSpecs-list-0-label');
+      await label.fill(`${await label.inputValue()} (review)`);
+      await label.press('Tab');
+      await page.getByRole('button', { name: 'Review & save' }).click();
+      await expect(page.getByRole('dialog')).toBeVisible();
+      expect(await dialogViolations(page)).toEqual([]);
+    });
+
     test('the import wizard', async ({ page }) => {
       await openConfigTab(page, 'system');
       await page.getByRole('button', { name: 'Import YAML' }).click();
@@ -111,6 +126,84 @@ for (const theme of THEMES) {
   });
 }
 
+/** The Wave 2 editors' overlays at phone width, where their bodies scroll. */
+for (const theme of THEMES) {
+  test.describe(`axe on editor overlays: ${theme} 390px`, () => {
+    test.use({ colorScheme: theme, viewport: { width: 390, height: 844 } });
+
+    test('the Azure group details drawer', async ({ page }) => {
+      await openConfigTab(page, 'providers');
+      await page.locator('#section-endpoints\\.azureOpenAI .settings-section-trigger').click();
+      /** The group with the longest model list, so the drawer body scrolls at this height. */
+      const counts = await page
+        .locator('.azure-groups-table tbody tr .azure-col-number')
+        .allInnerTexts();
+      const longest = counts.reduce(
+        (best, text, i) => (Number(text) > Number(counts[best]) ? i : best),
+        0,
+      );
+      await page
+        .getByRole('button', { name: /^Details of Azure group/ })
+        .nth(longest)
+        .click();
+      await expect(page.getByRole('dialog')).toBeVisible();
+      expect(await dialogViolations(page)).toEqual([]);
+    });
+
+    test('the custom endpoint editor drawer', async ({ page }) => {
+      await openConfigTab(page, 'custom');
+      await page.locator('li[data-endpoint-row] button[aria-haspopup="dialog"]').first().click();
+      await expect(page.getByRole('dialog')).toBeVisible();
+      expect(await dialogViolations(page)).toEqual([]);
+    });
+
+    test('Create endpoint', async ({ page }) => {
+      await openConfigTab(page, 'custom');
+      await page.getByRole('button', { name: 'Create endpoint' }).click();
+      await expect(page.getByRole('dialog')).toBeVisible();
+      expect(await dialogViolations(page)).toEqual([]);
+    });
+
+    test('Create MCP server', async ({ page }) => {
+      await openConfigTab(page, 'mcp');
+      await page.getByRole('button', { name: 'Create MCP server' }).click();
+      await expect(page.getByRole('dialog')).toBeVisible();
+      expect(await dialogViolations(page)).toEqual([]);
+    });
+  });
+}
+
+test.describe('row action menus', () => {
+  test.use({ colorScheme: 'light', viewport: { width: 1440, height: 900 } });
+
+  test('custom: an action that opens the editor leaves focus in it', async ({ page }) => {
+    await openConfigTab(page, 'custom');
+    const trigger = page.getByRole('button', { name: /^Actions for / }).first();
+    await trigger.focus();
+    await page.keyboard.press('Enter');
+    await expect(page.getByRole('menu')).toBeVisible();
+    await page.keyboard.press('Enter');
+    const drawer = page.getByRole('dialog');
+    await expect(drawer).toBeVisible();
+    await expect
+      .poll(() => drawer.evaluate((el) => el.contains(document.activeElement)))
+      .toBe(true);
+  });
+
+  for (const tab of ['custom', 'mcp'] as const) {
+    test(`${tab}: Escape returns focus to the menu button`, async ({ page }) => {
+      await openConfigTab(page, tab);
+      const trigger = page.getByRole('button', { name: /^Actions for / }).first();
+      await trigger.focus();
+      await page.keyboard.press('Enter');
+      await expect(page.getByRole('menu')).toBeVisible();
+      await page.keyboard.press('Escape');
+      await expect(page.getByRole('menu')).toBeHidden();
+      await expect(trigger).toBeFocused();
+    });
+  }
+});
+
 test.describe('settings layout invariants (1440px, light)', () => {
   test.use({
     colorScheme: 'light',
@@ -218,3 +311,55 @@ for (const variant of VISUAL_VARIANTS) {
     }
   });
 }
+
+test.describe('dialogs give focus back to what opened them', () => {
+  test.use({ colorScheme: 'light', viewport: { width: 1440, height: 900 } });
+
+  test('Create MCP server, closed with Escape', async ({ page }) => {
+    await openConfigTab(page, 'mcp');
+    const create = page.getByRole('button', { name: 'Create MCP server' });
+    await create.focus();
+    await page.keyboard.press('Enter');
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await page.keyboard.press('Escape');
+    await expect(page.getByRole('dialog')).toBeHidden();
+    await expect(create).toBeFocused();
+  });
+
+  test('the change review, closed with Escape', async ({ page }) => {
+    await openConfigTab(page, 'system');
+    const field = page.locator('#balance-refillAmount');
+    await field.fill('12345');
+    await field.press('Tab');
+    const review = page.getByRole('button', { name: 'Review & save' });
+    await review.focus();
+    await page.keyboard.press('Enter');
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await page.keyboard.press('Escape');
+    await expect(page.getByRole('dialog')).toBeHidden();
+    await expect(review).toBeFocused();
+  });
+});
+
+test.describe('custom endpoint drawer', () => {
+  test.use({ colorScheme: 'light', viewport: { width: 1440, height: 900 } });
+
+  test('a section link scrolls the drawer to its section', async ({ page }) => {
+    await openConfigTab(page, 'custom');
+    await page.locator('li[data-endpoint-row] button[aria-haspopup="dialog"]').first().click();
+    const drawer = page.locator('[data-endpoint-drawer]');
+    await expect(drawer).toBeVisible();
+    const links = drawer.locator('nav a');
+    await links.last().click();
+    await expect(links.last()).toHaveAttribute('aria-current', 'location');
+    const scrolled = () =>
+      drawer.locator('nav').evaluate((nav) => {
+        let node = nav.parentElement;
+        while (node && !/(auto|scroll)/.test(getComputedStyle(node).overflowY)) {
+          node = node.parentElement;
+        }
+        return node?.scrollTop ?? 0;
+      });
+    await expect.poll(scrolled).toBeGreaterThan(0);
+  });
+});

e2e/config-shell.spec.ts

@@ -14,8 +14,9 @@ test.skip(!LIVE, LIVE_SKIP_REASON);
 
 const TABS = ['providers', 'custom', 'specs', 'mcp', 'features', 'files', 'system'];
 /** Collapsed sections, groups and cards (not a model chip's inline editor or a select). */
+/** Collapsed sections, groups and cards (not menus, selects, tabs, or a chip's "why" disclosure). */
 const COLLAPSED =
-  'form [aria-expanded="false"]:not([aria-haspopup]):not([role=combobox]):not([role=tab]):not(.icon-btn)';
+  'form [aria-expanded="false"]:not([aria-haspopup]):not([role=combobox]):not([role=tab]):not(.icon-btn):not(.state-chip-link)';
 
 async function openTab(page: Page, tab: string, extra = '') {
   await page.goto(`/configuration?tab=${tab}${extra}`);

e2e/import.spec.ts

@@ -82,7 +82,7 @@ test('imports into a role that has no profile yet', async ({ page }) => {
   const admin = page.getByRole('radio', { name: /ADMIN/ });
   await admin.click();
   const { dialog, apply } = await previewAndApply(page, /into Role: ADMIN$/);
-  await expect(dialog.getByText('Custom welcome')).toBeVisible();
+  await expect(dialog.getByText('Welcome message')).toBeVisible();
   await apply.click();
   await expect(page.getByText(/Imported 1 value into Role: ADMIN/).first()).toBeVisible();
 });

e2e/specs.spec.ts

@@ -46,16 +46,16 @@ async function revertList(page: Page) {
   await saveAndWait(page);
 }
 
-/** Adds a spec with the four required fields, and returns its card. */
+/** Adds a spec with the four required fields (it opens on Endpoint, then Model), and returns its card. */
 async function addSpec(page: Page, label: string, endpoint: string, model: string) {
   await page.getByRole('button', { name: 'Add spec' }).click();
   const card = cards(page).last();
-  await expect(card.getByLabel(/^Label\*?$/)).toBeFocused();
-  await card.getByLabel(/^Label\*?$/).fill(label);
-  await card.getByLabel(/^Label\*?$/).press('Tab');
+  await expect(card.getByLabel(/^Endpoint\*?$/)).toBeFocused();
   await card.getByLabel(/^Endpoint\*?$/).selectOption(endpoint);
   await card.getByRole('combobox', { name: /^Model\*?$/ }).fill(model);
   await card.getByRole('combobox', { name: /^Model\*?$/ }).press('Tab');
+  await card.getByLabel(/^Label\*?$/).fill(label);
+  await card.getByLabel(/^Label\*?$/).press('Tab');
   return card;
 }
 
@@ -180,13 +180,15 @@ test.describe('Model specs', () => {
     page,
   }) => {
     await openSpecs(page, '&scope=role:USER');
-    const customize = page.getByRole('button', { name: /^Customize list for/ });
+    const customize = page.getByRole('button', { name: /^Override for Role: USER/ });
     test.skip((await customize.count()) === 0, 'Needs a USER role profile without its own list');
     await expect(page.getByRole('button', { name: 'Add spec' })).toHaveCount(0);
     await expect(cards(page).first()).toBeVisible();
     await customize.click();
     await expect(page.getByRole('button', { name: 'Add spec' })).toBeVisible();
     await expect(page.getByText(/replaces Base's list/)).toBeVisible();
+    await page.getByRole('button', { name: 'Cancel' }).click();
+    await expect(page.getByRole('button', { name: 'Add spec' })).toHaveCount(0);
   });
 
   test('the tab filter finds spec fields and phone width has no sideways scroll', async ({

src/components/access/GroupsTab.tsx

@@ -115,7 +115,7 @@ export function GroupsTab({ onCreateGroup }: t.GroupsTabProps) {
               <button
                 type="button"
                 onClick={() => setEditTarget(group)}
-                className="-my-2 -ml-2 min-w-0 flex-1 cursor-pointer rounded py-3 pl-3 text-left outline-none focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-(--cui-color-outline)"
+                className="-my-2 -ml-2 min-w-0 flex-1 cursor-pointer rounded py-3 pl-3 text-left outline-none focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-(--cui-color-outline) focus-visible:outline-solid"
               >
                 <div className="text-sm font-medium text-(--cui-color-text-default) hover:underline">
                   {group.name}

src/components/access/RolesTab.tsx

@@ -109,7 +109,7 @@ export function RolesTab({ onCreateRole }: t.RolesTabProps) {
               <button
                 type="button"
                 onClick={() => setEditTarget(role)}
-                className="-my-2 -ml-2 min-w-0 flex-1 cursor-pointer rounded py-3 pl-3 text-left outline-none focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-(--cui-color-outline)"
+                className="-my-2 -ml-2 min-w-0 flex-1 cursor-pointer rounded py-3 pl-3 text-left outline-none focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-(--cui-color-outline) focus-visible:outline-solid"
               >
                 <div className="flex items-center gap-2">
                   <span className="text-sm font-medium text-(--cui-color-text-default) hover:underline">

src/components/configuration/ConfigPage.tsx

@@ -41,6 +41,7 @@ import { CollectionEditsContext } from '@/contexts/CollectionEditsContext';
 import { ConfigErrorsProvider } from '@/contexts/ConfigErrorsContext';
 import { buildTocEntries, findTocEntry, toJumpTargets } from './toc';
 import { RevealTargetContext } from '@/contexts/RevealTargetContext';
+import { GlobalRevealContext } from '@/contexts/GlobalRevealContext';
 import { ConfigTableOfContents } from './ConfigTableOfContents';
 import { ResetBaseConfigDialog } from './ResetBaseConfigDialog';
 import { NavigationGuardDialog } from './NavigationGuardDialog';
@@ -400,6 +401,15 @@ export function ConfigPage({
     if (highlightField && filterPaths && !isRowVisible(filterPaths, highlightField)) clearFilter();
   }, [highlightField, filterPaths, clearFilter]);
 
+  /** "Overridden by Global →" chips, on any tab, open the Global overrides setting that wins (D11). */
+  const revealGlobal = useCallback(
+    (path: string) =>
+      navigate({
+        search: (prev: t.ConfigSearchParams) => ({ ...prev, tab: tabForPath(path), field: path }),
+      }),
+    [navigate],
+  );
+
   const configuredPaths = layers.activeConfiguredPaths;
   const revealSetting = useCallback(
     (item: t.ConfigSearchItem) => {
@@ -572,48 +582,50 @@ export function ConfigPage({
                 {isReady && (
                   <ScopeActionsProvider value={scopeActions}>
                     <RevealTargetContext.Provider value={highlightField ?? null}>
-                      <CollectionEditsContext.Provider value={edits.collectionEdits}>
-                        <ConfigTabContent
-                          sections={sectionsForActiveTab}
-                          configValues={activeConfigValues}
-                          editedValues={editedValues}
-                          onFieldChange={edits.handleFieldChange}
-                          onResetField={edits.handleResetField}
-                          onDiscardField={edits.handleDiscardField}
-                          previewMode={false}
-                          previewScope={editingScope}
-                          previewChangedPaths={layers.scopeChangedPaths}
-                          resolvedValues={layers.scopeResolvedValues}
-                          permissions={permissions}
-                          showChangedOnly={false}
-                          readOnly={!canEditActiveTab || scopeNotFound != null}
-                          configuredPaths={layers.activeConfiguredPaths}
-                          dbOverridePaths={layers.overridePaths}
-                          listOverrideCounts={layers.listOverrideCounts}
-                          touchedPaths={edits.touchedPaths}
-                          pendingResets={edits.pendingResets}
-                          sectionPermissions={sectionPermissions}
-                          schemaDefaults={layers.schemaDefaults}
-                          showConfiguredOnly={customizedOnly}
-                          isEditingScope={isEditingScope}
-                          baseRecordKeys={layers.baseRecordKeys}
-                          onValidationError={notifyError}
-                          editSessionId={edits.editSessionId}
-                          unknownSettings={topLevelUnknown}
-                          onShowAll={showAllSettings}
-                          filterText={filterText}
-                          onClearFilter={clearFilter}
-                          visibleSectionIds={filterSectionIds}
-                          filterPaths={filterPaths}
-                          valueLayers={layers.valueLayers}
-                          visibilityEdits={edits.visibilityEdits}
-                          onHideField={permissions.canAssign ? edits.handleHideField : undefined}
-                          onUnhideField={
-                            permissions.canAssign ? edits.handleUnhideField : undefined
-                          }
-                          onRenameEntry={edits.handleRenameEntry}
-                        />
-                      </CollectionEditsContext.Provider>
+                      <GlobalRevealContext.Provider value={revealGlobal}>
+                        <CollectionEditsContext.Provider value={edits.collectionEdits}>
+                          <ConfigTabContent
+                            sections={sectionsForActiveTab}
+                            configValues={activeConfigValues}
+                            editedValues={editedValues}
+                            onFieldChange={edits.handleFieldChange}
+                            onResetField={edits.handleResetField}
+                            onDiscardField={edits.handleDiscardField}
+                            previewMode={false}
+                            previewScope={editingScope}
+                            previewChangedPaths={layers.scopeChangedPaths}
+                            resolvedValues={layers.scopeResolvedValues}
+                            permissions={permissions}
+                            showChangedOnly={false}
+                            readOnly={!canEditActiveTab || scopeNotFound != null}
+                            configuredPaths={layers.activeConfiguredPaths}
+                            dbOverridePaths={layers.overridePaths}
+                            listOverrideCounts={layers.listOverrideCounts}
+                            touchedPaths={edits.touchedPaths}
+                            pendingResets={edits.pendingResets}
+                            sectionPermissions={sectionPermissions}
+                            schemaDefaults={layers.schemaDefaults}
+                            showConfiguredOnly={customizedOnly}
+                            isEditingScope={isEditingScope}
+                            baseRecordKeys={layers.baseRecordKeys}
+                            onValidationError={notifyError}
+                            editSessionId={edits.editSessionId}
+                            unknownSettings={topLevelUnknown}
+                            onShowAll={showAllSettings}
+                            filterText={filterText}
+                            onClearFilter={clearFilter}
+                            visibleSectionIds={filterSectionIds}
+                            filterPaths={filterPaths}
+                            valueLayers={layers.valueLayers}
+                            visibilityEdits={edits.visibilityEdits}
+                            onHideField={permissions.canAssign ? edits.handleHideField : undefined}
+                            onUnhideField={
+                              permissions.canAssign ? edits.handleUnhideField : undefined
+                            }
+                            onRenameEntry={edits.handleRenameEntry}
+                          />
+                        </CollectionEditsContext.Provider>
+                      </GlobalRevealContext.Provider>
                     </RevealTargetContext.Provider>
                   </ScopeActionsProvider>
                 )}
@@ -666,6 +678,7 @@ export function ConfigPage({
             open={resetBase.resetBaseOpen}
             resetting={resetBase.resettingBase}
             error={resetBase.resetBaseError}
+            termsUrl={resetBase.resetBaseTermsUrl}
             onConfirm={resetBase.handleResetBaseConfig}
             onCancel={resetBase.cancelResetBase}
             overrides={baseOverrides}

src/components/configuration/ConfigRow.tsx

@@ -159,7 +159,12 @@ export function ConfigRow({
             onUndo={undo}
             undoLabel={undoLabel}
           />
-          {showsShadow(state) && <ShadowBadge shadowedBy={state.shadowedBy} />}
+          {showsShadow(state) && (
+            <ShadowBadge
+              shadowedBy={state.shadowedBy}
+              source={localize('com_config_ui_state_edited')}
+            />
+          )}
         </>
       );
     }

src/components/configuration/ConfigTabContent.tsx

@@ -20,10 +20,10 @@ import { RevealTargetContext } from '@/contexts/RevealTargetContext';
 import { FieldRenderer, SingleFieldRenderer } from './renderer';
 import { RowFilterContext } from '@/contexts/RowFilterContext';
 import { deriveFieldValue, isSectionDisabled } from '@/utils';
+import { SECTION_META, isPathInSection } from './configMeta';
 import { ReadOnlySection } from './ReadOnlySection';
 import { UnknownSettings } from './UnknownSettings';
 import { ConfigSection } from './ConfigSection';
-import { SECTION_META, isPathInSection } from './configMeta';
 import { CodeField } from './fields/CodeField';
 import { InfoBanner } from './InfoBanner';
 import { ScopeGate } from './ScopeGate';
@@ -371,7 +371,7 @@ export function ConfigTabContent({
     return (
       <ReadOnlySection
         reason={section.readOnlyReason}
-        detail={detailKey ? localize(detailKey) : undefined}
+        message={detailKey ? localize(detailKey) : undefined}
         isEmpty={isEmpty && !filterPaths}
         reveal={reveal}
       >