fix: Code output extending over thinking bounds (#8837)

.github/workflows/post-merge-beta-cherry-pick.yml

@@ -114,10 +114,8 @@ jobs:
 
       - name: Mark workflow as failed if cherry-pick failed
         if: steps.gate.outputs.should_cherrypick == 'true' && steps.run_cherry_pick.outputs.status == 'failure'
-        env:
-          CHERRY_PICK_REASON: ${{ steps.run_cherry_pick.outputs.reason }}
         run: |
-          echo "::error::Automated cherry-pick failed (${CHERRY_PICK_REASON})."
+          echo "::error::Automated cherry-pick failed (${{ steps.run_cherry_pick.outputs.reason }})."
           exit 1
 
   notify-slack-on-cherry-pick-failure:

backend/ee/onyx/server/seeding.py

@@ -20,7 +20,6 @@ from ee.onyx.server.enterprise_settings.store import (
 from ee.onyx.server.enterprise_settings.store import upload_logo
 from onyx.context.search.enums import RecencyBiasSetting
 from onyx.db.engine.sql_engine import get_session_with_current_tenant
-from onyx.db.llm import fetch_existing_llm_provider
 from onyx.db.llm import update_default_provider
 from onyx.db.llm import upsert_llm_provider
 from onyx.db.models import Tool
@@ -118,38 +117,15 @@ def _seed_custom_tools(db_session: Session, tools: List[CustomToolSeed]) -> None
 def _seed_llms(
     db_session: Session, llm_upsert_requests: list[LLMProviderUpsertRequest]
 ) -> None:
-    if not llm_upsert_requests:
-        return
-
-    logger.notice("Seeding LLMs")
-    for request in llm_upsert_requests:
-        existing = fetch_existing_llm_provider(name=request.name, db_session=db_session)
-        if existing:
-            request.id = existing.id
-    seeded_providers = [
-        upsert_llm_provider(llm_upsert_request, db_session)
-        for llm_upsert_request in llm_upsert_requests
-    ]
-
-    default_provider = next(
-        (p for p in seeded_providers if p.model_configurations), None
-    )
-    if not default_provider:
-        return
-
-    visible_configs = [
-        mc for mc in default_provider.model_configurations if mc.is_visible
-    ]
-    default_config = (
-        visible_configs[0]
-        if visible_configs
-        else default_provider.model_configurations[0]
-    )
-    update_default_provider(
-        provider_id=default_provider.id,
-        model_name=default_config.name,
-        db_session=db_session,
-    )
+    if llm_upsert_requests:
+        logger.notice("Seeding LLMs")
+        seeded_providers = [
+            upsert_llm_provider(llm_upsert_request, db_session)
+            for llm_upsert_request in llm_upsert_requests
+        ]
+        update_default_provider(
+            provider_id=seeded_providers[0].id, db_session=db_session
+        )
 
 
 def _seed_personas(db_session: Session, personas: list[PersonaUpsertRequest]) -> None:

backend/ee/onyx/server/tenants/provisioning.py

@@ -33,7 +33,6 @@ from onyx.configs.constants import MilestoneRecordType
 from onyx.db.engine.sql_engine import get_session_with_shared_schema
 from onyx.db.engine.sql_engine import get_session_with_tenant
 from onyx.db.image_generation import create_default_image_gen_config_from_api_key
-from onyx.db.llm import fetch_existing_llm_provider
 from onyx.db.llm import update_default_provider
 from onyx.db.llm import upsert_cloud_embedding_provider
 from onyx.db.llm import upsert_llm_provider
@@ -303,17 +302,12 @@ def configure_default_api_keys(db_session: Session) -> None:
 
     has_set_default_provider = False
 
-    def _upsert(request: LLMProviderUpsertRequest, default_model: str) -> None:
+    def _upsert(request: LLMProviderUpsertRequest) -> None:
         nonlocal has_set_default_provider
         try:
-            existing = fetch_existing_llm_provider(
-                name=request.name, db_session=db_session
-            )
-            if existing:
-                request.id = existing.id
             provider = upsert_llm_provider(request, db_session)
             if not has_set_default_provider:
-                update_default_provider(provider.id, default_model, db_session)
+                update_default_provider(provider.id, db_session)
                 has_set_default_provider = True
         except Exception as e:
             logger.error(f"Failed to configure {request.provider} provider: {e}")
@@ -331,13 +325,14 @@ def configure_default_api_keys(db_session: Session) -> None:
             name="OpenAI",
             provider=OPENAI_PROVIDER_NAME,
             api_key=OPENAI_DEFAULT_API_KEY,
+            default_model_name=default_model_name,
             model_configurations=_build_model_configuration_upsert_requests(
                 OPENAI_PROVIDER_NAME, recommendations
             ),
             api_key_changed=True,
             is_auto_mode=True,
         )
-        _upsert(openai_provider, default_model_name)
+        _upsert(openai_provider)
 
         # Create default image generation config using the OpenAI API key
         try:
@@ -366,13 +361,14 @@ def configure_default_api_keys(db_session: Session) -> None:
             name="Anthropic",
             provider=ANTHROPIC_PROVIDER_NAME,
             api_key=ANTHROPIC_DEFAULT_API_KEY,
+            default_model_name=default_model_name,
             model_configurations=_build_model_configuration_upsert_requests(
                 ANTHROPIC_PROVIDER_NAME, recommendations
             ),
             api_key_changed=True,
             is_auto_mode=True,
         )
-        _upsert(anthropic_provider, default_model_name)
+        _upsert(anthropic_provider)
     else:
         logger.info(
             "ANTHROPIC_DEFAULT_API_KEY not set, skipping Anthropic provider configuration"
@@ -397,13 +393,14 @@ def configure_default_api_keys(db_session: Session) -> None:
             name="Google Vertex AI",
             provider=VERTEXAI_PROVIDER_NAME,
             custom_config=custom_config,
+            default_model_name=default_model_name,
             model_configurations=_build_model_configuration_upsert_requests(
                 VERTEXAI_PROVIDER_NAME, recommendations
             ),
             api_key_changed=True,
             is_auto_mode=True,
         )
-        _upsert(vertexai_provider, default_model_name)
+        _upsert(vertexai_provider)
     else:
         logger.info(
             "VERTEXAI_DEFAULT_CREDENTIALS not set, skipping Vertex AI provider configuration"
@@ -435,11 +432,12 @@ def configure_default_api_keys(db_session: Session) -> None:
             name="OpenRouter",
             provider=OPENROUTER_PROVIDER_NAME,
             api_key=OPENROUTER_DEFAULT_API_KEY,
+            default_model_name=default_model_name,
             model_configurations=model_configurations,
             api_key_changed=True,
             is_auto_mode=True,
         )
