Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🧹 refactor: Use Existing Variants and Drop Redundant Overrides in Nav, Skills and Prompts (#16868)
Marco Beretta1c3c6f7bc522
diff --git a/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx b/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsxindex 2372e33f30..55bab49640 100644--- a/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx@@ -119,7 +119,7 @@ function EndpointModelItemComponent({onClick={handleFavoriteClick}aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}className={cn(- 'hover:bg-surface-hover focus-visible:ring-ring-primary rounded-md p-1 focus-visible:ring-2 focus-visible:outline-hidden focus-visible:ring-inset',+ 'hover:bg-surface-hover focus-visible:ring-ring-primary text-text-secondary rounded-md p-1 focus-visible:ring-2 focus-visible:outline-hidden focus-visible:ring-inset',isFavorite? 'visible': // Visible by default so it's tappable on touch (no hover to@@ -130,7 +130,7 @@ function EndpointModelItemComponent({'group-focus-within:visible group-hover:visible group-data-[active-item]:visible [@media(hover:hover)]:invisible',)}>- <MorphIcon icon={isFavorite ? PinOff : Pin} className="text-text-secondary h-4 w-4" />+ <MorphIcon icon={isFavorite ? PinOff : Pin} className="h-4 w-4" /></button>{isSelected && (<>diff --git a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsxindex 015335e69a..12ab0544f5 100644--- a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx@@ -22,8 +22,8 @@ const GroupIcon: React.FC<GroupIconProps> = ({ iconURL, groupName }) => {if (isEntityEndpoint(iconURL)) {return (<div- className="relative"- style={{ width: pxToRem(20), height: pxToRem(20), margin: pxToRem(2) }}+ className="relative m-0.5"+ style={{ width: pxToRem(20), height: pxToRem(20) }}title={groupName}><EntityEndpointMark endpoint={iconURL} />@@ -33,10 +33,7 @@ const GroupIcon: React.FC<GroupIconProps> = ({ iconURL, groupName }) => {if (provider || !isImageURL(iconURL) || imageError) {return (- <div- className="relative"- style={{ width: pxToRem(20), height: pxToRem(20), margin: pxToRem(2) }}- >+ <div className="relative m-0.5" style={{ width: pxToRem(20), height: pxToRem(20) }}><ProviderIcon provider={provider} size={20} className="icon-md shrink-0" />{imageError && (<divdiff --git a/client/src/components/Chat/Menus/Endpoints/components/ModelSpecItem.tsx b/client/src/components/Chat/Menus/Endpoints/components/ModelSpecItem.tsxindex e2c18386b8..9533bfdfce 100644--- a/client/src/components/Chat/Menus/Endpoints/components/ModelSpecItem.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/ModelSpecItem.tsx@@ -70,7 +70,7 @@ export function ModelSpecItem({ spec, isSelected, posInSet, setSize }: ModelSpeconClick={handleFavoriteClick}aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}className={cn(- 'hover:bg-surface-hover focus-visible:ring-ring-primary rounded-md p-1 focus-visible:ring-2 focus-visible:outline-hidden focus-visible:ring-inset',+ 'hover:bg-surface-hover focus-visible:ring-ring-primary text-text-secondary rounded-md p-1 focus-visible:ring-2 focus-visible:outline-hidden focus-visible:ring-inset',isFavorite? 'visible': // Visible by default so it's tappable on touch (no hover to@@ -81,7 +81,7 @@ export function ModelSpecItem({ spec, isSelected, posInSet, setSize }: ModelSpec'group-focus-within:visible group-hover:visible group-data-[active-item]:visible [@media(hover:hover)]:invisible',)}>- <MorphIcon icon={isFavorite ? PinOff : Pin} className="text-text-secondary h-4 w-4" />+ <MorphIcon icon={isFavorite ? PinOff : Pin} className="h-4 w-4" /></button>{isSelected && (<>diff --git a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsxindex ba56f6d863..e47fd17211 100644--- a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx+++ b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx@@ -309,10 +309,7 @@ export function SearchResults({ results, localize, searchValue }: SearchResultsP><div className="flex items-center gap-2">{endpoint.icon && (- <div- className="border-border-light flex items-center justify-center overflow-hidden rounded-full border p-1"- style={{ borderRadius: '50%' }}- >+ <div className="border-border-light flex items-center justify-center overflow-hidden rounded-full border p-1">{endpoint.icon}</div>)}diff --git a/client/src/components/Chat/Menus/HeaderMenu.tsx b/client/src/components/Chat/Menus/HeaderMenu.tsxindex fd6fbc989b..f5f5dbb389 100644--- a/client/src/components/Chat/Menus/HeaderMenu.tsx+++ b/client/src/components/Chat/Menus/HeaderMenu.tsx@@ -169,11 +169,8 @@ export default function HeaderMenu({render={<Buttonsize="icon"- variant="outline"- className={cn(- 'bg-presentation hover:bg-surface-active-alt relative size-9 shrink-0 rounded-xl',- className,- )}+ variant="header-action"+ className={cn('relative size-9 shrink-0', className)}/>}>diff --git a/client/src/components/Chat/Menus/NewChat.tsx b/client/src/components/Chat/Menus/NewChat.tsxindex e9e0f7cf9a..526a59ed0c 100644--- a/client/src/components/Chat/Menus/NewChat.tsx+++ b/client/src/components/Chat/Menus/NewChat.tsx@@ -22,11 +22,8 @@ export default function NewChat({ className }: { className?: string }) {<ButtonasChildsize="icon"- variant="outline"- className={cn(- 'bg-presentation hover:bg-surface-active-alt size-9 shrink-0 rounded-xl',- className,- )}+ variant="header-action"+ className={cn('size-9 shrink-0', className)}><ahref="/c/new"diff --git a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsxindex 694ea6b9c1..c610b9542b 100644--- a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx+++ b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx@@ -143,7 +143,7 @@ const EditPresetDialog = ({return (<OGDialog open={presetModalVisible} onOpenChange={handleOpenChange} triggerRef={triggerRef}>- <OGDialogContent className="bg-surface-dialog md:rounded-theme-surface flex h-[100dvh] max-h-[100dvh] w-full max-w-full flex-col overflow-y-visible md:h-auto md:max-h-[90vh] md:max-w-[75vw] lg:max-w-[59.375rem]">+ <OGDialogContent className="md:rounded-theme-surface flex h-[100dvh] max-h-[100dvh] w-full max-w-full flex-col overflow-y-visible md:h-auto md:max-h-[90vh] md:max-w-[75vw] lg:max-w-[59.375rem]"><OGDialogTitle className="shrink-0">{localize('com_ui_edit_preset_title', { title: preset?.title })}</OGDialogTitle>@@ -163,7 +163,7 @@ const EditPresetDialog = ({value={(title as string | undefined) ?? ''}onChange={onTitleChange}placeholder={localize('com_endpoint_set_custom_name')}- className="rounded-theme-control border-border-medium h-9 w-full px-3 py-2"+ className="rounded-theme-control border-border-medium h-9 w-full"/></div><div className="flex w-full flex-col">diff --git a/client/src/components/Chat/Menus/Presets/PresetItems.tsx b/client/src/components/Chat/Menus/Presets/PresetItems.tsxindex bfee89adac..2a1e75b382 100644--- a/client/src/components/Chat/Menus/Presets/PresetItems.tsx+++ b/client/src/components/Chat/Menus/Presets/PresetItems.tsx@@ -239,8 +239,9 @@ const PresetItems: FC<{<div className="group rounded-theme-control hover:bg-surface-hover m-1.5 flex items-center gap-2 px-3 py-1.5 text-sm"><Buttonvariant="ghost"+ shape="theme"type="button"- className="rounded-theme-control h-auto min-w-0 flex-1 justify-start gap-1 bg-transparent p-2 text-left text-xs font-normal hover:bg-transparent focus-visible:ring-offset-0"+ className="h-auto min-w-0 flex-1 justify-start gap-1 p-2 text-left text-xs font-normal hover:bg-transparent focus-visible:ring-offset-0"onClick={() => onSelectPreset(preset)}aria-label={presetTitle}data-testid={`preset-item-${presetId}`}@@ -254,72 +255,82 @@ const PresetItems: FC<{<span className="truncate">{presetTitle}</span></Button><div className="flex items-center justify-end gap-1">- <TooltipAnchor- description={- defaultPreset?.presetId === presetId- ? localize('com_ui_unpin')- : localize('com_ui_pin')- }- aria-label={- defaultPreset?.presetId === presetId- ? localize('com_ui_unpin')- : localize('com_ui_pin')- }- render={- <Button- variant="ghost"- className={cn(- 'rounded-theme-control-round text-text-tertiary hover:text-text-primary focus:text-text-primary m-0 h-full bg-transparent p-2',- defaultPreset?.presetId === presetId- ? ''- : // opacity keeps buttons in the tab order; pointer-events-none- // while transparent so touch/pointer cannot hit invisible controls- 'sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus:pointer-events-auto sm:focus:opacity-100',- )}- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- onSetDefaultPreset(preset, defaultPreset?.presetId === presetId);- }}- >- <PinIcon unpin={defaultPreset?.presetId === presetId} />- </Button>- }- />- <TooltipAnchor- description={localize('com_ui_edit')}- aria-label={localize('com_ui_edit')}- render={- <Button- variant="ghost"- className="rounded-theme-control-round text-text-tertiary hover:text-text-primary focus:text-text-primary m-0 h-full p-2 sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus:pointer-events-auto sm:focus:opacity-100"- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- onChangePreset(preset);- }}- >- <EditIcon />- </Button>- }- />- <TooltipAnchor- description={localize('com_ui_delete')}- aria-label={localize('com_ui_delete')}- render={- <Button- variant="ghost"- className="rounded-theme-control-round text-text-tertiary hover:text-text-primary focus:text-text-primary m-0 h-full p-2 sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus:pointer-events-auto sm:focus:opacity-100"- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- onDeletePreset(preset);- }}- >- <TrashIcon />- </Button>- }- />+ <div+ className={cn(+ 'flex',+ // opacity keeps buttons in the tab order; pointer-events-none while+ // transparent so touch/pointer cannot hit invisible controls+ defaultPreset?.presetId !== presetId &&+ 'sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus-within:pointer-events-auto sm:focus-within:opacity-100',+ )}+ >+ <TooltipAnchor+ description={+ defaultPreset?.presetId === presetId+ ? localize('com_ui_unpin')+ : localize('com_ui_pin')+ }+ aria-label={+ defaultPreset?.presetId === presetId+ ? localize('com_ui_unpin')+ : localize('com_ui_pin')+ }+ render={+ <Button+ variant="ghost"+ shape="round"+ className="text-text-tertiary hover:text-text-primary focus:text-text-primary m-0 h-full p-2"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ onSetDefaultPreset(preset, defaultPreset?.presetId === presetId);+ }}+ >+ <PinIcon unpin={defaultPreset?.presetId === presetId} />+ </Button>+ }+ />+ </div>+ <div className="flex sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus-within:pointer-events-auto sm:focus-within:opacity-100">+ <TooltipAnchor+ description={localize('com_ui_edit')}+ aria-label={localize('com_ui_edit')}+ render={+ <Button+ variant="ghost"+ shape="round"+ className="text-text-tertiary focus:text-text-primary m-0 h-full p-2"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ onChangePreset(preset);+ }}+ >+ <EditIcon />+ </Button>+ }+ />+ </div>+ <div className="flex sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100 sm:focus-within:pointer-events-auto sm:focus-within:opacity-100">+ <TooltipAnchor+ description={localize('com_ui_delete')}+ aria-label={localize('com_ui_delete')}+ render={+ <Button+ variant="ghost"+ shape="round"+ className="text-text-tertiary focus:text-text-primary m-0 h-full p-2"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ onDeletePreset(preset);+ }}+ >+ <TrashIcon />+ </Button>+ }+ />+ </div></div></div></Flipped>diff --git a/client/src/components/Chat/Menus/PresetsMenu.tsx b/client/src/components/Chat/Menus/PresetsMenu.tsxindex 8ca4e48340..4cf5edc733 100644--- a/client/src/components/Chat/Menus/PresetsMenu.tsx+++ b/client/src/components/Chat/Menus/PresetsMenu.tsx@@ -72,11 +72,12 @@ const PresetsMenu: FC = () => {<Buttonsize="icon"variant="outline"+ shape="theme"tabIndex={0}id="presets-button"data-testid="presets-button"aria-label={localize('com_endpoint_examples')}- className="rounded-theme-control bg-presentation hover:bg-surface-hover h-9 w-9 shrink-0 duration-0"+ className="bg-presentation h-9 w-9 shrink-0 duration-0"><BookCopy className="icon-md" aria-hidden="true" /></Button>diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsxindex fa9acd6503..9cb9467c9c 100644--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx@@ -77,7 +77,7 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>value={title || ''}onChange={(e) => setTitle(e.target.value || '')}placeholder={localize('com_endpoint_preset_custom_name_placeholder')}- className="flex h-10 max-h-10 w-full resize-none rounded-theme-control border-border-medium px-3 py-2"+ className="rounded-theme-control border-border-medium flex h-10 max-h-10 w-full resize-none"/></div></form>diff --git a/client/src/components/Endpoints/Settings/Examples.tsx b/client/src/components/Endpoints/Settings/Examples.tsxindex 4ba62486c9..0fb313f431 100644--- a/client/src/components/Endpoints/Settings/Examples.tsx+++ b/client/src/components/Endpoints/Settings/Examples.tsx@@ -82,14 +82,14 @@ function Examples({ readonly, examples, setExample, addExample, removeExample }:<div className="flex justify-center"><Buttontype="button"- className="text-text-primary hover:bg-surface-hover hover:text-text-primary mt-1 mr-2 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal focus:ring-0 focus:ring-offset-0 dark:focus:ring-offset-0"+ className="text-text-primary hover:bg-surface-hover hover:text-text-primary mt-1 mr-2 h-auto items-center justify-center bg-transparent px-3 text-xs font-normal focus:ring-0 focus:ring-offset-0 dark:focus:ring-offset-0"onClick={removeExample}><Minus className="w-[1rem]" aria-hidden="true" /></Button><Buttontype="button"- className="text-text-primary hover:bg-surface-hover hover:text-text-primary mt-1 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal focus:ring-0 focus:ring-offset-0 dark:focus:ring-offset-0"+ className="text-text-primary hover:bg-surface-hover hover:text-text-primary mt-1 h-auto items-center justify-center bg-transparent px-3 text-xs font-normal focus:ring-0 focus:ring-offset-0 dark:focus:ring-offset-0"onClick={addExample}><Plus className="w-[1rem]" aria-hidden="true" />diff --git a/client/src/components/Nav/ExportConversation/ExportModal.tsx b/client/src/components/Nav/ExportConversation/ExportModal.tsxindex 3ba36a11f1..4485684d74 100644--- a/client/src/components/Nav/ExportConversation/ExportModal.tsx+++ b/client/src/components/Nav/ExportConversation/ExportModal.tsx@@ -130,7 +130,7 @@ export default function ExportModal({<Labelid="includeOptions-label"htmlFor="includeOptions"- className="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"+ className="text-sm leading-none font-medium">{exportOptionsSupport? localize('com_nav_export_include_endpoint_options')@@ -154,7 +154,7 @@ export default function ExportModal({<Labelid="exportBranches-label"htmlFor="exportBranches"- className="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"+ className="text-sm leading-none font-medium">{exportBranchesSupport? localize('com_nav_export_all_message_branches')@@ -177,7 +177,7 @@ export default function ExportModal({<Labelid="recursive-label"htmlFor="recursive"- className="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"+ className="text-sm leading-none font-medium">{localize('com_nav_export_recursive')}</Label>diff --git a/client/src/components/Nav/Settings/Dialog.tsx b/client/src/components/Nav/Settings/Dialog.tsxindex c96dc2fbba..c7ed761cc7 100644--- a/client/src/components/Nav/Settings/Dialog.tsx+++ b/client/src/components/Nav/Settings/Dialog.tsx@@ -100,11 +100,11 @@ export default function SettingsDialog({ open, onOpenChange }: TDialogProps) {</h2>)}<Button- variant="ghost"+ variant="quiet"size="icon"onClick={() => onOpenChange(false)}aria-label={localize('com_ui_close_settings')}- className="text-text-secondary hover:bg-surface-hover hover:text-text-primary focus:ring-border-xheavy h-auto w-auto rounded-lg p-1 transition-colors focus:ring-2"+ className="focus:ring-border-xheavy h-auto w-auto p-1 focus:ring-2"><X className="h-5 w-5" aria-hidden="true" /></Button>diff --git a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsxindex be59d3edf9..5f85eecfc4 100644--- a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx@@ -222,7 +222,6 @@ const BackupCodesItem: React.FC = () => {onChange={setOtpToken}maxLength={6}pattern={REGEXP_ONLY_DIGITS}- className="gap-2"><><InputOTPGroup>diff --git a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsxindex d6f7497c69..905d11515e 100644--- a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx@@ -113,7 +113,6 @@ const DeleteAccount = ({ disabled = false }: { title?: string; disabled?: booleaonChange={setOtpToken}maxLength={6}pattern={REGEXP_ONLY_DIGITS}- className="gap-2"><><InputOTPGroup>diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsxindex 8d4fd77f4d..30f6276882 100644--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx@@ -242,10 +242,7 @@ const TwoFactorAuthentication: React.FC = () => {</OGDialogTitle>{phase !== 'disable' && (<div className="mt-4 space-y-3">- <Progress- value={(currentStep / (steps.length - 1)) * 100}- className="h-2 rounded-full"- />+ <Progress value={(currentStep / (steps.length - 1)) * 100} className="h-2" /><div className="text-text-primary flex justify-between text-sm">{steps.map((step, index) => (<motion.spandiff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/BackupPhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/BackupPhase.tsxindex 7d5ed7225c..c718fa3c55 100644--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/BackupPhase.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/BackupPhase.tsx@@ -54,7 +54,7 @@ export const BackupPhase: React.FC<BackupPhaseProps> = ({<Buttonvariant="outline"onClick={onDownload}- className="flex-1 gap-2"+ className="flex-1"aria-label={localize('com_ui_download_backup')}><Download className="h-4 w-4" aria-hidden="true" />diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsxindex ae0372bda6..bd36029ff7 100644--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx@@ -43,7 +43,6 @@ export const DisablePhase: React.FC<DisablePhaseProps> = ({ onDisable, isDisablionChange={setToken}maxLength={6}pattern={REGEXP_ONLY_DIGITS}- className="gap-2"><><InputOTPGroup>@@ -65,7 +64,7 @@ export const DisablePhase: React.FC<DisablePhaseProps> = ({ onDisable, isDisablivariant="destructive"onClick={() => onDisable(token, useBackup)}disabled={isDisabling || !(useBackup ? isBackupCode(token) : token.length === 6)}- className="w-full rounded-xl px-6 py-3 transition-all disabled:opacity-50"+ className="w-full rounded-xl px-6 py-3 transition-all">{isDisabling && <Spinner className="mr-2" />}{isDisabling ? localize('com_ui_disabling') : localize('com_ui_2fa_disable')}diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/VerifyPhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/VerifyPhase.tsxindex 071522c506..be912fd739 100644--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/VerifyPhase.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/VerifyPhase.tsx@@ -42,7 +42,6 @@ export const VerifyPhase: React.FC<VerifyPhaseProps> = ({onChange={onTokenChange}maxLength={6}pattern={REGEXP_ONLY_DIGITS}- className="gap-2"><InputOTPGroup>{Array.from({ length: 3 }).map((_, i) => (diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsxindex 70c684036e..7777e8f92c 100644--- a/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx@@ -42,7 +42,7 @@ export default function ApiKeys() {ref={contentRef}tabIndex={-1}onOpenAutoFocus={handleOpenAutoFocus}- className="bg-surface-dialog text-text-primary w-11/12 max-w-2xl shadow-2xl"+ className="text-text-primary w-11/12 max-w-2xl shadow-2xl"aria-describedby={undefined}><OGDialogHeader className="space-y-0 pr-8 text-left">diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/List.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/List.tsxindex 28e6327b0a..55119cd75f 100644--- a/client/src/components/Nav/SettingsTabs/ApiKeys/List.tsx+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/List.tsx@@ -17,17 +17,17 @@ export default function List({ onCreate, headingId }: ListProps) {return (<divdata-testid="api-keys-loading"- className="flex items-center justify-center rounded-xl border border-border-light py-12"+ className="border-border-light flex items-center justify-center rounded-xl border py-12">- <Spinner className="h-6 w-6 text-text-secondary" />+ <Spinner tone="secondary" className="h-6 w-6" /></div>);}if (isError && data == null) {return (- <div className="flex flex-col items-center gap-3 rounded-xl border border-border-light px-6 py-10 text-center">- <p className="text-sm text-text-secondary">{localize('com_ui_api_keys_load_error')}</p>+ <div className="border-border-light flex flex-col items-center gap-3 rounded-xl border px-6 py-10 text-center">+ <p className="text-text-secondary text-sm">{localize('com_ui_api_keys_load_error')}</p><Button variant="outline" size="sm" onClick={() => refetch()} disabled={isFetching}>{localize('com_ui_retry')}</Button>@@ -39,15 +39,15 @@ export default function List({ onCreate, headingId }: ListProps) {if (keys.length === 0) {return (- <div className="flex flex-col items-center gap-3 rounded-xl border border-border-light px-6 py-12 text-center">- <span className="flex h-12 w-12 items-center justify-center rounded-full bg-surface-secondary text-text-secondary">+ <div className="border-border-light flex flex-col items-center gap-3 rounded-xl border px-6 py-12 text-center">+ <span className="bg-surface-secondary text-text-secondary flex h-12 w-12 items-center justify-center rounded-full"><KeyRound className="h-5 w-5" aria-hidden="true" /></span><div className="space-y-1">- <h3 className="text-sm font-medium text-text-primary">+ <h3 className="text-text-primary text-sm font-medium">{localize('com_ui_api_keys_empty_title')}</h3>- <p className="mx-auto max-w-xs text-sm text-text-secondary">+ <p className="text-text-secondary mx-auto max-w-xs text-sm">{localize('com_ui_api_keys_empty_text')}</p></div>@@ -61,7 +61,7 @@ export default function List({ onCreate, headingId }: ListProps) {return (<ul- className="divide-y divide-border-light overflow-hidden rounded-xl border border-border-light"+ className="divide-border-light border-border-light divide-y overflow-hidden rounded-xl border"aria-labelledby={headingId}aria-label={headingId == null ? localize('com_ui_agent_api_keys') : undefined}>diff --git a/client/src/components/Nav/SettingsTabs/Integrations/LangfuseConnection.tsx b/client/src/components/Nav/SettingsTabs/Integrations/LangfuseConnection.tsxindex c0169e3875..d98c00ac5c 100644--- a/client/src/components/Nav/SettingsTabs/Integrations/LangfuseConnection.tsx+++ b/client/src/components/Nav/SettingsTabs/Integrations/LangfuseConnection.tsx@@ -370,7 +370,7 @@ export default function LangfuseConnection() {data-testid="langfuse-connection-loading"className="border-border-light flex items-center justify-center rounded-xl border py-12">- <Spinner className="text-text-secondary h-6 w-6" />+ <Spinner tone="secondary" className="h-6 w-6" /><span className="sr-only">{localize('com_ui_loading')}</span></div>);diff --git a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsxindex 37d25c50cd..f61eff9799 100644--- a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx+++ b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx@@ -42,7 +42,7 @@ export default function ProviderKeys() {ref={contentRef}tabIndex={-1}onOpenAutoFocus={handleOpenAutoFocus}- className="bg-surface-dialog text-text-primary focus-visible:ring-text-primary w-11/12 max-w-2xl shadow-2xl focus-visible:ring-2 focus-visible:ring-inset"+ className="text-text-primary focus-visible:ring-text-primary w-11/12 max-w-2xl shadow-2xl focus-visible:ring-2 focus-visible:ring-inset"aria-describedby={undefined}><OGDialogHeader className="space-y-0 pr-8 text-left">diff --git a/client/src/components/Prompts/buttons/AutoSendPrompt.tsx b/client/src/components/Prompts/buttons/AutoSendPrompt.tsxindex dcd3b1f519..e4f0bfe1e3 100644--- a/client/src/components/Prompts/buttons/AutoSendPrompt.tsx+++ b/client/src/components/Prompts/buttons/AutoSendPrompt.tsx@@ -1,6 +1,7 @@import { useRecoilState } from 'recoil';import { Button, CheckboxGlyph } from '@librechat/client';import { useLocalize } from '~/hooks';+import { cn } from '~/utils';import store from '~/store';export default function AutoSendPrompt({@@ -25,7 +26,10 @@ export default function AutoSendPrompt({onClick={() => handleCheckedChange(!autoSendPrompts)}aria-label={localize('com_nav_auto_send_prompts')}aria-pressed={autoSendPrompts}- className={`border-border-light relative h-9 w-full gap-2 rounded-lg font-medium ${autoSendPrompts ? 'bg-surface-hover hover:bg-surface-hover' : ''}`}+ className={cn(+ 'relative h-9 w-full font-medium',+ autoSendPrompts && 'bg-surface-hover hover:bg-surface-hover',+ )}>{/* The button owns the state through `aria-pressed`; this is the mark, not asecond control inside it. */}diff --git a/client/src/components/Prompts/dialogs/VariableDialog.tsx b/client/src/components/Prompts/dialogs/VariableDialog.tsxindex 9151d6dc15..c8eb979bcd 100644--- a/client/src/components/Prompts/dialogs/VariableDialog.tsx+++ b/client/src/components/Prompts/dialogs/VariableDialog.tsx@@ -31,7 +31,7 @@ const VariableDialog: React.FC<VariableDialogProps> = ({ open, onClose, group })return (<OGDialog open={open} onOpenChange={handleOpenChange}>- <OGDialogContent className="max-h-[90vh] max-w-full overflow-y-auto bg-surface-dialog text-text-primary md:max-w-[60vw]">+ <OGDialogContent className="text-text-primary max-h-[90vh] max-w-full overflow-y-auto md:max-w-[60vw]"><OGDialogTitle>{group.name}</OGDialogTitle><VariableForm group={group} onClose={onClose} /></OGDialogContent>diff --git a/client/src/components/Prompts/display/PromptActions.tsx b/client/src/components/Prompts/display/PromptActions.tsxindex 7c04b54999..5e8acc3a04 100644--- a/client/src/components/Prompts/display/PromptActions.tsx+++ b/client/src/components/Prompts/display/PromptActions.tsx@@ -50,7 +50,7 @@ const PromptActions = ({ group, mainText, onUsePrompt }: PromptActionsProps) =><Buttonvariant="submit"onClick={handleUsePrompt}- className="flex-1 gap-2 sm:min-w-40 sm:flex-none"+ className="flex-1 sm:min-w-40 sm:flex-none"aria-label={localize('com_ui_use_prompt')}><Send className="h-4 w-4" aria-hidden="true" />diff --git a/client/src/components/Prompts/display/PromptTextCard.tsx b/client/src/components/Prompts/display/PromptTextCard.tsxindex 41bf4d23c9..bd40bcb26b 100644--- a/client/src/components/Prompts/display/PromptTextCard.tsx+++ b/client/src/components/Prompts/display/PromptTextCard.tsx@@ -67,7 +67,9 @@ const PromptTextCard = ({ mainText }: PromptTextCardProps) => {}aria-live="polite">- <MorphIcon icon={isCopied ? Check : Copy} className="text-text-secondary size-4" />+ <span className="text-text-secondary flex">+ <MorphIcon icon={isCopied ? Check : Copy} className="size-4" />+ </span></Button>}/>diff --git a/client/src/components/Prompts/display/PromptVariables.tsx b/client/src/components/Prompts/display/PromptVariables.tsxindex cb857258e9..b9f262e0ce 100644--- a/client/src/components/Prompts/display/PromptVariables.tsx+++ b/client/src/components/Prompts/display/PromptVariables.tsx@@ -49,7 +49,7 @@ const DropdownVariableCard = ({ parsed }: { parsed: ParsedVariable }) => {<ChevronRight className="text-text-secondary size-3.5" aria-hidden="true" /></div><span className="text-text-primary text-sm font-medium">{parsed.name}</span>- <span className="bg-surface-tertiary text-text-secondary rounded-full px-1.5 py-0.5 text-[10px] font-medium">+ <span className="bg-surface-tertiary text-text-secondary text-3xs rounded-full px-1.5 py-0.5 font-medium">{parsed.options.length} {localize('com_ui_options')}</span></div>@@ -91,7 +91,7 @@ const SpecialVariableChip = ({ parsed }: { parsed: ParsedVariable }) => {</div><div className="min-w-0 flex-1"><span className="text-text-primary text-xs font-medium">{displayLabel}</span>- {description && <p className="text-text-secondary mt-0.5 text-[11px]">{description}</p>}+ {description && <p className="text-text-secondary text-2xs mt-0.5">{description}</p>}</div></div>);@@ -165,7 +165,7 @@ const PromptVariables = ({>{specialVars.length > 0 && (<section aria-label={localize('com_ui_special_variables')}>- <h5 className="text-text-secondary mb-2 text-[11px] font-medium tracking-wide uppercase">+ <h5 className="text-text-secondary text-2xs mb-2 font-medium tracking-wide uppercase">{localize('com_ui_special_variables')}</h5><div className="grid gap-2 sm:grid-cols-2">@@ -178,7 +178,7 @@ const PromptVariables = ({{dropdownVariables.length > 0 && (<section aria-label={localize('com_ui_dropdown_variables')}>- <h5 className="text-text-secondary mb-2 text-[11px] font-medium tracking-wide uppercase">+ <h5 className="text-text-secondary text-2xs mb-2 font-medium tracking-wide uppercase">{localize('com_ui_dropdown_variables')}</h5><div className="flex flex-col gap-2">@@ -191,7 +191,7 @@ const PromptVariables = ({{simpleVariables.length > 0 && (<section aria-label={localize('com_ui_text_variables')}>- <h5 className="text-text-secondary mb-2 text-[11px] font-medium tracking-wide uppercase">+ <h5 className="text-text-secondary text-2xs mb-2 font-medium tracking-wide uppercase">{localize('com_ui_text_variables')}</h5><div className="flex flex-wrap gap-2">diff --git a/client/src/components/Prompts/editor/VariablesDropdown.tsx b/client/src/components/Prompts/editor/VariablesDropdown.tsxindex 4fc1cd9b39..a84f8e91eb 100644--- a/client/src/components/Prompts/editor/VariablesDropdown.tsx+++ b/client/src/components/Prompts/editor/VariablesDropdown.tsx@@ -127,7 +127,7 @@ export default function VariablesDropdown({{localize('com_ui_special_variables')}</span>{usedCount > 0 && (- <span className="bg-surface-tertiary text-text-secondary flex size-4 items-center justify-center rounded-full text-[10px] font-medium">+ <span className="bg-surface-tertiary text-text-secondary text-3xs flex size-4 items-center justify-center rounded-full font-medium">{usedCount}</span>)}diff --git a/client/src/components/Prompts/fields/PromptName.tsx b/client/src/components/Prompts/fields/PromptName.tsxindex 310e4b953b..8a4d809f6c 100644--- a/client/src/components/Prompts/fields/PromptName.tsx+++ b/client/src/components/Prompts/fields/PromptName.tsx@@ -131,7 +131,7 @@ const PromptName: React.FC<Props> = ({ name, isLoading = false, isError = false,onKeyDown={handleKeyDown}onBlur={saveName}disabled={isLoading}- className="text-text-primary focus:border-border-medium h-8 min-w-0 flex-1 rounded-md border border-transparent bg-transparent pr-0 pl-2 text-base font-semibold disabled:opacity-60"+ className="text-text-primary focus:border-border-medium h-8 min-w-0 flex-1 rounded-md border-transparent pr-0 pl-2 text-base font-semibold disabled:opacity-60"aria-label={localize('com_ui_name')}/>) : (diff --git a/client/src/components/Prompts/forms/CreatePromptForm.tsx b/client/src/components/Prompts/forms/CreatePromptForm.tsxindex 663c816907..954244868c 100644--- a/client/src/components/Prompts/forms/CreatePromptForm.tsx+++ b/client/src/components/Prompts/forms/CreatePromptForm.tsx@@ -141,7 +141,7 @@ const CreatePromptForm = ({{...field}id="prompt-name"type="text"- className="peer border-border-medium text-text-primary mr-2 w-full border p-2 text-2xl"+ className="peer border-border-medium text-text-primary mr-2 w-full p-2 text-2xl"placeholder=" "tabIndex={0}aria-label={localize('com_ui_prompt_name')}diff --git a/client/src/components/Prompts/lists/ListCard.tsx b/client/src/components/Prompts/lists/ListCard.tsxindex 9dbc05f2c8..3b186e3c98 100644--- a/client/src/components/Prompts/lists/ListCard.tsx+++ b/client/src/components/Prompts/lists/ListCard.tsx@@ -28,7 +28,7 @@ export default function ListCard({: localize('com_ui_prompt_group_button_no_category', { name });return (- <div className="relative flex w-full cursor-pointer flex-col gap-2 rounded-xl px-3 pt-3 pb-4 text-start align-top text-[15px]">+ <div className="text-1sm relative flex w-full cursor-pointer flex-col gap-2 rounded-xl px-3 pt-3 pb-4 text-start align-top">{onClick && (<buttontype="button"diff --git a/client/src/components/Prompts/sidebar/GroupSidePanel.tsx b/client/src/components/Prompts/sidebar/GroupSidePanel.tsxindex f8261555ef..93dc66e54f 100644--- a/client/src/components/Prompts/sidebar/GroupSidePanel.tsx+++ b/client/src/components/Prompts/sidebar/GroupSidePanel.tsx@@ -73,7 +73,7 @@ export default function GroupSidePanel({data-testid="close-prompts-panel-button"aria-label={localize('com_nav_close_sidebar')}aria-expanded={true}- className="hover:bg-surface-hover rounded-full border-none bg-transparent p-2 md:rounded-xl"+ className="rounded-full border-none p-2 md:rounded-xl"onClick={onClose}><Sidebar />diff --git a/client/src/components/Prompts/utils/SkeletonForm.tsx b/client/src/components/Prompts/utils/SkeletonForm.tsxindex f781770c5d..3a430a0978 100644--- a/client/src/components/Prompts/utils/SkeletonForm.tsx+++ b/client/src/components/Prompts/utils/SkeletonForm.tsx@@ -4,7 +4,7 @@ export default function SkeletonForm() {return (<div><div className="text-text-primary flex flex-col items-center justify-between px-4 sm:flex-row">- <Skeleton className="mb-1 flex h-10 w-32 flex-row items-center font-bold sm:text-xl md:mb-0 md:h-12 md:text-2xl" />+ <Skeleton className="mb-1 flex h-10 w-32 flex-row items-center md:mb-0 md:h-12" /></div><div className="flex h-full w-full flex-col md:flex-row">{/* Left Section */}diff --git a/client/src/components/Skills/buttons/SkillToggle.tsx b/client/src/components/Skills/buttons/SkillToggle.tsxindex 839928653b..6bc1595837 100644--- a/client/src/components/Skills/buttons/SkillToggle.tsx+++ b/client/src/components/Skills/buttons/SkillToggle.tsx@@ -24,7 +24,7 @@ function SkillToggle({ enabled, onChange }: SkillToggleProps) {render={<spanonClick={(e) => e.stopPropagation()}- className="inline-flex h-9 items-center gap-2 rounded-md px-2 transition-colors hover:bg-surface-hover"+ className="hover:bg-surface-hover inline-flex h-9 items-center gap-2 rounded-md px-2 transition-colors"><Switchid={switchId}@@ -35,7 +35,8 @@ function SkillToggle({ enabled, onChange }: SkillToggleProps) {<Labelid={labelId}htmlFor={switchId}- className="cursor-pointer select-none whitespace-nowrap text-xs font-medium text-text-secondary"+ variant="secondary"+ className="cursor-pointer text-xs font-medium whitespace-nowrap select-none">{localize('com_ui_skill_available')}</Label>diff --git a/client/src/components/Skills/dialogs/CreateSkillDialog.tsx b/client/src/components/Skills/dialogs/CreateSkillDialog.tsxindex 70bba60898..5e19cac454 100644--- a/client/src/components/Skills/dialogs/CreateSkillDialog.tsx+++ b/client/src/components/Skills/dialogs/CreateSkillDialog.tsx@@ -19,7 +19,6 @@ import type { TSkill } from 'librechat-data-provider';import type { FormEvent } from 'react';import { useCreateSkillMutation } from '~/data-provider';import { useLocalize } from '~/hooks';-import { cn } from '~/utils';interface CreateSkillDialogProps {isOpen: boolean;@@ -171,7 +170,7 @@ export default function CreateSkillDialog({{/* Skill name */}<div className="flex flex-col gap-1.5">- <Label htmlFor="create-skill-name" className="text-text-secondary text-sm font-medium">+ <Label htmlFor="create-skill-name" variant="secondary" className="text-sm font-medium">{localize('com_ui_name')}</Label><Input@@ -179,7 +178,7 @@ export default function CreateSkillDialog({placeholder={localize('com_ui_skill_name_placeholder')}aria-invalid={errors.name ? 'true' : 'false'}autoComplete="off"- className="border-border-medium text-text-primary placeholder:text-text-secondary focus-visible:ring-ring-primary flex h-10 w-full rounded-xl border bg-transparent px-3 py-2 text-sm focus-visible:ring-2 disabled:cursor-not-allowed disabled:opacity-50"+ className="border-border-medium text-text-primary focus-visible:ring-ring-primary flex h-10 w-full rounded-xl"{...register('name', {required: localize('com_ui_skill_name_required'),pattern: {@@ -263,7 +262,6 @@ export default function CreateSkillDialog({variant="submit"disabled={submitDisabled}aria-busy={createSkill.isLoading}- className={cn(submitDisabled && 'opacity-50')}>{localize(createSkill.isLoading ? 'com_ui_creating' : 'com_ui_create')}</Button>diff --git a/client/src/components/Skills/display/SkillFileViewer.tsx b/client/src/components/Skills/display/SkillFileViewer.tsxindex 904299eb88..36147e5ab7 100644--- a/client/src/components/Skills/display/SkillFileViewer.tsx+++ b/client/src/components/Skills/display/SkillFileViewer.tsx@@ -153,7 +153,7 @@ function SkillFileViewer({ skillId, relativePath, skill }: SkillFileViewerProps)<>{isLoading && (<div className="flex items-center justify-center py-12">- <Spinner className="text-text-secondary size-6" />+ <Spinner tone="secondary" className="size-6" /></div>)}diff --git a/client/src/components/Skills/display/SkillState.tsx b/client/src/components/Skills/display/SkillState.tsxindex 20750e3bc8..78203253c5 100644--- a/client/src/components/Skills/display/SkillState.tsx+++ b/client/src/components/Skills/display/SkillState.tsx@@ -47,7 +47,7 @@ export default function SkillState({<div className={cn('mb-4 flex size-12 items-center justify-center rounded-xl', style.wrap)}><Icon className={cn('size-6', style.icon)} aria-hidden="true" /></div>- <p className="text-text-primary text-[15px] font-semibold">{title}</p>+ <p className="text-text-primary text-1sm font-semibold">{title}</p><p className="text-text-secondary mt-1.5 text-sm leading-relaxed">{description}</p>{actionLabel && onAction && (<Buttondiff --git a/client/src/components/Skills/forms/CreateSkillForm.tsx b/client/src/components/Skills/forms/CreateSkillForm.tsxindex 10ec3f2912..a2112e9a67 100644--- a/client/src/components/Skills/forms/CreateSkillForm.tsx+++ b/client/src/components/Skills/forms/CreateSkillForm.tsx@@ -169,7 +169,7 @@ export default function CreateSkillForm({{...field}id="skill-name"type="text"- className="peer border-border-medium text-text-primary mr-2 w-full border p-2 text-2xl"+ className="peer border-border-medium text-text-primary mr-2 w-full p-2 text-2xl"placeholder=" "tabIndex={0}aria-label={localize('com_ui_name')}@@ -219,7 +219,8 @@ export default function CreateSkillForm({<div className="flex flex-col"><LabelhtmlFor="skill-description"- className="text-text-secondary mb-1 text-sm font-medium"+ variant="secondary"+ className="mb-1 text-sm font-medium">{localize('com_ui_description')}<span className="text-text-destructive ml-0.5">*</span>@@ -277,7 +278,7 @@ export default function CreateSkillForm({type="submit"disabled={createDisabled}aria-disabled={createDisabled || undefined}- className={cn('w-full sm:w-auto', createDisabled && 'opacity-50')}+ className="w-full sm:w-auto">{localize('com_ui_skill_create_title')}</Button>diff --git a/client/src/components/Skills/forms/SkillContentEditor.tsx b/client/src/components/Skills/forms/SkillContentEditor.tsxindex ca6b6f6642..4c7f6cec62 100644--- a/client/src/components/Skills/forms/SkillContentEditor.tsx+++ b/client/src/components/Skills/forms/SkillContentEditor.tsx@@ -75,10 +75,9 @@ const SkillContentEditor: React.FC<SkillContentEditorProps> = ({aria-label={isEditing ? localize('com_ui_save') : localize('com_ui_edit')}className="hover:bg-surface-tertiary size-8 p-0">- <MorphIcon- icon={isEditing ? Check : SquarePen}- className="text-text-secondary size-4"- />+ <span className="text-text-secondary flex">+ <MorphIcon icon={isEditing ? Check : SquarePen} className="size-4" />+ </span></Button>}/>@@ -134,8 +133,8 @@ const SkillContentEditor: React.FC<SkillContentEditorProps> = ({</ReactMarkdown>)}<div className="pointer-events-none sticky bottom-1/2 z-10 flex translate-y-1/2 items-center justify-center opacity-0 transition-all duration-200 group-hover/preview:opacity-100">- <div className="border-border-light bg-surface-primary flex items-center gap-2 rounded-lg border px-3 py-1.5 shadow-md">- <MorphIcon icon={SquarePen} className="text-text-secondary size-4" />+ <div className="border-border-light bg-surface-primary text-text-secondary flex items-center gap-2 rounded-lg border px-3 py-1.5 shadow-md">+ <MorphIcon icon={SquarePen} className="size-4" /><span className="text-text-primary text-sm font-medium">{localize('com_ui_click_to_edit')}</span>diff --git a/client/src/components/Skills/forms/SkillForm.tsx b/client/src/components/Skills/forms/SkillForm.tsxindex 4c98af5ecd..26648e40de 100644--- a/client/src/components/Skills/forms/SkillForm.tsx+++ b/client/src/components/Skills/forms/SkillForm.tsx@@ -196,7 +196,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {id="skill-name"type="text"readOnly={readOnly}- className="peer border-border-medium text-text-primary mr-2 w-full border p-2 text-2xl"+ className="peer border-border-medium text-text-primary mr-2 w-full p-2 text-2xl"placeholder=" "tabIndex={0}aria-label={localize('com_ui_name')}@@ -287,7 +287,8 @@ export default function SkillForm({ skillId }: SkillFormProps) {<div className="flex flex-col"><LabelhtmlFor="skill-description"- className="text-text-secondary mb-1 text-sm font-medium"+ variant="secondary"+ className="mb-1 text-sm font-medium">{localize('com_ui_description')}<span className="text-text-destructive ml-0.5">*</span>@@ -333,7 +334,6 @@ export default function SkillForm({ skillId }: SkillFormProps) {variant="outline"onClick={() => reset(values)}disabled={!isDirty}- className={cn(!isDirty && 'opacity-50')}>{localize('com_ui_reset')}</Button>@@ -341,7 +341,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {type="submit"disabled={saveDisabled}aria-disabled={saveDisabled || undefined}- className={cn('w-full sm:w-auto', saveDisabled && 'opacity-50')}+ className="w-full sm:w-auto">{localize('com_ui_save')}</Button>diff --git a/client/src/components/Skills/layouts/SkillsView.tsx b/client/src/components/Skills/layouts/SkillsView.tsxindex bbbccdaf89..33aae009b3 100644--- a/client/src/components/Skills/layouts/SkillsView.tsx+++ b/client/src/components/Skills/layouts/SkillsView.tsx@@ -40,7 +40,7 @@ export default function SkillsView() {if (!rolesLoaded) {return (<div className="bg-surface-primary-alt flex h-full w-full items-center justify-center">- <Spinner className="text-text-secondary" aria-label={localize('com_ui_loading')} />+ <Spinner tone="secondary" aria-label={localize('com_ui_loading')} /></div>);}@@ -110,7 +110,7 @@ function DetailView({ skillId }: { skillId: string }) {if (skillQuery.isLoading) {return (<div className="bg-surface-primary-alt flex h-full w-full items-center justify-center">- <Spinner className="text-text-secondary" aria-label={localize('com_ui_loading')} />+ <Spinner tone="secondary" aria-label={localize('com_ui_loading')} /></div>);}diff --git a/client/src/components/Skills/tree/SkillFileEditor.tsx b/client/src/components/Skills/tree/SkillFileEditor.tsxindex bef1a68864..07b0ac9238 100644--- a/client/src/components/Skills/tree/SkillFileEditor.tsx+++ b/client/src/components/Skills/tree/SkillFileEditor.tsx@@ -90,11 +90,11 @@ export default function SkillFileEditor({ skillId, nodeId, fileName }: SkillFile<Buttontype="button"variant={isDirty ? 'submit' : 'outline'}- size="sm"+ size="compact"disabled={!isDirty || updateContent.isLoading}onClick={handleSave}aria-label={localize('com_ui_save')}- className="h-7 gap-1.5 px-2.5 text-xs"+ className="h-7"><Save className="size-3" />{localize('com_ui_save')}@@ -106,20 +106,21 @@ export default function SkillFileEditor({ skillId, nodeId, fileName }: SkillFilevalue={displayContent}onChange={handleChange}spellCheck={false}+ variant="transparent"className={cn(- 'text-text-primary size-full resize-none rounded-none border-0 bg-transparent px-4 py-3 font-mono text-[13px] leading-6',- 'focus-visible:ring-ring-primary focus:ring-0 focus:ring-offset-0 focus-visible:ring-2 focus-visible:ring-inset',+ 'text-text-primary size-full resize-none rounded-none border-0 px-4 py-3 font-mono text-[13px] leading-6',+ 'focus-visible:ring-ring-primary focus:ring-0 focus:ring-offset-0 focus-visible:ring-inset',)}aria-label={`${localize('com_ui_edit')} ${fileName}`}/></div><div className="border-border-light flex items-center justify-between border-t px-4 py-1">- <span className="text-text-secondary text-[11px]">+ <span className="text-text-secondary text-2xs">{lineCount === 1? localize('com_ui_line_count', { 0: String(lineCount) }): localize('com_ui_lines_count', { 0: String(lineCount) })}</span>- <span className="text-text-secondary text-[11px]">+ <span className="text-text-secondary text-2xs">{isDirty ? localize('com_ui_file_modified') : localize('com_ui_saved')}</span></div>diff --git a/client/src/components/Skills/tree/SkillFilePreview.tsx b/client/src/components/Skills/tree/SkillFilePreview.tsxindex 5ed82b95c6..ab6e05b9e8 100644--- a/client/src/components/Skills/tree/SkillFilePreview.tsx+++ b/client/src/components/Skills/tree/SkillFilePreview.tsx@@ -37,19 +37,13 @@ export default function SkillFilePreview({ skillId, nodeId, fileName }: SkillFil)}<span className="text-text-primary truncate text-sm font-medium">{fileName}</span>{ext && (- <span className="bg-surface-tertiary text-text-tertiary rounded px-1.5 py-0.5 text-[11px] font-medium tracking-wide uppercase">+ <span className="bg-surface-tertiary text-text-tertiary text-2xs rounded px-1.5 py-0.5 font-medium tracking-wide uppercase">{ext}</span>)}</div>{downloadUrl && (- <Button- type="button"- variant="outline"- size="sm"- className="h-7 gap-1.5 px-2.5 text-xs"- asChild- >+ <Button type="button" variant="outline" size="compact" className="h-7" asChild><ahref={downloadUrl}download={fileName}diff --git a/e2e/specs/mock/scenarios/header-action-buttons.spec.ts b/e2e/specs/mock/scenarios/header-action-buttons.spec.tsnew file mode 100644index 0000000000..dc16d0e883--- /dev/null+++ b/e2e/specs/mock/scenarios/header-action-buttons.spec.ts@@ -0,0 +1,32 @@+import { expect, test } from '@playwright/test';+import { NEW_CHAT_PATH, mockReply, sendMessage } from '../helpers';++/**+ * The conversation menu trigger in the phone-width chat header uses the `header-action` Button variant, so it+ * reads as the same persistent control as the sidebar toggle beside it: a 12px corner, a 1px+ * chrome edge.+ */++test('@scenario:default-theme-chat-header-unchanged header menu trigger keeps its shape in both modes', async ({+ page,+}) => {+ test.setTimeout(90000);+ await page.setViewportSize({ width: 390, height: 800 });+ await page.goto(NEW_CHAT_PATH, { timeout: 15000 });+ await sendMessage(page, 'header action buttons');+ await expect(mockReply(page)).toBeVisible({ timeout: 30000 });+ for (const mode of ['light', 'dark']) {+ await page.evaluate((appearance) => localStorage.setItem('color-theme', appearance), mode);+ await page.reload();+ const trigger = page.getByTestId('header-overflow-menu');+ await expect(trigger).toBeVisible({ timeout: 30000 });+ const style = await trigger.evaluate((node) => {+ const computed = getComputedStyle(node);+ return {+ radius: computed.borderTopLeftRadius,+ width: computed.borderTopWidth,+ };+ });+ expect(style).toEqual({ radius: '12px', width: '1px' });+ }+});diff --git a/eslint-suppressions.json b/eslint-suppressions.jsonindex 7cb967a91d..8e74221da6 100644--- a/eslint-suppressions.json+++ b/eslint-suppressions.json@@ -219,49 +219,19 @@"count": 2}},- "client/src/components/Chat/Menus/Endpoints/components/EndpointModelItem.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },- "client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx": {- "shadcn/no-inline-styles": {- "count": 2- }- },- "client/src/components/Chat/Menus/Endpoints/components/ModelSpecItem.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },- "client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx": {- "shadcn/no-inline-styles": {- "count": 1- }- },- "client/src/components/Chat/Menus/HeaderMenu.tsx": {- "shadcn/no-restyle": {- "count": 3- }- },- "client/src/components/Chat/Menus/NewChat.tsx": {- "shadcn/no-restyle": {- "count": 3- }- },"client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx": {"shadcn/no-restyle": {- "count": 6+ "count": 3}},"client/src/components/Chat/Menus/Presets/PresetItems.tsx": {"shadcn/no-restyle": {- "count": 44+ "count": 21}},"client/src/components/Chat/Menus/PresetsMenu.tsx": {"shadcn/no-restyle": {- "count": 4+ "count": 2}},"client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx": {@@ -676,7 +646,7 @@},"client/src/components/Endpoints/SaveAsPresetDialog.tsx": {"shadcn/no-restyle": {- "count": 4+ "count": 2}},"client/src/components/Endpoints/Settings/Advanced.tsx": {@@ -697,7 +667,7 @@},"client/src/components/Endpoints/Settings/Examples.tsx": {"shadcn/no-restyle": {- "count": 24+ "count": 20}},"client/src/components/Endpoints/URLIcon.tsx": {@@ -826,11 +796,6 @@"count": 3}},- "client/src/components/Nav/ExportConversation/ExportModal.tsx": {- "shadcn/no-restyle": {- "count": 3- }- },"client/src/components/Nav/KeyboardShortcutsDialog.tsx": {"shadcn/no-arbitrary-values": {"count": 4@@ -846,7 +811,7 @@},"client/src/components/Nav/Settings/Dialog.tsx": {"shadcn/no-restyle": {- "count": 8+ "count": 3}},"client/src/components/Nav/SettingsTabs/Account/Avatar.tsx": {@@ -854,29 +819,19 @@"count": 3}},- "client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },"client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx": {"shadcn/no-restyle": {- "count": 14+ "count": 13}},"client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx": {- "shadcn/no-restyle": {- "count": 2- }- },- "client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/BackupPhase.tsx": {"shadcn/no-restyle": {"count": 1}},"client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx": {"shadcn/no-restyle": {- "count": 6+ "count": 4}},"client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx": {@@ -884,11 +839,6 @@"count": 3}},- "client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/VerifyPhase.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },"client/src/components/Nav/SettingsTabs/ApiKeys/Admin.tsx": {"shadcn/no-restyle": {"count": 2@@ -896,12 +846,12 @@},"client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx": {"shadcn/no-restyle": {- "count": 4+ "count": 3}},"client/src/components/Nav/SettingsTabs/ApiKeys/List.tsx": {"shadcn/no-restyle": {- "count": 2+ "count": 1}},"client/src/components/Nav/SettingsTabs/ApiKeys/Reveal.tsx": {@@ -932,14 +882,9 @@"count": 1}},- "client/src/components/Nav/SettingsTabs/Integrations/LangfuseConnection.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },"client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx": {"shadcn/no-restyle": {- "count": 6+ "count": 5}},"client/src/components/Nav/SettingsTabs/Speech/STT/AutoSendTextSelector.tsx": {@@ -1003,7 +948,7 @@},"client/src/components/Prompts/buttons/AutoSendPrompt.tsx": {"shadcn/no-restyle": {- "count": 6+ "count": 3}},"client/src/components/Prompts/dialogs/SharePrompt.tsx": {@@ -1012,23 +957,13 @@}},"client/src/components/Prompts/dialogs/VariableDialog.tsx": {- "shadcn/no-restyle": {- "count": 2- }- },- "client/src/components/Prompts/display/PromptActions.tsx": {"shadcn/no-restyle": {"count": 1}},"client/src/components/Prompts/display/PromptTextCard.tsx": {"shadcn/no-restyle": {- "count": 2- }- },- "client/src/components/Prompts/display/PromptVariables.tsx": {- "shadcn/no-arbitrary-values": {- "count": 5+ "count": 1}},"client/src/components/Prompts/editor/PromptEditor.tsx": {@@ -1037,9 +972,6 @@}},"client/src/components/Prompts/editor/VariablesDropdown.tsx": {- "shadcn/no-arbitrary-values": {- "count": 1- },"shadcn/no-restyle": {"count": 2}@@ -1056,12 +988,12 @@},"client/src/components/Prompts/fields/PromptName.tsx": {"shadcn/no-restyle": {- "count": 11+ "count": 9}},"client/src/components/Prompts/forms/CreatePromptForm.tsx": {"shadcn/no-restyle": {- "count": 16+ "count": 15}},"client/src/components/Prompts/forms/PromptForm.tsx": {@@ -1080,11 +1012,6 @@"count": 2}},- "client/src/components/Prompts/lists/ListCard.tsx": {- "shadcn/no-arbitrary-values": {- "count": 1- }- },"client/src/components/Prompts/sidebar/FilterPrompts.tsx": {"shadcn/no-restyle": {"count": 1@@ -1095,12 +1022,7 @@},"client/src/components/Prompts/sidebar/GroupSidePanel.tsx": {"shadcn/no-restyle": {- "count": 7- }- },- "client/src/components/Prompts/utils/SkeletonForm.tsx": {- "shadcn/no-restyle": {- "count": 3+ "count": 5}},"client/src/components/Share/MessagesView.tsx": {@@ -1558,14 +1480,9 @@"count": 1}},- "client/src/components/Skills/buttons/SkillToggle.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },"client/src/components/Skills/dialogs/CreateSkillDialog.tsx": {"shadcn/no-restyle": {- "count": 36+ "count": 26}},"client/src/components/Skills/display/SkillDetail.tsx": {@@ -1573,39 +1490,24 @@"count": 1}},- "client/src/components/Skills/display/SkillFileViewer.tsx": {- "shadcn/no-restyle": {- "count": 1- }- },"client/src/components/Skills/display/SkillMarkdownRenderer.tsx": {"shadcn/no-arbitrary-values": {"count": 1}},- "client/src/components/Skills/display/SkillState.tsx": {- "shadcn/no-arbitrary-values": {- "count": 1- }- },"client/src/components/Skills/forms/CreateSkillForm.tsx": {"shadcn/no-restyle": {- "count": 17+ "count": 14}},"client/src/components/Skills/forms/SkillContentEditor.tsx": {"shadcn/no-restyle": {- "count": 13+ "count": 11}},"client/src/components/Skills/forms/SkillForm.tsx": {"shadcn/no-restyle": {- "count": 18- }- },- "client/src/components/Skills/layouts/SkillsView.tsx": {- "shadcn/no-restyle": {- "count": 2+ "count": 14}},"client/src/components/Skills/lists/SkillListItem.tsx": {@@ -1615,18 +1517,18 @@},"client/src/components/Skills/tree/SkillFileEditor.tsx": {"shadcn/no-arbitrary-values": {- "count": 3+ "count": 1},"shadcn/no-restyle": {- "count": 18+ "count": 13}},"client/src/components/Skills/tree/SkillFilePreview.tsx": {"shadcn/no-arbitrary-values": {- "count": 3+ "count": 2},"shadcn/no-restyle": {- "count": 5+ "count": 2}},"client/src/components/Tools/AssistantToolsDialog.tsx": {