🙌 OpenHands: AI-Driven Development
fix(settings): layout, SDK save UX, extensions parity, secrets/MCP polish (#512)
FraterCCCLXIIIb7abb1e28bcf
diff --git a/__tests__/components/features/context-menu/context-menu-nav-link.test.tsx b/__tests__/components/features/context-menu/context-menu-nav-link.test.tsxindex 3a8976e8fe..629b19eb33 100644--- a/__tests__/components/features/context-menu/context-menu-nav-link.test.tsx+++ b/__tests__/components/features/context-menu/context-menu-nav-link.test.tsx@@ -9,6 +9,7 @@ const mockNavItem = {to: "/settings/test",icon: <span data-testid="test-icon">Icon</span>,text: I18nKey.SETTINGS$NAV_API_KEYS,+ subtitle: I18nKey.SETTINGS$PAGE_SECRETS_SUBLINE,};const renderContextMenuNavLink = (item = mockNavItem, onClick = vi.fn()) =>diff --git a/__tests__/components/features/settings/settings-nav-link.test.tsx b/__tests__/components/features/settings/settings-nav-link.test.tsxindex 97dc6146c5..95142ffbdc 100644--- a/__tests__/components/features/settings/settings-nav-link.test.tsx+++ b/__tests__/components/features/settings/settings-nav-link.test.tsx@@ -9,6 +9,7 @@ const mockNavItem = {to: "/settings/test",icon: <span data-testid="test-icon">Icon</span>,text: I18nKey.SETTINGS$NAV_API_KEYS,+ subtitle: I18nKey.SETTINGS$PAGE_LLM_SUBLINE,};const renderSettingsNavLink = (@@ -65,6 +66,7 @@ describe("SettingsNavLink", () => {to: "/settings/secrets",icon: <span>Icon</span>,text: I18nKey.SETTINGS$NAV_SECRETS,+ subtitle: I18nKey.SETTINGS$PAGE_SECRETS_SUBLINE,};// Actdiff --git a/__tests__/components/features/settings/settings-navigation.test.tsx b/__tests__/components/features/settings/settings-navigation.test.tsxindex b23b34e867..1088fb4b96 100644--- a/__tests__/components/features/settings/settings-navigation.test.tsx+++ b/__tests__/components/features/settings/settings-navigation.test.tsx@@ -1,10 +1,13 @@+import type { ReactNode } from "react";import { render, screen, within } from "@testing-library/react";import userEvent from "@testing-library/user-event";import { describe, expect, it, vi } from "vitest";import { MemoryRouter } from "react-router";+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";import { SettingsNavigation } from "#/components/features/settings/settings-navigation";import { OSS_NAV_ITEMS } from "#/constants/settings-nav";import { SettingsNavRenderedItem } from "#/hooks/use-settings-nav-items";+import { ActiveBackendProvider } from "#/contexts/active-backend-context";const baseItems: SettingsNavRenderedItem[] = [{ type: "header", text: "SETTINGS$TITLE" as never },@@ -13,16 +16,28 @@ const baseItems: SettingsNavRenderedItem[] = [{ type: "item", item: OSS_NAV_ITEMS[1] },];+function renderSettingsNavigation(ui: ReactNode) {+ return render(+ <QueryClientProvider+ client={+ new QueryClient({ defaultOptions: { queries: { retry: false } } })+ }+ >+ <ActiveBackendProvider>+ <MemoryRouter>{ui}</MemoryRouter>+ </ActiveBackendProvider>+ </QueryClientProvider>,+ );+}+describe("SettingsNavigation", () => {it("renders the provided OSS navigation items, headers, and dividers", () => {- render(- <MemoryRouter>- <SettingsNavigation- isMobileMenuOpen={false}- onCloseMobileMenu={vi.fn()}- navigationItems={baseItems}- />- </MemoryRouter>,+ renderSettingsNavigation(+ <SettingsNavigation+ isMobileMenuOpen={false}+ onCloseMobileMenu={vi.fn()}+ navigationItems={baseItems}+ />,);expect(screen.getByTestId("settings-navbar")).toBeInTheDocument();@@ -35,14 +50,12 @@ describe("SettingsNavigation", () => {it("closes the mobile drawer when the close button is clicked", async () => {const onCloseMobileMenu = vi.fn();- render(- <MemoryRouter>- <SettingsNavigation- isMobileMenuOpen- onCloseMobileMenu={onCloseMobileMenu}- navigationItems={baseItems}- />- </MemoryRouter>,+ renderSettingsNavigation(+ <SettingsNavigation+ isMobileMenuOpen+ onCloseMobileMenu={onCloseMobileMenu}+ navigationItems={baseItems}+ />,);await userEvent.click(@@ -54,14 +67,12 @@ describe("SettingsNavigation", () => {it("closes the mobile drawer after a navigation item is selected", async () => {const onCloseMobileMenu = vi.fn();- render(- <MemoryRouter>- <SettingsNavigation- isMobileMenuOpen- onCloseMobileMenu={onCloseMobileMenu}- navigationItems={baseItems}- />- </MemoryRouter>,+ renderSettingsNavigation(+ <SettingsNavigation+ isMobileMenuOpen+ onCloseMobileMenu={onCloseMobileMenu}+ navigationItems={baseItems}+ />,);const mobileNav = screen.getByTestId("settings-navbar");diff --git a/src/components/features/mcp-page/installed-server-card.tsx b/src/components/features/mcp-page/installed-server-card.tsxindex 390ab97093..941656c8a7 100644--- a/src/components/features/mcp-page/installed-server-card.tsx+++ b/src/components/features/mcp-page/installed-server-card.tsx@@ -1,5 +1,4 @@-import { FaPencil, FaTrash } from "react-icons/fa6";-import { Puzzle } from "lucide-react";+import { Puzzle, Pencil, Trash2 } from "lucide-react";import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";import { MCPServerConfig } from "#/types/mcp-server";@@ -86,33 +85,30 @@ export function InstalledServerCard({</span></div>{subtitle && (- <p- className="text-xs text-content-2 italic truncate"- title={subtitle}- >+ <p className="text-xs text-content-2 truncate" title={subtitle}>{subtitle}</p>)}</div>- <div className="flex items-center gap-3 shrink-0">+ <div className="flex shrink-0 items-center gap-0.5"><buttondata-testid="edit-mcp-server-button"type="button"onClick={onEdit}aria-label={t(I18nKey.MCP$EDIT_SERVER_ARIA, { name: title })}- className="text-content-2 hover:text-content-1 transition-colors cursor-pointer"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaPencil size={14} />+ <Pencil aria-hidden className="size-3.5" strokeWidth={2} /></button><buttondata-testid="delete-mcp-server-button"type="button"onClick={onDelete}aria-label={t(I18nKey.MCP$DELETE_SERVER_ARIA, { name: title })}- className="text-content-2 hover:text-red-500 transition-colors cursor-pointer"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaTrash size={14} />+ <Trash2 aria-hidden className="size-3.5" strokeWidth={2} /></button></div></div>diff --git a/src/components/features/onboarding/steps/setup-llm-step.tsx b/src/components/features/onboarding/steps/setup-llm-step.tsxindex fdf9c2213b..9c9e507abf 100644--- a/src/components/features/onboarding/steps/setup-llm-step.tsx+++ b/src/components/features/onboarding/steps/setup-llm-step.tsx@@ -117,7 +117,7 @@ export function SetupLlmStep({ onBack, onNext }: SetupLlmStepProps) {<divdata-testid="onboarding-llm-settings"- className="flex-1 min-h-0 flex flex-col"+ className="flex min-h-0 flex-1 flex-col overflow-y-auto custom-scrollbar-always"><LlmSettingsScreenembeddeddiff --git a/src/components/features/settings/agent-server-onboarding.tsx b/src/components/features/settings/agent-server-onboarding.tsxindex 7d2494ab7a..ea3f63280b 100644--- a/src/components/features/settings/agent-server-onboarding.tsx+++ b/src/components/features/settings/agent-server-onboarding.tsx@@ -116,7 +116,7 @@ export function AgentServerConnectionForm({<p className="text-sm font-medium uppercase tracking-[0.24em] text-primary">{t("SETTINGS$AGENT_SERVER_CONNECTION_DETAILS_TITLE")}</p>- <p className="mt-3 max-w-[680px] text-sm leading-7 text-[var(--oh-muted)]">+ <p className="mt-3 w-full min-w-0 text-sm leading-7 text-[var(--oh-muted)]">{t("SETTINGS$AGENT_SERVER_CONNECTION_DETAILS_DESCRIPTION")}</p></div>@@ -130,7 +130,7 @@ export function AgentServerConnectionForm({value={baseUrl}onChange={setBaseUrl}placeholder={t("SETTINGS$AGENT_SERVER_URL_PLACEHOLDER")}- className="w-full max-w-[680px]"+ className="w-full min-w-0"/><SettingsInput@@ -142,10 +142,10 @@ export function AgentServerConnectionForm({onChange={setSessionApiKey}placeholder={t("SETTINGS$AGENT_SERVER_API_KEY_PLACEHOLDER")}showOptionalTag- className="w-full max-w-[680px]"+ className="w-full min-w-0"/>- <p className="max-w-[680px] text-xs leading-6 text-[var(--oh-text-subtle)]">+ <p className="w-full min-w-0 text-xs leading-6 text-[var(--oh-text-subtle)]">{t("SETTINGS$AGENT_SERVER_BROWSER_ONLY_NOTE")}</p></div>diff --git a/src/components/features/settings/app-settings/language-input.tsx b/src/components/features/settings/app-settings/language-input.tsxindex 06cfb134dc..d5fcaa08d1 100644--- a/src/components/features/settings/app-settings/language-input.tsx+++ b/src/components/features/settings/app-settings/language-input.tsx@@ -28,7 +28,7 @@ export function LanguageInput({}))}defaultSelectedKey={defaultKey}isClearable={false}- wrapperClassName="w-full max-w-[680px]"+ wrapperClassName="w-full min-w-0"/>);}diff --git a/src/components/features/settings/app-settings/theme-input.tsx b/src/components/features/settings/app-settings/theme-input.tsxindex d1d5ea5833..9ecaa05752 100644--- a/src/components/features/settings/app-settings/theme-input.tsx+++ b/src/components/features/settings/app-settings/theme-input.tsx@@ -32,7 +32,7 @@ export function ThemeInput() {defaultSelectedKey={readPersistedColorTheme()}onSelectionChange={handleSelectionChange}isClearable={false}- wrapperClassName="w-full max-w-[680px]"+ wrapperClassName="w-full min-w-0"/>);}diff --git a/src/components/features/settings/input-skeleton.tsx b/src/components/features/settings/input-skeleton.tsxindex dfd5d909cf..63f9e602d9 100644--- a/src/components/features/settings/input-skeleton.tsx+++ b/src/components/features/settings/input-skeleton.tsx@@ -2,7 +2,7 @@ export function InputSkeleton() {return (<div className="flex flex-col gap-2.5"><div className="w-[70px] h-[20px] skeleton" />- <div className="w-[680px] h-[40px] skeleton" />+ <div className="w-full min-w-0 h-[40px] skeleton" /></div>);}diff --git a/src/components/features/settings/llm-profiles/llm-settings-local-view.tsx b/src/components/features/settings/llm-profiles/llm-settings-local-view.tsxindex b92d4d4c45..944c46c738 100644--- a/src/components/features/settings/llm-profiles/llm-settings-local-view.tsx+++ b/src/components/features/settings/llm-profiles/llm-settings-local-view.tsx@@ -299,7 +299,7 @@ export function LlmSettingsLocalView() {/>{/* Action buttons */}- <div className="flex justify-end gap-3 pt-4 border-t border-tertiary">+ <div className="flex justify-start gap-3 pt-4 border-t border-[var(--oh-border)]"><BrandButtontestId="cancel-profile-btn"type="button"diff --git a/src/components/features/settings/mcp-settings/mcp-server-form.tsx b/src/components/features/settings/mcp-settings/mcp-server-form.tsxindex 1feac2646f..be95b23113 100644--- a/src/components/features/settings/mcp-settings/mcp-server-form.tsx+++ b/src/components/features/settings/mcp-settings/mcp-server-form.tsx@@ -290,7 +290,7 @@ export function MCPServerForm({isClearable={false}allowsCustomValue={false}required- wrapperClassName={cn("w-full", "max-w-[680px]")}+ wrapperClassName="w-full min-w-0"/>)}@@ -303,7 +303,7 @@ export function MCPServerForm({name="url"type="url"label={t(I18nKey.SETTINGS$MCP_URL)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"requireddefaultValue={server?.url || ""}placeholder="https://api.example.com"@@ -314,7 +314,7 @@ export function MCPServerForm({name="api_key"type="password"label={t(I18nKey.SETTINGS$MCP_API_KEY)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"showOptionalTagdefaultValue={server?.api_key || ""}placeholder={t(I18nKey.SETTINGS$MCP_API_KEY_PLACEHOLDER)}@@ -326,7 +326,7 @@ export function MCPServerForm({name="timeout"type="number"label={t(I18nKey.SETTINGS$MCP_TIMEOUT_LABEL)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"showOptionalTagdefaultValue={server?.timeout?.toString() || ""}placeholder="60"@@ -344,7 +344,7 @@ export function MCPServerForm({name="name"type="text"label={t(I18nKey.SETTINGS$MCP_NAME)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"requireddefaultValue={server?.name || ""}placeholder="my-mcp-server"@@ -356,13 +356,13 @@ export function MCPServerForm({name="command"type="text"label={t(I18nKey.SETTINGS$MCP_COMMAND)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"requireddefaultValue={server?.command || ""}placeholder="npx"/>- <label className="flex flex-col gap-2.5 w-full max-w-[680px]">+ <label className="flex flex-col gap-2.5 w-full min-w-0"><div className="flex items-center gap-2"><span className="text-sm">{t(I18nKey.SETTINGS$MCP_COMMAND_ARGUMENTS)}@@ -385,7 +385,7 @@ export function MCPServerForm({</p></label>- <label className="flex flex-col gap-2.5 w-full max-w-[680px]">+ <label className="flex flex-col gap-2.5 w-full min-w-0"><div className="flex items-center gap-2"><span className="text-sm">{t(I18nKey.SETTINGS$MCP_ENVIRONMENT_VARIABLES)}diff --git a/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx b/src/components/features/settings/mcp-settings/mcp-server-list-item.tsxindex 751d492dc5..d2e7d2191b 100644--- a/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx+++ b/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx@@ -1,4 +1,4 @@-import { FaPencil, FaTrash } from "react-icons/fa6";+import { Pencil, Trash2 } from "lucide-react";import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";@@ -67,18 +67,18 @@ export function MCPServerListItem({className="grid grid-cols-[minmax(0,0.25fr)_120px_minmax(0,1fr)_120px] gap-4 items-start border-t border-[var(--oh-border-subtle)]"><td- className="p-3 text-sm text-content-2 truncate min-w-0"+ className="px-3 py-2 text-sm text-content-2 truncate min-w-0"title={serverName}>{serverName}</td>- <td className="p-3 text-sm text-content-2 whitespace-nowrap">+ <td className="px-3 py-2 text-sm text-content-2 whitespace-nowrap">{getServerTypeLabel(server.type)}</td><td- className="p-3 text-sm text-content-2 opacity-80 italic min-w-0 truncate"+ className="px-3 py-2 text-sm text-content-2 opacity-80 min-w-0 truncate"title={serverDescription}><span className="inline-block max-w-full align-bottom">@@ -86,24 +86,24 @@ export function MCPServerListItem({</span></td>- <td className="p-3 flex items-start justify-end gap-4 whitespace-nowrap">+ <td className="flex items-start justify-end gap-0.5 whitespace-nowrap px-3 py-2"><buttondata-testid="edit-mcp-server-button"type="button"onClick={onEdit}aria-label={`Edit ${serverName}`}- className="cursor-pointer hover:text-content-1 transition-colors"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaPencil size={16} />+ <Pencil aria-hidden className="size-4" strokeWidth={2} /></button><buttondata-testid="delete-mcp-server-button"type="button"onClick={onDelete}aria-label={`Delete ${serverName}`}- className="cursor-pointer hover:text-content-1 transition-colors"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaTrash size={16} />+ <Trash2 aria-hidden className="size-4" strokeWidth={2} /></button></td></tr>diff --git a/src/components/features/settings/mcp-settings/mcp-server-list.tsx b/src/components/features/settings/mcp-settings/mcp-server-list.tsxindex 09c6a26c69..ed653cd91d 100644--- a/src/components/features/settings/mcp-settings/mcp-server-list.tsx+++ b/src/components/features/settings/mcp-settings/mcp-server-list.tsx@@ -42,16 +42,16 @@ export function MCPServerList({<table className="w-full"><thead className="bg-base-tertiary"><tr className="grid grid-cols-[minmax(0,0.25fr)_120px_minmax(0,1fr)_120px] gap-4 items-start">- <th className="text-left p-3 text-sm font-medium">+ <th className="px-3 py-2 text-left text-sm font-medium">{t(I18nKey.SETTINGS$NAME)}</th>- <th className="text-left p-3 text-sm font-medium">+ <th className="px-3 py-2 text-left text-sm font-medium">{t(I18nKey.SETTINGS$MCP_SERVER_TYPE)}</th>- <th className="text-left p-3 text-sm font-medium">+ <th className="px-3 py-2 text-left text-sm font-medium">{t(I18nKey.SETTINGS$MCP_SERVER_DETAILS)}</th>- <th className="text-right p-3 text-sm font-medium">+ <th className="px-3 py-2 text-right text-sm font-medium">{t(I18nKey.SETTINGS$ACTIONS)}</th></tr>diff --git a/src/components/features/settings/mobile-header.tsx b/src/components/features/settings/mobile-header.tsxindex e3a6942ac7..d696d23441 100644--- a/src/components/features/settings/mobile-header.tsx+++ b/src/components/features/settings/mobile-header.tsx@@ -15,7 +15,7 @@ export function MobileHeader({const { t } = useTranslation("openhands");return (- <div className="flex items-center justify-between mb-4 md:hidden">+ <div className="flex items-center justify-between pt-8 mb-4 md:hidden"><div className="flex items-center gap-2"><SettingsIcon width={16} height={16} /><Typography.H2>{t(I18nKey.SETTINGS$TITLE)}</Typography.H2>diff --git a/src/components/features/settings/sdk-settings/schema-field.tsx b/src/components/features/settings/sdk-settings/schema-field.tsxindex ff5361f8f9..5bf1b5fe21 100644--- a/src/components/features/settings/sdk-settings/schema-field.tsx+++ b/src/components/features/settings/sdk-settings/schema-field.tsx@@ -167,7 +167,7 @@ export function SchemaField({disabled={isDisabled}onChange={(event) => onChange(event.target.value)}className={cn(- "bg-tertiary border border-[var(--oh-border-input)] min-h-32 w-full rounded-sm p-2 font-mono text-sm",+ "bg-tertiary border border-[var(--oh-border-input)] min-h-32 w-full min-w-0 rounded-sm p-2 font-mono text-sm","placeholder:italic placeholder:text-tertiary-alt","disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",)}diff --git a/src/components/features/settings/sdk-settings/sdk-section-page.tsx b/src/components/features/settings/sdk-settings/sdk-section-page.tsxindex 3e2a3790fa..684d405ad3 100644--- a/src/components/features/settings/sdk-settings/sdk-section-page.tsx+++ b/src/components/features/settings/sdk-settings/sdk-section-page.tsx@@ -432,25 +432,17 @@ export function SdkSectionPage({if (Object.keys(values).length === 0) return <LlmSettingsInputsSkeleton />;- // In embedded mode the form body owns scrolling so the surrounding- // chrome (heading, tabs, footer) stays pinned. Otherwise we keep the- // historical block layout, reserving `pb-20` for the sticky Save bar- // when it is rendered.- let bodyClassName: string;- if (embedded) {- bodyClassName =- "flex-1 min-h-0 overflow-y-auto custom-scrollbar-always flex flex-col gap-8";- } else if (hideSaveButton) {- bodyClassName = "flex flex-col gap-8";- } else {- bodyClassName = "flex flex-col gap-8 pb-20";- }+ // Scrolling is owned by the settings shell (or onboarding wrapper), not a+ // nested scroll region. Save actions are inline after the last field.+ const bodyClassName = "flex flex-col gap-8";return (<divdata-testid={testId}className={- embedded ? "relative flex-1 min-h-0 flex flex-col" : "h-full relative"+ embedded+ ? "relative flex min-h-0 w-full flex-1 flex-col"+ : "relative w-full min-h-0"}><ViewToggle@@ -474,7 +466,7 @@ export function SdkSectionPage({key={`${section.key}-${sectionIndex}`}className="flex flex-col gap-4">- <div className="grid gap-4 xl:grid-cols-2">+ <div className="flex flex-col gap-4">{section.fields.map((field) => (<SchemaFieldkey={field.key}@@ -489,25 +481,25 @@ export function SdkSectionPage({</div></section>))}- </div>- {!isReadOnly && !hideSaveButton ? (- <div className={embedded ? "pt-2" : "sticky bottom-0 bg-base py-4"}>- <BrandButton- testId="save-button"- type="button"- variant="primary"- isDisabled={- isPending || (Object.keys(dirty).length === 0 && !extraDirty)- }- onClick={handleSave}- >- {isPending- ? t(I18nKey.SETTINGS$SAVING)- : t(I18nKey.SETTINGS$SAVE_CHANGES)}- </BrandButton>- </div>- ) : null}+ {!isReadOnly && !hideSaveButton ? (+ <div className="flex justify-start pt-2">+ <BrandButton+ testId="save-button"+ type="button"+ variant="primary"+ isDisabled={+ isPending || (Object.keys(dirty).length === 0 && !extraDirty)+ }+ onClick={handleSave}+ >+ {isPending+ ? t(I18nKey.SETTINGS$SAVING)+ : t(I18nKey.SETTINGS$SAVE_CHANGES)}+ </BrandButton>+ </div>+ ) : null}+ </div></div>);}diff --git a/src/components/features/settings/sdk-settings/view-toggle.tsx b/src/components/features/settings/sdk-settings/view-toggle.tsxindex c72401b753..70f9591b80 100644--- a/src/components/features/settings/sdk-settings/view-toggle.tsx+++ b/src/components/features/settings/sdk-settings/view-toggle.tsx@@ -1,7 +1,7 @@import { useTranslation } from "react-i18next";-import { BrandButton } from "#/components/features/settings/brand-button";import { I18nKey } from "#/i18n/declaration";import { SettingsView } from "#/utils/sdk-settings-schema";+import { cn } from "#/utils/utils";interface ViewToggleProps {view: SettingsView;@@ -11,6 +11,16 @@ interface ViewToggleProps {isDisabled?: boolean;}+const tabButtonClass = (isActive: boolean, isDisabled: boolean) =>+ cn(+ "w-fit px-2 py-2 text-sm cursor-pointer rounded-none bg-transparent transition-[color,border-color]",+ "border-b-2 pb-2",+ isActive+ ? "text-white border-white"+ : "text-[var(--oh-muted)] border-transparent hover:text-white",+ isDisabled && "pointer-events-none opacity-30 cursor-not-allowed",+ );+export function ViewToggle({view,setView,@@ -23,37 +33,47 @@ export function ViewToggle({if (!showAdvanced && !showAll) return null;return (- <div className="flex items-center gap-2 mb-6">- <BrandButton- testId="sdk-section-basic-toggle"- variant={view === "basic" ? "primary" : "secondary"}+ <div+ role="tablist"+ aria-orientation="horizontal"+ className="mb-6 flex items-center gap-2"+ >+ <button+ data-testid="sdk-section-basic-toggle"type="button"- isDisabled={isDisabled}+ role="tab"+ aria-selected={view === "basic"}+ disabled={isDisabled}+ className={tabButtonClass(view === "basic", isDisabled)}onClick={() => setView("basic")}>{t(I18nKey.SETTINGS$BASIC)}- </BrandButton>+ </button>{showAdvanced ? (- <BrandButton- testId="sdk-section-advanced-toggle"- variant={view === "advanced" ? "primary" : "secondary"}+ <button+ data-testid="sdk-section-advanced-toggle"type="button"- isDisabled={isDisabled}+ role="tab"+ aria-selected={view === "advanced"}+ disabled={isDisabled}+ className={tabButtonClass(view === "advanced", isDisabled)}onClick={() => setView("advanced")}>{t(I18nKey.SETTINGS$ADVANCED)}- </BrandButton>+ </button>) : null}{showAll ? (- <BrandButton- testId="sdk-section-all-toggle"- variant={view === "all" ? "primary" : "secondary"}+ <button+ data-testid="sdk-section-all-toggle"type="button"- isDisabled={isDisabled}+ role="tab"+ aria-selected={view === "all"}+ disabled={isDisabled}+ className={tabButtonClass(view === "all", isDisabled)}onClick={() => setView("all")}>{t(I18nKey.SETTINGS$ALL)}- </BrandButton>+ </button>) : null}</div>);diff --git a/src/components/features/settings/secrets-settings/secret-form.tsx b/src/components/features/settings/secrets-settings/secret-form.tsxindex a57caae86f..b6aaaa8f56 100644--- a/src/components/features/settings/secrets-settings/secret-form.tsx+++ b/src/components/features/settings/secrets-settings/secret-form.tsx@@ -120,7 +120,7 @@ export function SecretForm({name="secret-name"type="text"label="Name"- className="w-full max-w-[350px]"+ className="w-full min-w-0"requireddefaultValue={mode === "edit" && selectedSecret ? selectedSecret : ""}placeholder={t("SECRETS$API_KEY_EXAMPLE")}@@ -130,7 +130,7 @@ export function SecretForm({{error && <p className="text-red-500 text-sm">{error}</p>}{mode === "add" && (- <label className="flex flex-col gap-2.5 w-full max-w-[680px]">+ <label className="flex flex-col gap-2.5 w-full min-w-0"><span className="text-sm">{t(I18nKey.FORM$VALUE)}</span><textareadata-testid="value-input"@@ -146,7 +146,7 @@ export function SecretForm({</label>)}- <label className="flex flex-col gap-2.5 w-full max-w-[680px]">+ <label className="flex flex-col gap-2.5 w-full min-w-0"><div className="flex items-center gap-2"><span className="text-sm">{t(I18nKey.FORM$DESCRIPTION)}</span><OptionalTag />diff --git a/src/components/features/settings/secrets-settings/secret-list-item.tsx b/src/components/features/settings/secrets-settings/secret-list-item.tsxindex ae9118963f..81d14af40c 100644--- a/src/components/features/settings/secrets-settings/secret-list-item.tsx+++ b/src/components/features/settings/secrets-settings/secret-list-item.tsx@@ -1,14 +1,14 @@-import { FaPencil, FaTrash } from "react-icons/fa6";+import { Pencil, Trash2 } from "lucide-react";export function SecretListItemSkeleton() {return (- <div className="border-t border-[var(--oh-border-input)] last-of-type:border-b max-w-[830px] pr-2.5 py-[13px] flex items-center justify-between">+ <div className="border-t border-[var(--oh-border-input)] last-of-type:border-b w-full min-w-0 pr-2.5 py-[13px] flex items-center justify-between"><div className="flex items-center justify-between w-1/3"><span className="skeleton h-4 w-1/2" /><span className="skeleton h-4 w-1/4" /></div>- <div className="flex items-center gap-8">+ <div className="flex items-center gap-1"><span className="skeleton h-4 w-4" /><span className="skeleton h-4 w-4" /></div>@@ -34,36 +34,36 @@ export function SecretListItem({data-testid="secret-item"className="border-t border-[var(--oh-border)]">- <td className="p-3 text-sm text-content-2 truncate" title={title}>+ <td className="px-3 py-2 text-sm text-content-2 truncate" title={title}>{title}</td><td- className="p-3 truncate overflow-hidden whitespace-nowrap text-sm text-content-2 opacity-80 italic"+ className="px-3 py-2 truncate overflow-hidden whitespace-nowrap text-sm text-content-2 opacity-80"title={description || ""}>{description || ""}</td>- <td className="p-3">- <div className="flex items-center justify-end gap-4">+ <td className="px-3 py-2">+ <div className="flex items-center justify-end gap-0.5"><buttondata-testid="edit-secret-button"type="button"onClick={onEdit}aria-label={`Edit ${title}`}- className="cursor-pointer"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaPencil size={16} />+ <Pencil aria-hidden className="size-4" strokeWidth={2} /></button><buttondata-testid="delete-secret-button"type="button"onClick={onDelete}aria-label={`Delete ${title}`}- className="cursor-pointer"+ className="inline-flex cursor-pointer items-center justify-center rounded-md p-1 text-muted transition-colors hover:bg-interactive-hover hover:text-white">- <FaTrash size={16} />+ <Trash2 aria-hidden className="size-4" strokeWidth={2} /></button></div></td>diff --git a/src/components/features/settings/settings-dropdown-input.tsx b/src/components/features/settings/settings-dropdown-input.tsxindex 325cdd4290..67420fc6eb 100644--- a/src/components/features/settings/settings-dropdown-input.tsx+++ b/src/components/features/settings/settings-dropdown-input.tsx@@ -52,7 +52,9 @@ export function SettingsDropdownInput({const { t } = useTranslation("openhands");return (- <label className={cn("flex flex-col gap-2.5", wrapperClassName)}>+ <label+ className={cn("flex flex-col gap-2.5 w-full min-w-0", wrapperClassName)}+ >{label && (<div className="flex items-center gap-1"><span className="text-sm">{label}</span>@@ -84,7 +86,7 @@ export function SettingsDropdownInput({inputProps={{classNames: {inputWrapper: cn(- "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic",+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full min-w-0 rounded-sm p-2 placeholder:italic",inputWrapperClassName,),input: inputClassName,diff --git a/src/components/features/settings/settings-input.tsx b/src/components/features/settings/settings-input.tsxindex 71f0f8f444..58a467762b 100644--- a/src/components/features/settings/settings-input.tsx+++ b/src/components/features/settings/settings-input.tsx@@ -71,7 +71,7 @@ export const SettingsInput = forwardRef<HTMLInputElement, SettingsInputProps>() {const errorId = error && testId ? `${testId}-error` : undefined;return (- <label className={cn("flex flex-col gap-2.5 w-fit", className)}>+ <label className={cn("flex flex-col gap-2.5 w-full min-w-0", className)}><div className="flex items-center gap-2">{startContent}<span className={cn("text-sm", labelClassName)}>{label}</span>@@ -103,7 +103,7 @@ export const SettingsInput = forwardRef<HTMLInputElement, SettingsInputProps>(aria-describedby={errorId ?? ariaDescribedBy}aria-invalid={!!error || ariaInvalid}className={cn(- "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full min-w-0 rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt","disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",error && "border-red-500",)}diff --git a/src/components/features/settings/settings-layout.tsx b/src/components/features/settings/settings-layout.tsxindex 06dc68f961..ab2ef3037d 100644--- a/src/components/features/settings/settings-layout.tsx+++ b/src/components/features/settings/settings-layout.tsx@@ -1,6 +1,9 @@import { useState } from "react";import { MobileHeader } from "./mobile-header";-import { SettingsNavigation } from "./settings-navigation";+import {+ SettingsDesktopSidebar,+ SettingsMobileDrawer,+} from "./settings-navigation";import { SettingsNavRenderedItem } from "#/hooks/use-settings-nav-items";interface SettingsLayoutProps {@@ -8,6 +11,11 @@ interface SettingsLayoutProps {navigationItems: SettingsNavRenderedItem[];}+/**+ * Mirrors the extensions layout (Skills / MCP): aside and main are siblings,+ * and only the main column scrolls so the left nav stays pinned like+ * ExtensionsNavigation.+ */export function SettingsLayout({children,navigationItems,@@ -18,25 +26,22 @@ export function SettingsLayout({const closeMobileMenu = () => setIsMobileMenuOpen(false);return (- <div className="flex flex-col h-full px-[14px] pt-8">- {/* Mobile header */}+ <div className="flex h-full flex-col px-[14px] md:px-0"><MobileHeaderisMobileMenuOpen={isMobileMenuOpen}onToggleMenu={toggleMobileMenu}/>- {/* Desktop layout with navigation and main content */}- <div className="flex flex-1 overflow-hidden gap-10">- {/* Navigation */}- <SettingsNavigation- isMobileMenuOpen={isMobileMenuOpen}- onCloseMobileMenu={closeMobileMenu}- navigationItems={navigationItems}- />- {/* Main content */}- <main className="flex-1 overflow-auto custom-scrollbar-always">- {children}+ <div className="flex min-h-0 flex-1 gap-10 md:items-start">+ <SettingsDesktopSidebar navigationItems={navigationItems} />+ <main className="flex min-h-0 min-w-0 flex-1 flex-col overflow-y-auto custom-scrollbar-always md:pr-[14px] md:pt-8 md:pb-12">+ <div className="mx-auto w-full min-w-0 max-w-[800px]">{children}</div></main></div>+ <SettingsMobileDrawer+ isMobileMenuOpen={isMobileMenuOpen}+ onCloseMobileMenu={closeMobileMenu}+ navigationItems={navigationItems}+ /></div>);}diff --git a/src/components/features/settings/settings-navigation.tsx b/src/components/features/settings/settings-navigation.tsxindex 80b351046f..68765b0b3c 100644--- a/src/components/features/settings/settings-navigation.tsx+++ b/src/components/features/settings/settings-navigation.tsx@@ -9,6 +9,7 @@ import { SettingsNavHeader } from "./settings-nav-header";import { SettingsNavDivider } from "./settings-nav-divider";import { SettingsNavLink } from "./settings-nav-link";import { SidebarNavLink } from "#/components/features/sidebar/sidebar-nav-link";+import { BackendSyncedSettingsBadge } from "#/components/features/settings/backend-synced-settings-badge";interface SettingsNavigationProps {isMobileMenuOpen: boolean;@@ -16,11 +17,14 @@ interface SettingsNavigationProps {navigationItems: SettingsNavRenderedItem[];}-export function SettingsNavigation({- isMobileMenuOpen,- onCloseMobileMenu,+/**+ * Desktop sidebar — sibling of the scrolling main column (same pattern as+ * {@link ExtensionsNavigation}). Mobile drawer stays `position: fixed` outside+ * this row in the layout.+ */+export function SettingsDesktopSidebar({navigationItems,-}: SettingsNavigationProps) {+}: Pick<SettingsNavigationProps, "navigationItems">) {const { t } = useTranslation("openhands");const desktopNavItems = navigationItems.filter((item): item is Extract<SettingsNavRenderedItem, { type: "item" }> =>@@ -28,31 +32,51 @@ export function SettingsNavigation({);return (- <>- <aside- data-testid="settings-navbar-desktop"- className="hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2"- >- <Typography.Text className="px-3 text-xs font-semibold uppercase tracking-wider text-[var(--oh-muted)]">- {t(I18nKey.SETTINGS$TITLE)}- </Typography.Text>- <div className="flex flex-col gap-0.5 pt-0.5">- {desktopNavItems.map((renderedItem) => (- <SidebarNavLink- key={renderedItem.item.to}- to={renderedItem.item.to}- label={t(renderedItem.item.text as I18nKey)}- end- testId={`sidebar-settings-${renderedItem.item.to}`}- icon={renderedItem.item.icon}- />- ))}- </div>- </aside>+ <aside+ data-testid="settings-navbar-desktop"+ className={cn(+ "hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2",+ "md:sticky md:top-8 md:self-start md:pl-8",+ )}+ >+ <Typography.Text className="px-2 text-sm font-normal text-white">+ {t(I18nKey.SETTINGS$TITLE)}+ </Typography.Text>+ <div className="flex flex-col gap-0.5 pt-0.5">+ {desktopNavItems.map((renderedItem) => (+ <SidebarNavLink+ key={renderedItem.item.to}+ to={renderedItem.item.to}+ label={t(renderedItem.item.text as I18nKey)}+ end+ testId={`sidebar-settings-${renderedItem.item.to}`}+ icon={renderedItem.item.icon}+ />+ ))}+ </div>+ <div className="px-2 pt-3">+ <BackendSyncedSettingsBadge />+ </div>+ </aside>+ );+}+/**+ * Mobile overlay + drawer. Rendered outside the scrolling flex row so `position:+ * fixed` does not interact with flex item sizing on desktop.+ */+export function SettingsMobileDrawer({+ isMobileMenuOpen,+ onCloseMobileMenu,+ navigationItems,+}: SettingsNavigationProps) {+ const { t } = useTranslation("openhands");++ return (+ <>{isMobileMenuOpen && (<div- className="fixed inset-0 bg-black bg-opacity-50 z-40 md:hidden"+ className="fixed inset-0 z-40 bg-black bg-opacity-50 md:hidden"onClick={onCloseMobileMenu}/>)}@@ -65,14 +89,14 @@ export function SettingsNavigation({)}><div className="flex items-center justify-between">- <div className="flex items-center gap-2 ml-1 sm:ml-4.5">+ <div className="ml-1 flex items-center gap-2 sm:ml-4.5"><SettingsIcon width={16} height={16} /><Typography.H2>{t(I18nKey.SETTINGS$TITLE)}</Typography.H2></div><buttontype="button"onClick={onCloseMobileMenu}- className="md:hidden p-0.5 hover:bg-tertiary rounded-md transition-colors cursor-pointer"+ className="cursor-pointer rounded-md p-0.5 transition-colors hover:bg-tertiary md:hidden"aria-label="Close navigation menu"><CloseIcon width={32} height={32} />@@ -103,7 +127,20 @@ export function SettingsNavigation({);})}</div>++ <div className="px-2 pt-3">+ <BackendSyncedSettingsBadge />+ </div></nav></>);}++export function SettingsNavigation(props: SettingsNavigationProps) {+ return (+ <>+ <SettingsDesktopSidebar navigationItems={props.navigationItems} />+ <SettingsMobileDrawer {...props} />+ </>+ );+}diff --git a/src/components/features/skills/extensions-navigation.tsx b/src/components/features/skills/extensions-navigation.tsxindex e9e8532587..9b05fc29a0 100644--- a/src/components/features/skills/extensions-navigation.tsx+++ b/src/components/features/skills/extensions-navigation.tsx@@ -77,9 +77,9 @@ export function ExtensionsNavigation() {return (<asidedata-testid="extensions-navbar-desktop"- className="hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2 md:sticky md:top-8 md:self-start md:pl-[14px]"+ className="hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2 md:sticky md:top-8 md:self-start md:pl-8">- <span className="px-3 text-xs font-semibold uppercase tracking-wider text-[var(--oh-muted)]">+ <span className="px-2 text-sm font-normal text-white">{t(I18nKey.NAV$EXTENSIONS)}</span><div className="flex flex-col gap-0.5 pt-0.5">diff --git a/src/components/shared/modals/settings/model-selector.tsx b/src/components/shared/modals/settings/model-selector.tsxindex ffb1a511ea..a4272b90ee 100644--- a/src/components/shared/modals/settings/model-selector.tsx+++ b/src/components/shared/modals/settings/model-selector.tsx@@ -117,7 +117,7 @@ export function ModelSelector({return (<divclassName={cn(- "flex flex-col md:flex-row w-full max-w-[680px] justify-between gap-4 md:gap-[46px]",+ "flex flex-col md:flex-row w-full min-w-0 justify-between gap-4 md:gap-[46px]",wrapperClassName,)}>diff --git a/src/constants/settings-nav.tsx b/src/constants/settings-nav.tsxindex 5096c7b90c..5461b770ea 100644--- a/src/constants/settings-nav.tsx+++ b/src/constants/settings-nav.tsx@@ -1,13 +1,14 @@+import { AppWindow, Shield } from "lucide-react";import KeyIcon from "#/icons/key.svg?react";-import LockIcon from "#/icons/lock.svg?react";import MemoryIcon from "#/icons/memory_icon.svg?react";-import SettingsGearIcon from "#/icons/settings-gear.svg?react";import CircuitIcon from "#/icons/u-circuit.svg?react";export interface SettingsNavItem {icon: React.ReactElement;to: string;text: string;+ /** Short grey subline under the page title (`settings.tsx`). */+ subtitle: string;}export const OSS_NAV_ITEMS: SettingsNavItem[] = [@@ -15,25 +16,30 @@ export const OSS_NAV_ITEMS: SettingsNavItem[] = [icon: <CircuitIcon width={16} height={16} />,to: "/settings",text: "SETTINGS$NAV_LLM",+ subtitle: "SETTINGS$PAGE_LLM_SUBLINE",},{icon: <MemoryIcon width={16} height={16} />,to: "/settings/condenser",text: "SETTINGS$NAV_CONDENSER",+ subtitle: "SETTINGS$PAGE_CONDENSER_SUBLINE",},{- icon: <LockIcon width={16} height={16} />,+ icon: <Shield className="size-4" strokeWidth={2} aria-hidden />,to: "/settings/verification",text: "SETTINGS$NAV_VERIFICATION",+ subtitle: "SETTINGS$PAGE_VERIFICATION_SUBLINE",},{- icon: <SettingsGearIcon width={16} height={16} />,+ icon: <AppWindow className="size-4" strokeWidth={2} aria-hidden />,to: "/settings/app",text: "SETTINGS$NAV_APPLICATION",+ subtitle: "SETTINGS$PAGE_APPLICATION_SUBLINE",},{icon: <KeyIcon width={16} height={16} />,to: "/settings/secrets",text: "SETTINGS$NAV_SECRETS",+ subtitle: "SETTINGS$PAGE_SECRETS_SUBLINE",},];diff --git a/src/i18n/translation.json b/src/i18n/translation.jsonindex a835609e89..f73ca04ae5 100644--- a/src/i18n/translation.json+++ b/src/i18n/translation.json@@ -4980,6 +4980,91 @@"uk": "Верифікація","ca": "Verificació"},+ "SETTINGS$PAGE_LLM_SUBLINE": {+ "en": "Model, API key, and options for the agent.",+ "ja": "エージェントのモデル、APIキー、およびオプション。",+ "zh-CN": "代理的模型、API 密钥和选项。",+ "zh-TW": "代理的模型、API 金鑰和選項。",+ "ko-KR": "에이전트의 모델, API 키 및 옵션입니다.",+ "no": "Modell, API-nøkkel og alternativer for agenten.",+ "it": "Modello, chiave API e opzioni per l'agente.",+ "pt": "Modelo, chave da API e opções para o agente.",+ "es": "Modelo, clave de API y opciones para el agente.",+ "ar": "النموذج ومفتاح API وخيارات الوكيل.",+ "fr": "Modèle, clé API et options pour l'agent.",+ "tr": "Aracı için model, API anahtarı ve seçenekler.",+ "de": "Modell, API-Schlüssel und Optionen für den Agenten.",+ "uk": "Модель, API ключ та параметри агента.",+ "ca": "Model, clau d'API i opcions per a l'agent."+ },+ "SETTINGS$PAGE_CONDENSER_SUBLINE": {+ "en": "Summarize long chats to stay within context limits.",+ "ja": "コンテキスト制限内に収まるよう、長いチャットを要約します。",+ "zh-CN": "对长对话进行摘要,以保持在上下文限制内。",+ "zh-TW": "對長對話進行摘要,以保持在上下文限制內。",+ "ko-KR": "긴 대화를 요약하여 컨텍스트 제한 내에 유지합니다.",+ "no": "Oppsummer lange samtaler for å holde deg innenfor kontekstgrensene.",+ "it": "Riassumi le chat lunghe per rimanere entro i limiti di contesto.",+ "pt": "Resuma conversas longas para se manter dentro dos limites de contexto.",+ "es": "Resume las conversaciones largas para mantenerte dentro de los límites del contexto.",+ "ar": "لخّص المحادثات الطويلة للبقاء ضمن حدود السياق.",+ "fr": "Résumez les longues conversations pour rester dans les limites du contexte.",+ "tr": "Bağlam sınırları içinde kalmak için uzun sohbetleri özetleyin.",+ "de": "Fasse lange Chats zusammen, um innerhalb der Kontextgrenzen zu bleiben.",+ "uk": "Стискайте довгі розмови, щоб залишатися в межах контексту.",+ "ca": "Resumeix converses llargues per mantenir-te dins dels límits de context."+ },+ "SETTINGS$PAGE_VERIFICATION_SUBLINE": {+ "en": "Confirmation prompts and security checks on actions.",+ "ja": "アクションに対する確認プロンプトとセキュリティチェック。",+ "zh-CN": "针对操作的确认提示和安全检查。",+ "zh-TW": "針對操作的確認提示和安全檢查。",+ "ko-KR": "작업에 대한 확인 프롬프트 및 보안 검사.",+ "no": "Bekreftelsesmeldinger og sikkerhetskontroller for handlinger.",+ "it": "Richieste di conferma e controlli di sicurezza sulle azioni.",+ "pt": "Solicitações de confirmação e verificações de segurança em ações.",+ "es": "Solicitudes de confirmación y comprobaciones de seguridad sobre las acciones.",+ "ar": "مطالبات التأكيد وفحوصات الأمان على الإجراءات.",+ "fr": "Invites de confirmation et contrôles de sécurité sur les actions.",+ "tr": "Eylemler için onay istemleri ve güvenlik kontrolleri.",+ "de": "Bestätigungsabfragen und Sicherheitsprüfungen für Aktionen.",+ "uk": "Запити підтвердження та перевірки безпеки для дій.",+ "ca": "Sol·licituds de confirmació i comprovacions de seguretat sobre les accions."+ },+ "SETTINGS$PAGE_APPLICATION_SUBLINE": {+ "en": "Language, theme, notifications, and Git identity.",+ "ja": "言語、テーマ、通知、およびGitアイデンティティ。",+ "zh-CN": "语言、主题、通知和 Git 身份。",+ "zh-TW": "語言、主題、通知和 Git 身分。",+ "ko-KR": "언어, 테마, 알림 및 Git 신원.",+ "no": "Språk, tema, varsler og Git-identitet.",+ "it": "Lingua, tema, notifiche e identità Git.",+ "pt": "Idioma, tema, notificações e identidade do Git.",+ "es": "Idioma, tema, notificaciones e identidad de Git.",+ "ar": "اللغة والسمة والإشعارات وهوية Git.",+ "fr": "Langue, thème, notifications et identité Git.",+ "tr": "Dil, tema, bildirimler ve Git kimliği.",+ "de": "Sprache, Theme, Benachrichtigungen und Git-Identität.",+ "uk": "Мова, тема, сповіщення та особистість Git.",+ "ca": "Idioma, tema, notificacions i identitat de Git."+ },+ "SETTINGS$PAGE_SECRETS_SUBLINE": {+ "en": "Named values the agent can use during conversations.",+ "ja": "会話中にエージェントが使用できる名前付きの値。",+ "zh-CN": "代理可在对话中使用的命名值。",+ "zh-TW": "代理可在對話中使用的命名值。",+ "ko-KR": "에이전트가 대화 중에 사용할 수 있는 명명된 값입니다.",+ "no": "Navngitte verdier som agenten kan bruke under samtaler.",+ "it": "Valori nominati che l'agente può usare durante le conversazioni.",+ "pt": "Valores nomeados que o agente pode usar durante conversas.",+ "es": "Valores con nombre que el agente puede usar durante las conversaciones.",+ "ar": "قيم مُسماة يمكن للوكيل استخدامها أثناء المحادثات.",+ "fr": "Valeurs nommées que l'agent peut utiliser pendant les conversations.",+ "tr": "Aracının görüşmeler sırasında kullanabileceği adlandırılmış değerler.",+ "de": "Benannte Werte, die der Agent während Gesprächen verwenden kann.",+ "uk": "Іменовані значення, які агент може використовувати під час розмов.",+ "ca": "Valors amb nom que l'agent pot utilitzar durant les converses."+ },"GIT$MERGE_REQUEST": {"en": "Merge Request","ja": "マージリクエスト",diff --git a/src/routes/app-settings.tsx b/src/routes/app-settings.tsxindex 8d2f6d0470..8bef5551ea 100644--- a/src/routes/app-settings.tsx+++ b/src/routes/app-settings.tsx@@ -133,7 +133,7 @@ export function AppSettingsScreen() {<formdata-testid="app-settings-screen"action={formAction}- className="flex flex-col h-full justify-between"+ className="flex flex-col gap-6">{shouldBeLoading && <AppSettingsInputsSkeleton />}{!shouldBeLoading && (@@ -180,7 +180,7 @@ export function AppSettingsScreen() {defaultValue={settings.git_user_name || ""}onChange={checkIfGitUserNameHasChanged}placeholder={t(I18nKey.SETTINGS$GIT_USERNAME_PLACEHOLDER)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"/><SettingsInputtestId="git-user-email-input"@@ -190,24 +190,23 @@ export function AppSettingsScreen() {defaultValue={settings.git_user_email || ""}onChange={checkIfGitUserEmailHasChanged}placeholder={t(I18nKey.SETTINGS$GIT_EMAIL_PLACEHOLDER)}- className="w-full max-w-[680px]"+ className="w-full min-w-0"/></div>+ <div className="flex justify-start pt-4">+ <BrandButton+ testId="submit-button"+ variant="primary"+ type="submit"+ isDisabled={isPending || formIsClean}+ >+ {!isPending && t("SETTINGS$SAVE_CHANGES")}+ {isPending && t("SETTINGS$SAVING")}+ </BrandButton>+ </div></div></div>)}-- <div className="flex gap-6 p-6 justify-end">- <BrandButton- testId="submit-button"- variant="primary"- type="submit"- isDisabled={isPending || formIsClean}- >- {!isPending && t("SETTINGS$SAVE_CHANGES")}- {isPending && t("SETTINGS$SAVING")}- </BrandButton>- </div></form>);}diff --git a/src/routes/mcp.tsx b/src/routes/mcp.tsxindex 2535fca639..37a05c5bf6 100644--- a/src/routes/mcp.tsx+++ b/src/routes/mcp.tsx@@ -136,8 +136,8 @@ export default function MCPPage() {return (<div data-testid="mcp-page" className="flex h-full gap-10"><ExtensionsNavigation />- <main className="flex-1 min-w-0 overflow-auto custom-scrollbar-always pr-[14px] pt-8 pb-12">- <div className="max-w-5xl flex flex-col gap-6">+ <main className="flex min-h-0 min-w-0 flex-1 flex-col overflow-y-auto custom-scrollbar-always pr-[14px] pt-8 pb-12">+ <div className="mx-auto flex w-full min-w-0 max-w-[800px] flex-col gap-6"><div className="min-w-0"><div className="flex items-start justify-between gap-4"><div className="space-y-1">diff --git a/src/routes/secrets-settings.tsx b/src/routes/secrets-settings.tsxindex 58c1e2e0b0..1fa851bab2 100644--- a/src/routes/secrets-settings.tsx+++ b/src/routes/secrets-settings.tsx@@ -102,19 +102,19 @@ export function SecretsSettingsScreen() {{view === "list" && !isLoadingSecrets && (<divref={tableContainerRef}- className="border border-[var(--oh-border)] rounded-md overflow-auto max-h-[60vh]"+ className="border border-[var(--oh-border)] rounded-md overflow-auto max-h-[min(40vh,22rem)] bg-base-secondary"onScroll={handleScroll}><table className="w-full min-w-full table-fixed"><thead className="bg-base-tertiary sticky top-0"><tr>- <th className="w-1/4 text-left p-3 text-sm font-medium">+ <th className="w-1/4 px-3 py-2 text-left text-sm font-medium">{t(I18nKey.SETTINGS$NAME)}</th>- <th className="w-1/2 text-left p-3 text-sm font-medium">+ <th className="w-1/2 px-3 py-2 text-left text-sm font-medium">{t(I18nKey.SECRETS$DESCRIPTION)}</th>- <th className="w-1/4 text-right p-3 text-sm font-medium">+ <th className="w-1/4 px-3 py-2 text-right text-sm font-medium">{t(I18nKey.SETTINGS$ACTIONS)}</th></tr>diff --git a/src/routes/settings.tsx b/src/routes/settings.tsxindex 7c03250a6a..2e13db081d 100644--- a/src/routes/settings.tsx+++ b/src/routes/settings.tsx@@ -8,7 +8,6 @@ import { SettingsLayout } from "#/components/features/settings";import { WebClientConfig } from "#/api/option-service/option.types";import { QUERY_KEYS, CONFIG_CACHE_OPTIONS } from "#/hooks/query/query-keys";import { Typography } from "#/ui/typography";-import { BackendSyncedSettingsBadge } from "#/components/features/settings/backend-synced-settings-badge";import { useSettingsNavItems } from "#/hooks/use-settings-nav-items";import {getFirstAvailablePath,@@ -43,15 +42,27 @@ function SettingsScreen() {const matches = useMatches();const navItems = useSettingsNavItems();- const currentSectionTitle = useMemo(() => {+ const { currentSectionTitle, currentSectionSubtitle } = useMemo(() => {const currentRenderedItem = navItems.find((item) => item.type === "item" && item.item.to === location.pathname,);if (currentRenderedItem?.type === "item") {- return currentRenderedItem.item.text;+ return {+ currentSectionTitle: currentRenderedItem.item.text,+ currentSectionSubtitle: currentRenderedItem.item.subtitle,+ };}const firstItem = navItems.find((item) => item.type === "item");- return firstItem?.type === "item" ? firstItem.item.text : "SETTINGS$TITLE";+ if (firstItem?.type === "item") {+ return {+ currentSectionTitle: firstItem.item.text,+ currentSectionSubtitle: firstItem.item.subtitle,+ };+ }+ return {+ currentSectionTitle: "SETTINGS$TITLE",+ currentSectionSubtitle: null as string | null,+ };}, [navItems, location.pathname]);const routeHandle = matches.find((m) => m.pathname === location.pathname)@@ -59,18 +70,23 @@ function SettingsScreen() {const shouldHideTitle = routeHandle?.hideTitle === true;return (- <main data-testid="settings-screen" className="h-full">+ <main data-testid="settings-screen" className="min-h-0"><SettingsLayout navigationItems={navItems}>- <div className="flex flex-col gap-6 h-full">+ <div className="flex flex-col gap-6 pb-8">{!shouldHideTitle && (- <div className="flex flex-col items-start gap-2">+ <header className="space-y-1"><Typography.H2>{t(currentSectionTitle)}</Typography.H2>- <BackendSyncedSettingsBadge />- </div>+ {currentSectionSubtitle ? (+ <p+ data-testid="settings-page-subtitle"+ className="text-sm leading-5 text-tertiary-light"+ >+ {t(currentSectionSubtitle)}+ </p>+ ) : null}+ </header>)}- <div className="flex-1 overflow-auto custom-scrollbar-always">- <Outlet />- </div>+ <Outlet /></div></SettingsLayout></main>diff --git a/src/routes/skills-plugins.tsx b/src/routes/skills-plugins.tsxindex f71efcdb34..5fbb5da2f2 100644--- a/src/routes/skills-plugins.tsx+++ b/src/routes/skills-plugins.tsx@@ -8,16 +8,18 @@ export default function SkillsPluginsScreen() {return (<div data-testid="skills-plugins-screen" className="flex h-full gap-10"><ExtensionsNavigation />- <section className="flex-1 min-w-0 overflow-auto custom-scrollbar-always pr-[14px] pt-8">- <div className="min-w-0 space-y-1 mb-4">- <h2 className="text-xl font-semibold leading-6 text-foreground">- {t(I18nKey.SETTINGS$PLUGINS_TITLE)}- </h2>- <div className="max-w-2xl text-sm text-tertiary-light">- {t(I18nKey.SETTINGS$PLUGINS_DESCRIPTION)}+ <main className="flex min-h-0 min-w-0 flex-1 flex-col overflow-y-auto custom-scrollbar-always pr-[14px] pt-8 pb-12">+ <div className="mx-auto w-full min-w-0 max-w-[800px]">+ <div className="mb-4 min-w-0 space-y-1">+ <h2 className="text-xl font-semibold leading-6 text-foreground">+ {t(I18nKey.SETTINGS$PLUGINS_TITLE)}+ </h2>+ <div className="max-w-2xl text-sm text-tertiary-light">+ {t(I18nKey.SETTINGS$PLUGINS_DESCRIPTION)}+ </div></div></div>- </section>+ </main></div>);}diff --git a/src/routes/skills-settings.tsx b/src/routes/skills-settings.tsxindex 507c59af0d..8916467111 100644--- a/src/routes/skills-settings.tsx+++ b/src/routes/skills-settings.tsx@@ -87,8 +87,8 @@ function SkillsSettingsScreen() {return (<div data-testid="skills-settings-screen" className="flex h-full gap-10"><ExtensionsNavigation />- <div className="flex-1 min-w-0 flex flex-col h-full overflow-auto custom-scrollbar-always pr-[14px] pt-8 pb-12">- <div className="max-w-5xl flex flex-col gap-6">+ <main className="flex min-h-0 min-w-0 h-full flex-1 flex-col overflow-y-auto custom-scrollbar-always pr-[14px] pt-8 pb-12">+ <div className="mx-auto flex w-full min-w-0 max-w-[800px] flex-col gap-6"><div className="min-w-0 space-y-1"><h2 className="text-xl font-semibold leading-6 text-foreground">{t(I18nKey.SETTINGS$SKILLS_TITLE)}@@ -154,7 +154,7 @@ function SkillsSettingsScreen() {</>)}</div>- </div>+ </main></div>);}diff --git a/src/routes/verification-settings.tsx b/src/routes/verification-settings.tsxindex 03cb8057cc..e89875987d 100644--- a/src/routes/verification-settings.tsx+++ b/src/routes/verification-settings.tsx@@ -82,7 +82,7 @@ function VerificationSettingsHeader({onSecurityAnalyzerChange(key ? String(key) : null)}/>- <p className="text-tertiary-alt text-xs leading-5 max-w-[680px] ">+ <p className="text-tertiary-alt text-xs leading-5">{t(I18nKey.SETTINGS$SECURITY_ANALYZER_DESCRIPTION)}</p></div>