-        _upsert(openrouter_provider, default_model_name)
+        _upsert(openrouter_provider)
     else:
         logger.info(
             "OPENROUTER_DEFAULT_API_KEY not set, skipping OpenRouter provider configuration"

backend/onyx/db/image_generation.py

@@ -202,6 +202,7 @@ def create_default_image_gen_config_from_api_key(
             api_key=api_key,
             api_base=None,
             api_version=None,
+            default_model_name=model_name,
             deployment_name=None,
             is_public=True,
         )

backend/onyx/db/llm.py

@@ -213,29 +213,11 @@ def upsert_llm_provider(
     llm_provider_upsert_request: LLMProviderUpsertRequest,
     db_session: Session,
 ) -> LLMProviderView:
-    existing_llm_provider: LLMProviderModel | None = None
-    if llm_provider_upsert_request.id:
-        existing_llm_provider = fetch_existing_llm_provider_by_id(
-            id=llm_provider_upsert_request.id, db_session=db_session
-        )
-        if not existing_llm_provider:
-            raise ValueError(
-                f"LLM provider with id {llm_provider_upsert_request.id} not found"
-            )
+    existing_llm_provider = fetch_existing_llm_provider(
+        name=llm_provider_upsert_request.name, db_session=db_session
+    )
 
-        if existing_llm_provider.name != llm_provider_upsert_request.name:
-            raise ValueError(
-                f"LLM provider with id {llm_provider_upsert_request.id} name change not allowed"
-            )
-    else:
-        existing_llm_provider = fetch_existing_llm_provider(
-            name=llm_provider_upsert_request.name, db_session=db_session
-        )
-        if existing_llm_provider:
-            raise ValueError(
-                f"LLM provider with name '{llm_provider_upsert_request.name}'"
-                " already exists"
-            )
+    if not existing_llm_provider:
         existing_llm_provider = LLMProviderModel(name=llm_provider_upsert_request.name)
         db_session.add(existing_llm_provider)
 
@@ -256,7 +238,11 @@ def upsert_llm_provider(
     existing_llm_provider.api_base = api_base
     existing_llm_provider.api_version = llm_provider_upsert_request.api_version
     existing_llm_provider.custom_config = custom_config
-
+    # TODO: Remove default model name on api change
+    # Needed due to /provider/{id}/default endpoint not disclosing the default model name
+    existing_llm_provider.default_model_name = (
+        llm_provider_upsert_request.default_model_name
+    )
     existing_llm_provider.is_public = llm_provider_upsert_request.is_public
     existing_llm_provider.is_auto_mode = llm_provider_upsert_request.is_auto_mode
     existing_llm_provider.deployment_name = llm_provider_upsert_request.deployment_name
@@ -320,6 +306,15 @@ def upsert_llm_provider(
                 display_name=model_config.display_name,
             )
 
+    default_model = fetch_default_model(db_session, LLMModelFlowType.CHAT)
+    if default_model and default_model.llm_provider_id == existing_llm_provider.id:
+        _update_default_model(
+            db_session=db_session,
+            provider_id=existing_llm_provider.id,
+            model=existing_llm_provider.default_model_name,
+            flow_type=LLMModelFlowType.CHAT,
+        )
+
     # Make sure the relationship table stays up to date
     update_group_llm_provider_relationships__no_commit(
         llm_provider_id=existing_llm_provider.id,
@@ -493,22 +488,6 @@ def fetch_existing_llm_provider(
     return provider_model
 
 
-def fetch_existing_llm_provider_by_id(
-    id: int, db_session: Session
-) -> LLMProviderModel | None:
-    provider_model = db_session.scalar(
-        select(LLMProviderModel)
-        .where(LLMProviderModel.id == id)
-        .options(
-            selectinload(LLMProviderModel.model_configurations),
-            selectinload(LLMProviderModel.groups),
-            selectinload(LLMProviderModel.personas),
-        )
-    )
-
-    return provider_model
-
-
 def fetch_embedding_provider(
     db_session: Session, provider_type: EmbeddingProvider
 ) -> CloudEmbeddingProviderModel | None:
@@ -625,13 +604,22 @@ def remove_llm_provider__no_commit(db_session: Session, provider_id: int) -> Non
     db_session.flush()
 
 
-def update_default_provider(
-    provider_id: int, model_name: str, db_session: Session
-) -> None:
+def update_default_provider(provider_id: int, db_session: Session) -> None:
+    # Attempt to get the default_model_name from the provider first
+    # TODO: Remove default_model_name check
+    provider = db_session.scalar(
+        select(LLMProviderModel).where(
+            LLMProviderModel.id == provider_id,
+        )
+    )
+
+    if provider is None:
+        raise ValueError(f"LLM Provider with id={provider_id} does not exist")
+
     _update_default_model(
         db_session,
         provider_id,
-        model_name,
+        provider.default_model_name,  # type: ignore[arg-type]
         LLMModelFlowType.CHAT,
     )
 
@@ -817,6 +805,12 @@ def sync_auto_mode_models(
             )
             changes += 1
 
+    # In Auto mode, default model is always set from GitHub config
+    default_model = llm_recommendations.get_default_model(provider.provider)
+    if default_model and provider.default_model_name != default_model.name:
+        provider.default_model_name = default_model.name
+        changes += 1
+
     db_session.commit()
     return changes
 

backend/onyx/server/manage/image_generation/api.py

@@ -97,6 +97,7 @@ def _build_llm_provider_request(
             ),  # Only this from source
             api_base=api_base,  # From request
             api_version=api_version,  # From request
+            default_model_name=model_name,
             deployment_name=deployment_name,  # From request
             is_public=True,
             groups=[],
@@ -135,6 +136,7 @@ def _build_llm_provider_request(
         api_key=api_key,
         api_base=api_base,
         api_version=api_version,
+        default_model_name=model_name,
         deployment_name=deployment_name,
         is_public=True,
         groups=[],
@@ -166,6 +168,7 @@ def _create_image_gen_llm_provider__no_commit(
         api_key=provider_request.api_key,
         api_base=provider_request.api_base,
         api_version=provider_request.api_version,
+        default_model_name=provider_request.default_model_name,
         deployment_name=provider_request.deployment_name,
         is_public=provider_request.is_public,
         custom_config=provider_request.custom_config,

backend/onyx/server/manage/llm/api.py

@@ -22,10 +22,7 @@ from onyx.auth.users import current_chat_accessible_user
 from onyx.db.engine.sql_engine import get_session
 from onyx.db.enums import LLMModelFlowType
 from onyx.db.llm import can_user_access_llm_provider
-from onyx.db.llm import fetch_default_llm_model
-from onyx.db.llm import fetch_default_vision_model
 from onyx.db.llm import fetch_existing_llm_provider
-from onyx.db.llm import fetch_existing_llm_provider_by_id
 from onyx.db.llm import fetch_existing_llm_providers
 from onyx.db.llm import fetch_existing_models
 from onyx.db.llm import fetch_persona_with_groups
@@ -55,12 +52,11 @@ from onyx.llm.well_known_providers.llm_provider_options import (
 )
 from onyx.server.manage.llm.models import BedrockFinalModelResponse
 from onyx.server.manage.llm.models import BedrockModelsRequest
-from onyx.server.manage.llm.models import DefaultModel
 from onyx.server.manage.llm.models import LLMCost
 from onyx.server.manage.llm.models import LLMProviderDescriptor
-from onyx.server.manage.llm.models import LLMProviderResponse
 from onyx.server.manage.llm.models import LLMProviderUpsertRequest
 from onyx.server.manage.llm.models import LLMProviderView
+from onyx.server.manage.llm.models import ModelConfigurationUpsertRequest
 from onyx.server.manage.llm.models import OllamaFinalModelResponse
 from onyx.server.manage.llm.models import OllamaModelDetails
 from onyx.server.manage.llm.models import OllamaModelsRequest
@@ -237,9 +233,12 @@ def test_llm_configuration(
 
     test_api_key = test_llm_request.api_key
     test_custom_config = test_llm_request.custom_config
-    if test_llm_request.id:
-        existing_provider = fetch_existing_llm_provider_by_id(
-            id=test_llm_request.id, db_session=db_session
+    if test_llm_request.name:
+        # NOTE: we are querying by name. we probably should be querying by an invariant id, but
+        # as it turns out the name is not editable in the UI and other code also keys off name,
+        # so we won't rock the boat just yet.
+        existing_provider = fetch_existing_llm_provider(
+            name=test_llm_request.name, db_session=db_session
         )
         if existing_provider:
             test_custom_config = _restore_masked_custom_config_values(
@@ -269,7 +268,7 @@ def test_llm_configuration(
 
     llm = get_llm(
         provider=test_llm_request.provider,
-        model=test_llm_request.model,
+        model=test_llm_request.default_model_name,
         api_key=test_api_key,
         api_base=test_llm_request.api_base,
         api_version=test_llm_request.api_version,
@@ -304,7 +303,7 @@ def list_llm_providers(
     include_image_gen: bool = Query(False),
     _: User = Depends(current_admin_user),
     db_session: Session = Depends(get_session),
-) -> LLMProviderResponse[LLMProviderView]:
+) -> list[LLMProviderView]:
     start_time = datetime.now(timezone.utc)
     logger.debug("Starting to fetch LLM providers")
 
@@ -329,15 +328,7 @@ def list_llm_providers(
     duration = (end_time - start_time).total_seconds()
     logger.debug(f"Completed fetching LLM providers in {duration:.2f} seconds")
 
-    return LLMProviderResponse[LLMProviderView].from_models(
-        providers=llm_provider_list,
-        default_text=DefaultModel.from_model_config(
-            fetch_default_llm_model(db_session)
-        ),
-        default_vision=DefaultModel.from_model_config(
-            fetch_default_vision_model(db_session)
-        ),
-    )
+    return llm_provider_list
 
 
 @admin_router.put("/provider")
@@ -353,44 +344,18 @@ def put_llm_provider(
     # validate request (e.g. if we're intending to create but the name already exists we should throw an error)
     # NOTE: may involve duplicate fetching to Postgres, but we're assuming SQLAlchemy is smart enough to cache
     # the result
-    existing_provider = None
-    if llm_provider_upsert_request.id:
-        existing_provider = fetch_existing_llm_provider_by_id(
-            id=llm_provider_upsert_request.id, db_session=db_session
-        )
-
-    # Check name constraints
-    # TODO: Once port from name to id is complete, unique name will no longer be required
-    if existing_provider and llm_provider_upsert_request.name != existing_provider.name:
-        raise HTTPException(
-            status_code=400,
-            detail="Renaming providers is not currently supported",
-        )
-
-    found_provider = fetch_existing_llm_provider(
+    existing_provider = fetch_existing_llm_provider(
         name=llm_provider_upsert_request.name, db_session=db_session
     )
-    if found_provider is not None and found_provider is not existing_provider:
-        raise HTTPException(
-            status_code=400,
-            detail=f"Provider with name={llm_provider_upsert_request.name} already exists",
-        )
-
     if existing_provider and is_creation:
         raise HTTPException(
             status_code=400,
-            detail=(
-                f"LLM Provider with name {llm_provider_upsert_request.name} and "
-                f"id={llm_provider_upsert_request.id} already exists"
-            ),
+            detail=f"LLM Provider with name {llm_provider_upsert_request.name} already exists",
         )
     elif not existing_provider and not is_creation:
         raise HTTPException(
             status_code=400,
-            detail=(
-                f"LLM Provider with name {llm_provider_upsert_request.name} and "
-                f"id={llm_provider_upsert_request.id} does not exist"
-            ),
+            detail=f"LLM Provider with name {llm_provider_upsert_request.name} does not exist",
         )
 
     # SSRF Protection: Validate api_base and custom_config match stored values
@@ -428,6 +393,22 @@ def put_llm_provider(
                 deduplicated_personas.append(persona_id)
         llm_provider_upsert_request.personas = deduplicated_personas
 
+    default_model_found = False
+
+    for model_configuration in llm_provider_upsert_request.model_configurations:
+        if model_configuration.name == llm_provider_upsert_request.default_model_name:
+            model_configuration.is_visible = True
+            default_model_found = True
+
+    # TODO: Remove this logic on api change
+    # Believed to be a dead pathway but we want to be safe for now
+    if not default_model_found:
+        llm_provider_upsert_request.model_configurations.append(
+            ModelConfigurationUpsertRequest(
+                name=llm_provider_upsert_request.default_model_name, is_visible=True
+            )
+        )
+
     # the llm api key is sanitized when returned to clients, so the only time we
     # should get a real key is when it is explicitly changed
     if existing_provider and not llm_provider_upsert_request.api_key_changed:
@@ -457,8 +438,8 @@ def put_llm_provider(
             config = fetch_llm_recommendations_from_github()
             if config and llm_provider_upsert_request.provider in config.providers:
                 # Refetch the provider to get the updated model
-                updated_provider = fetch_existing_llm_provider_by_id(
-                    id=result.id, db_session=db_session
+                updated_provider = fetch_existing_llm_provider(
+                    name=llm_provider_upsert_request.name, db_session=db_session
                 )
                 if updated_provider:
                     sync_auto_mode_models(
@@ -488,29 +469,28 @@ def delete_llm_provider(
         raise HTTPException(status_code=404, detail=str(e))
 
 
-@admin_router.post("/default")
+@admin_router.post("/provider/{provider_id}/default")
 def set_provider_as_default(
-    default_model_request: DefaultModel,
+    provider_id: int,
     _: User = Depends(current_admin_user),
     db_session: Session = Depends(get_session),
 ) -> None:
-    update_default_provider(
-        provider_id=default_model_request.provider_id,
-        model_name=default_model_request.model_name,
-        db_session=db_session,
-    )
+    update_default_provider(provider_id=provider_id, db_session=db_session)
 
 
-@admin_router.post("/default-vision")
+@admin_router.post("/provider/{provider_id}/default-vision")
 def set_provider_as_default_vision(
-    default_model: DefaultModel,
+    provider_id: int,
+    vision_model: str | None = Query(
+        None, description="The default vision model to use"
+    ),
     _: User = Depends(current_admin_user),
     db_session: Session = Depends(get_session),
 ) -> None:
+    if vision_model is None:
+        raise HTTPException(status_code=404, detail="Vision model not provided")
     update_default_vision_provider(
-        provider_id=default_model.provider_id,
-        vision_model=default_model.model_name,
-        db_session=db_session,
+        provider_id=provider_id, vision_model=vision_model, db_session=db_session
     )
 
 
@@ -536,7 +516,7 @@ def get_auto_config(
 def get_vision_capable_providers(
     _: User = Depends(current_admin_user),
     db_session: Session = Depends(get_session),
-) -> LLMProviderResponse[VisionProviderResponse]:
+) -> list[VisionProviderResponse]:
     """Return a list of LLM providers and their models that support image input"""
     vision_models = fetch_existing_models(
         db_session=db_session, flow_types=[LLMModelFlowType.VISION]
@@ -565,13 +545,7 @@ def get_vision_capable_providers(
     ]
 
     logger.debug(f"Found {len(vision_provider_response)} vision-capable providers")
-
-    return LLMProviderResponse[VisionProviderResponse].from_models(
-        providers=vision_provider_response,
-        default_vision=DefaultModel.from_model_config(
-            fetch_default_vision_model(db_session)
-        ),
-    )
+    return vision_provider_response
 
 
 """Endpoints for all"""
@@ -581,7 +555,7 @@ def get_vision_capable_providers(
 def list_llm_provider_basics(
     user: User = Depends(current_chat_accessible_user),
     db_session: Session = Depends(get_session),
-) -> LLMProviderResponse[LLMProviderDescriptor]:
+) -> list[LLMProviderDescriptor]:
     """Get LLM providers accessible to the current user.
 
     Returns:
@@ -618,15 +592,7 @@ def list_llm_provider_basics(
         f"Completed fetching {len(accessible_providers)} user-accessible providers in {duration:.2f} seconds"
     )
 
-    return LLMProviderResponse[LLMProviderDescriptor].from_models(
-        providers=accessible_providers,
-        default_text=DefaultModel.from_model_config(
-            fetch_default_llm_model(db_session)
-        ),
-        default_vision=DefaultModel.from_model_config(
-            fetch_default_vision_model(db_session)
-        ),
-    )
+    return accessible_providers
 
 
 def get_valid_model_names_for_persona(
@@ -669,7 +635,7 @@ def list_llm_providers_for_persona(
     persona_id: int,
     user: User = Depends(current_chat_accessible_user),
     db_session: Session = Depends(get_session),
-) -> LLMProviderResponse[LLMProviderDescriptor]:
+) -> list[LLMProviderDescriptor]:
     """Get LLM providers for a specific persona.
 
     Returns providers that the user can access when using this persona:
@@ -716,51 +682,7 @@ def list_llm_providers_for_persona(
         f"Completed fetching {len(llm_provider_list)} LLM providers for persona {persona_id} in {duration:.2f} seconds"
     )
 
-    # Get the default model and vision model for the persona
-    # TODO: Port persona's over to use ID
-    persona_default_provider = persona.llm_model_provider_override
-    persona_default_model = persona.llm_model_version_override
-
-    default_text_model = fetch_default_llm_model(db_session)
-    default_vision_model = fetch_default_vision_model(db_session)
-
-    # Build default_text and default_vision using persona overrides when available,
-    # falling back to the global defaults.
-    default_text = DefaultModel.from_model_config(default_text_model)
-    default_vision = DefaultModel.from_model_config(default_vision_model)
-
-    if persona_default_provider:
-        provider = fetch_existing_llm_provider(persona_default_provider, db_session)
-        if provider and can_user_access_llm_provider(
-            provider, user_group_ids, persona, is_admin=is_admin
-        ):
-            if persona_default_model:
-                # Persona specifies both provider and model — use them directly
-                default_text = DefaultModel(
-                    provider_id=provider.id,
-                    model_name=persona_default_model,
-                )
-            else:
-                # Persona specifies only the provider — pick a visible (public) model,
-                # falling back to any model on this provider
-                visible_model = next(
-                    (mc for mc in provider.model_configurations if mc.is_visible),
-                    None,
-                )
-                fallback_model = visible_model or next(
-                    iter(provider.model_configurations), None
-                )
-                if fallback_model:
-                    default_text = DefaultModel(
-                        provider_id=provider.id,
-                        model_name=fallback_model.name,
-                    )
-
-    return LLMProviderResponse[LLMProviderDescriptor].from_models(
-        providers=llm_provider_list,
-        default_text=default_text,
-        default_vision=default_vision,
-    )
+    return llm_provider_list
 
 
 @admin_router.get("/provider-contextual-cost")

backend/onyx/server/manage/llm/models.py

@@ -1,9 +1,5 @@
-from __future__ import annotations
-
 from typing import Any
-from typing import Generic
 from typing import TYPE_CHECKING
-from typing import TypeVar
 
 from pydantic import BaseModel
 from pydantic import Field
@@ -25,22 +21,50 @@ if TYPE_CHECKING:
         ModelConfiguration as ModelConfigurationModel,
     )
 
-T = TypeVar("T", "LLMProviderDescriptor", "LLMProviderView", "VisionProviderResponse")
+
+# TODO: Clear this up on api refactor
+# There is still logic that requires sending each providers default model name
+# There is no logic that requires sending the providers default vision model name
+# We only send for the one that is actually the default
+def get_default_llm_model_name(llm_provider_model: "LLMProviderModel") -> str:
+    """Find the default conversation model name for a provider.
+
+    Returns the model name if found, otherwise returns empty string.
+    """
+    for model_config in llm_provider_model.model_configurations:
+        for flow in model_config.llm_model_flows:
+            if flow.is_default and flow.llm_model_flow_type == LLMModelFlowType.CHAT:
+                return model_config.name
+    return ""
+
+
+def get_default_vision_model_name(llm_provider_model: "LLMProviderModel") -> str | None:
+    """Find the default vision model name for a provider.
+
+    Returns the model name if found, otherwise returns None.
+    """
+    for model_config in llm_provider_model.model_configurations:
+        for flow in model_config.llm_model_flows:
+            if flow.is_default and flow.llm_model_flow_type == LLMModelFlowType.VISION:
+                return model_config.name
+    return None
 
 
 class TestLLMRequest(BaseModel):
     # provider level
-    id: int | None = None
+    name: str | None = None
     provider: str
-    model: str
     api_key: str | None = None
     api_base: str | None = None
     api_version: str | None = None
     custom_config: dict[str, str] | None = None
 
     # model level
+    default_model_name: str
     deployment_name: str | None = None
 
+    model_configurations: list["ModelConfigurationUpsertRequest"]
+
     # if try and use the existing API/custom config key
     api_key_changed: bool
     custom_config_changed: bool
@@ -56,10 +80,13 @@ class LLMProviderDescriptor(BaseModel):
     """A descriptor for an LLM provider that can be safely viewed by
     non-admin users. Used when giving a list of available LLMs."""
 
-    id: int
     name: str
     provider: str
     provider_display_name: str  # Human-friendly name like "Claude (Anthropic)"
+    default_model_name: str
+    is_default_provider: bool | None
+    is_default_vision_provider: bool | None
+    default_vision_model: str | None
     model_configurations: list["ModelConfigurationView"]
 
     @classmethod
@@ -72,12 +99,24 @@ class LLMProviderDescriptor(BaseModel):
         )
 
         provider = llm_provider_model.provider
+        default_model_name = get_default_llm_model_name(llm_provider_model)
+        default_vision_model = get_default_vision_model_name(llm_provider_model)
+
+        is_default_provider = bool(default_model_name)
+        is_default_vision_provider = default_vision_model is not None
+
+        default_model_name = (
+            default_model_name or llm_provider_model.default_model_name or ""
+        )
 
         return cls(
-            id=llm_provider_model.id,
             name=llm_provider_model.name,
             provider=provider,
             provider_display_name=get_provider_display_name(provider),
+            default_model_name=default_model_name,
+            is_default_provider=is_default_provider,
+            is_default_vision_provider=is_default_vision_provider,
+            default_vision_model=default_vision_model,
             model_configurations=filter_model_configurations(
                 llm_provider_model.model_configurations, provider
             ),
@@ -91,17 +130,18 @@ class LLMProvider(BaseModel):
     api_base: str | None = None
     api_version: str | None = None
     custom_config: dict[str, str] | None = None
+    default_model_name: str
     is_public: bool = True
     is_auto_mode: bool = False
     groups: list[int] = Field(default_factory=list)
     personas: list[int] = Field(default_factory=list)
     deployment_name: str | None = None
+    default_vision_model: str | None = None
 
 
 class LLMProviderUpsertRequest(LLMProvider):
     # should only be used for a "custom" provider
     # for default providers, the built-in model names are used
-    id: int | None = None
     api_key_changed: bool = False
     custom_config_changed: bool = False
     model_configurations: list["ModelConfigurationUpsertRequest"] = []
@@ -117,6 +157,8 @@ class LLMProviderView(LLMProvider):
     """Stripped down representation of LLMProvider for display / limited access info only"""
 
     id: int
+    is_default_provider: bool | None = None
+    is_default_vision_provider: bool | None = None
     model_configurations: list["ModelConfigurationView"]
 
     @classmethod
@@ -138,6 +180,16 @@ class LLMProviderView(LLMProvider):
 
         provider = llm_provider_model.provider
 
+        default_model_name = get_default_llm_model_name(llm_provider_model)
+        default_vision_model = get_default_vision_model_name(llm_provider_model)
+
+        is_default_provider = bool(default_model_name)
+        is_default_vision_provider = default_vision_model is not None
+
+        default_model_name = (
+            default_model_name or llm_provider_model.default_model_name or ""
+        )
+
         return cls(
             id=llm_provider_model.id,
             name=llm_provider_model.name,
@@ -150,6 +202,10 @@ class LLMProviderView(LLMProvider):
             api_base=llm_provider_model.api_base,
             api_version=llm_provider_model.api_version,
             custom_config=llm_provider_model.custom_config,
+            default_model_name=default_model_name,
+            is_default_provider=is_default_provider,
+            is_default_vision_provider=is_default_vision_provider,
+            default_vision_model=default_vision_model,
             is_public=llm_provider_model.is_public,
             is_auto_mode=llm_provider_model.is_auto_mode,
             groups=groups,
@@ -369,38 +425,3 @@ class OpenRouterFinalModelResponse(BaseModel):
         int | None
     )  # From OpenRouter API context_length (may be missing for some models)
     supports_image_input: bool
-
-
-class DefaultModel(BaseModel):
-    provider_id: int
-    model_name: str
-
-    @classmethod
-    def from_model_config(
-        cls, model_config: ModelConfigurationModel | None
-    ) -> DefaultModel | None:
-        if not model_config:
-            return None
-        return cls(
-            provider_id=model_config.llm_provider_id,
-            model_name=model_config.name,
-        )
-
-
-class LLMProviderResponse(BaseModel, Generic[T]):
-    providers: list[T]
-    default_text: DefaultModel | None = None
-    default_vision: DefaultModel | None = None
-
-    @classmethod
-    def from_models(
-        cls,
-        providers: list[T],
-        default_text: DefaultModel | None = None,
-        default_vision: DefaultModel | None = None,
-    ) -> LLMProviderResponse[T]:
-        return cls(
-            providers=providers,
-            default_text=default_text,
-            default_vision=default_vision,
-        )

backend/onyx/setup.py

@@ -25,7 +25,6 @@ from onyx.db.enums import EmbeddingPrecision
 from onyx.db.index_attempt import cancel_indexing_attempts_past_model
 from onyx.db.index_attempt import expire_index_attempts
 from onyx.db.llm import fetch_default_llm_model
-from onyx.db.llm import fetch_existing_llm_provider
 from onyx.db.llm import update_default_provider
 from onyx.db.llm import upsert_llm_provider
 from onyx.db.search_settings import get_active_search_settings
@@ -255,18 +254,14 @@ def setup_postgres(db_session: Session) -> None:
         logger.notice("Setting up default OpenAI LLM for dev.")
 
         llm_model = GEN_AI_MODEL_VERSION or "gpt-4o-mini"
-        provider_name = "DevEnvPresetOpenAI"
-        existing = fetch_existing_llm_provider(
-            name=provider_name, db_session=db_session
-        )
         model_req = LLMProviderUpsertRequest(
-            id=existing.id if existing else None,
-            name=provider_name,
+            name="DevEnvPresetOpenAI",
             provider=LlmProviderNames.OPENAI,
             api_key=GEN_AI_API_KEY,
             api_base=None,
             api_version=None,
             custom_config=None,
+            default_model_name=llm_model,
             is_public=True,
             groups=[],
             model_configurations=[
@@ -278,9 +273,7 @@ def setup_postgres(db_session: Session) -> None:
         new_llm_provider = upsert_llm_provider(
             llm_provider_upsert_request=model_req, db_session=db_session
         )
-        update_default_provider(
-            provider_id=new_llm_provider.id, model_name=llm_model, db_session=db_session
-        )
+        update_default_provider(provider_id=new_llm_provider.id, db_session=db_session)
 
 
 def update_default_multipass_indexing(db_session: Session) -> None:

backend/tests/daily/llm/test_bedrock.py

@@ -17,7 +17,7 @@ def test_bedrock_llm_configuration(client: TestClient) -> None:
     # Prepare the test request payload
     test_request: dict[str, Any] = {
         "provider": LlmProviderNames.BEDROCK,
-        "model": _DEFAULT_BEDROCK_MODEL,
+        "default_model_name": _DEFAULT_BEDROCK_MODEL,
         "api_key": None,
         "api_base": None,
         "api_version": None,
@@ -44,7 +44,7 @@ def test_bedrock_llm_configuration_invalid_key(client: TestClient) -> None:
     # Prepare the test request payload with invalid credentials
     test_request: dict[str, Any] = {
         "provider": LlmProviderNames.BEDROCK,
-        "model": _DEFAULT_BEDROCK_MODEL,
+        "default_model_name": _DEFAULT_BEDROCK_MODEL,
         "api_key": None,
         "api_base": None,
         "api_version": None,

backend/tests/external_dependency_unit/answer/conftest.py

@@ -28,6 +28,7 @@ def ensure_default_llm_provider(db_session: Session) -> None:
             provider=LlmProviderNames.OPENAI,
             api_key=os.environ.get("OPENAI_API_KEY", "test"),
             is_public=True,
+            default_model_name="gpt-4o-mini",
             model_configurations=[
                 ModelConfigurationUpsertRequest(
                     name="gpt-4o-mini",
@@ -40,7 +41,7 @@ def ensure_default_llm_provider(db_session: Session) -> None:
             llm_provider_upsert_request=llm_provider_request,
             db_session=db_session,
         )
-        update_default_provider(provider.id, "gpt-4o-mini", db_session)
+        update_default_provider(provider.id, db_session)
     except Exception as exc:  # pragma: no cover - only hits on duplicate setup issues
         # Rollback to clear the pending transaction state
         db_session.rollback()

backend/tests/external_dependency_unit/answer/test_answer_without_openai.py

@@ -47,6 +47,7 @@ def test_answer_with_only_anthropic_provider(
             name=provider_name,
             provider=LlmProviderNames.ANTHROPIC,
             api_key=anthropic_api_key,
+            default_model_name=anthropic_model,
             is_public=True,
             groups=[],
             model_configurations=[
@@ -58,7 +59,7 @@ def test_answer_with_only_anthropic_provider(
     )
 
     try:
-        update_default_provider(anthropic_provider.id, anthropic_model, db_session)
+        update_default_provider(anthropic_provider.id, db_session)
 
         test_user = create_test_user(db_session, email_prefix="anthropic_only")
         chat_session = create_chat_session(

backend/tests/external_dependency_unit/llm/test_llm_provider.py

@@ -29,7 +29,6 @@ from onyx.server.manage.llm.api import (
     test_llm_configuration as run_test_llm_configuration,
 )
 from onyx.server.manage.llm.models import LLMProviderUpsertRequest
-from onyx.server.manage.llm.models import LLMProviderView
 from onyx.server.manage.llm.models import ModelConfigurationUpsertRequest
 from onyx.server.manage.llm.models import TestLLMRequest as LLMTestRequest
 
@@ -45,14 +44,15 @@ def _create_test_provider(
     db_session: Session,
     name: str,
     api_key: str = "sk-test-key-00000000000000000000000000000000000",
-) -> LLMProviderView:
+) -> None:
     """Helper to create a test LLM provider in the database."""
-    return upsert_llm_provider(
+    upsert_llm_provider(
         LLMProviderUpsertRequest(
             name=name,
             provider=LlmProviderNames.OPENAI,
             api_key=api_key,
             api_key_changed=True,
+            default_model_name="gpt-4o-mini",
             model_configurations=[
                 ModelConfigurationUpsertRequest(name="gpt-4o-mini", is_visible=True)
             ],
@@ -102,11 +102,17 @@ class TestLLMConfigurationEndpoint:
                 # This should complete without exception
                 run_test_llm_configuration(
                     test_llm_request=LLMTestRequest(
+                        name=None,  # New provider (not in DB)
                         provider=LlmProviderNames.OPENAI,
                         api_key="sk-new-test-key-0000000000000000000000000000",
                         api_key_changed=True,
                         custom_config_changed=False,
-                        model="gpt-4o-mini",
+                        default_model_name="gpt-4o-mini",
+                        model_configurations=[
+                            ModelConfigurationUpsertRequest(
+                                name="gpt-4o-mini", is_visible=True
+                            )
+                        ],
                     ),
                     _=_create_mock_admin(),
                     db_session=db_session,
@@ -146,11 +152,17 @@ class TestLLMConfigurationEndpoint:
                 with pytest.raises(HTTPException) as exc_info:
                     run_test_llm_configuration(
                         test_llm_request=LLMTestRequest(
+                            name=None,
                             provider=LlmProviderNames.OPENAI,
                             api_key="sk-invalid-key-00000000000000000000000000",
                             api_key_changed=True,
                             custom_config_changed=False,
-                            model="gpt-4o-mini",
+                            default_model_name="gpt-4o-mini",
+                            model_configurations=[
+                                ModelConfigurationUpsertRequest(
+                                    name="gpt-4o-mini", is_visible=True
+                                )
+                            ],
                         ),
                         _=_create_mock_admin(),
                         db_session=db_session,
@@ -182,9 +194,7 @@ class TestLLMConfigurationEndpoint:
 
         try:
             # First, create the provider in the database
-            provider = _create_test_provider(
-                db_session, provider_name, api_key=original_api_key
-            )
+            _create_test_provider(db_session, provider_name, api_key=original_api_key)
 
             with patch(
                 "onyx.server.manage.llm.api.test_llm", side_effect=mock_test_llm_capture
@@ -192,12 +202,17 @@ class TestLLMConfigurationEndpoint:
                 # Test with api_key_changed=False - should use stored key
                 run_test_llm_configuration(
                     test_llm_request=LLMTestRequest(
-                        id=provider.id,
+                        name=provider_name,  # Existing provider
                         provider=LlmProviderNames.OPENAI,
                         api_key=None,  # Not providing a new key
                         api_key_changed=False,  # Using existing key
                         custom_config_changed=False,
-                        model="gpt-4o-mini",
+                        default_model_name="gpt-4o-mini",
+                        model_configurations=[
+                            ModelConfigurationUpsertRequest(
+                                name="gpt-4o-mini", is_visible=True
+                            )
+                        ],
                     ),
                     _=_create_mock_admin(),
                     db_session=db_session,
@@ -231,9 +246,7 @@ class TestLLMConfigurationEndpoint:
 
         try:
             # First, create the provider in the database
-            provider = _create_test_provider(
-                db_session, provider_name, api_key=original_api_key
-            )
+            _create_test_provider(db_session, provider_name, api_key=original_api_key)
 
             with patch(
                 "onyx.server.manage.llm.api.test_llm", side_effect=mock_test_llm_capture
@@ -241,12 +254,17 @@ class TestLLMConfigurationEndpoint:
                 # Test with api_key_changed=True - should use new key
                 run_test_llm_configuration(
                     test_llm_request=LLMTestRequest(
-                        id=provider.id,
+                        name=provider_name,  # Existing provider
                         provider=LlmProviderNames.OPENAI,
                         api_key=new_api_key,  # Providing a new key
                         api_key_changed=True,  # Key is being changed
                         custom_config_changed=False,
-                        model="gpt-4o-mini",
+                        default_model_name="gpt-4o-mini",
+                        model_configurations=[
+                            ModelConfigurationUpsertRequest(
+                                name="gpt-4o-mini", is_visible=True
+                            )
+                        ],
                     ),
                     _=_create_mock_admin(),
                     db_session=db_session,
@@ -279,7 +297,7 @@ class TestLLMConfigurationEndpoint:
 
         try:
             # First, create the provider in the database with custom_config
-            provider = upsert_llm_provider(
+            upsert_llm_provider(
                 LLMProviderUpsertRequest(
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
@@ -287,6 +305,7 @@ class TestLLMConfigurationEndpoint:
                     api_key_changed=True,
                     custom_config=original_custom_config,
                     custom_config_changed=True,
+                    default_model_name="gpt-4o-mini",
                     model_configurations=[
                         ModelConfigurationUpsertRequest(
                             name="gpt-4o-mini", is_visible=True
@@ -302,13 +321,18 @@ class TestLLMConfigurationEndpoint:
                 # Test with custom_config_changed=False - should use stored config
                 run_test_llm_configuration(
                     test_llm_request=LLMTestRequest(
-                        id=provider.id,
+                        name=provider_name,
                         provider=LlmProviderNames.OPENAI,
                         api_key=None,
                         api_key_changed=False,
                         custom_config=None,  # Not providing new config
                         custom_config_changed=False,  # Using existing config
-                        model="gpt-4o-mini",
+                        default_model_name="gpt-4o-mini",
+                        model_configurations=[
+                            ModelConfigurationUpsertRequest(
+                                name="gpt-4o-mini", is_visible=True
+                            )
+                        ],
                     ),
                     _=_create_mock_admin(),
                     db_session=db_session,
@@ -344,11 +368,17 @@ class TestLLMConfigurationEndpoint:
                 for model_name in test_models:
                     run_test_llm_configuration(
                         test_llm_request=LLMTestRequest(
+                            name=None,
                             provider=LlmProviderNames.OPENAI,
                             api_key="sk-test-key-00000000000000000000000000000000000",
                             api_key_changed=True,
                             custom_config_changed=False,
-                            model=model_name,
+                            default_model_name=model_name,
+                            model_configurations=[
+                                ModelConfigurationUpsertRequest(
+                                    name=model_name, is_visible=True
+                                )
+                            ],
                         ),
                         _=_create_mock_admin(),
                         db_session=db_session,
@@ -412,6 +442,7 @@ class TestDefaultProviderEndpoint:
                     provider=LlmProviderNames.OPENAI,
                     api_key=provider_1_api_key,
                     api_key_changed=True,
+                    default_model_name=provider_1_initial_model,
                     model_configurations=[
                         ModelConfigurationUpsertRequest(name="gpt-4", is_visible=True),
                         ModelConfigurationUpsertRequest(name="gpt-4o", is_visible=True),
@@ -421,7 +452,7 @@ class TestDefaultProviderEndpoint:
             )
 
             # Set provider 1 as the default provider explicitly
-            update_default_provider(provider_1.id, provider_1_initial_model, db_session)
+            update_default_provider(provider_1.id, db_session)
 
             # Step 2: Call run_test_default_provider - should use provider 1's default model
             with patch(
@@ -441,6 +472,7 @@ class TestDefaultProviderEndpoint:
                     provider=LlmProviderNames.OPENAI,
                     api_key=provider_2_api_key,
                     api_key_changed=True,
+                    default_model_name=provider_2_default_model,
                     model_configurations=[
                         ModelConfigurationUpsertRequest(
                             name="gpt-4o-mini", is_visible=True
@@ -467,11 +499,11 @@ class TestDefaultProviderEndpoint:
             # Step 5: Update provider 1's default model
             upsert_llm_provider(
                 LLMProviderUpsertRequest(
-                    id=provider_1.id,
                     name=provider_1_name,
                     provider=LlmProviderNames.OPENAI,
                     api_key=provider_1_api_key,
                     api_key_changed=True,
+                    default_model_name=provider_1_updated_model,  # Changed
                     model_configurations=[
                         ModelConfigurationUpsertRequest(name="gpt-4", is_visible=True),
                         ModelConfigurationUpsertRequest(name="gpt-4o", is_visible=True),
@@ -480,9 +512,6 @@ class TestDefaultProviderEndpoint:
                 db_session=db_session,
             )
 
-            # Set provider 1's default model to the updated model
-            update_default_provider(provider_1.id, provider_1_updated_model, db_session)
-
             # Step 6: Call run_test_default_provider - should use new model on provider 1
             with patch(
                 "onyx.server.manage.llm.api.test_llm", side_effect=mock_test_llm_capture
@@ -495,7 +524,7 @@ class TestDefaultProviderEndpoint:
             captured_llms.clear()
 
             # Step 7: Change the default provider to provider 2
-            update_default_provider(provider_2.id, provider_2_default_model, db_session)
+            update_default_provider(provider_2.id, db_session)
 
             # Step 8: Call run_test_default_provider - should use provider 2
             with patch(
@@ -567,6 +596,7 @@ class TestDefaultProviderEndpoint:
                     provider=LlmProviderNames.OPENAI,
                     api_key="sk-test-key-00000000000000000000000000000000000",
                     api_key_changed=True,
+                    default_model_name="gpt-4o-mini",
                     model_configurations=[
                         ModelConfigurationUpsertRequest(
                             name="gpt-4o-mini", is_visible=True
@@ -575,7 +605,7 @@ class TestDefaultProviderEndpoint:
                 ),
                 db_session=db_session,
             )
-            update_default_provider(provider.id, "gpt-4o-mini", db_session)
+            update_default_provider(provider.id, db_session)
 
             # Test should fail
             with patch(

backend/tests/external_dependency_unit/llm/test_llm_provider_api_base.py

@@ -49,6 +49,7 @@ def _create_test_provider(
             api_key_changed=True,
             api_base=api_base,
             custom_config=custom_config,
+            default_model_name="gpt-4o-mini",
             model_configurations=[
                 ModelConfigurationUpsertRequest(name="gpt-4o-mini", is_visible=True)
             ],
@@ -90,14 +91,14 @@ class TestLLMProviderChanges:
         the API key should be blocked.
         """
         try:
-            provider = _create_test_provider(db_session, provider_name)
+            _create_test_provider(db_session, provider_name)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_base="https://attacker.example.com",
+                    default_model_name="gpt-4o-mini",
                 )
 
                 with pytest.raises(HTTPException) as exc_info:
@@ -124,16 +125,16 @@ class TestLLMProviderChanges:
         Changing api_base IS allowed when the API key is also being changed.
         """
         try:
-            provider = _create_test_provider(db_session, provider_name)
+            _create_test_provider(db_session, provider_name)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_key="sk-new-key-00000000000000000000000000000000000",
                     api_key_changed=True,
                     api_base="https://custom-endpoint.example.com/v1",
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -158,16 +159,14 @@ class TestLLMProviderChanges:
         original_api_base = "https://original.example.com/v1"
 
         try:
-            provider = _create_test_provider(
-                db_session, provider_name, api_base=original_api_base
-            )
+            _create_test_provider(db_session, provider_name, api_base=original_api_base)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_base=original_api_base,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -191,14 +190,14 @@ class TestLLMProviderChanges:
         changes. This allows model-only updates when provider has no custom base URL.
         """
         try:
-            view = _create_test_provider(db_session, provider_name, api_base=None)
+            _create_test_provider(db_session, provider_name, api_base=None)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=view.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_base="",
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -224,16 +223,14 @@ class TestLLMProviderChanges:
         original_api_base = "https://original.example.com/v1"
 
         try:
-            provider = _create_test_provider(
-                db_session, provider_name, api_base=original_api_base
-            )
+            _create_test_provider(db_session, provider_name, api_base=original_api_base)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_base=None,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 with pytest.raises(HTTPException) as exc_info:
@@ -262,14 +259,14 @@ class TestLLMProviderChanges:
         users have full control over their deployment.
         """
         try:
-            provider = _create_test_provider(db_session, provider_name)
+            _create_test_provider(db_session, provider_name)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", False):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_base="https://custom.example.com/v1",
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -300,6 +297,7 @@ class TestLLMProviderChanges:
                     api_key="sk-new-key-00000000000000000000000000000000000",
                     api_key_changed=True,
                     api_base="https://custom.example.com/v1",
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -324,7 +322,7 @@ class TestLLMProviderChanges:
         redirect LLM API requests).
         """
         try:
-            provider = _create_test_provider(
+            _create_test_provider(
                 db_session,
                 provider_name,
                 custom_config={"SOME_CONFIG": "original_value"},
@@ -332,11 +330,11 @@ class TestLLMProviderChanges:
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     custom_config={"OPENAI_API_BASE": "https://attacker.example.com"},
                     custom_config_changed=True,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 with pytest.raises(HTTPException) as exc_info:
@@ -364,15 +362,15 @@ class TestLLMProviderChanges:
         without changing the API key.
         """
         try:
-            provider = _create_test_provider(db_session, provider_name)
+            _create_test_provider(db_session, provider_name)
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     custom_config={"OPENAI_API_BASE": "https://attacker.example.com"},
                     custom_config_changed=True,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 with pytest.raises(HTTPException) as exc_info:
@@ -401,7 +399,7 @@ class TestLLMProviderChanges:
         new_config = {"AWS_REGION_NAME": "us-west-2"}
 
         try:
-            provider = _create_test_provider(
+            _create_test_provider(
                 db_session,
                 provider_name,
                 custom_config={"AWS_REGION_NAME": "us-east-1"},
@@ -409,13 +407,13 @@ class TestLLMProviderChanges:
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     api_key="sk-new-key-00000000000000000000000000000000000",
                     api_key_changed=True,
                     custom_config_changed=True,
                     custom_config=new_config,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -440,17 +438,17 @@ class TestLLMProviderChanges:
         original_config = {"AWS_REGION_NAME": "us-east-1"}
 
         try:
-            provider = _create_test_provider(
+            _create_test_provider(
                 db_session, provider_name, custom_config=original_config
             )
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", True):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     custom_config=original_config,
                     custom_config_changed=True,
+                    default_model_name="gpt-4o-mini",
                 )
 
                 result = put_llm_provider(
@@ -476,7 +474,7 @@ class TestLLMProviderChanges:
         new_config = {"AWS_REGION_NAME": "eu-west-1"}
 
         try:
-            provider = _create_test_provider(
+            _create_test_provider(
                 db_session,
                 provider_name,
                 custom_config={"AWS_REGION_NAME": "us-east-1"},
@@ -484,10 +482,10 @@ class TestLLMProviderChanges:
 
             with patch("onyx.server.manage.llm.api.MULTI_TENANT", False):
                 update_request = LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=provider_name,
                     provider=LlmProviderNames.OPENAI,
                     custom_config=new_config,
+                    default_model_name="gpt-4o-mini",
                     custom_config_changed=True,
                 )
 
@@ -532,8 +530,14 @@ def test_upload_with_custom_config_then_change(
         with patch("onyx.server.manage.llm.api.test_llm", side_effect=capture_test_llm):
             run_llm_config_test(
                 LLMTestRequest(
+                    name=name,
                     provider=provider_name,
-                    model=default_model_name,
+                    default_model_name=default_model_name,
+                    model_configurations=[
+                        ModelConfigurationUpsertRequest(
+                            name=default_model_name, is_visible=True
+                        )
+                    ],
                     api_key_changed=False,
                     custom_config_changed=True,
                     custom_config=custom_config,
@@ -542,10 +546,11 @@ def test_upload_with_custom_config_then_change(
                 db_session=db_session,
             )
 
-            provider = put_llm_provider(
+            put_llm_provider(
                 llm_provider_upsert_request=LLMProviderUpsertRequest(
                     name=name,
                     provider=provider_name,
+                    default_model_name=default_model_name,
                     custom_config=custom_config,
                     model_configurations=[
                         ModelConfigurationUpsertRequest(
@@ -564,9 +569,14 @@ def test_upload_with_custom_config_then_change(
             # Turn auto mode off
             run_llm_config_test(
                 LLMTestRequest(
-                    id=provider.id,
+                    name=name,
                     provider=provider_name,
-                    model=default_model_name,
+                    default_model_name=default_model_name,
+                    model_configurations=[
+                        ModelConfigurationUpsertRequest(
+                            name=default_model_name, is_visible=True
+                        )
+                    ],
                     api_key_changed=False,
                     custom_config_changed=False,
                 ),
@@ -576,9 +586,9 @@ def test_upload_with_custom_config_then_change(
 
             put_llm_provider(
                 llm_provider_upsert_request=LLMProviderUpsertRequest(
-                    id=provider.id,
                     name=name,
                     provider=provider_name,
+                    default_model_name=default_model_name,
                     model_configurations=[
                         ModelConfigurationUpsertRequest(
                             name=default_model_name, is_visible=True
@@ -606,13 +616,13 @@ def test_upload_with_custom_config_then_change(
                 )
 
             # Check inside the database and check that custom_config is the same as the original
-            db_provider = fetch_existing_llm_provider(name=name, db_session=db_session)
-            if not db_provider:
+            provider = fetch_existing_llm_provider(name=name, db_session=db_session)
+            if not provider:
                 assert False, "Provider not found in the database"
 
-            assert db_provider.custom_config == custom_config, (
+            assert provider.custom_config == custom_config, (
                 f"Expected custom_config {custom_config}, "
-                f"but got {db_provider.custom_config}"
+                f"but got {provider.custom_config}"
             )
     finally:
         db_session.rollback()
@@ -632,10 +642,11 @@ def test_preserves_masked_sensitive_custom_config_on_provider_update(
     }
 
     try:
-        view = put_llm_provider(
+        put_llm_provider(
             llm_provider_upsert_request=LLMProviderUpsertRequest(
                 name=name,
                 provider=provider,
+                default_model_name=default_model_name,
                 custom_config=original_custom_config,
                 model_configurations=[
                     ModelConfigurationUpsertRequest(
@@ -654,9 +665,9 @@ def test_preserves_masked_sensitive_custom_config_on_provider_update(
         with patch("onyx.server.manage.llm.api.MULTI_TENANT", False):
             put_llm_provider(
                 llm_provider_upsert_request=LLMProviderUpsertRequest(
-                    id=view.id,
                     name=name,
                     provider=provider,
+                    default_model_name=default_model_name,
                     custom_config={
                         "vertex_credentials": _mask_string(
                             original_custom_config["vertex_credentials"]
@@ -695,7 +706,7 @@ def test_preserves_masked_sensitive_custom_config_on_test_request(
 ) -> None:
     """LLM test should restore masked sensitive custom config values before invocation."""
     name = f"test-provider-vertex-test-{uuid4().hex[:8]}"
-    provider_name = LlmProviderNames.VERTEX_AI.value
+    provider = LlmProviderNames.VERTEX_AI.value
     default_model_name = "gemini-2.5-pro"
     original_custom_config = {
         "vertex_credentials": '{"type":"service_account","private_key":"REAL_PRIVATE_KEY"}',
@@ -708,10 +719,11 @@ def test_preserves_masked_sensitive_custom_config_on_test_request(
         return ""
 
     try:
-        provider = put_llm_provider(
+        put_llm_provider(
             llm_provider_upsert_request=LLMProviderUpsertRequest(
                 name=name,
-                provider=provider_name,
+                provider=provider,
+                default_model_name=default_model_name,
                 custom_config=original_custom_config,
                 model_configurations=[
                     ModelConfigurationUpsertRequest(
@@ -730,9 +742,14 @@ def test_preserves_masked_sensitive_custom_config_on_test_request(
         with patch("onyx.server.manage.llm.api.test_llm", side_effect=capture_test_llm):
             run_llm_config_test(
                 LLMTestRequest(
-                    id=provider.id,
-                    provider=provider_name,
-                    model=default_model_name,
+                    name=name,
+                    provider=provider,
+                    default_model_name=default_model_name,
+                    model_configurations=[
+                        ModelConfigurationUpsertRequest(
+                            name=default_model_name, is_visible=True
+                        )
+                    ],
                     api_key_changed=False,
                     custom_config_changed=True,
                     custom_config={

backend/tests/external_dependency_unit/llm/test_llm_provider_auto_mode.py

@@ -15,11 +15,9 @@ import pytest
 from sqlalchemy.orm import Session
 
 from onyx.db.enums import LLMModelFlowType
-from onyx.db.llm import fetch_auto_mode_providers
 from onyx.db.llm import fetch_default_llm_model
 from onyx.db.llm import fetch_existing_llm_provider
 from onyx.db.llm import fetch_existing_llm_providers
-from onyx.db.llm import fetch_llm_provider_view
 from onyx.db.llm import remove_llm_provider
 from onyx.db.llm import sync_auto_mode_models
 from onyx.db.llm import update_default_provider
@@ -137,6 +135,7 @@ class TestAutoModeSyncFeature:
                         api_key="sk-test-key-00000000000000000000000000000000000",
                         api_key_changed=True,
                         is_auto_mode=True,
+                        default_model_name=expected_default_model,
                         model_configurations=[],  # No model configs provided
                     ),
                     is_creation=True,
@@ -164,8 +163,13 @@ class TestAutoModeSyncFeature:
                 if mc.name in all_expected_models:
                     assert mc.is_visible is True, f"Model '{mc.name}' should be visible"
 
+            # Verify the default model was set correctly
+            assert (
+                provider.default_model_name == expected_default_model
+            ), f"Default model should be '{expected_default_model}'"
+
             # Step 4: Set the provider as default
-            update_default_provider(provider.id, expected_default_model, db_session)
+            update_default_provider(provider.id, db_session)
 
             # Step 5: Fetch the default provider and verify
             default_model = fetch_default_llm_model(db_session)
@@ -234,6 +238,7 @@ class TestAutoModeSyncFeature:
                         api_key="sk-test-key-00000000000000000000000000000000000",
                         api_key_changed=True,
                         is_auto_mode=True,
+                        default_model_name="gpt-4o",
                         model_configurations=[],
                     ),
                     is_creation=True,
@@ -312,6 +317,7 @@ class TestAutoModeSyncFeature:
                     api_key="sk-test-key-00000000000000000000000000000000000",
                     api_key_changed=True,
                     is_auto_mode=False,  # Not in auto mode initially
+                    default_model_name="gpt-4",
                     model_configurations=initial_models,
                 ),
                 is_creation=True,
@@ -320,13 +326,13 @@ class TestAutoModeSyncFeature:
             )
 
             # Verify initial state: all models are visible
-            initial_provider = fetch_existing_llm_provider(
+            provider = fetch_existing_llm_provider(
                 name=provider_name, db_session=db_session
             )
-            assert initial_provider is not None
-            assert initial_provider.is_auto_mode is False
+            assert provider is not None
+            assert provider.is_auto_mode is False
 
-            for mc in initial_provider.model_configurations:
+            for mc in provider.model_configurations:
                 assert (
                     mc.is_visible is True
                 ), f"Initial model '{mc.name}' should be visible"
@@ -338,12 +344,12 @@ class TestAutoModeSyncFeature:
             ):
                 put_llm_provider(
                     llm_provider_upsert_request=LLMProviderUpsertRequest(
-                        id=initial_provider.id,
                         name=provider_name,
                         provider=LlmProviderNames.OPENAI,
                         api_key=None,  # Not changing API key
                         api_key_changed=False,
                         is_auto_mode=True,  # Now enabling auto mode
+                        default_model_name=auto_mode_default,
                         model_configurations=[],  # Auto mode will sync from config
                     ),
                     is_creation=False,  # This is an update
@@ -354,15 +360,15 @@ class TestAutoModeSyncFeature:
             # Step 3: Verify model visibility after auto mode transition
             # Expire session cache to force fresh fetch after sync_auto_mode_models committed
             db_session.expire_all()
-            provider_view = fetch_llm_provider_view(
-                provider_name=provider_name, db_session=db_session
+            provider = fetch_existing_llm_provider(
+                name=provider_name, db_session=db_session
             )
-            assert provider_view is not None
-            assert provider_view.is_auto_mode is True
+            assert provider is not None
+            assert provider.is_auto_mode is True
 
             # Build a map of model name -> visibility
             model_visibility = {
-                mc.name: mc.is_visible for mc in provider_view.model_configurations
+                mc.name: mc.is_visible for mc in provider.model_configurations
             }
 
             # Models in auto mode config should be visible
@@ -382,6 +388,9 @@ class TestAutoModeSyncFeature:
                         model_visibility[model_name] is False
                     ), f"Model '{model_name}' not in auto config should NOT be visible"
 
+            # Verify the default model was updated
+            assert provider.default_model_name == auto_mode_default
+
         finally:
             db_session.rollback()
             _cleanup_provider(db_session, provider_name)
@@ -423,12 +432,8 @@ class TestAutoModeSyncFeature:
                         api_key="sk-test-key-00000000000000000000000000000000000",
                         api_key_changed=True,
                         is_auto_mode=True,
-                        model_configurations=[
-                            ModelConfigurationUpsertRequest(
-                                name="gpt-4o",
-                                is_visible=True,
-                            )
-                        ],
+                        default_model_name="gpt-4o",
+                        model_configurations=[],
                     ),
                     is_creation=True,
                     _=_create_mock_admin(),
@@ -530,6 +535,7 @@ class TestAutoModeSyncFeature:
                         api_key=provider_1_api_key,
                         api_key_changed=True,
                         is_auto_mode=True,
+                        default_model_name=provider_1_default_model,
                         model_configurations=[],
                     ),
                     is_creation=True,
@@ -543,7 +549,7 @@ class TestAutoModeSyncFeature:
                 name=provider_1_name, db_session=db_session
             )
             assert provider_1 is not None
-            update_default_provider(provider_1.id, provider_1_default_model, db_session)
+            update_default_provider(provider_1.id, db_session)
 
             with patch(
                 "onyx.server.manage.llm.api.fetch_llm_recommendations_from_github",
@@ -557,6 +563,7 @@ class TestAutoModeSyncFeature:
                         api_key=provider_2_api_key,
                         api_key_changed=True,
                         is_auto_mode=True,
+                        default_model_name=provider_2_default_model,
                         model_configurations=[],
                     ),
                     is_creation=True,
@@ -577,7 +584,7 @@ class TestAutoModeSyncFeature:
                 name=provider_2_name, db_session=db_session
             )
             assert provider_2 is not None
-            update_default_provider(provider_2.id, provider_2_default_model, db_session)
+            update_default_provider(provider_2.id, db_session)
 
             # Step 5: Verify provider 2 is now the default
             db_session.expire_all()
@@ -637,6 +644,7 @@ class TestAutoModeMissingFlows:
                     api_key="sk-test-key-00000000000000000000000000000000000",
                     api_key_changed=True,
                     is_auto_mode=True,
+                    default_model_name="gpt-4o",
                     model_configurations=[],
                 ),
                 is_creation=True,
@@ -693,364 +701,3 @@ class TestAutoModeMissingFlows:
         finally:
             db_session.rollback()
             _cleanup_provider(db_session, provider_name)
-
-
-class TestAutoModeTransitionsAndResync:
-    """Tests for auto/manual transitions, config evolution, and sync idempotency."""
-
-    def test_auto_to_manual_mode_preserves_models_and_stops_syncing(
-        self,
-        db_session: Session,
-        provider_name: str,
-    ) -> None:
-        """Disabling auto mode should preserve the current model list and
-        prevent future syncs from altering visibility.
-
-        Steps:
-        1. Create provider in auto mode — models synced from config.
-        2. Update provider to manual mode (is_auto_mode=False).
-        3. Verify all models remain with unchanged visibility.
-        4. Call sync_auto_mode_models with a *different* config.
-        5. Verify fetch_auto_mode_providers excludes this provider, so the
-           periodic task would never call sync on it.
-        """
-        initial_config = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o",
-            additional_models=["gpt-4o-mini"],
-        )
-
-        try:
-            # Step 1: Create in auto mode
-            with patch(
-                "onyx.server.manage.llm.api.fetch_llm_recommendations_from_github",
-                return_value=initial_config,
-            ):
-                put_llm_provider(
-                    llm_provider_upsert_request=LLMProviderUpsertRequest(
-                        name=provider_name,
-                        provider=LlmProviderNames.OPENAI,
-                        api_key="sk-test-key-00000000000000000000000000000000000",
-                        api_key_changed=True,
-                        is_auto_mode=True,
-                        model_configurations=[],
-                    ),
-                    is_creation=True,
-                    _=_create_mock_admin(),
-                    db_session=db_session,
-                )
-
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-            visibility_before = {
-                mc.name: mc.is_visible for mc in provider.model_configurations
-            }
-            assert visibility_before == {"gpt-4o": True, "gpt-4o-mini": True}
-
-            # Step 2: Switch to manual mode
-            put_llm_provider(
-                llm_provider_upsert_request=LLMProviderUpsertRequest(
-                    id=provider.id,
-                    name=provider_name,
-                    provider=LlmProviderNames.OPENAI,
-                    api_key=None,
-                    api_key_changed=False,
-                    is_auto_mode=False,
-                    model_configurations=[
-                        ModelConfigurationUpsertRequest(name="gpt-4o", is_visible=True),
-                        ModelConfigurationUpsertRequest(
-                            name="gpt-4o-mini", is_visible=True
-                        ),
-                    ],
-                ),
-                is_creation=False,
-                _=_create_mock_admin(),
-                db_session=db_session,
-            )
-
-            # Step 3: Models unchanged
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-            assert provider.is_auto_mode is False
-            visibility_after = {
-                mc.name: mc.is_visible for mc in provider.model_configurations
-            }
-            assert visibility_after == visibility_before
-
-            # Step 4-5: Provider excluded from auto mode queries
-            auto_providers = fetch_auto_mode_providers(db_session)
-            auto_provider_ids = {p.id for p in auto_providers}
-            assert provider.id not in auto_provider_ids
-
-        finally:
-            db_session.rollback()
-            _cleanup_provider(db_session, provider_name)
-
-    def test_resync_adds_new_and_hides_removed_models(
-        self,
-        db_session: Session,
-        provider_name: str,
-    ) -> None:
-        """When the GitHub config changes between syncs, a subsequent sync
-        should add newly listed models and hide models that were removed.
-
-        Steps:
-        1. Create provider in auto mode with config v1: [gpt-4o, gpt-4o-mini].
-        2. Sync with config v2: [gpt-4o, gpt-4-turbo] (gpt-4o-mini removed,
-           gpt-4-turbo added).
-        3. Verify gpt-4o still visible, gpt-4o-mini hidden, gpt-4-turbo added
-           and visible.
-        """
-        config_v1 = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o",
-            additional_models=["gpt-4o-mini"],
-        )
-        config_v2 = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o",
-            additional_models=["gpt-4-turbo"],
-        )
-
-        try:
-            # Step 1: Create with config v1
-            with patch(
-                "onyx.server.manage.llm.api.fetch_llm_recommendations_from_github",
-                return_value=config_v1,
-            ):
-                put_llm_provider(
-                    llm_provider_upsert_request=LLMProviderUpsertRequest(
-                        name=provider_name,
-                        provider=LlmProviderNames.OPENAI,
-                        api_key="sk-test-key-00000000000000000000000000000000000",
-                        api_key_changed=True,
-                        is_auto_mode=True,
-                        model_configurations=[],
-                    ),
-                    is_creation=True,
-                    _=_create_mock_admin(),
-                    db_session=db_session,
-                )
-
-            # Step 2: Re-sync with config v2
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-
-            changes = sync_auto_mode_models(
-                db_session=db_session,
-                provider=provider,
-                llm_recommendations=config_v2,
-            )
-            assert changes > 0
-
-            # Step 3: Verify
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-
-            visibility = {
-                mc.name: mc.is_visible for mc in provider.model_configurations
-            }
-
-            # gpt-4o: still in config -> visible
-            assert visibility["gpt-4o"] is True
-            # gpt-4o-mini: removed from config -> hidden (not deleted)
-            assert "gpt-4o-mini" in visibility, "Removed model should still exist in DB"
-            assert visibility["gpt-4o-mini"] is False
-            # gpt-4-turbo: newly added -> visible
-            assert visibility["gpt-4-turbo"] is True
-
-        finally:
-            db_session.rollback()
-            _cleanup_provider(db_session, provider_name)
-
-    def test_sync_is_idempotent(
-        self,
-        db_session: Session,
-        provider_name: str,
-    ) -> None:
-        """Running sync twice with the same config should produce zero
-        changes on the second call."""
-        config = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o",
-            additional_models=["gpt-4o-mini", "gpt-4-turbo"],
-        )
-
-        try:
-            with patch(
-                "onyx.server.manage.llm.api.fetch_llm_recommendations_from_github",
-                return_value=config,
-            ):
-                put_llm_provider(
-                    llm_provider_upsert_request=LLMProviderUpsertRequest(
-                        name=provider_name,
-                        provider=LlmProviderNames.OPENAI,
-                        api_key="sk-test-key-00000000000000000000000000000000000",
-                        api_key_changed=True,
-                        is_auto_mode=True,
-                        model_configurations=[],
-                    ),
-                    is_creation=True,
-                    _=_create_mock_admin(),
-                    db_session=db_session,
-                )
-
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-
-            # First explicit sync (may report changes if creation already synced)
-            sync_auto_mode_models(
-                db_session=db_session,
-                provider=provider,
-                llm_recommendations=config,
-            )
-
-            # Snapshot state after first sync
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-            snapshot = {
-                mc.name: (mc.is_visible, mc.display_name)
-                for mc in provider.model_configurations
-            }
-
-            # Second sync — should be a no-op
-            changes = sync_auto_mode_models(
-                db_session=db_session,
-                provider=provider,
-                llm_recommendations=config,
-            )
-            assert (
-                changes == 0
-            ), f"Expected 0 changes on idempotent re-sync, got {changes}"
-
-            # State should be identical
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-            current = {
-                mc.name: (mc.is_visible, mc.display_name)
-                for mc in provider.model_configurations
-            }
-            assert current == snapshot
-
-        finally:
-            db_session.rollback()
-            _cleanup_provider(db_session, provider_name)
-
-    def test_default_model_hidden_when_removed_from_config(
-        self,
-        db_session: Session,
-        provider_name: str,
-    ) -> None:
-        """When the current default model is removed from the config, sync
-        should hide it. The default model flow row should still exist (it
-        points at the ModelConfiguration), but the model is no longer visible.
-
-        Steps:
-        1. Create provider with config: default=gpt-4o, additional=[gpt-4o-mini].
-        2. Set gpt-4o as the global default.
-        3. Re-sync with config: default=gpt-4o-mini (gpt-4o removed entirely).
-        4. Verify gpt-4o is hidden, gpt-4o-mini is visible, and
-           fetch_default_llm_model still returns a result (the flow row persists).
-        """
-        config_v1 = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o",
-            additional_models=["gpt-4o-mini"],
-        )
-        config_v2 = _create_mock_llm_recommendations(
-            provider=LlmProviderNames.OPENAI,
-            default_model_name="gpt-4o-mini",
-            additional_models=[],
-        )
-
-        try:
-            with patch(
-                "onyx.server.manage.llm.api.fetch_llm_recommendations_from_github",
-                return_value=config_v1,
-            ):
-                put_llm_provider(
-                    llm_provider_upsert_request=LLMProviderUpsertRequest(
-                        name=provider_name,
-                        provider=LlmProviderNames.OPENAI,
-                        api_key="sk-test-key-00000000000000000000000000000000000",
-                        api_key_changed=True,
-                        is_auto_mode=True,
-                        model_configurations=[],
-                    ),
-                    is_creation=True,
-                    _=_create_mock_admin(),
-                    db_session=db_session,
-                )
-
-            # Step 2: Set gpt-4o as global default
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-            update_default_provider(provider.id, "gpt-4o", db_session)
-
-            default_before = fetch_default_llm_model(db_session)
-            assert default_before is not None
-            assert default_before.name == "gpt-4o"
-
-            # Step 3: Re-sync with config v2 (gpt-4o removed)
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-
-            changes = sync_auto_mode_models(
-                db_session=db_session,
-                provider=provider,
-                llm_recommendations=config_v2,
-            )
-            assert changes > 0
-
-            # Step 4: Verify visibility
-            db_session.expire_all()
-            provider = fetch_existing_llm_provider(
-                name=provider_name, db_session=db_session
-            )
-            assert provider is not None
-
-            visibility = {
-                mc.name: mc.is_visible for mc in provider.model_configurations
-            }
-            assert visibility["gpt-4o"] is False, "Removed default should be hidden"
-            assert visibility["gpt-4o-mini"] is True, "New default should be visible"
-
-            # The LLMModelFlow row for gpt-4o still exists (is_default=True),
-            # but the model is hidden. fetch_default_llm_model filters on
-            # is_visible=True, so it should NOT return gpt-4o.
-            db_session.expire_all()
-            default_after = fetch_default_llm_model(db_session)
-            assert (
-                default_after is None or default_after.name != "gpt-4o"
-            ), "Hidden model should not be returned as the default"
-
-        finally:
-            db_session.rollback()
-            _cleanup_provider(db_session, provider_name)

backend/tests/external_dependency_unit/llm/test_llm_provider_called.py

@@ -64,6 +64,7 @@ def _create_provider(
             name=name,
             provider=provider,
             api_key="sk-ant-api03-...",
+            default_model_name="claude-3-5-sonnet-20240620",
             is_public=is_public,
             model_configurations=[
                 ModelConfigurationUpsertRequest(
@@ -153,9 +154,7 @@ def test_user_sends_message_to_private_provider(
     )
     _create_provider(db_session, LlmProviderNames.GOOGLE, "private-provider", False)
 
-    update_default_provider(
-        public_provider_id, "claude-3-5-sonnet-20240620", db_session
-    )
+    update_default_provider(public_provider_id, db_session)
 
     try:
         # Create chat session

backend/tests/external_dependency_unit/search_settings/test_search_settings.py

@@ -42,6 +42,7 @@ def _create_llm_provider_and_model(
             name=provider_name,
             provider="openai",
             api_key="test-api-key",
+            default_model_name=model_name,
             model_configurations=[
                 ModelConfigurationUpsertRequest(
                     name=model_name,

backend/tests/external_dependency_unit/slack_bot/test_slack_bot_federated_search.py

@@ -434,6 +434,7 @@ class TestSlackBotFederatedSearch:
                 name=f"test-llm-provider-{uuid4().hex[:8]}",
                 provider=LlmProviderNames.OPENAI,
                 api_key=api_key,
+                default_model_name="gpt-4o",
                 is_public=True,
                 model_configurations=[
                     ModelConfigurationUpsertRequest(
@@ -447,7 +448,7 @@ class TestSlackBotFederatedSearch:
             db_session=db_session,
         )
 
-        update_default_provider(provider_view.id, "gpt-4o", db_session)
+        update_default_provider(provider_view.id, db_session)
 
     def _teardown_common_mocks(self, patches: list) -> None:
         """Stop all patches"""

backend/tests/integration/common_utils/managers/llm_provider.py

@@ -4,12 +4,10 @@ from uuid import uuid4
 import requests
 
 from onyx.llm.constants import LlmProviderNames
-from onyx.server.manage.llm.models import DefaultModel
 from onyx.server.manage.llm.models import LLMProviderUpsertRequest
 from onyx.server.manage.llm.models import LLMProviderView
 from onyx.server.manage.llm.models import ModelConfigurationUpsertRequest
 from tests.integration.common_utils.constants import API_SERVER_URL
-from tests.integration.common_utils.constants import GENERAL_HEADERS
 from tests.integration.common_utils.test_models import DATestLLMProvider
 from tests.integration.common_utils.test_models import DATestUser
 
@@ -34,6 +32,7 @@ class LLMProviderManager:
         llm_provider = LLMProviderUpsertRequest(
             name=name or f"test-provider-{uuid4()}",
             provider=provider or LlmProviderNames.OPENAI,
+            default_model_name=default_model_name or "gpt-4o-mini",
             api_key=api_key or os.environ["OPENAI_API_KEY"],
             api_base=api_base,
             api_version=api_version,
@@ -66,7 +65,7 @@ class LLMProviderManager:
             name=response_data["name"],
             provider=response_data["provider"],
             api_key=response_data["api_key"],
-            default_model_name=default_model_name or "gpt-4o-mini",
+            default_model_name=response_data["default_model_name"],
             is_public=response_data["is_public"],
             is_auto_mode=response_data.get("is_auto_mode", False),
             groups=response_data["groups"],
@@ -76,19 +75,9 @@ class LLMProviderManager:
         )
 
         if set_as_default:
-            if default_model_name is None:
-                default_model_name = "gpt-4o-mini"
             set_default_response = requests.post(
-                f"{API_SERVER_URL}/admin/llm/default",
-                json={
-                    "provider_id": response_data["id"],
-                    "model_name": default_model_name,
-                },
-                headers=(
-                    user_performing_action.headers
-                    if user_performing_action
-                    else GENERAL_HEADERS
-                ),
+                f"{API_SERVER_URL}/admin/llm/provider/{llm_response.json()['id']}/default",
+                headers=user_performing_action.headers,
             )
             set_default_response.raise_for_status()
 
@@ -115,7 +104,7 @@ class LLMProviderManager:
             headers=user_performing_action.headers,
         )
         response.raise_for_status()
-        return [LLMProviderView(**p) for p in response.json()["providers"]]
+        return [LLMProviderView(**ug) for ug in response.json()]
 
     @staticmethod
     def verify(
@@ -124,11 +113,7 @@ class LLMProviderManager:
         verify_deleted: bool = False,
     ) -> None:
         all_llm_providers = LLMProviderManager.get_all(user_performing_action)
-        default_model = LLMProviderManager.get_default_model(user_performing_action)
         for fetched_llm_provider in all_llm_providers:
-            model_names = [
-                model.name for model in fetched_llm_provider.model_configurations
-            ]
             if llm_provider.id == fetched_llm_provider.id:
                 if verify_deleted:
                     raise ValueError(
@@ -141,30 +126,11 @@ class LLMProviderManager:
                 if (
                     fetched_llm_groups == llm_provider_groups
                     and llm_provider.provider == fetched_llm_provider.provider
-                    and (
-                        default_model is None or default_model.model_name in model_names
-                    )
+                    and llm_provider.default_model_name
+                    == fetched_llm_provider.default_model_name
                     and llm_provider.is_public == fetched_llm_provider.is_public
                     and set(fetched_llm_provider.personas) == set(llm_provider.personas)
                 ):
                     return
         if not verify_deleted:
             raise ValueError(f"LLM Provider {llm_provider.id} not found")
-
-    @staticmethod
-    def get_default_model(
-        user_performing_action: DATestUser | None = None,
-    ) -> DefaultModel | None:
-        response = requests.get(
-            f"{API_SERVER_URL}/admin/llm/provider",
-            headers=(
-                user_performing_action.headers
-                if user_performing_action
-                else GENERAL_HEADERS
-            ),
-        )
-        response.raise_for_status()
-        default_text = response.json().get("default_text")
-        if default_text is None:
-            return None
-        return DefaultModel(**default_text)

backend/tests/integration/common_utils/test_models.py

@@ -128,7 +128,7 @@ class DATestLLMProvider(BaseModel):
     name: str
     provider: str
     api_key: str
-    default_model_name: str | None = None
+    default_model_name: str
     is_public: bool
     is_auto_mode: bool = False
     groups: list[int]

backend/tests/integration/tests/llm_auto_update/test_auto_llm_update.py

@@ -42,10 +42,12 @@ def _create_provider_with_api(
     llm_provider_data = {
         "name": name,
         "provider": provider_type,
+        "default_model_name": default_model,
         "api_key": "test-api-key-for-auto-mode-testing",
         "api_base": None,
         "api_version": None,
         "custom_config": None,
+        "fast_default_model_name": default_model,
         "is_public": True,
         "is_auto_mode": is_auto_mode,
         "groups": [],
@@ -70,7 +72,7 @@ def _get_provider_by_id(admin_user: DATestUser, provider_id: int) -> dict:
         headers=admin_user.headers,
     )
     response.raise_for_status()
-    for provider in response.json()["providers"]:
+    for provider in response.json():
         if provider["id"] == provider_id:
             return provider
     raise ValueError(f"Provider with id {provider_id} not found")
@@ -217,6 +219,15 @@ def test_auto_mode_provider_gets_synced_from_github_config(
         "is_visible"
     ], "Outdated model should not be visible after sync"
 
+    # Verify default model was set from GitHub config
+    expected_default = (
+        default_model["name"] if isinstance(default_model, dict) else default_model
+    )
+    assert synced_provider["default_model_name"] == expected_default, (
+        f"Default model should be {expected_default}, "
+        f"got {synced_provider['default_model_name']}"
+    )
+
 
 def test_manual_mode_provider_not_affected_by_auto_sync(
     reset: None,  # noqa: ARG001
@@ -262,3 +273,7 @@ def test_manual_mode_provider_not_affected_by_auto_sync(
         f"Manual mode provider models should not change. "
         f"Initial: {initial_models}, Current: {current_models}"
     )
+
+    assert (
+        updated_provider["default_model_name"] == custom_model
+    ), f"Manual mode default model should remain {custom_model}"

backend/tests/integration/tests/llm_provider/test_llm_provider_access_control.py

@@ -6,21 +6,20 @@ from sqlalchemy.orm import Session
 
 from onyx.context.search.enums import RecencyBiasSetting
 from onyx.db.engine.sql_engine import get_session_with_current_tenant
+from onyx.db.enums import LLMModelFlowType
 from onyx.db.llm import can_user_access_llm_provider
 from onyx.db.llm import fetch_user_group_ids
-from onyx.db.llm import update_default_provider
-from onyx.db.llm import upsert_llm_provider
+from onyx.db.models import LLMModelFlow
 from onyx.db.models import LLMProvider as LLMProviderModel
 from onyx.db.models import LLMProvider__Persona
 from onyx.db.models import LLMProvider__UserGroup
+from onyx.db.models import ModelConfiguration
 from onyx.db.models import Persona
 from onyx.db.models import User
 from onyx.db.models import User__UserGroup
 from onyx.db.models import UserGroup
 from onyx.llm.constants import LlmProviderNames
 from onyx.llm.factory import get_llm_for_persona
-from onyx.server.manage.llm.models import LLMProviderUpsertRequest
-from onyx.server.manage.llm.models import ModelConfigurationUpsertRequest
 from tests.integration.common_utils.constants import API_SERVER_URL
 from tests.integration.common_utils.managers.llm_provider import LLMProviderManager
 from tests.integration.common_utils.managers.persona import PersonaManager
@@ -42,30 +41,24 @@ def _create_llm_provider(
     is_public: bool,
     is_default: bool,
 ) -> LLMProviderModel:
-    _provider = upsert_llm_provider(
-        llm_provider_upsert_request=LLMProviderUpsertRequest(
-            name=name,
-            provider=LlmProviderNames.OPENAI,
-            api_key=None,
-            api_base=None,
-            api_version=None,
-            custom_config=None,
-            is_public=is_public,
-            model_configurations=[
-                ModelConfigurationUpsertRequest(
-                    name=default_model_name,
-                    is_visible=True,
-                )
-            ],
-        ),
-        db_session=db_session,
+    provider = LLMProviderModel(
+        name=name,
+        provider=LlmProviderNames.OPENAI,
+        api_key=None,
+        api_base=None,
+        api_version=None,
+        custom_config=None,
+        default_model_name=default_model_name,
+        deployment_name=None,
+        is_public=is_public,
+        # Use None instead of False to avoid unique constraint violation
+        # The is_default_provider column has unique=True, so only one True and one False allowed
+        is_default_provider=is_default if is_default else None,
+        is_default_vision_provider=False,
+        default_vision_model=None,
     )
-    if is_default:
-        update_default_provider(_provider.id, default_model_name, db_session)
-
-    provider = db_session.get(LLMProviderModel, _provider.id)
-    if not provider:
-        raise ValueError(f"Provider {name} not found")
+    db_session.add(provider)
+    db_session.flush()
     return provider
 
 
@@ -277,6 +270,24 @@ def test_get_llm_for_persona_falls_back_when_access_denied(
             provider_name=restricted_provider.name,
         )
 
+        # Set up ModelConfiguration + LLMModelFlow so get_default_llm() can
+        # resolve the default provider when the fallback path is triggered.
+        default_model_config = ModelConfiguration(
+            llm_provider_id=default_provider.id,
+            name=default_provider.default_model_name,
+            is_visible=True,
+        )
+        db_session.add(default_model_config)
+        db_session.flush()
+        db_session.add(
+            LLMModelFlow(
+                model_configuration_id=default_model_config.id,
+                llm_model_flow_type=LLMModelFlowType.CHAT,
+                is_default=True,
+            )
+        )
+        db_session.flush()
+
         access_group = UserGroup(name="persona-group")
         db_session.add(access_group)
         db_session.flush()
@@ -310,19 +321,13 @@ def test_get_llm_for_persona_falls_back_when_access_denied(
             persona=persona,
             user=admin_model,
         )
-        assert (
-            allowed_llm.config.model_name
-            == restricted_provider.model_configurations[0].name
-        )
+        assert allowed_llm.config.model_name == restricted_provider.default_model_name
 
         fallback_llm = get_llm_for_persona(
             persona=persona,
             user=basic_model,
         )
-        assert (
-            fallback_llm.config.model_name
-            == default_provider.model_configurations[0].name
-        )
+        assert fallback_llm.config.model_name == default_provider.default_model_name
 
 
 def test_list_llm_provider_basics_excludes_non_public_unrestricted(
@@ -341,7 +346,6 @@ def test_list_llm_provider_basics_excludes_non_public_unrestricted(
         name="public-provider",
         is_public=True,
         set_as_default=True,
-        default_model_name="gpt-4o",
         user_performing_action=admin_user,
     )
 
@@ -361,7 +365,7 @@ def test_list_llm_provider_basics_excludes_non_public_unrestricted(
         headers=basic_user.headers,
     )
     assert response.status_code == 200
-    providers = response.json()["providers"]
+    providers = response.json()
     provider_names = [p["name"] for p in providers]
 
     # Public provider should be visible
@@ -376,7 +380,7 @@ def test_list_llm_provider_basics_excludes_non_public_unrestricted(
         headers=admin_user.headers,
     )
     assert admin_response.status_code == 200
-    admin_providers = admin_response.json()["providers"]
+    admin_providers = admin_response.json()
     admin_provider_names = [p["name"] for p in admin_providers]
 
     assert public_provider.name in admin_provider_names
@@ -392,7 +396,6 @@ def test_provider_delete_clears_persona_references(reset: None) -> None:  # noqa
         name="default-provider",
         is_public=True,
         set_as_default=True,
-        default_model_name="gpt-4o",
         user_performing_action=admin_user,
     )
 

backend/tests/integration/tests/llm_provider/test_llm_provider_persona_access.py

@@ -107,7 +107,7 @@ def test_authorized_persona_access_returns_filtered_providers(
 
     # Should succeed
     assert response.status_code == 200
-    providers = response.json()["providers"]
+    providers = response.json()
 
     # Should include the restricted provider since basic_user can access the persona
     provider_names = [p["name"] for p in providers]
@@ -140,7 +140,7 @@ def test_persona_id_zero_applies_rbac(
 
     # Should succeed (persona_id=0 refers to default persona, which is public)
     assert response.status_code == 200
-    providers = response.json()["providers"]
+    providers = response.json()
 
     # Should NOT include the restricted provider since basic_user is not in group2
     provider_names = [p["name"] for p in providers]
@@ -182,7 +182,7 @@ def test_admin_can_query_any_persona(
 
     # Should succeed - admins can access any persona
     assert response.status_code == 200
-    providers = response.json()["providers"]
+    providers = response.json()
 
     # Should include the restricted provider
     provider_names = [p["name"] for p in providers]
@@ -223,7 +223,7 @@ def test_public_persona_accessible_to_all(
 
     # Should succeed
     assert response.status_code == 200
-    providers = response.json()["providers"]
+    providers = response.json()
 
     # Should return the public provider
     assert len(providers) > 0

backend/tests/unit/onyx/llm/test_factory.py

@@ -44,6 +44,7 @@ def _build_provider_view(
         id=1,
         name="test-provider",
         provider=provider,
+        default_model_name="test-model",
         model_configurations=[
             ModelConfigurationView(
                 name="test-model",
@@ -61,6 +62,7 @@ def _build_provider_view(
         groups=[],
         personas=[],
         deployment_name=None,
+        default_vision_model=None,
     )
 
 

web/src/app/admin/configuration/image-generation/ImageGenerationConnectionModal.tsx

@@ -2,7 +2,7 @@
 
 import { ModalCreationInterface } from "@/refresh-components/contexts/ModalContext";
 import { ImageProvider } from "@/app/admin/configuration/image-generation/constants";
-import { LLMProviderView } from "@/interfaces/llm";
+import { LLMProviderView } from "@/app/admin/configuration/llm/interfaces";
 import { ImageGenerationConfigView } from "@/lib/configuration/imageConfigurationService";
 import { getImageGenForm } from "./forms";
 

web/src/app/admin/configuration/image-generation/ImageGenerationContent.tsx

@@ -7,7 +7,7 @@ import { Select } from "@/refresh-components/cards";
 import { useCreateModal } from "@/refresh-components/contexts/ModalContext";
 import { toast } from "@/hooks/useToast";
 import { errorHandlingFetcher } from "@/lib/fetcher";
-import { LLMProviderResponse, LLMProviderView } from "@/interfaces/llm";
+import { LLMProviderView } from "@/app/admin/configuration/llm/interfaces";
 import {
   IMAGE_PROVIDER_GROUPS,
   ImageProvider,
@@ -23,14 +23,13 @@ import Message from "@/refresh-components/messages/Message";
 
 export default function ImageGenerationContent() {
   const {
-    data: llmProviderResponse,
+    data: llmProviders = [],
     error: llmError,
     mutate: refetchProviders,
-  } = useSWR<LLMProviderResponse<LLMProviderView>>(
+  } = useSWR<LLMProviderView[]>(
     "/api/admin/llm/provider?include_image_gen=true",
     errorHandlingFetcher
   );
-  const llmProviders = llmProviderResponse?.providers ?? [];
 
   const {
     data: configs = [],

web/src/app/admin/configuration/image-generation/forms/types.ts

@@ -1,6 +1,6 @@
 import { FormikProps } from "formik";
 import { ImageProvider } from "../constants";
-import { LLMProviderView } from "@/interfaces/llm";
+import { LLMProviderView } from "@/app/admin/configuration/llm/interfaces";
 import {
   ImageGenerationConfigView,
   ImageGenerationCredentials,

web/src/app/admin/configuration/llm/LLMConfiguration.tsx

@@ -0,0 +1,84 @@
+"use client";
+
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import useSWR from "swr";
+import { Callout } from "@/components/ui/callout";
+import Text from "@/refresh-components/texts/Text";
+import Title from "@/components/ui/title";
+import { ThreeDotsLoader } from "@/components/Loading";
+import { LLMProviderView } from "./interfaces";
+import { LLM_PROVIDERS_ADMIN_URL } from "./constants";
+import { OpenAIForm } from "./forms/OpenAIForm";
+import { AnthropicForm } from "./forms/AnthropicForm";
+import { OllamaForm } from "./forms/OllamaForm";
+import { AzureForm } from "./forms/AzureForm";
+import { BedrockForm } from "./forms/BedrockForm";
+import { VertexAIForm } from "./forms/VertexAIForm";
+import { OpenRouterForm } from "./forms/OpenRouterForm";
+import { getFormForExistingProvider } from "./forms/getForm";
+import { CustomForm } from "./forms/CustomForm";
+
+export function LLMConfiguration() {
+  const { data: existingLlmProviders } = useSWR<LLMProviderView[]>(
+    LLM_PROVIDERS_ADMIN_URL,
+    errorHandlingFetcher
+  );
+
+  if (!existingLlmProviders) {
+    return <ThreeDotsLoader />;
+  }
+
+  const isFirstProvider = existingLlmProviders.length === 0;
+
+  return (
+    <>
+      <Title className="mb-2">Enabled LLM Providers</Title>
+
+      {existingLlmProviders.length > 0 ? (
+        <>
+          <Text as="p" className="mb-4">
+            If multiple LLM providers are enabled, the default provider will be
+            used for all &quot;Default&quot; Assistants. For user-created
+            Assistants, you can select the LLM provider/model that best fits the
+            use case!
+          </Text>
+          <div className="flex flex-col gap-y-4">
+            {[...existingLlmProviders]
+              .sort((a, b) => {
+                if (a.is_default_provider && !b.is_default_provider) return -1;
+                if (!a.is_default_provider && b.is_default_provider) return 1;
+                return 0;
+              })
+              .map((llmProvider) => (
+                <div key={llmProvider.id}>
+                  {getFormForExistingProvider(llmProvider)}
+                </div>
+              ))}
+          </div>
+        </>
+      ) : (
+        <Callout type="warning" title="No LLM providers configured yet">
+          Please set one up below in order to start using Onyx!
+        </Callout>
+      )}
+
+      <Title className="mb-2 mt-6">Add LLM Provider</Title>
+      <Text as="p" className="mb-4">
+        Add a new LLM provider by either selecting from one of the default
+        providers or by specifying your own custom LLM provider.
+      </Text>
+
+      <div className="flex flex-col gap-y-4">
+        <OpenAIForm shouldMarkAsDefault={isFirstProvider} />
+        <AnthropicForm shouldMarkAsDefault={isFirstProvider} />
+        <OllamaForm shouldMarkAsDefault={isFirstProvider} />
+        <AzureForm shouldMarkAsDefault={isFirstProvider} />
+        <BedrockForm shouldMarkAsDefault={isFirstProvider} />
+        <VertexAIForm shouldMarkAsDefault={isFirstProvider} />
+        <OpenRouterForm shouldMarkAsDefault={isFirstProvider} />
+
+        <CustomForm shouldMarkAsDefault={isFirstProvider} />
+      </div>
+    </>
+  );
+}

web/src/app/admin/configuration/llm/ModelConfigurationField.tsx

@@ -1,14 +1,13 @@
 "use client";
 
 import { ArrayHelpers, FieldArray, FormikProps, useField } from "formik";
-import { ModelConfiguration } from "@/interfaces/llm";
+import { ModelConfiguration } from "./interfaces";
 import { ManualErrorMessage, TextFormField } from "@/components/Field";
 import { useEffect, useState } from "react";
 import CreateButton from "@/refresh-components/buttons/CreateButton";
 import { Button } from "@opal/components";
 import { SvgX } from "@opal/icons";
 import Text from "@/refresh-components/texts/Text";
-
 function ModelConfigurationRow({
   name,
   index,

web/src/app/admin/configuration/llm/constants.ts

@@ -1,5 +1,4 @@
-export const LLM_ADMIN_URL = "/api/admin/llm";
-export const LLM_PROVIDERS_ADMIN_URL = `${LLM_ADMIN_URL}/provider`;
+export const LLM_PROVIDERS_ADMIN_URL = "/api/admin/llm/provider";
 
 export const LLM_CONTEXTUAL_COST_ADMIN_URL =
   "/api/admin/llm/provider-contextual-cost";

web/src/app/admin/configuration/llm/forms/AnthropicForm.tsx

@@ -1,5 +1,5 @@
 import { Form, Formik } from "formik";
-import { LLMProviderFormProps } from "@/interfaces/llm";
+import { LLMProviderFormProps } from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -21,19 +21,15 @@ import { DisplayModels } from "./components/DisplayModels";
 export const ANTHROPIC_PROVIDER_NAME = "anthropic";
 const DEFAULT_DEFAULT_MODEL_NAME = "claude-sonnet-4-5";
 
-export function AnthropicModal({
+export function AnthropicForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   return (
     <ProviderFormEntrypointWrapper
       providerName="Anthropic"
       providerEndpoint={ANTHROPIC_PROVIDER_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -56,6 +52,7 @@ export function AnthropicModal({
           api_key: existingLlmProvider?.api_key ?? "",
           api_base: existingLlmProvider?.api_base ?? undefined,
           default_model_name:
+            existingLlmProvider?.default_model_name ??
             wellKnownLLMProvider?.recommended_default_model?.name ??
             DEFAULT_DEFAULT_MODEL_NAME,
           // Default to auto mode for new Anthropic providers

web/src/app/admin/configuration/llm/forms/AzureForm.tsx

@@ -1,6 +1,6 @@
 import { Form, Formik } from "formik";
 import { TextFormField } from "@/components/Field";
-import { LLMProviderFormProps, LLMProviderView } from "@/interfaces/llm";
+import { LLMProviderFormProps, LLMProviderView } from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -28,7 +28,7 @@ import Separator from "@/refresh-components/Separator";
 export const AZURE_PROVIDER_NAME = "azure";
 const AZURE_DISPLAY_NAME = "Microsoft Azure Cloud";
 
-interface AzureModalValues extends BaseLLMFormValues {
+interface AzureFormValues extends BaseLLMFormValues {
   api_key: string;
   target_uri: string;
   api_base?: string;
@@ -47,19 +47,15 @@ const buildTargetUri = (existingLlmProvider?: LLMProviderView): string => {
   return `${existingLlmProvider.api_base}/openai/deployments/${deploymentName}/chat/completions?api-version=${existingLlmProvider.api_version}`;
 };
 
-export function AzureModal({
+export function AzureForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   return (
     <ProviderFormEntrypointWrapper
       providerName={AZURE_DISPLAY_NAME}
       providerEndpoint={AZURE_PROVIDER_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -74,7 +70,7 @@ export function AzureModal({
           existingLlmProvider,
           wellKnownLLMProvider
         );
-        const initialValues: AzureModalValues = {
+        const initialValues: AzureFormValues = {
           ...buildDefaultInitialValues(
             existingLlmProvider,
             modelConfigurations
@@ -101,7 +97,7 @@ export function AzureModal({
             validateOnMount={true}
             onSubmit={async (values, { setSubmitting }) => {
               // Parse target_uri to extract api_base, api_version, and deployment_name
-              let processedValues: AzureModalValues = { ...values };
+              let processedValues: AzureFormValues = { ...values };
 
               if (values.target_uri) {
                 try {

web/src/app/admin/configuration/llm/forms/BedrockForm.tsx

@@ -8,7 +8,7 @@ import {
   LLMProviderFormProps,
   LLMProviderView,
   ModelConfiguration,
-} from "@/interfaces/llm";
+} from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -27,7 +27,7 @@ import {
 } from "./formUtils";
 import { AdvancedOptions } from "./components/AdvancedOptions";
 import { DisplayModels } from "./components/DisplayModels";
-import { fetchBedrockModels } from "@/app/admin/configuration/llm/utils";
+import { fetchBedrockModels } from "../utils";
 import Separator from "@/refresh-components/Separator";
 import Text from "@/refresh-components/texts/Text";
 import Tabs from "@/refresh-components/Tabs";
@@ -65,7 +65,7 @@ const FIELD_AWS_ACCESS_KEY_ID = "custom_config.AWS_ACCESS_KEY_ID";
 const FIELD_AWS_SECRET_ACCESS_KEY = "custom_config.AWS_SECRET_ACCESS_KEY";
 const FIELD_AWS_BEARER_TOKEN_BEDROCK = "custom_config.AWS_BEARER_TOKEN_BEDROCK";
 
-interface BedrockModalValues extends BaseLLMFormValues {
+interface BedrockFormValues extends BaseLLMFormValues {
   custom_config: {
     AWS_REGION_NAME: string;
     BEDROCK_AUTH_METHOD?: string;
@@ -75,8 +75,8 @@ interface BedrockModalValues extends BaseLLMFormValues {
   };
 }
 
-interface BedrockModalInternalsProps {
-  formikProps: FormikProps<BedrockModalValues>;
+interface BedrockFormInternalsProps {
+  formikProps: FormikProps<BedrockFormValues>;
   existingLlmProvider: LLMProviderView | undefined;
   fetchedModels: ModelConfiguration[];
   setFetchedModels: (models: ModelConfiguration[]) => void;
@@ -87,7 +87,7 @@ interface BedrockModalInternalsProps {
   onClose: () => void;
 }
 
-function BedrockModalInternals({
+function BedrockFormInternals({
   formikProps,
   existingLlmProvider,
   fetchedModels,
@@ -97,7 +97,7 @@ function BedrockModalInternals({
   testError,
   mutate,
   onClose,
-}: BedrockModalInternalsProps) {
+}: BedrockFormInternalsProps) {
   const authMethod = formikProps.values.custom_config?.BEDROCK_AUTH_METHOD;
 
   // Clean up unused auth fields when tab changes
@@ -258,11 +258,9 @@ function BedrockModalInternals({
   );
 }
 
-export function BedrockModal({
+export function BedrockForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   const [fetchedModels, setFetchedModels] = useState<ModelConfiguration[]>([]);
 
@@ -270,8 +268,6 @@ export function BedrockModal({
     <ProviderFormEntrypointWrapper
       providerName={BEDROCK_DISPLAY_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -286,7 +282,7 @@ export function BedrockModal({
           existingLlmProvider,
           wellKnownLLMProvider
         );
-        const initialValues: BedrockModalValues = {
+        const initialValues: BedrockFormValues = {
           ...buildDefaultInitialValues(
             existingLlmProvider,
             modelConfigurations
@@ -356,7 +352,7 @@ export function BedrockModal({
             }}
           >
             {(formikProps) => (
-              <BedrockModalInternals
+              <BedrockFormInternals
                 formikProps={formikProps}
                 existingLlmProvider={existingLlmProvider}
                 fetchedModels={fetchedModels}

web/src/app/admin/configuration/llm/forms/CustomForm.test.tsx

@@ -7,7 +7,7 @@
  */
 import React from "react";
 import { render, screen, setupUser, waitFor } from "@tests/setup/test-utils";
-import { CustomModal } from "./CustomModal";
+import { CustomForm } from "./CustomForm";
 import { toast } from "@/hooks/useToast";
 
 // Mock SWR's mutate function and useSWR
@@ -116,10 +116,11 @@ describe("Custom LLM Provider Configuration Workflow", () => {
         name: "My Custom Provider",
         provider: "openai",
         api_key: "test-key",
+        default_model_name: "gpt-4",
       }),
     } as Response);
 
-    render(<CustomModal />);
+    render(<CustomForm />);
 
     await openModalAndFillBasicFields(user, {
       name: "My Custom Provider",
@@ -176,7 +177,7 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       json: async () => ({ detail: "Invalid API key" }),
     } as Response);
 
-    render(<CustomModal />);
+    render(<CustomForm />);
 
     await openModalAndFillBasicFields(user, {
       name: "Bad Provider",
@@ -223,13 +224,13 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       api_key: "old-key",
       api_base: "",
       api_version: "",
+      default_model_name: "claude-3-opus",
       model_configurations: [
         {
           name: "claude-3-opus",
           is_visible: true,
           max_input_tokens: null,
-          supports_image_input: false,
-          supports_reasoning: false,
+          supports_image_input: null,
         },
       ],
       custom_config: {},
@@ -238,6 +239,9 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       groups: [],
       personas: [],
       deployment_name: null,
+      is_default_provider: false,
+      default_vision_model: null,
+      is_default_vision_provider: null,
     };
 
     // Mock POST /api/admin/llm/test
@@ -252,7 +256,7 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       json: async () => ({ ...existingProvider, api_key: "new-key" }),
     } as Response);
 
-    render(<CustomModal existingLlmProvider={existingProvider} />);
+    render(<CustomForm existingLlmProvider={existingProvider} />);
 
     // For existing provider, click "Edit" button to open modal
     const editButton = screen.getByRole("button", { name: /edit/i });
@@ -303,13 +307,13 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       api_key: "old-key",
       api_base: "https://example-openai-compatible.local/v1",
       api_version: "",
+      default_model_name: "gpt-oss-20b-bw-failover",
       model_configurations: [
         {
           name: "gpt-oss-20b-bw-failover",
           is_visible: true,
           max_input_tokens: null,
-          supports_image_input: false,
-          supports_reasoning: false,
+          supports_image_input: null,
         },
       ],
       custom_config: {},
@@ -318,6 +322,9 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       groups: [],
       personas: [],
       deployment_name: null,
+      is_default_provider: false,
+      default_vision_model: null,
+      is_default_vision_provider: null,
     };
 
     // Mock POST /api/admin/llm/test
@@ -336,21 +343,19 @@ describe("Custom LLM Provider Configuration Workflow", () => {
             name: "gpt-oss-20b-bw-failover",
             is_visible: true,
             max_input_tokens: null,
-            supports_image_input: false,
-            supports_reasoning: false,
+            supports_image_input: null,
           },
           {
             name: "nemotron",
             is_visible: true,
             max_input_tokens: null,
-            supports_image_input: false,
-            supports_reasoning: false,
+            supports_image_input: null,
           },
         ],
       }),
     } as Response);
 
-    render(<CustomModal existingLlmProvider={existingProvider} />);
+    render(<CustomForm existingLlmProvider={existingProvider} />);
 
     const editButton = screen.getByRole("button", { name: /edit/i });
     await user.click(editButton);
@@ -418,7 +423,7 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       json: async () => ({}),
     } as Response);
 
-    render(<CustomModal shouldMarkAsDefault={true} />);
+    render(<CustomForm shouldMarkAsDefault={true} />);
 
     await openModalAndFillBasicFields(user, {
       name: "New Default Provider",
@@ -458,7 +463,7 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       json: async () => ({ detail: "Database error" }),
     } as Response);
 
-    render(<CustomModal />);
+    render(<CustomForm />);
 
     await openModalAndFillBasicFields(user, {
       name: "Test Provider",
@@ -494,7 +499,7 @@ describe("Custom LLM Provider Configuration Workflow", () => {
       json: async () => ({ id: 1, name: "Provider with Custom Config" }),
     } as Response);
 
-    render(<CustomModal />);
+    render(<CustomForm />);
 
     // Open modal
     const openButton = screen.getByRole("button", {

web/src/app/admin/configuration/llm/forms/CustomForm.tsx

@@ -7,7 +7,7 @@ import {
   Formik,
   ErrorMessage,
 } from "formik";
-import { LLMProviderFormProps, LLMProviderView } from "@/interfaces/llm";
+import { LLMProviderFormProps, LLMProviderView } from "../interfaces";
 import * as Yup from "yup";
 import { ProviderFormEntrypointWrapper } from "./components/FormWrapper";
 import { DisplayNameField } from "./components/DisplayNameField";
@@ -21,7 +21,7 @@ import {
 } from "./formUtils";
 import { AdvancedOptions } from "./components/AdvancedOptions";
 import { TextFormField } from "@/components/Field";
-import { ModelConfigurationField } from "@/app/admin/configuration/llm/ModelConfigurationField";
+import { ModelConfigurationField } from "../ModelConfigurationField";
 import Text from "@/refresh-components/texts/Text";
 import CreateButton from "@/refresh-components/buttons/CreateButton";
 import IconButton from "@/refresh-components/buttons/IconButton";
@@ -38,11 +38,9 @@ function customConfigProcessing(customConfigsList: [string, string][]) {
   return customConfig;
 }
 
-export function CustomModal({
+export function CustomForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   return (
     <ProviderFormEntrypointWrapper
@@ -50,8 +48,6 @@ export function CustomModal({
       existingLlmProvider={existingLlmProvider}
       buttonMode={!existingLlmProvider}
       buttonText="Add Custom LLM Provider"
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -72,15 +68,7 @@ export function CustomModal({
               ...modelConfiguration,
               max_input_tokens: modelConfiguration.max_input_tokens ?? null,
             })
-          ) ?? [
-            {
-              name: "",
-              is_visible: true,
-              max_input_tokens: null,
-              supports_image_input: false,
-              supports_reasoning: false,
-            },
-          ],
+          ) ?? [{ name: "", is_visible: true, max_input_tokens: null }],
           custom_config_list: existingLlmProvider?.custom_config
             ? Object.entries(existingLlmProvider.custom_config)
             : [],
@@ -124,8 +112,7 @@ export function CustomModal({
                   name: mc.name,
                   is_visible: mc.is_visible,
                   max_input_tokens: mc.max_input_tokens ?? null,
-                  supports_image_input: mc.supports_image_input ?? false,
-                  supports_reasoning: mc.supports_reasoning ?? false,
+                  supports_image_input: null,
                 }))
                 .filter(
                   (mc) => mc.name === values.default_model_name || mc.is_visible

web/src/app/admin/configuration/llm/forms/OllamaForm.tsx

@@ -5,7 +5,7 @@ import {
   LLMProviderFormProps,
   LLMProviderView,
   ModelConfiguration,
-} from "@/interfaces/llm";
+} from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -24,20 +24,20 @@ import {
 import { AdvancedOptions } from "./components/AdvancedOptions";
 import { DisplayModels } from "./components/DisplayModels";
 import { useEffect, useState } from "react";
-import { fetchOllamaModels } from "@/app/admin/configuration/llm/utils";
+import { fetchOllamaModels } from "../utils";
 
 export const OLLAMA_PROVIDER_NAME = "ollama_chat";
 const DEFAULT_API_BASE = "http://127.0.0.1:11434";
 
-interface OllamaModalValues extends BaseLLMFormValues {
+interface OllamaFormValues extends BaseLLMFormValues {
   api_base: string;
   custom_config: {
     OLLAMA_API_KEY?: string;
   };
 }
 
-interface OllamaModalContentProps {
-  formikProps: FormikProps<OllamaModalValues>;
+interface OllamaFormContentProps {
+  formikProps: FormikProps<OllamaFormValues>;
   existingLlmProvider?: LLMProviderView;
   fetchedModels: ModelConfiguration[];
   setFetchedModels: (models: ModelConfiguration[]) => void;
@@ -48,7 +48,7 @@ interface OllamaModalContentProps {
   isFormValid: boolean;
 }
 
-function OllamaModalContent({
+function OllamaFormContent({
   formikProps,
   existingLlmProvider,
   fetchedModels,
@@ -58,7 +58,7 @@ function OllamaModalContent({
   mutate,
   onClose,
   isFormValid,
-}: OllamaModalContentProps) {
+}: OllamaFormContentProps) {
   const [isLoadingModels, setIsLoadingModels] = useState(true);
 
   useEffect(() => {
@@ -131,11 +131,9 @@ function OllamaModalContent({
   );
 }
 
-export function OllamaModal({
+export function OllamaForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   const [fetchedModels, setFetchedModels] = useState<ModelConfiguration[]>([]);
 
@@ -143,8 +141,6 @@ export function OllamaModal({
     <ProviderFormEntrypointWrapper
       providerName="Ollama"
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -159,7 +155,7 @@ export function OllamaModal({
           existingLlmProvider,
           wellKnownLLMProvider
         );
-        const initialValues: OllamaModalValues = {
+        const initialValues: OllamaFormValues = {
           ...buildDefaultInitialValues(
             existingLlmProvider,
             modelConfigurations
@@ -216,7 +212,7 @@ export function OllamaModal({
             }}
           >
             {(formikProps) => (
-              <OllamaModalContent
+              <OllamaFormContent
                 formikProps={formikProps}
                 existingLlmProvider={existingLlmProvider}
                 fetchedModels={fetchedModels}

web/src/app/admin/configuration/llm/forms/OpenAIForm.tsx

@@ -1,6 +1,6 @@
 import { Form, Formik } from "formik";
 
-import { LLMProviderFormProps } from "@/interfaces/llm";
+import { LLMProviderFormProps } from "../interfaces";
 import * as Yup from "yup";
 import { ProviderFormEntrypointWrapper } from "./components/FormWrapper";
 import { DisplayNameField } from "./components/DisplayNameField";
@@ -19,19 +19,15 @@ import { DisplayModels } from "./components/DisplayModels";
 export const OPENAI_PROVIDER_NAME = "openai";
 const DEFAULT_DEFAULT_MODEL_NAME = "gpt-5.2";
 
-export function OpenAIModal({
+export function OpenAIForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   return (
     <ProviderFormEntrypointWrapper
       providerName="OpenAI"
       providerEndpoint={OPENAI_PROVIDER_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -53,6 +49,7 @@ export function OpenAIModal({
           ),
           api_key: existingLlmProvider?.api_key ?? "",
           default_model_name:
+            existingLlmProvider?.default_model_name ??
             wellKnownLLMProvider?.recommended_default_model?.name ??
             DEFAULT_DEFAULT_MODEL_NAME,
           // Default to auto mode for new OpenAI providers

web/src/app/admin/configuration/llm/forms/OpenRouterForm.tsx

@@ -5,7 +5,7 @@ import {
   LLMProviderFormProps,
   ModelConfiguration,
   OpenRouterModelResponse,
-} from "@/interfaces/llm";
+} from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -32,7 +32,7 @@ const OPENROUTER_DISPLAY_NAME = "OpenRouter";
 const DEFAULT_API_BASE = "https://openrouter.ai/api/v1";
 const OPENROUTER_MODELS_API_URL = "/api/admin/llm/openrouter/available-models";
 
-interface OpenRouterModalValues extends BaseLLMFormValues {
+interface OpenRouterFormValues extends BaseLLMFormValues {
   api_key: string;
   api_base: string;
 }
@@ -80,7 +80,6 @@ async function fetchOpenRouterModels(params: {
       is_visible: true,
       max_input_tokens: modelData.max_input_tokens,
       supports_image_input: modelData.supports_image_input,
-      supports_reasoning: false,
     }));
 
     return { models };
@@ -91,11 +90,9 @@ async function fetchOpenRouterModels(params: {
   }
 }
 
-export function OpenRouterModal({
+export function OpenRouterForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   const [fetchedModels, setFetchedModels] = useState<ModelConfiguration[]>([]);
 
@@ -104,8 +101,6 @@ export function OpenRouterModal({
       providerName={OPENROUTER_DISPLAY_NAME}
       providerEndpoint={OPENROUTER_PROVIDER_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -120,7 +115,7 @@ export function OpenRouterModal({
           existingLlmProvider,
           wellKnownLLMProvider
         );
-        const initialValues: OpenRouterModalValues = {
+        const initialValues: OpenRouterFormValues = {
           ...buildDefaultInitialValues(
             existingLlmProvider,
             modelConfigurations

web/src/app/admin/configuration/llm/forms/VertexAIForm.tsx

@@ -1,6 +1,6 @@
 import { Form, Formik } from "formik";
 import { TextFormField, FileUploadFormField } from "@/components/Field";
-import { LLMProviderFormProps } from "@/interfaces/llm";
+import { LLMProviderFormProps } from "../interfaces";
 import * as Yup from "yup";
 import {
   ProviderFormEntrypointWrapper,
@@ -25,26 +25,22 @@ const VERTEXAI_DISPLAY_NAME = "Google Cloud Vertex AI";
 const VERTEXAI_DEFAULT_MODEL = "gemini-2.5-pro";
 const VERTEXAI_DEFAULT_LOCATION = "global";
 
-interface VertexAIModalValues extends BaseLLMFormValues {
+interface VertexAIFormValues extends BaseLLMFormValues {
   custom_config: {
     vertex_credentials: string;
     vertex_location: string;
   };
 }
 
-export function VertexAIModal({
+export function VertexAIForm({
   existingLlmProvider,
   shouldMarkAsDefault,
-  open,
-  onOpenChange,
 }: LLMProviderFormProps) {
   return (
     <ProviderFormEntrypointWrapper
       providerName={VERTEXAI_DISPLAY_NAME}
       providerEndpoint={VERTEXAI_PROVIDER_NAME}
       existingLlmProvider={existingLlmProvider}
-      open={open}
-      onOpenChange={onOpenChange}
     >
       {({
         onClose,
@@ -59,12 +55,13 @@ export function VertexAIModal({
           existingLlmProvider,
           wellKnownLLMProvider
         );
-        const initialValues: VertexAIModalValues = {
+        const initialValues: VertexAIFormValues = {
           ...buildDefaultInitialValues(
             existingLlmProvider,
             modelConfigurations
           ),
           default_model_name:
+            existingLlmProvider?.default_model_name ??
             wellKnownLLMProvider?.recommended_default_model?.name ??
             VERTEXAI_DEFAULT_MODEL,
           // Default to auto mode for new Vertex AI providers

web/src/app/admin/configuration/llm/forms/components/DisplayModels.tsx

@@ -1,4 +1,4 @@
-import { ModelConfiguration, SimpleKnownModel } from "@/interfaces/llm";
+import { ModelConfiguration, SimpleKnownModel } from "../../interfaces";
 import { FormikProps } from "formik";
 import { BaseLLMFormValues } from "../formUtils";
 

web/src/app/admin/configuration/llm/forms/components/FetchModelsButton.tsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import Button from "@/refresh-components/buttons/Button";
 import Text from "@/refresh-components/texts/Text";
 import SimpleTooltip from "@/refresh-components/SimpleTooltip";
-import { ModelConfiguration } from "@/interfaces/llm";
+import { ModelConfiguration } from "../../interfaces";
 
 interface FetchModelsButtonProps {
   onFetch: () => Promise<{ models: ModelConfiguration[]; error?: string }>;

web/src/app/admin/configuration/llm/forms/components/FormActionButtons.tsx

@@ -2,9 +2,8 @@ import { LoadingAnimation } from "@/components/Loading";
 import Text from "@/refresh-components/texts/Text";
 import Button from "@/refresh-components/buttons/Button";
 import { SvgTrash } from "@opal/icons";
-import { LLMProviderView } from "@/interfaces/llm";
-import { LLM_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
-import { deleteLlmProvider } from "@/lib/llmConfig/svc";
+import { LLMProviderView } from "../../interfaces";
+import { LLM_PROVIDERS_ADMIN_URL } from "../../constants";
 
 interface FormActionButtonsProps {
   isTesting: boolean;
@@ -26,14 +25,41 @@ export function FormActionButtons({
   const handleDelete = async () => {
     if (!existingLlmProvider) return;
 
-    try {
-      await deleteLlmProvider(existingLlmProvider.id);
-      mutate(LLM_PROVIDERS_ADMIN_URL);
-      onClose();
-    } catch (e) {
-      const message = e instanceof Error ? e.message : "Unknown error";
-      alert(`Failed to delete provider: ${message}`);
+    const response = await fetch(
+      `${LLM_PROVIDERS_ADMIN_URL}/${existingLlmProvider.id}`,
+      {
+        method: "DELETE",
+      }
+    );
+
+    if (!response.ok) {
+      const errorMsg = (await response.json()).detail;
+      alert(`Failed to delete provider: ${errorMsg}`);
+      return;
     }
+
+    // If the deleted provider was the default, set the first remaining provider as default
+    if (existingLlmProvider.is_default_provider) {
+      const remainingProvidersResponse = await fetch(LLM_PROVIDERS_ADMIN_URL);
+      if (remainingProvidersResponse.ok) {
+        const remainingProviders = await remainingProvidersResponse.json();
+
+        if (remainingProviders.length > 0) {
+          const setDefaultResponse = await fetch(
+            `${LLM_PROVIDERS_ADMIN_URL}/${remainingProviders[0].id}/default`,
+            {
+              method: "POST",
+            }
+          );
+          if (!setDefaultResponse.ok) {
+            console.error("Failed to set new default provider");
+          }
+        }
+      }
+    }
+
+    mutate(LLM_PROVIDERS_ADMIN_URL);
+    onClose();
   };
 
   return (

web/src/app/admin/configuration/llm/forms/components/FormWrapper.tsx

@@ -6,7 +6,7 @@ import { toast } from "@/hooks/useToast";
 import {
   LLMProviderView,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
+} from "../../interfaces";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 import Modal from "@/refresh-components/Modal";
 import Text from "@/refresh-components/texts/Text";
@@ -14,7 +14,7 @@ import Button from "@/refresh-components/buttons/Button";
 import { SvgSettings } from "@opal/icons";
 import { Badge } from "@/components/ui/badge";
 import { cn } from "@/lib/utils";
-import { LLM_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
+import { LLM_PROVIDERS_ADMIN_URL } from "../../constants";
 
 export interface ProviderFormContext {
   onClose: () => void;
@@ -35,10 +35,6 @@ interface ProviderFormEntrypointWrapperProps {
   buttonMode?: boolean;
   /** Custom button text for buttonMode (defaults to "Add {providerName}") */
   buttonText?: string;
-  /** Controlled open state — when defined, the wrapper renders only a modal (no card/button UI) */
-  open?: boolean;
-  /** Callback when controlled modal requests close */
-  onOpenChange?: (open: boolean) => void;
 }
 
 export function ProviderFormEntrypointWrapper({
@@ -48,11 +44,8 @@ export function ProviderFormEntrypointWrapper({
   existingLlmProvider,
   buttonMode,
   buttonText,
-  open,
-  onOpenChange,
 }: ProviderFormEntrypointWrapperProps) {
   const [formIsVisible, setFormIsVisible] = useState(false);
-  const isControlled = open !== undefined;
 
   // Shared hooks
   const { mutate } = useSWRConfig();
@@ -61,25 +54,15 @@ export function ProviderFormEntrypointWrapper({
   const [isTesting, setIsTesting] = useState(false);
   const [testError, setTestError] = useState<string>("");
 
-  // Suppress SWR when controlled + closed to avoid unnecessary API calls
-  const swrKey =
-    providerEndpoint && !(isControlled && !open)
-      ? `/api/admin/llm/built-in/options/${providerEndpoint}`
-      : null;
-
   // Fetch model configurations for this provider
   const { data: wellKnownLLMProvider } = useSWR<WellKnownLLMProviderDescriptor>(
-    swrKey,
+    providerEndpoint
+      ? `/api/admin/llm/built-in/options/${providerEndpoint}`
+      : null,
     errorHandlingFetcher
   );
 
-  const onClose = () => {
-    if (isControlled) {
-      onOpenChange?.(false);
-    } else {
-      setFormIsVisible(false);
-    }
-  };
+  const onClose = () => setFormIsVisible(false);
 
   async function handleSetAsDefault(): Promise<void> {
     if (!existingLlmProvider) return;
@@ -110,28 +93,6 @@ export function ProviderFormEntrypointWrapper({
     wellKnownLLMProvider,
   };
 
-  // Controlled mode: render nothing when closed, render only modal when open
-  if (isControlled) {
-    if (!open) return null;
-
-    return (
-      <Modal open onOpenChange={onClose}>
-        <Modal.Content>
-          <Modal.Header
-            icon={SvgSettings}
-            title={`${existingLlmProvider ? "Configure" : "Setup"} ${
-              existingLlmProvider?.name
-                ? `"${existingLlmProvider.name}"`
-                : providerName
-            }`}
-            onClose={onClose}
-          />
-          <Modal.Body>{children(context)}</Modal.Body>
-        </Modal.Content>
-      </Modal>
-    );
-  }
-
   // Button mode: simple button that opens a modal
   if (buttonMode && !existingLlmProvider) {
     return (
@@ -174,18 +135,24 @@ export function ProviderFormEntrypointWrapper({
               <Text as="p" secondaryBody text03 className="italic">
                 ({providerName})
               </Text>
-              <Text
-                as="p"
-                className={cn("text-action-link-05", "cursor-pointer")}
-                onClick={handleSetAsDefault}
-              >
-                Set as default
-              </Text>
+              {!existingLlmProvider.is_default_provider && (
+                <Text
+                  as="p"
+                  className={cn("text-action-link-05", "cursor-pointer")}
+                  onClick={handleSetAsDefault}
+                >
+                  Set as default
+                </Text>
+              )}
             </div>
 
             {existingLlmProvider && (
               <div className="my-auto ml-3">
-                <Badge variant="success">Enabled</Badge>
+                {existingLlmProvider.is_default_provider ? (
+                  <Badge variant="agent">Default</Badge>
+                ) : (
+                  <Badge variant="success">Enabled</Badge>
+                )}
               </div>
             )}
 

web/src/app/admin/configuration/llm/forms/formUtils.ts

@@ -2,11 +2,8 @@ import {
   LLMProviderView,
   ModelConfiguration,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
-import {
-  LLM_ADMIN_URL,
-  LLM_PROVIDERS_ADMIN_URL,
-} from "@/lib/llmConfig/constants";
+} from "../interfaces";
+import { LLM_PROVIDERS_ADMIN_URL } from "../constants";
 import { toast } from "@/hooks/useToast";
 import * as Yup from "yup";
 import isEqual from "lodash/isEqual";
@@ -18,7 +15,10 @@ export const buildDefaultInitialValues = (
   existingLlmProvider?: LLMProviderView,
   modelConfigurations?: ModelConfiguration[]
 ) => {
-  const defaultModelName = modelConfigurations?.[0]?.name ?? "";
+  const defaultModelName =
+    existingLlmProvider?.default_model_name ??
+    modelConfigurations?.[0]?.name ??
+    "";
 
   // Auto mode must be explicitly enabled by the user
   // Default to false for new providers, preserve existing value when editing
@@ -119,7 +119,6 @@ export const filterModelConfigurations = (
         is_visible: visibleModels.includes(modelConfiguration.name),
         max_input_tokens: modelConfiguration.max_input_tokens ?? null,
         supports_image_input: modelConfiguration.supports_image_input,
-        supports_reasoning: modelConfiguration.supports_reasoning,
         display_name: modelConfiguration.display_name,
       })
     )
@@ -142,7 +141,6 @@ export const getAutoModeModelConfigurations = (
       is_visible: modelConfiguration.is_visible,
       max_input_tokens: modelConfiguration.max_input_tokens ?? null,
       supports_image_input: modelConfiguration.supports_image_input,
-      supports_reasoning: modelConfiguration.supports_reasoning,
       display_name: modelConfiguration.display_name,
     })
   );
@@ -225,8 +223,6 @@ export const submitLLMProvider = async <T extends BaseLLMFormValues>({
       body: JSON.stringify({
         provider: providerName,
         ...finalValues,
-        model: finalDefaultModelName,
-        id: existingLlmProvider?.id,
       }),
     });
     setIsTesting(false);
@@ -251,7 +247,6 @@ export const submitLLMProvider = async <T extends BaseLLMFormValues>({
       body: JSON.stringify({
         provider: providerName,
         ...finalValues,
-        id: existingLlmProvider?.id,
       }),
     }
   );
@@ -267,16 +262,12 @@ export const submitLLMProvider = async <T extends BaseLLMFormValues>({
 
   if (shouldMarkAsDefault) {
     const newLlmProvider = (await response.json()) as LLMProviderView;
-    const setDefaultResponse = await fetch(`${LLM_ADMIN_URL}/default`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        provider_id: newLlmProvider.id,
-        model_name: finalDefaultModelName,
-      }),
-    });
+    const setDefaultResponse = await fetch(
+      `${LLM_PROVIDERS_ADMIN_URL}/${newLlmProvider.id}/default`,
+      {
+        method: "POST",
+      }
+    );
     if (!setDefaultResponse.ok) {
       const errorMsg = (await setDefaultResponse.json()).detail;
       toast.error(`Failed to set provider as default: ${errorMsg}`);

web/src/app/admin/configuration/llm/forms/getForm.tsx

@@ -0,0 +1,44 @@
+import { LLMProviderName, LLMProviderView } from "../interfaces";
+import { AnthropicForm } from "./AnthropicForm";
+import { OpenAIForm } from "./OpenAIForm";
+import { OllamaForm } from "./OllamaForm";
+import { AzureForm } from "./AzureForm";
+import { VertexAIForm } from "./VertexAIForm";
+import { OpenRouterForm } from "./OpenRouterForm";
+import { CustomForm } from "./CustomForm";
+import { BedrockForm } from "./BedrockForm";
+
+export function detectIfRealOpenAIProvider(provider: LLMProviderView) {
+  return (
+    provider.provider === LLMProviderName.OPENAI &&
+    provider.api_key &&
+    !provider.api_base &&
+    Object.keys(provider.custom_config || {}).length === 0
+  );
+}
+
+export const getFormForExistingProvider = (provider: LLMProviderView) => {
+  switch (provider.provider) {
+    case LLMProviderName.OPENAI:
+      // "openai" as a provider name can be used for litellm proxy / any OpenAI-compatible provider
+      if (detectIfRealOpenAIProvider(provider)) {
+        return <OpenAIForm existingLlmProvider={provider} />;
+      } else {
+        return <CustomForm existingLlmProvider={provider} />;
+      }
+    case LLMProviderName.ANTHROPIC:
+      return <AnthropicForm existingLlmProvider={provider} />;
+    case LLMProviderName.OLLAMA_CHAT:
+      return <OllamaForm existingLlmProvider={provider} />;
+    case LLMProviderName.AZURE:
+      return <AzureForm existingLlmProvider={provider} />;
+    case LLMProviderName.VERTEX_AI:
+      return <VertexAIForm existingLlmProvider={provider} />;
+    case LLMProviderName.BEDROCK:
+      return <BedrockForm existingLlmProvider={provider} />;
+    case LLMProviderName.OPENROUTER:
+      return <OpenRouterForm existingLlmProvider={provider} />;
+    default:
+      return <CustomForm existingLlmProvider={provider} />;
+  }
+};

web/src/app/admin/configuration/llm/interfaces.ts

@@ -13,8 +13,8 @@ export interface ModelConfiguration {
   name: string;
   is_visible: boolean;
   max_input_tokens: number | null;
-  supports_image_input: boolean;
-  supports_reasoning: boolean;
+  supports_image_input: boolean | null;
+  supports_reasoning?: boolean;
   display_name?: string;
   provider_display_name?: string;
   vendor?: string;
@@ -30,6 +30,7 @@ export interface SimpleKnownModel {
 export interface WellKnownLLMProviderDescriptor {
   name: string;
   known_models: ModelConfiguration[];
+
   recommended_default_model: SimpleKnownModel | null;
 }
 
@@ -39,31 +40,44 @@ export interface LLMModelDescriptor {
   maxTokens: number;
 }
 
-export interface LLMProviderView {
-  id: number;
+export interface LLMProvider {
   name: string;
   provider: string;
   api_key: string | null;
   api_base: string | null;
   api_version: string | null;
   custom_config: { [key: string]: string } | null;
+  default_model_name: string;
   is_public: boolean;
   is_auto_mode: boolean;
   groups: number[];
   personas: number[];
   deployment_name: string | null;
+  default_vision_model: string | null;
+  is_default_vision_provider: boolean | null;
   model_configurations: ModelConfiguration[];
 }
 
+export interface LLMProviderView extends LLMProvider {
+  id: number;
+  is_default_provider: boolean | null;
+}
+
 export interface VisionProvider extends LLMProviderView {
   vision_models: string[];
 }
 
 export interface LLMProviderDescriptor {
-  id: number;
   name: string;
   provider: string;
-  provider_display_name: string;
+  provider_display_name?: string;
+  default_model_name: string;
+  is_default_provider: boolean | null;
+  is_default_vision_provider?: boolean | null;
+  default_vision_model?: string | null;
+  is_public?: boolean;
+  groups?: number[];
+  personas?: number[];
   model_configurations: ModelConfiguration[];
 }
 
@@ -88,22 +102,9 @@ export interface BedrockModelResponse {
   supports_image_input: boolean;
 }
 
-export interface DefaultModel {
-  provider_id: number;
-  model_name: string;
-}
-
-export interface LLMProviderResponse<T> {
-  providers: T[];
-  default_text: DefaultModel | null;
-  default_vision: DefaultModel | null;
-}
-
 export interface LLMProviderFormProps {
   existingLlmProvider?: LLMProviderView;
   shouldMarkAsDefault?: boolean;
-  open?: boolean;
-  onOpenChange?: (open: boolean) => void;
 }
 
 // Param types for model fetching functions - use snake_case to match API structure

web/src/app/admin/configuration/llm/page.tsx

@@ -1,7 +1,14 @@
 "use client";
 
-import LLMConfigurationPage from "@/refresh-pages/admin/LLMConfigurationPage";
-
+import { AdminPageTitle } from "@/components/admin/Title";
+import { LLMConfiguration } from "./LLMConfiguration";
+import { SvgCpu } from "@opal/icons";
 export default function Page() {
-  return <LLMConfigurationPage />;
+  return (
+    <>
+      <AdminPageTitle title="LLM Setup" icon={SvgCpu} />
+
+      <LLMConfiguration />
+    </>
+  );
 }

web/src/app/admin/configuration/llm/utils.ts

@@ -24,7 +24,7 @@ import {
   BedrockFetchParams,
   OllamaFetchParams,
   OpenRouterFetchParams,
-} from "@/interfaces/llm";
+} from "./interfaces";
 import { SvgAws, SvgOpenrouter } from "@opal/icons";
 
 // Aggregator providers that host models from multiple vendors
@@ -106,8 +106,8 @@ export const getProviderIcon = (
   return CPUIcon;
 };
 
-export const isAnthropic = (provider: string, modelName?: string) =>
-  provider === "anthropic" || !!modelName?.toLowerCase().includes("claude");
+export const isAnthropic = (provider: string, modelName: string) =>
+  provider === "anthropic" || modelName.toLowerCase().includes("claude");
 
 /**
  * Fetches Bedrock models directly without any form state dependencies.
@@ -153,7 +153,6 @@ export const fetchBedrockModels = async (
       is_visible: false,
       max_input_tokens: modelData.max_input_tokens,
       supports_image_input: modelData.supports_image_input,
-      supports_reasoning: false,
     }));
 
     return { models };
@@ -206,7 +205,6 @@ export const fetchOllamaModels = async (
       is_visible: true,
       max_input_tokens: modelData.max_input_tokens,
       supports_image_input: modelData.supports_image_input,
-      supports_reasoning: false,
     }));
 
     return { models };
@@ -264,7 +262,6 @@ export const fetchOpenRouterModels = async (
       is_visible: true,
       max_input_tokens: modelData.max_input_tokens,
       supports_image_input: modelData.supports_image_input,
-      supports_reasoning: false,
     }));
 
     return { models };

web/src/app/admin/embeddings/EmbeddingModelSelectionForm.tsx

@@ -25,7 +25,7 @@ import { ModelOption } from "@/components/embedding/ModelSelector";
 import {
   EMBEDDING_MODELS_ADMIN_URL,
   EMBEDDING_PROVIDERS_ADMIN_URL,
-} from "@/lib/llmConfig/constants";
+} from "@/app/admin/configuration/llm/constants";
 import { AdvancedSearchConfiguration } from "@/app/admin/embeddings/interfaces";
 import Button from "@/refresh-components/buttons/Button";
 

web/src/app/admin/embeddings/modals/ChangeCredentialsModal.tsx

@@ -14,7 +14,7 @@ import {
 import {
   EMBEDDING_PROVIDERS_ADMIN_URL,
   LLM_PROVIDERS_ADMIN_URL,
-} from "@/lib/llmConfig/constants";
+} from "@/app/admin/configuration/llm/constants";
 import { mutate } from "swr";
 import { testEmbedding } from "@/app/admin/embeddings/pages/utils";
 import { SvgSettings } from "@opal/icons";

web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx

@@ -11,7 +11,7 @@ import {
   EmbeddingProvider,
   getFormattedProviderName,
 } from "@/components/embedding/interfaces";
-import { EMBEDDING_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
+import { EMBEDDING_PROVIDERS_ADMIN_URL } from "@/app/admin/configuration/llm/constants";
 import Modal from "@/refresh-components/Modal";
 import { SvgSettings } from "@opal/icons";
 export interface ProviderCreationModalProps {

web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx

@@ -15,7 +15,7 @@ import {
 import NumberInput from "../../connectors/[connector]/pages/ConnectorInput/NumberInput";
 import { StringOrNumberOption } from "@/components/Dropdown";
 import useSWR from "swr";
-import { LLM_CONTEXTUAL_COST_ADMIN_URL } from "@/lib/llmConfig/constants";
+import { LLM_CONTEXTUAL_COST_ADMIN_URL } from "../../configuration/llm/constants";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 import Button from "@/refresh-components/buttons/Button";
 import { NEXT_PUBLIC_CLOUD_ENABLED } from "@/lib/constants";

web/src/app/app/message/messageComponents/MessageToolbar.tsx

@@ -18,7 +18,7 @@ import SourceTag from "@/refresh-components/buttons/source-tag/SourceTag";
 import { citationsToSourceInfoArray } from "@/refresh-components/buttons/source-tag/sourceTagUtils";
 import CopyIconButton from "@/refresh-components/buttons/CopyIconButton";
 import LLMPopover from "@/refresh-components/popovers/LLMPopover";
-import { parseLlmDescriptor } from "@/lib/llmConfig/utils";
+import { parseLlmDescriptor } from "@/lib/llm/utils";
 import { LlmManager } from "@/lib/hooks";
 import { Message } from "@/app/app/interfaces";
 import { SvgThumbsDown, SvgThumbsUp } from "@opal/icons";

web/src/app/app/message/messageComponents/interfaces.ts

@@ -47,6 +47,8 @@ export interface RendererResult {
 
   // Whether this renderer supports collapsible mode (collapse button shown only when true)
   supportsCollapsible?: boolean;
+  /** Whether the step should remain collapsible even in single-step timelines */
+  alwaysCollapsible?: boolean;
   /** Whether the result should be wrapped by timeline UI or rendered as-is */
   timelineLayout?: TimelineLayout;
 }

web/src/app/app/message/messageComponents/timeline/TimelineStepComposer.tsx

@@ -50,7 +50,9 @@ export function TimelineStepComposer({
             header={result.status}
             isExpanded={result.isExpanded}
             onToggle={result.onToggle}
-            collapsible={collapsible && !isSingleStep}
+            collapsible={
+              collapsible && (!isSingleStep || !!result.alwaysCollapsible)
+            }
             supportsCollapsible={result.supportsCollapsible}
             isLastStep={index === results.length - 1 && isLastStep}
             isFirstStep={index === 0 && isFirstStep}

web/src/app/app/message/messageComponents/timeline/primitives/TimelineRow.tsx

@@ -54,7 +54,7 @@ export function TimelineRow({
           isHover={isHover}
         />
       )}
-      <div className="flex-1">{children}</div>
+      <div className="flex-1 min-w-0">{children}</div>
     </div>
   );
 }

web/src/app/app/message/messageComponents/timeline/renderers/code/PythonToolRenderer.tsx

@@ -138,7 +138,7 @@ export const PythonToolRenderer: MessageRenderer<PythonToolPacket, {}> = ({
       {stdout && (
         <div className="rounded-md bg-background-neutral-02 p-3">
           <div className="text-xs font-semibold mb-1 text-text-03">Output:</div>
-          <pre className="text-sm whitespace-pre-wrap font-mono text-text-01">
+          <pre className="text-sm whitespace-pre-wrap font-mono text-text-01 overflow-x-auto">
             {stdout}
           </pre>
         </div>
@@ -150,7 +150,7 @@ export const PythonToolRenderer: MessageRenderer<PythonToolPacket, {}> = ({
           <div className="text-xs font-semibold mb-1 text-status-error-05">
             Error:
           </div>
-          <pre className="text-sm whitespace-pre-wrap font-mono text-status-error-05">
+          <pre className="text-sm whitespace-pre-wrap font-mono text-status-error-05 overflow-x-auto">
             {stderr}
           </pre>
         </div>
@@ -181,6 +181,7 @@ export const PythonToolRenderer: MessageRenderer<PythonToolPacket, {}> = ({
         status,
         content,
         supportsCollapsible: true,
+        alwaysCollapsible: true,
       },
     ]);
   }
@@ -191,6 +192,7 @@ export const PythonToolRenderer: MessageRenderer<PythonToolPacket, {}> = ({
       icon: SvgTerminal,
       status,
       supportsCollapsible: true,
+      alwaysCollapsible: true,
       content: (
         <FadingEdgeContainer
           direction="bottom"

web/src/app/craft/components/BuildLLMPopover.tsx

@@ -11,7 +11,7 @@ import Text from "@/refresh-components/texts/Text";
 import Popover, { PopoverMenu } from "@/refresh-components/Popover";
 import Switch from "@/refresh-components/inputs/Switch";
 import LineItem from "@/refresh-components/buttons/LineItem";
-import { LLMProviderDescriptor } from "@/interfaces/llm";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   BuildLlmSelection,
   BUILD_MODE_PROVIDERS,

web/src/app/craft/hooks/useBuildLlmSelection.ts

@@ -1,5 +1,5 @@
 import { useMemo, useState, useCallback } from "react";
-import { LLMProviderDescriptor } from "@/interfaces/llm";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   BuildLlmSelection,
   getBuildLlmSelection,

web/src/app/craft/hooks/useBuildSessionController.ts

@@ -7,7 +7,7 @@ import { usePreProvisionPolling } from "@/app/craft/hooks/usePreProvisionPolling
 import { CRAFT_SEARCH_PARAM_NAMES } from "@/app/craft/services/searchParams";
 import { CRAFT_PATH } from "@/app/craft/v1/constants";
 import { getBuildUserPersona } from "@/app/craft/onboarding/constants";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "@/lib/hooks/useLLMProviders";
 import { checkPreProvisionedSession } from "@/app/craft/services/apiServices";
 
 interface UseBuildSessionControllerProps {

web/src/app/craft/onboarding/components/BuildOnboardingModal.tsx

@@ -18,8 +18,8 @@ import {
   getBuildLlmSelection,
   getDefaultLlmSelection,
 } from "@/app/craft/onboarding/constants";
-import { LLMProviderDescriptor } from "@/interfaces/llm";
-import { LLM_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
+import { LLM_PROVIDERS_ADMIN_URL } from "@/app/admin/configuration/llm/constants";
 import {
   buildInitialValues,
   testApiKeyHelper,

web/src/app/craft/onboarding/components/OnboardingLlmSetup.tsx

@@ -5,7 +5,10 @@ import { cn } from "@/lib/utils";
 import { Disabled } from "@/refresh-components/Disabled";
 import Text from "@/refresh-components/texts/Text";
 import SimpleTooltip from "@/refresh-components/SimpleTooltip";
-import { LLMProviderName, LLMProviderDescriptor } from "@/interfaces/llm";
+import {
+  LLMProviderName,
+  LLMProviderDescriptor,
+} from "@/app/admin/configuration/llm/interfaces";
 
 // Provider configurations
 export type ProviderKey = "anthropic" | "openai" | "openrouter";

web/src/app/craft/onboarding/constants.ts

@@ -19,12 +19,13 @@ const LLM_SELECTION_PRIORITY = [
 interface MinimalLlmProvider {
   name: string;
   provider: string;
-  model_configurations: { name: string; is_visible: boolean }[];
+  default_model_name: string;
+  is_default_provider: boolean | null;
 }
 
 /**
  * Get the best default LLM selection based on available providers.
- * Priority: Anthropic > OpenAI > OpenRouter > first available
+ * Priority: Anthropic > OpenAI > OpenRouter > system default > first available
  */
 export function getDefaultLlmSelection(
   llmProviders: MinimalLlmProvider[] | undefined
@@ -43,16 +44,23 @@ export function getDefaultLlmSelection(
     }
   }
 
-  // Fallback: first available provider, use its first visible model
+  // Fallback: use the default provider's default model
+  const defaultProvider = llmProviders.find((p) => p.is_default_provider);
+  if (defaultProvider) {
+    return {
+      providerName: defaultProvider.name,
+      provider: defaultProvider.provider,
+      modelName: defaultProvider.default_model_name,
+    };
+  }
+
+  // Final fallback: first available provider
   const firstProvider = llmProviders[0];
   if (firstProvider) {
-    const firstModel = firstProvider.model_configurations.find(
-      (m) => m.is_visible
-    );
     return {
       providerName: firstProvider.name,
       provider: firstProvider.provider,
-      modelName: firstModel?.name ?? "",
+      modelName: firstProvider.default_model_name,
     };
   }
 

web/src/app/craft/onboarding/hooks/useOnboardingModal.ts

@@ -2,8 +2,8 @@
 
 import { useCallback, useState, useMemo, useEffect } from "react";
 import { useUser } from "@/providers/UserProvider";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
-import { LLMProviderName } from "@/interfaces/llm";
+import { useLLMProviders } from "@/lib/hooks/useLLMProviders";
+import { LLMProviderName } from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingModalMode,
   OnboardingModalController,
@@ -18,7 +18,9 @@ import { useBuildSessionStore } from "@/app/craft/hooks/useBuildSessionStore";
 
 // Check if all 3 build mode providers are configured (anthropic, openai, openrouter)
 function checkAllProvidersConfigured(
-  llmProviders: import("@/interfaces/llm").LLMProviderDescriptor[] | undefined
+  llmProviders:
+    | import("@/app/admin/configuration/llm/interfaces").LLMProviderDescriptor[]
+    | undefined
 ): boolean {
   if (!llmProviders || llmProviders.length === 0) {
     return false;
@@ -33,7 +35,9 @@ function checkAllProvidersConfigured(
 
 // Check if at least one provider is configured
 function checkHasAnyProvider(
-  llmProviders: import("@/interfaces/llm").LLMProviderDescriptor[] | undefined
+  llmProviders:
+    | import("@/app/admin/configuration/llm/interfaces").LLMProviderDescriptor[]
+    | undefined
 ): boolean {
   return !!(llmProviders && llmProviders.length > 0);
 }

web/src/app/craft/onboarding/types.ts

@@ -33,7 +33,9 @@ export interface OnboardingModalController {
   close: () => void;
 
   // Data needed for modal
-  llmProviders: import("@/interfaces/llm").LLMProviderDescriptor[] | undefined;
+  llmProviders:
+    | import("@/app/admin/configuration/llm/interfaces").LLMProviderDescriptor[]
+    | undefined;
   initialValues: {
     firstName: string;
     lastName: string;
@@ -52,9 +54,7 @@ export interface OnboardingModalController {
   completeUserInfo: (info: BuildUserInfo) => Promise<void>;
   completeLlmSetup: () => Promise<void>;
   refetchLlmProviders: () => Promise<
-    | import("@/interfaces/llm").LLMProviderResponse<
-        import("@/interfaces/llm").LLMProviderDescriptor
-      >
+    | import("@/app/admin/configuration/llm/interfaces").LLMProviderDescriptor[]
     | undefined
   >;
 }

web/src/app/craft/v1/configure/page.tsx

@@ -46,7 +46,7 @@ import Switch from "@/refresh-components/inputs/Switch";
 import SimpleTooltip from "@/refresh-components/SimpleTooltip";
 import NotAllowedModal from "@/app/craft/onboarding/components/NotAllowedModal";
 import { useOnboarding } from "@/app/craft/onboarding/BuildOnboardingProvider";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "@/lib/hooks/useLLMProviders";
 import { useUser } from "@/providers/UserProvider";
 import { getProviderIcon } from "@/app/admin/configuration/llm/utils";
 import {

web/src/components/admin/ClientLayout.tsx

@@ -27,7 +27,6 @@ const SETTINGS_LAYOUT_PREFIXES = [
   "/admin/document-index-migration",
   "/admin/discord-bot",
   "/admin/theme",
-  "/admin/configuration/llm",
 ];
 
 export function ClientLayout({

web/src/components/chat/ProviderContext.tsx

@@ -2,7 +2,7 @@
 import {
   WellKnownLLMProviderDescriptor,
   LLMProviderDescriptor,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import React, {
   createContext,
   useContext,
@@ -11,9 +11,9 @@ import React, {
   useCallback,
 } from "react";
 import { useUser } from "@/providers/UserProvider";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "@/lib/hooks/useLLMProviders";
 import { useLLMProviderOptions } from "@/lib/hooks/useLLMProviderOptions";
-import { testDefaultProvider as testDefaultProviderSvc } from "@/lib/llmConfig/svc";
+import { testDefaultProvider as testDefaultProviderSvc } from "@/lib/llm/svc";
 
 interface ProviderContextType {
   shouldShowConfigurationNeeded: boolean;

web/src/components/llm/LLMSelector.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { useMemo } from "react";
-import { parseLlmDescriptor, structureValue } from "@/lib/llmConfig/utils";
-import { DefaultModel, LLMProviderDescriptor } from "@/interfaces/llm";
+import { parseLlmDescriptor, structureValue } from "@/lib/llm/utils";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { getProviderIcon } from "@/app/admin/configuration/llm/utils";
 import InputSelect from "@/refresh-components/inputs/InputSelect";
 import { createIcon } from "@/components/icons/icons";
@@ -23,7 +23,6 @@ export interface LLMSelectorProps {
   name?: string;
   userSettings?: boolean;
   llmProviders: LLMProviderDescriptor[];
-  defaultText?: DefaultModel | null;
   currentLlm: string | null;
   onSelect: (value: string | null) => void;
   requiresImageGeneration?: boolean;
@@ -34,7 +33,6 @@ export default function LLMSelector({
   name,
   userSettings,
   llmProviders,
-  defaultText,
   currentLlm,
   onSelect,
   requiresImageGeneration,
@@ -141,11 +139,11 @@ export default function LLMSelector({
     });
   }, [llmOptions]);
 
-  const defaultProvider = defaultText
-    ? llmProviders.find((p) => p.id === defaultText.provider_id)
-    : undefined;
+  const defaultProvider = llmProviders.find(
+    (llmProvider) => llmProvider.is_default_provider
+  );
 
-  const defaultModelName = defaultText?.model_name;
+  const defaultModelName = defaultProvider?.default_model_name;
   const defaultModelConfig = defaultProvider?.model_configurations.find(
     (m) => m.name === defaultModelName
   );

web/src/hooks/useChatController.ts

@@ -42,7 +42,7 @@ import {
   getFinalLLM,
   modelSupportsImageInput,
   structureValue,
-} from "@/lib/llmConfig/utils";
+} from "@/lib/llm/utils";
 import {
   CurrentMessageFIFO,
   updateCurrentMessageFIFO,

web/src/hooks/useLLMProviders.ts

@@ -1,150 +0,0 @@
-"use client";
-
-import useSWR from "swr";
-import { errorHandlingFetcher } from "@/lib/fetcher";
-import {
-  LLMProviderDescriptor,
-  LLMProviderResponse,
-  LLMProviderView,
-  WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
-import { LLM_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
-
-/**
- * Fetches configured LLM providers accessible to the current user.
- *
- * Hits the **non-admin** endpoints which return `LLMProviderDescriptor`
- * (no `id` or sensitive fields like `api_key`). Use this hook in
- * user-facing UI (chat, popovers, onboarding) where you need the list
- * of providers and their visible models but don't need admin-level details.
- *
- * The backend wraps the provider list in an `LLMProviderResponse` envelope
- * that also carries the global default text and vision models. This hook
- * unwraps `.providers` for convenience while still exposing the defaults.
- *
- * **Endpoints:**
- * - No `personaId` → `GET /api/llm/provider`
- *   Returns all public providers plus restricted providers the user can
- *   access via group membership.
- * - With `personaId` → `GET /api/llm/persona/{personaId}/providers`
- *   Returns providers scoped to a specific persona, respecting RBAC
- *   restrictions. Use this when displaying model options for a particular
- *   assistant.
- *
- * @param personaId - Optional persona ID for RBAC-scoped providers.
- *
- * @returns
- * - `llmProviders` — The array of provider descriptors, or `undefined`
- *    while loading.
- * - `defaultText` — The global (or persona-overridden) default text model.
- * - `defaultVision` — The global (or persona-overridden) default vision model.
- * - `isLoading` — `true` until the first successful response or error.
- * - `error` — The SWR error object, if any.
- * - `refetch` — SWR `mutate` function to trigger a revalidation.
- */
-export function useLLMProviders(personaId?: number) {
-  const url =
-    personaId !== undefined
-      ? `/api/llm/persona/${personaId}/providers`
-      : "/api/llm/provider";
-
-  const { data, error, mutate } = useSWR<
-    LLMProviderResponse<LLMProviderDescriptor>
-  >(url, errorHandlingFetcher, {
-    revalidateOnFocus: false,
-    dedupingInterval: 60000,
-  });
-
-  return {
-    llmProviders: data?.providers,
-    defaultText: data?.default_text ?? null,
-    defaultVision: data?.default_vision ?? null,
-    isLoading: !error && !data,
-    error,
-    refetch: mutate,
-  };
-}
-
-/**
- * Fetches configured LLM providers via the **admin** endpoint.
- *
- * Hits `GET /api/admin/llm/provider` which returns `LLMProviderView` —
- * the full provider object including `id`, `api_key` (masked),
- * group/persona assignments, and all other admin-visible fields.
- *
- * Use this hook on admin pages (e.g. the LLM Configuration page) where
- * you need provider IDs for mutations (setting defaults, editing, deleting)
- * or need to display admin-only metadata. **Do not use in user-facing UI**
- * — use `useLLMProviders` instead.
- *
- * @returns
- * - `llmProviders` — The array of full provider views, or `undefined`
- *    while loading.
- * - `defaultText` — The global default text model.
- * - `defaultVision` — The global default vision model.
- * - `isLoading` — `true` until the first successful response or error.
- * - `error` — The SWR error object, if any.
- * - `refetch` — SWR `mutate` function to trigger a revalidation.
- */
-export function useAdminLLMProviders() {
-  const { data, error, mutate } = useSWR<LLMProviderResponse<LLMProviderView>>(
-    LLM_PROVIDERS_ADMIN_URL,
-    errorHandlingFetcher,
-    {
-      revalidateOnFocus: false,
-      dedupingInterval: 60000,
-    }
-  );
-
-  return {
-    llmProviders: data?.providers,
-    defaultText: data?.default_text ?? null,
-    defaultVision: data?.default_vision ?? null,
-    isLoading: !error && !data,
-    error,
-    refetch: mutate,
-  };
-}
-
-/**
- * Fetches the catalog of well-known (built-in) LLM providers.
- *
- * Hits `GET /api/admin/llm/built-in/options` which returns the static
- * list of provider descriptors that Onyx ships with out of the box
- * (OpenAI, Anthropic, Vertex AI, Bedrock, Azure, Ollama, OpenRouter,
- * etc.). Each descriptor includes the provider's known models and the
- * recommended default model.
- *
- * Used primarily on the LLM Configuration page and onboarding flows
- * to show which providers are available to set up, and to pre-populate
- * model lists before the user has entered credentials.
- *
- * @returns
- * - `wellKnownLLMProviders` — The array of built-in provider descriptors,
- *    or `null` while loading.
- * - `isLoading` — `true` until the first successful response or error.
- * - `error` — The SWR error object, if any.
- * - `mutate` — SWR `mutate` function to trigger a revalidation.
- */
-export function useWellKnownLLMProviders() {
-  const {
-    data: wellKnownLLMProviders,
-    error,
-    isLoading,
-    mutate,
-  } = useSWR<WellKnownLLMProviderDescriptor[]>(
-    "/api/admin/llm/built-in/options",
-    errorHandlingFetcher,
-    {
-      revalidateOnFocus: false,
-      dedupingInterval: 60000,
-    }
-  );
-
-  return {
-    wellKnownLLMProviders: wellKnownLLMProviders ?? null,
-    isLoading,
-    error,
-    mutate,
-  };
-}

web/src/lib/hooks.llmResolver.test.ts

@@ -2,8 +2,8 @@ import {
   getDefaultLlmDescriptor,
   getValidLlmDescriptorForProviders,
 } from "@/lib/hooks";
-import { structureValue } from "@/lib/llmConfig/utils";
-import { LLMProviderDescriptor } from "@/interfaces/llm";
+import { structureValue } from "@/lib/llm/utils";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { makeProvider } from "@tests/setup/llmProviderTestUtils";
 
 describe("LLM resolver helpers", () => {
@@ -11,30 +11,29 @@ describe("LLM resolver helpers", () => {
     const sharedModel = "shared-runtime-model";
     const providers: LLMProviderDescriptor[] = [
       makeProvider({
-        id: 1,
         name: "OpenAI Provider",
         provider: "openai",
+        default_model_name: sharedModel,
+        is_default_provider: true,
         model_configurations: [
           {
             name: sharedModel,
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: false,
-            supports_reasoning: false,
           },
         ],
       }),
       makeProvider({
-        id: 2,
         name: "Anthropic Provider",
         provider: "anthropic",
+        default_model_name: sharedModel,
         model_configurations: [
           {
             name: sharedModel,
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: false,
-            supports_reasoning: false,
           },
         ],
       }),
@@ -55,30 +54,29 @@ describe("LLM resolver helpers", () => {
   test("falls back to default provider when model is unavailable", () => {
     const providers: LLMProviderDescriptor[] = [
       makeProvider({
-        id: 10,
         name: "Default OpenAI",
         provider: "openai",
+        default_model_name: "gpt-4o-mini",
+        is_default_provider: true,
         model_configurations: [
           {
             name: "gpt-4o-mini",
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: true,
-            supports_reasoning: false,
           },
         ],
       }),
       makeProvider({
-        id: 20,
         name: "Anthropic Backup",
         provider: "anthropic",
+        default_model_name: "claude-3-5-sonnet",
         model_configurations: [
           {
             name: "claude-3-5-sonnet",
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: true,
-            supports_reasoning: false,
           },
         ],
       }),
@@ -99,30 +97,30 @@ describe("LLM resolver helpers", () => {
   test("uses first provider with models when no explicit default exists", () => {
     const providers: LLMProviderDescriptor[] = [
       makeProvider({
-        id: 30,
         name: "First Provider",
         provider: "openai",
+        default_model_name: "gpt-first",
+        is_default_provider: false,
         model_configurations: [
           {
             name: "gpt-first",
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: false,
-            supports_reasoning: false,
           },
         ],
       }),
       makeProvider({
-        id: 40,
         name: "Second Provider",
         provider: "anthropic",
+        default_model_name: "claude-second",
+        is_default_provider: false,
         model_configurations: [
           {
             name: "claude-second",
             is_visible: true,
             max_input_tokens: null,
             supports_image_input: false,
-            supports_reasoning: false,
           },
         ],
       }),

web/src/lib/hooks.ts

@@ -23,22 +23,23 @@ import {
 } from "react";
 import { DateRangePickerValue } from "@/components/dateRangeSelectors/AdminDateRangeSelector";
 import { SourceMetadata } from "./search/interfaces";
-import { parseLlmDescriptor } from "./llmConfig/utils";
+import { parseLlmDescriptor } from "./llm/utils";
 import { ChatSession } from "@/app/app/interfaces";
+import { AllUsersResponse } from "./types";
 import { Credential } from "./connectors/credentials";
 import { SettingsContext } from "@/providers/SettingsProvider";
 import {
   MinimalPersonaSnapshot,
   PersonaLabel,
 } from "@/app/admin/assistants/interfaces";
-import { DefaultModel, LLMProviderDescriptor } from "@/interfaces/llm";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { isAnthropic } from "@/app/admin/configuration/llm/utils";
 import { getSourceMetadataForSources } from "./sources";
 import { AuthType, NEXT_PUBLIC_CLOUD_ENABLED } from "./constants";
 import { useUser } from "@/providers/UserProvider";
 import { SEARCH_TOOL_ID } from "@/app/app/components/tools/constants";
 import { updateTemperatureOverrideForChatSession } from "@/app/app/services/lib";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "./hooks/useLLMProviders";
 
 const CREDENTIAL_URL = "/api/manage/admin/credential";
 
@@ -532,31 +533,26 @@ providing appropriate defaults for new conversations based on the available tool
 */
 
 export function getDefaultLlmDescriptor(
-  llmProviders: LLMProviderDescriptor[],
-  defaultText?: DefaultModel | null
+  llmProviders: LLMProviderDescriptor[]
 ): LlmDescriptor | null {
-  if (defaultText) {
-    const provider = llmProviders.find((p) => p.id === defaultText.provider_id);
-    if (provider) {
-      return {
-        name: provider.name,
-        provider: provider.provider,
-        modelName: defaultText.model_name,
-      };
-    }
+  const defaultProvider = llmProviders.find(
+    (provider) => provider.is_default_provider
+  );
+  if (defaultProvider) {
+    return {
+      name: defaultProvider.name,
+      provider: defaultProvider.provider,
+      modelName: defaultProvider.default_model_name,
+    };
   }
-  // Fallback: first provider with visible models
   const firstLlmProvider = llmProviders.find(
     (provider) => provider.model_configurations.length > 0
   );
   if (firstLlmProvider) {
-    const firstModel = firstLlmProvider.model_configurations.find(
-      (m) => m.is_visible
-    );
     return {
       name: firstLlmProvider.name,
       provider: firstLlmProvider.provider,
-      modelName: firstModel?.name ?? "",
+      modelName: firstLlmProvider.default_model_name,
     };
   }
   return null;
@@ -641,25 +637,19 @@ export function useLlmManager(
 
   // Get all user-accessible providers via SWR (general providers - no persona filter)
   // This includes public + all restricted providers user can access via groups
-  const {
-    llmProviders: allUserProviders,
-    defaultText: allUserDefaultText,
-    isLoading: isLoadingAllProviders,
-  } = useLLMProviders();
+  const { llmProviders: allUserProviders, isLoading: isLoadingAllProviders } =
+    useLLMProviders();
   // Fetch persona-specific providers to enforce RBAC restrictions per assistant
   // Only fetch if we have an assistant selected
   const personaId =
     liveAssistant?.id !== undefined ? liveAssistant.id : undefined;
   const {
     llmProviders: personaProviders,
-    defaultText: personaDefaultText,
     isLoading: isLoadingPersonaProviders,
   } = useLLMProviders(personaId);
 
   const llmProviders =
     personaProviders !== undefined ? personaProviders : allUserProviders;
-  const defaultText =
-    personaProviders !== undefined ? personaDefaultText : allUserDefaultText;
 
   const [userHasManuallyOverriddenLLM, setUserHasManuallyOverriddenLLM] =
     useState(false);
@@ -718,7 +708,7 @@ export function useLlmManager(
       } else if (user?.preferences?.default_model) {
         setCurrentLlm(getValidLlmDescriptor(user.preferences.default_model));
       } else {
-        const defaultLlm = getDefaultLlmDescriptor(llmProviders, defaultText);
+        const defaultLlm = getDefaultLlmDescriptor(llmProviders);
         if (defaultLlm) {
           setCurrentLlm(defaultLlm);
         }

web/src/lib/hooks/useLLMProviderOptions.ts

@@ -1,5 +1,5 @@
 import useSWR from "swr";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 
 export function useLLMProviderOptions() {

web/src/lib/hooks/useLLMProviders.test.ts

@@ -1,5 +1,5 @@
 import useSWR from "swr";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "./useLLMProviders";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 
 jest.mock("swr", () => ({
@@ -45,7 +45,7 @@ describe("useLLMProviders", () => {
     const mockMutate = jest.fn();
     const providers = [{ name: "Persona Provider" }];
     mockUseSWR.mockReturnValue({
-      data: { providers, default_text: null, default_vision: null },
+      data: providers,
       error: undefined,
       mutate: mockMutate,
       isValidating: false,

web/src/lib/hooks/useLLMProviders.ts

@@ -0,0 +1,30 @@
+import useSWR from "swr";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
+import { errorHandlingFetcher } from "@/lib/fetcher";
+
+export function useLLMProviders(personaId?: number) {
+  // personaId can be:
+  // - undefined: public providers only (/api/llm/provider)
+  // - number (personaId): persona-specific providers with RBAC enforcement
+
+  const url =
+    typeof personaId === "number"
+      ? `/api/llm/persona/${personaId}/providers`
+      : "/api/llm/provider";
+
+  const { data, error, mutate } = useSWR<LLMProviderDescriptor[] | undefined>(
+    url,
+    errorHandlingFetcher,
+    {
+      revalidateOnFocus: false, // Cache aggressively for performance
+      dedupingInterval: 60000, // Dedupe requests within 1 minute
+    }
+  );
+
+  return {
+    llmProviders: data,
+    isLoading: !error && !data,
+    error,
+    refetch: mutate,
+  };
+}

web/src/lib/llm/fetchLLMs.ts

@@ -0,0 +1,10 @@
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
+import { fetchSS } from "../utilsSS";
+
+export async function fetchLLMProvidersSS() {
+  const response = await fetchSS("/llm/provider");
+  if (response.ok) {
+    return (await response.json()) as LLMProviderDescriptor[];
+  }
+  return [];
+}

web/src/lib/llm/svc.ts

@@ -0,0 +1,23 @@
+/**
+ * LLM action functions for mutations.
+ *
+ * These are async functions for one-off actions that don't need SWR caching.
+ *
+ * Endpoints:
+ * - /api/admin/llm/test/default - Test the default LLM provider connection
+ */
+
+/**
+ * Test the default LLM provider.
+ * Returns true if the default provider is configured and working, false otherwise.
+ */
+export async function testDefaultProvider(): Promise<boolean> {
+  try {
+    const response = await fetch("/api/admin/llm/test/default", {
+      method: "POST",
+    });
+    return response?.ok || false;
+  } catch {
+    return false;
+  }
+}

web/src/lib/llm/utils.ts

@@ -1,28 +1,21 @@
 import { MinimalPersonaSnapshot } from "@/app/admin/assistants/interfaces";
 import {
-  DefaultModel,
   LLMProviderDescriptor,
   ModelConfiguration,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import { LlmDescriptor } from "@/lib/hooks";
 
 export function getFinalLLM(
   llmProviders: LLMProviderDescriptor[],
   persona: MinimalPersonaSnapshot | null,
-  currentLlm: LlmDescriptor | null,
-  defaultText?: DefaultModel | null
+  currentLlm: LlmDescriptor | null
 ): [string, string] {
-  const defaultProvider = defaultText
-    ? llmProviders.find((p) => p.id === defaultText.provider_id)
-    : llmProviders.find((p) =>
-        p.model_configurations.some((m) => m.is_visible)
-      );
+  const defaultProvider = llmProviders.find(
+    (llmProvider) => llmProvider.is_default_provider
+  );
 
   let provider = defaultProvider?.provider || "";
-  let model =
-    defaultText?.model_name ||
-    defaultProvider?.model_configurations.find((m) => m.is_visible)?.name ||
-    "";
+  let model = defaultProvider?.default_model_name || "";
 
   if (persona) {
     // Map "provider override" to actual LLLMProvider

web/src/lib/llm/visionLLM.ts

@@ -1,4 +1,4 @@
-import { VisionProvider } from "@/interfaces/llm";
+import { VisionProvider } from "@/app/admin/configuration/llm/interfaces";
 
 export async function fetchVisionProviders(): Promise<VisionProvider[]> {
   const response = await fetch("/api/admin/llm/vision-providers", {

web/src/lib/llmConfig/providers.ts

@@ -1,68 +0,0 @@
-import type { IconFunctionComponent } from "@opal/types";
-import {
-  SvgCpu,
-  SvgOpenai,
-  SvgClaude,
-  SvgOllama,
-  SvgCloud,
-  SvgAws,
-  SvgOpenrouter,
-  SvgServer,
-  SvgAzure,
-  SvgGemini,
-  SvgLitellm,
-} from "@opal/icons";
-
-const PROVIDER_ICONS: Record<string, IconFunctionComponent> = {
-  openai: SvgOpenai,
-  anthropic: SvgClaude,
-  vertex_ai: SvgGemini,
-  bedrock: SvgAws,
-  azure: SvgAzure,
-  litellm: SvgLitellm,
-  ollama_chat: SvgOllama,
-  openrouter: SvgOpenrouter,
-
-  // fallback
-  custom: SvgServer,
-};
-
-const PROVIDER_PRODUCT_NAMES: Record<string, string> = {
-  openai: "GPT",
-  anthropic: "Claude",
-  vertex_ai: "Gemini",
-  bedrock: "Amazon Bedrock",
-  azure: "Azure OpenAI",
-  litellm: "LiteLLM",
-  ollama_chat: "Ollama",
-  openrouter: "OpenRouter",
-
-  // fallback
-  custom: "Custom Models",
-};
-
-const PROVIDER_DISPLAY_NAMES: Record<string, string> = {
-  openai: "OpenAI",
-  anthropic: "Anthropic",
-  vertex_ai: "Google Cloud Vertex AI",
-  bedrock: "AWS",
-  azure: "Microsoft Azure",
-  litellm: "LiteLLM",
-  ollama_chat: "Ollama",
-  openrouter: "OpenRouter",
-
-  // fallback
-  custom: "Other providers or self-hosted",
-};
-
-export function getProviderProductName(providerName: string): string {
-  return PROVIDER_PRODUCT_NAMES[providerName] ?? providerName;
-}
-
-export function getProviderDisplayName(providerName: string): string {
-  return PROVIDER_DISPLAY_NAMES[providerName] ?? providerName;
-}
-
-export function getProviderIcon(providerName: string): IconFunctionComponent {
-  return PROVIDER_ICONS[providerName] ?? SvgCpu;
-}

web/src/lib/llmConfig/svc.ts

@@ -1,71 +0,0 @@
-/**
- * LLM action functions for mutations.
- *
- * These are async functions for one-off actions that don't need SWR caching.
- *
- * Endpoints:
- * - /api/admin/llm/test/default - Test the default LLM provider connection
- * - /api/admin/llm/default - Set the default LLM model
- * - /api/admin/llm/provider/{id} - Delete an LLM provider
- */
-
-import {
-  LLM_ADMIN_URL,
-  LLM_PROVIDERS_ADMIN_URL,
-} from "@/lib/llmConfig/constants";
-
-/**
- * Test the default LLM provider.
- * Returns true if the default provider is configured and working, false otherwise.
- */
-export async function testDefaultProvider(): Promise<boolean> {
-  try {
-    const response = await fetch(`${LLM_ADMIN_URL}/test/default`, {
-      method: "POST",
-    });
-    return response?.ok || false;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Set the default LLM model.
- * @param providerId - The provider ID
- * @param modelName - The model name within that provider
- * @throws Error with the detail message from the API on failure
- */
-export async function setDefaultLlmModel(
-  providerId: number,
-  modelName: string
-): Promise<void> {
-  const response = await fetch(`${LLM_ADMIN_URL}/default`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
-      provider_id: providerId,
-      model_name: modelName,
-    }),
-  });
-
-  if (!response.ok) {
-    const errorMsg = (await response.json()).detail;
-    throw new Error(errorMsg);
-  }
-}
-
-/**
- * Delete an LLM provider.
- * @param providerId - The provider ID to delete
- * @throws Error with the detail message from the API on failure
- */
-export async function deleteLlmProvider(providerId: number): Promise<void> {
-  const response = await fetch(`${LLM_PROVIDERS_ADMIN_URL}/${providerId}`, {
-    method: "DELETE",
-  });
-
-  if (!response.ok) {
-    const errorMsg = (await response.json()).detail;
-    throw new Error(errorMsg);
-  }
-}

web/src/refresh-components/onboarding/OnboardingFlow.tsx

@@ -4,7 +4,7 @@ import NameStep from "./steps/NameStep";
 import LLMStep from "./steps/LLMStep";
 import FinalStep from "./steps/FinalStep";
 import { OnboardingActions, OnboardingState, OnboardingStep } from "./types";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { useUser } from "@/providers/UserProvider";
 import { UserRole } from "@/lib/types";
 import NonAdminStep from "./components/NonAdminStep";

web/src/refresh-components/onboarding/components/llmConnectionHelpers.ts

@@ -1,4 +1,4 @@
-import { ModelConfiguration } from "@/interfaces/llm";
+import { ModelConfiguration } from "@/app/admin/configuration/llm/interfaces";
 import { parseAzureTargetUri } from "@/lib/azureTargetUri";
 
 export const buildInitialValues = () => ({
@@ -93,7 +93,7 @@ export const testApiKeyHelper = async (
       ...(formValues?.custom_config ?? {}),
       ...(customConfigOverride ?? {}),
     },
-    model: modelName ?? formValues?.default_model_name ?? "",
+    default_model_name: modelName ?? formValues?.default_model_name ?? "",
     model_configurations: [
       ...(formValues.model_configurations || []).map(
         (model: ModelConfiguration) => ({

web/src/refresh-components/onboarding/forms/AnthropicOnboardingForm.tsx

@@ -8,7 +8,7 @@ import Separator from "@/refresh-components/Separator";
 import {
   ModelConfiguration,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/AzureOnboardingForm.tsx

@@ -6,7 +6,7 @@ import InputTypeIn from "@/refresh-components/inputs/InputTypeIn";
 import PasswordInputTypeIn from "@/refresh-components/inputs/PasswordInputTypeIn";
 import InputComboBox from "@/refresh-components/inputs/InputComboBox";
 import Separator from "@/refresh-components/Separator";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/BedrockOnboardingForm.tsx

@@ -11,7 +11,7 @@ import Text from "@/refresh-components/texts/Text";
 import { Button } from "@opal/components";
 import { cn, noProp } from "@/lib/utils";
 import { SvgAlertCircle, SvgRefreshCw } from "@opal/icons";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/OllamaOnboardingForm.tsx

@@ -12,7 +12,7 @@ import { Button } from "@opal/components";
 import Tabs from "@/refresh-components/Tabs";
 import { cn, noProp } from "@/lib/utils";
 import { SvgRefreshCw } from "@opal/icons";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/OnboardingFormWrapper.tsx

@@ -5,8 +5,8 @@ import ProviderModal from "@/components/modals/ProviderModal";
 import {
   ModelConfiguration,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
-import { LLM_PROVIDERS_ADMIN_URL } from "@/lib/llmConfig/constants";
+} from "@/app/admin/configuration/llm/interfaces";
+import { LLM_PROVIDERS_ADMIN_URL } from "@/app/admin/configuration/llm/constants";
 import { OnboardingActions, OnboardingState } from "../types";
 import { APIFormFieldState } from "@/refresh-components/form/types";
 import {

web/src/refresh-components/onboarding/forms/OpenAIOnboardingForm.tsx

@@ -8,7 +8,7 @@ import Separator from "@/refresh-components/Separator";
 import {
   ModelConfiguration,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/OpenRouterOnboardingForm.tsx

@@ -8,7 +8,7 @@ import Separator from "@/refresh-components/Separator";
 import { Button } from "@opal/components";
 import { cn, noProp } from "@/lib/utils";
 import { SvgRefreshCw } from "@opal/icons";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/VertexAIOnboardingForm.tsx

@@ -10,7 +10,7 @@ import { SvgRefreshCw } from "@opal/icons";
 import {
   ModelConfiguration,
   WellKnownLLMProviderDescriptor,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingFormWrapper,
   OnboardingFormChildProps,

web/src/refresh-components/onboarding/forms/__tests__/testHelpers.tsx

@@ -9,7 +9,7 @@ import {
   WellKnownLLMProviderDescriptor,
   LLMProviderName,
   ModelConfiguration,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import {
   OnboardingState,
   OnboardingActions,
@@ -34,14 +34,12 @@ export function createMockLLMDescriptor(
               is_visible: true,
               max_input_tokens: 4096,
               supports_image_input: false,
-              supports_reasoning: false,
             },
             {
               name: "test-model-2",
               is_visible: true,
               max_input_tokens: 8192,
               supports_image_input: true,
-              supports_reasoning: false,
             },
           ],
     recommended_default_model: null,
@@ -172,42 +170,36 @@ export const OPENAI_DEFAULT_VISIBLE_MODELS = [
     is_visible: true,
     max_input_tokens: 128000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "gpt-5-mini",
     is_visible: true,
     max_input_tokens: 128000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "o1",
     is_visible: true,
     max_input_tokens: 200000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "o3-mini",
     is_visible: true,
     max_input_tokens: 200000,
     supports_image_input: false,
-    supports_reasoning: false,
   },
   {
     name: "gpt-4o",
     is_visible: true,
     max_input_tokens: 128000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "gpt-4o-mini",
     is_visible: true,
     max_input_tokens: 128000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
 ];
 
@@ -222,21 +214,18 @@ export const ANTHROPIC_DEFAULT_VISIBLE_MODELS = [
     is_visible: true,
     max_input_tokens: 200000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "claude-sonnet-4-5",
     is_visible: true,
     max_input_tokens: 200000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "claude-haiku-4-5",
     is_visible: true,
     max_input_tokens: 200000,
     supports_image_input: true,
-    supports_reasoning: false,
   },
 ];
 
@@ -251,21 +240,18 @@ export const VERTEXAI_DEFAULT_VISIBLE_MODELS = [
     is_visible: true,
     max_input_tokens: 1048576,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "gemini-2.5-flash-lite",
     is_visible: true,
     max_input_tokens: 1048576,
     supports_image_input: true,
-    supports_reasoning: false,
   },
   {
     name: "gemini-2.5-pro",
     is_visible: true,
     max_input_tokens: 1048576,
     supports_image_input: true,
-    supports_reasoning: false,
   },
 ];
 
@@ -284,14 +270,12 @@ export const MOCK_PROVIDERS = {
       is_visible: true,
       max_input_tokens: 4096,
       supports_image_input: false,
-      supports_reasoning: false,
     },
     {
       name: "mistral",
       is_visible: true,
       max_input_tokens: 8192,
       supports_image_input: false,
-      supports_reasoning: false,
     },
   ]),
   azure: createMockLLMDescriptor(LLMProviderName.AZURE, [
@@ -300,7 +284,6 @@ export const MOCK_PROVIDERS = {
       is_visible: true,
       max_input_tokens: 8192,
       supports_image_input: true,
-      supports_reasoning: false,
     },
   ]),
   bedrock: createMockLLMDescriptor(LLMProviderName.BEDROCK, [
@@ -309,7 +292,6 @@ export const MOCK_PROVIDERS = {
       is_visible: true,
       max_input_tokens: 200000,
       supports_image_input: true,
-      supports_reasoning: false,
     },
   ]),
   vertexAi: createMockLLMDescriptor(
@@ -322,7 +304,6 @@ export const MOCK_PROVIDERS = {
       is_visible: true,
       max_input_tokens: 8192,
       supports_image_input: true,
-      supports_reasoning: false,
     },
   ]),
 };

web/src/refresh-components/onboarding/forms/getOnboardingForm.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import {
   WellKnownLLMProviderDescriptor,
   LLMProviderName,
-} from "@/interfaces/llm";
+} from "@/app/admin/configuration/llm/interfaces";
 import { OnboardingActions, OnboardingState } from "../types";
 import { OpenAIOnboardingForm } from "./OpenAIOnboardingForm";
 import { AnthropicOnboardingForm } from "./AnthropicOnboardingForm";

web/src/refresh-components/onboarding/steps/LLMStep.tsx

@@ -4,7 +4,7 @@ import Button from "@/refresh-components/buttons/Button";
 import Separator from "@/refresh-components/Separator";
 import LLMProviderCard from "../components/LLMProviderCard";
 import { OnboardingActions, OnboardingState, OnboardingStep } from "../types";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import {
   getOnboardingForm,
   getProviderDisplayInfo,

web/src/refresh-components/onboarding/useOnboardingState.ts

@@ -7,11 +7,11 @@ import {
   OnboardingState,
   OnboardingStep,
 } from "./types";
-import { WellKnownLLMProviderDescriptor } from "@/interfaces/llm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { updateUserPersonalization } from "@/lib/userSettings";
 import { useUser } from "@/providers/UserProvider";
 import { MinimalPersonaSnapshot } from "@/app/admin/assistants/interfaces";
-import { useLLMProviders } from "@/hooks/useLLMProviders";
+import { useLLMProviders } from "@/lib/hooks/useLLMProviders";
 import { useProviderStatus } from "@/components/chat/ProviderContext";
 
 export function useOnboardingState(liveAssistant?: MinimalPersonaSnapshot): {