settings: trust public OpenHands provider models

__tests__/components/modals/settings/model-selector-openhands.test.tsx

@@ -6,7 +6,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ModelSelector } from "#/components/shared/modals/settings/model-selector";
 import { server } from "#/mocks/node";
 
-describe("ModelSelector — OpenHands round-trip", () => {
+describe("ModelSelector — OpenHands provider", () => {
   let providersCount = 0;
   let verifiedCount = 0;
   let modelsCount = 0;
@@ -20,7 +20,9 @@ describe("ModelSelector — OpenHands round-trip", () => {
     server.use(
       http.get("*/api/llm/providers", () => {
         providersCount += 1;
-        return HttpResponse.json({ providers: ["anthropic", "openai"] });
+        return HttpResponse.json({
+          providers: ["openhands", "anthropic", "openai"],
+        });
       }),
       http.get("*/api/llm/models/verified", () => {
         verifiedCount += 1;
@@ -47,25 +49,13 @@ describe("ModelSelector — OpenHands round-trip", () => {
     );
   }
 
-  it("shows OpenHands as the provider for a persisted litellm_proxy/<m> + All-Hands proxy base URL, fetching each LLM endpoint exactly once", async () => {
-    // Arrange — mirrors the post-save state: the SDK rewrote openhands/<m>
-    // to litellm_proxy/<m> on disk and pinned the All-Hands proxy base URL.
-    renderWithQuery(
-      <ModelSelector
-        currentModel="litellm_proxy/claude-opus-4-7"
-        currentBaseUrl="https://llm-proxy.app.all-hands.dev/"
-      />,
-    );
+  it("shows OpenHands as the provider for a public openhands/<m> model", async () => {
+    renderWithQuery(<ModelSelector currentModel="openhands/claude-opus-4-7" />);
 
-    // Act / Assert — the bootstrap effect must wait for the openhands
-    // verified list to load before resolving the displayed provider.
     await waitFor(() => {
       expect(screen.getByLabelText("LLM$PROVIDER")).toHaveValue("OpenHands");
     });
 
-    // Assert — the three queries that all need verified-models data share
-    // a single cache entry, and the bootstrap effect picks the right
-    // provider on its first run, so /models is not fetched twice.
     expect(providersCount).toBe(1);
     expect(verifiedCount).toBe(1);
     expect(modelsCount).toBe(1);

__tests__/components/settings/llm-profiles/llm-settings-local-view.test.tsx

@@ -593,7 +593,10 @@ describe("LlmSettingsLocalView", () => {
   });
 
   describe("Basic tab save", () => {
-    it("drops hidden base_url values for OpenHands models", async () => {
+    it("drops stale base_url for OpenHands models in Basic mode", async () => {
+      // Arrange — a profile whose stored config pairs an OpenHands model with a
+      // stale base_url. In Basic mode the public provider prefix is enough; the
+      // SDK derives provider transport details when making LLM calls.
       const user = userEvent.setup();
       vi.mocked(ProfilesService.getProfile).mockResolvedValue({
         name: "gpt-4-profile",
@@ -608,6 +611,7 @@ describe("LlmSettingsLocalView", () => {
 
       renderWithProviders(<LlmSettingsLocalView />);
 
+      // Act — open the profile in edit mode, force the Basic tab, and save.
       await user.click(screen.getAllByTestId("profile-menu-trigger")[0]);
       await user.click(screen.getByTestId("profile-edit"));
       await waitFor(() => {
@@ -621,11 +625,54 @@ describe("LlmSettingsLocalView", () => {
       });
       await user.click(screen.getByTestId("save-profile-btn"));
 
+      // Assert — the saved LLM config keeps the OpenHands model and drops the
+      // stale base_url instead of re-stamping a LiteLLM proxy detail.
       await waitFor(() => expect(mockSaveMutateAsync).toHaveBeenCalled());
       const savedLlm = mockSaveMutateAsync.mock.calls[0][0].request.llm;
       expect(savedLlm.model).toBe("openhands/claude-opus-4-5-20251101");
       expect(savedLlm).not.toHaveProperty("base_url");
     });
+
+    it("drops base_url for stored litellm_proxy profiles in Basic mode", async () => {
+      // Arrange — legacy profiles may still contain a LiteLLM proxy model and
+      // proxy base_url. The SDK migration owns that compatibility; the Basic tab
+      // should not keep re-stamping transport details.
+      const user = userEvent.setup();
+      vi.mocked(ProfilesService.getProfile).mockResolvedValue({
+        name: "gpt-4-profile",
+        api_key_set: true,
+        config: {
+          model: "litellm_proxy/claude-opus-4-8",
+          api_key: "gAAAA_encrypted_key",
+          base_url: "https://llm-proxy.app.all-hands.dev/",
+        },
+      });
+      mockSaveMutateAsync.mockResolvedValueOnce({ success: true });
+
+      renderWithProviders(<LlmSettingsLocalView />);
+
+      // Act — open the profile in edit mode, force the Basic tab, and save
+      // without touching the model dropdown.
+      await user.click(screen.getAllByTestId("profile-menu-trigger")[0]);
+      await user.click(screen.getByTestId("profile-edit"));
+      await waitFor(() => {
+        expect(screen.getByTestId("profile-name-input")).toHaveValue(
+          "gpt-4-profile",
+        );
+      });
+      await user.click(await screen.findByTestId("sdk-section-basic-toggle"));
+      await waitFor(() => {
+        expect(screen.getByTestId("save-profile-btn")).not.toBeDisabled();
+      });
+      await user.click(screen.getByTestId("save-profile-btn"));
+
+      // Assert — the legacy model is preserved, but the Basic tab drops the
+      // base_url instead of reverse-mapping it in the frontend.
+      await waitFor(() => expect(mockSaveMutateAsync).toHaveBeenCalled());
+      const savedLlm = mockSaveMutateAsync.mock.calls[0][0].request.llm;
+      expect(savedLlm.model).toBe("litellm_proxy/claude-opus-4-8");
+      expect(savedLlm).not.toHaveProperty("base_url");
+    });
   });
 
   describe("All tab save", () => {

src/components/shared/modals/settings/model-selector.tsx

@@ -15,13 +15,10 @@ import { HelpLink } from "#/ui/help-link";
 import { PRODUCT_URL } from "#/utils/constants";
 import { useSearchProviders } from "#/hooks/query/use-search-providers";
 import { useProviderModels } from "#/hooks/query/use-provider-models";
-import { useOpenhandsVerifiedModels } from "#/hooks/query/use-openhands-verified-models";
-import { normalizeDisplayModel } from "#/utils/normalize-display-model";
 
 interface ModelSelectorProps {
   isDisabled?: boolean;
   currentModel?: string;
-  currentBaseUrl?: string;
   onChange?: (provider: string | null, model: string | null) => void;
   onDefaultValuesChanged?: (
     provider: string | null,
@@ -34,7 +31,6 @@ interface ModelSelectorProps {
 export function ModelSelector({
   isDisabled,
   currentModel,
-  currentBaseUrl,
   onChange,
   onDefaultValuesChanged,
   wrapperClassName,
@@ -47,7 +43,6 @@ export function ModelSelector({
   const [selectedModel, setSelectedModel] = React.useState<string | null>(null);
 
   const { data: providers = [] } = useSearchProviders();
-  const { data: openhandsVerifiedModels } = useOpenhandsVerifiedModels();
   const {
     data: providerModels = [],
     isLoading: isLoadingModels,
@@ -73,24 +68,15 @@ export function ModelSelector({
   );
 
   React.useEffect(() => {
-    // Wait for the openhands verified list before initializing — otherwise a
-    // persisted `litellm_proxy/<m>` model would first land as `litellm_proxy`
-    // and only later flip to `openhands`, triggering a redundant /api/llm/models
-    // fetch for the throwaway provider value.
-    if (currentModel && openhandsVerifiedModels !== undefined) {
-      const displayModel = normalizeDisplayModel(
-        currentModel,
-        currentBaseUrl,
-        openhandsVerifiedModels,
-      );
-      const { provider, model } = extractModelAndProvider(displayModel);
+    if (currentModel) {
+      const { provider, model } = extractModelAndProvider(currentModel);
 
-      setLitellmId(displayModel);
+      setLitellmId(currentModel);
       setSelectedProvider(provider || null);
       setSelectedModel(model);
       onDefaultValuesChanged?.(provider || null, model);
     }
-  }, [currentModel, currentBaseUrl, openhandsVerifiedModels]);
+  }, [currentModel]);
 
   const handleChangeProvider = (provider: string) => {
     setSelectedProvider(provider);

src/components/shared/modals/settings/settings-form.tsx

@@ -70,7 +70,6 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
 
   const isLLMKeySet = settings.llm_api_key_set;
   const currentModel = getAgentSettingValue(settings, "llm.model");
-  const currentBaseUrl = getAgentSettingValue(settings, "llm.base_url");
 
   return (
     <div>
@@ -85,9 +84,6 @@ export function SettingsForm({ settings, onClose }: SettingsFormProps) {
             currentModel={
               typeof currentModel === "string" ? currentModel : undefined
             }
-            currentBaseUrl={
-              typeof currentBaseUrl === "string" ? currentBaseUrl : undefined
-            }
             wrapperClassName="!flex-col !gap-[17px]"
             labelClassName={SETTINGS_FORM.LABEL_CLASSNAME}
           />

src/routes/llm-settings.tsx

@@ -33,7 +33,6 @@ import {
   resolveLlmAuthType,
 } from "#/constants/llm-subscription";
 import { useOpenAISubscriptionModels } from "#/hooks/query/use-llm-subscription-models";
-import { OPENHANDS_LLM_PROXY_BASE_URL } from "#/utils/openhands-llm";
 
 const LLM_EXCLUDED_KEYS = new Set([
   "llm.model",
@@ -58,14 +57,6 @@ const getSchemaFieldDefaultValue = (
 
 const KNOWN_PROVIDER_DEFAULT_BASE_URLS: Partial<Record<string, Set<string>>> = {
   openai: new Set(["https://api.openai.com", "https://api.openai.com/v1"]),
-  openhands: new Set([
-    OPENHANDS_LLM_PROXY_BASE_URL,
-    "https://llm-proxy.app.all-hands.dev/v1",
-  ]),
-  litellm_proxy: new Set([
-    OPENHANDS_LLM_PROXY_BASE_URL,
-    "https://llm-proxy.app.all-hands.dev/v1",
-  ]),
 };
 
 const normalizeBaseUrl = (baseUrl: string) => {
@@ -350,7 +341,6 @@ export function LlmSettingsScreen({
                 <>
                   <ModelSelector
                     currentModel={modelValue || undefined}
-                    currentBaseUrl={baseUrlValue || undefined}
                     onChange={(provider, model) => {
                       const nextModel = buildModelId(provider, model);
                       if (nextModel) {