fix(llm): enforce persona restrictions on public LLM providers

Public providers (`is_public=True`) with persona whitelists were
bypassing persona checks entirely — the early return on `is_public`
short-circuited before persona restrictions were evaluated. This meant
any persona could use a public provider even if it was explicitly
restricted to specific personas.

Additionally, `hasAnyProvider` in the frontend `useLlmManager` hook
used the global provider list (no persona context), causing chat input
to be disabled for all personas when the default provider was non-public
— even if the selected persona had its own provider assigned.

Backend: check persona restrictions first, then apply is_public as a
group-bypass only. Frontend: derive hasAnyProvider from the persona-aware
provider list instead of the global one.

backend/alembic/versions/57122d037335_add_python_tool_on_default.py

@@ -1,69 +0,0 @@
-"""add python tool on default
-
-Revision ID: 57122d037335
-Revises: c0c937d5c9e5
-Create Date: 2026-02-27 10:10:40.124925
-
-"""
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = "57122d037335"
-down_revision = "c0c937d5c9e5"
-branch_labels = None
-depends_on = None
-
-
-PYTHON_TOOL_NAME = "python"
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-
-    # Look up the PythonTool id
-    result = conn.execute(
-        sa.text("SELECT id FROM tool WHERE name = :name"),
-        {"name": PYTHON_TOOL_NAME},
-    ).fetchone()
-
-    if not result:
-        return
-
-    tool_id = result[0]
-
-    # Attach to the default persona (id=0) if not already attached
-    conn.execute(
-        sa.text(
-            """
-            INSERT INTO persona__tool (persona_id, tool_id)
-            VALUES (0, :tool_id)
-            ON CONFLICT DO NOTHING
-            """
-        ),
-        {"tool_id": tool_id},
-    )
-
-
-def downgrade() -> None:
-    conn = op.get_bind()
-
-    result = conn.execute(
-        sa.text("SELECT id FROM tool WHERE name = :name"),
-        {"name": PYTHON_TOOL_NAME},
-    ).fetchone()
-
-    if not result:
-        return
-
-    conn.execute(
-        sa.text(
-            """
-            DELETE FROM persona__tool
-            WHERE persona_id = 0 AND tool_id = :tool_id
-            """
-        ),
-        {"tool_id": result[0]},
-    )

backend/onyx/db/llm.py

@@ -109,17 +109,21 @@ def can_user_access_llm_provider(
         is_admin: If True, bypass user group restrictions but still respect persona restrictions
 
     Access logic:
-    1. If is_public=True → everyone has access (public override)
-    2. If is_public=False:
-       - Both groups AND personas set → must satisfy BOTH (AND logic, admins bypass group check)
-       - Only groups set → must be in one of the groups (OR across groups, admins bypass)
-       - Only personas set → must use one of the personas (OR across personas, applies to admins)
-       - Neither set → NOBODY has access unless admin (locked, admin-only)
-    """
-    # Public override - everyone has access
-    if provider.is_public:
-        return True
+    - is_public controls USER access (group bypass): when True, all users can access
+      regardless of group membership. When False, user must be in a whitelisted group
+      (or be admin).
+    - Persona restrictions are ALWAYS enforced when set, regardless of is_public.
+      This allows admins to make a provider available to all users while still
+      restricting which personas (assistants) can use it.
 
+    Decision matrix:
+    1. is_public=True, no personas set → everyone has access
+    2. is_public=True, personas set → all users, but only whitelisted personas
+    3. is_public=False, groups+personas set → must satisfy BOTH (admins bypass groups)
+    4. is_public=False, only groups set → must be in group (admins bypass)
+    5. is_public=False, only personas set → must use whitelisted persona
+    6. is_public=False, neither set → admin-only (locked)
+    """
     # Extract IDs once to avoid multiple iterations
     provider_group_ids = (
         {group.id for group in provider.groups} if provider.groups else set()
@@ -128,25 +132,30 @@ def can_user_access_llm_provider(
         {p.id for p in provider.personas} if provider.personas else set()
     )
 
-    has_groups = bool(provider_group_ids)
     has_personas = bool(provider_persona_ids)
 
-    # Both groups AND personas set → AND logic (must satisfy both)
-    if has_groups and has_personas:
-        # Admins bypass group check but still must satisfy persona restrictions
-        user_in_group = is_admin or bool(user_group_ids & provider_group_ids)
+    # Persona restrictions are always enforced when set, regardless of is_public
+    if has_personas:
         persona_allowed = persona.id in provider_persona_ids if persona else False
-        return user_in_group and persona_allowed
+        if not persona_allowed:
+            return False
 
-    # Only groups set → user must be in one of the groups (admins bypass)
+    # Public providers bypass user/group checks
+    if provider.is_public:
+        return True
+
+    has_groups = bool(provider_group_ids)
+
+    # Groups set → user must be in one of the groups (admins bypass)
     if has_groups:
         return is_admin or bool(user_group_ids & provider_group_ids)
 
-    # Only personas set → persona must be in allowed list (applies to admins too)
+    # Only personas set (no groups) — persona check already passed above,
+    # so the user is allowed via persona whitelist alone
     if has_personas:
-        return persona.id in provider_persona_ids if persona else False
+        return True
 
-    # Neither groups nor personas set, and not public → admins can access
+    # Neither groups nor personas set, and not public → admin-only (locked)
     return is_admin
 
 

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

@@ -577,9 +577,9 @@ def list_llm_provider_basics(
     for provider in all_providers:
         # Use centralized access control logic with persona=None since we're
         # listing providers without a specific persona context. This correctly:
-        # - Includes all public providers
+        # - Includes public providers WITHOUT persona restrictions
         # - Includes providers user can access via group membership
-        # - Excludes persona-only restricted providers (requires specific persona)
+        # - Excludes providers with persona restrictions (requires specific persona)
         # - Excludes non-public providers with no restrictions (admin-only)
         if can_user_access_llm_provider(
             provider, user_group_ids, persona=None, is_admin=is_admin
@@ -604,7 +604,7 @@ def get_valid_model_names_for_persona(
 
     Returns a list of model names (e.g., ["gpt-4o", "claude-3-5-sonnet"]) that are
     available to the user when using this persona, respecting all RBAC restrictions.
-    Public providers are always included.
+    Public providers are included unless they have persona restrictions that exclude this persona.
     """
     persona = fetch_persona_with_groups(db_session, persona_id)
     if not persona:
@@ -618,7 +618,7 @@ def get_valid_model_names_for_persona(
 
     valid_models = []
     for llm_provider_model in all_providers:
-        # Public providers always included, restricted checked via RBAC
+        # Check access with persona context — respects all RBAC restrictions
         if can_user_access_llm_provider(
             llm_provider_model, user_group_ids, persona, is_admin=is_admin
         ):
@@ -639,7 +639,7 @@ def list_llm_providers_for_persona(
     """Get LLM providers for a specific persona.
 
     Returns providers that the user can access when using this persona:
-    - All public providers (is_public=True) - ALWAYS included
+    - Public providers (respecting persona restrictions if set)
     - Restricted providers user can access via group/persona restrictions
 
     This endpoint is used for background fetching of restricted providers
@@ -668,7 +668,7 @@ def list_llm_providers_for_persona(
     llm_provider_list: list[LLMProviderDescriptor] = []
 
     for llm_provider_model in all_providers:
-        # Use simplified access check - public providers always included
+        # Check access with persona context — respects persona restrictions
         if can_user_access_llm_provider(
             llm_provider_model, user_group_ids, persona, is_admin=is_admin
         ):

backend/onyx/server/metrics/prometheus_setup.py

@@ -11,7 +11,6 @@ SQLAlchemy connection pool metrics are registered separately via
 """
 
 from prometheus_fastapi_instrumentator import Instrumentator
-from prometheus_fastapi_instrumentator.metrics import default as default_metrics
 from sqlalchemy.exc import TimeoutError as SATimeoutError
 from starlette.applications import Starlette
 
@@ -61,14 +60,6 @@ def setup_prometheus_metrics(app: Starlette) -> None:
         excluded_handlers=_EXCLUDED_HANDLERS,
     )
 
-    # Explicitly create the default metrics (http_requests_total,
-    # http_request_duration_seconds, etc.) and add them first.  The library
-    # skips creating defaults when ANY custom instrumentations are registered
-    # via .add(), so we must include them ourselves.
-    default_callback = default_metrics(latency_lowr_buckets=_LATENCY_BUCKETS)
-    if default_callback:
-        instrumentator.add(default_callback)
-
     instrumentator.add(slow_request_callback)
     instrumentator.add(per_tenant_request_callback)
 

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

@@ -243,6 +243,116 @@ def test_can_user_access_llm_provider_or_logic(
         )
 
 
+def test_public_provider_with_persona_restrictions(
+    users: tuple[DATestUser, DATestUser],
+) -> None:
+    """Public providers should still enforce persona restrictions.
+
+    Regression test for the bug where is_public=True caused
+    can_user_access_llm_provider() to return True immediately,
+    bypassing persona whitelist checks entirely.
+    """
+    admin_user, _basic_user = users
+
+    with get_session_with_current_tenant() as db_session:
+        # Public provider with persona restrictions
+        public_restricted = _create_llm_provider(
+            db_session,
+            name="public-persona-restricted",
+            default_model_name="gpt-4o",
+            is_public=True,
+            is_default=True,
+        )
+
+        whitelisted_persona = _create_persona(
+            db_session,
+            name="whitelisted-persona",
+            provider_name=public_restricted.name,
+        )
+        non_whitelisted_persona = _create_persona(
+            db_session,
+            name="non-whitelisted-persona",
+            provider_name=public_restricted.name,
+        )
+
+        # Only whitelist one persona
+        db_session.add(
+            LLMProvider__Persona(
+                llm_provider_id=public_restricted.id,
+                persona_id=whitelisted_persona.id,
+            )
+        )
+        db_session.flush()
+        db_session.refresh(public_restricted)
+
+        admin_model = db_session.get(User, admin_user.id)
+        assert admin_model is not None
+        admin_group_ids = fetch_user_group_ids(db_session, admin_model)
+
+        # Whitelisted persona — should be allowed
+        assert can_user_access_llm_provider(
+            public_restricted,
+            admin_group_ids,
+            whitelisted_persona,
+        )
+
+        # Non-whitelisted persona — should be denied despite is_public=True
+        assert not can_user_access_llm_provider(
+            public_restricted,
+            admin_group_ids,
+            non_whitelisted_persona,
+        )
+
+        # No persona context (e.g. global provider list) — should be denied
+        # because provider has persona restrictions set
+        assert not can_user_access_llm_provider(
+            public_restricted,
+            admin_group_ids,
+            persona=None,
+        )
+
+
+def test_public_provider_without_persona_restrictions(
+    users: tuple[DATestUser, DATestUser],
+) -> None:
+    """Public providers with no persona restrictions remain accessible to all."""
+    admin_user, basic_user = users
+
+    with get_session_with_current_tenant() as db_session:
+        public_unrestricted = _create_llm_provider(
+            db_session,
+            name="public-unrestricted",
+            default_model_name="gpt-4o",
+            is_public=True,
+            is_default=True,
+        )
+
+        any_persona = _create_persona(
+            db_session,
+            name="any-persona",
+            provider_name=public_unrestricted.name,
+        )
+
+        admin_model = db_session.get(User, admin_user.id)
+        basic_model = db_session.get(User, basic_user.id)
+        assert admin_model is not None
+        assert basic_model is not None
+
+        admin_group_ids = fetch_user_group_ids(db_session, admin_model)
+        basic_group_ids = fetch_user_group_ids(db_session, basic_model)
+
+        # Any user, any persona — all allowed
+        assert can_user_access_llm_provider(
+            public_unrestricted, admin_group_ids, any_persona
+        )
+        assert can_user_access_llm_provider(
+            public_unrestricted, basic_group_ids, any_persona
+        )
+        assert can_user_access_llm_provider(
+            public_unrestricted, admin_group_ids, persona=None
+        )
+
+
 def test_get_llm_for_persona_falls_back_when_access_denied(
     users: tuple[DATestUser, DATestUser],
 ) -> None:

backend/tests/integration/tests/migrations/test_assistant_consolidation_migration.py

@@ -72,9 +72,6 @@ def test_cold_startup_default_assistant() -> None:
         assert (
             "read_file" in tool_names
         ), "Default assistant should have FileReaderTool attached"
-        assert (
-            "python" in tool_names
-        ), "Default assistant should have PythonTool attached"
 
         # Also verify by display names for clarity
         assert (
@@ -89,11 +86,8 @@ def test_cold_startup_default_assistant() -> None:
         assert (
             "File Reader" in tool_display_names
         ), "Default assistant should have File Reader tool"
-        assert (
-            "Code Interpreter" in tool_display_names
-        ), "Default assistant should have Code Interpreter tool"
 
-        # Should have exactly 6 tools
+        # Should have exactly 5 tools
         assert (
-            len(tool_associations) == 6
-        ), f"Default assistant should have exactly 6 tools attached, got {len(tool_associations)}"
+            len(tool_associations) == 5
+        ), f"Default assistant should have exactly 5 tools attached, got {len(tool_associations)}"

backend/tests/unit/onyx/server/test_prometheus_instrumentation.py

@@ -82,7 +82,7 @@ def test_setup_attaches_instrumentator_to_app() -> None:
             inprogress_labels=True,
             excluded_handlers=["/health", "/metrics", "/openapi.json"],
         )
-        assert mock_instance.add.call_count == 3
+        assert mock_instance.add.call_count == 2
         mock_instance.instrument.assert_called_once_with(
             app,
             latency_lowr_buckets=(

contributing_guides/best_practices.md

@@ -163,16 +163,3 @@ Add clear comments:
 - Any TODOs you add in the code must be accompanied by either the name/username
   of the owner of that TODO, or an issue number for an issue referencing that
   piece of work.
-- Avoid module-level logic that runs on import, which leads to import-time side
-  effects. Essentially every piece of meaningful logic should exist within some
-  function that has to be explicitly invoked. Acceptable exceptions to this may
-  include loading environment variables or setting up loggers.
-  - If you find yourself needing something like this, you may want that logic to
-    exist in a file dedicated for manual execution (contains `if __name__ ==
-    "__main__":`) which should not be imported by anything else.
-- Related to the above, do not conflate Python scripts you intend to run from
-  the command line (contains `if __name__ == "__main__":`) with modules you
-  intend to import from elsewhere. If for some unlikely reason they have to be
-  the same file, any logic specific to executing the file (including imports)
-  should be contained in the `if __name__ == "__main__":` block.
-  - Generally these executable files exist in `backend/scripts/`.

web/src/app/admin/actions/mcp/page.tsx

@@ -10,7 +10,7 @@ export default function Main() {
       <SettingsLayouts.Header
         icon={SvgMcp}
         title="MCP Actions"
-        description="Connect MCP (Model Context Protocol) servers to add custom actions and tools for your agents."
+        description="Connect MCP (Model Context Protocol) servers to add custom actions and tools for your assistants."
         separator
       />
       <SettingsLayouts.Body>

web/src/app/admin/actions/open-api/page.tsx

@@ -10,7 +10,7 @@ export default function Main() {
       <SettingsLayouts.Header
         icon={SvgActions}
         title="OpenAPI Actions"
-        description="Connect OpenAPI servers to add custom actions and tools for your agents."
+        description="Connect OpenAPI servers to add custom actions and tools for your assistants."
         separator
       />
       <SettingsLayouts.Body>

web/src/app/admin/assistants/PersonaTable.tsx

@@ -170,7 +170,7 @@ export function PersonasTable({
       {deleteModalOpen && personaToDelete && (
         <ConfirmationModalLayout
           icon={SvgAlertCircle}
-          title="Delete Agent"
+          title="Delete Assistant"
           onClose={closeDeleteModal}
           submit={<Button onClick={handleDeletePersona}>Delete</Button>}
         >
@@ -183,15 +183,15 @@ export function PersonasTable({
           const isDefault = personaToToggleDefault.is_default_persona;
 
           const title = isDefault
-            ? "Remove Featured Agent"
-            : "Set Featured Agent";
+            ? "Remove Featured Assistant"
+            : "Set Featured Assistant";
           const buttonText = isDefault ? "Remove Feature" : "Set as Featured";
           const text = isDefault
             ? `Are you sure you want to remove the featured status of ${personaToToggleDefault.name}?`
             : `Are you sure you want to set the featured status of ${personaToToggleDefault.name}?`;
           const additionalText = isDefault
-            ? `Removing "${personaToToggleDefault.name}" as a featured agent will not affect its visibility or accessibility.`
-            : `Setting "${personaToToggleDefault.name}" as a featured agent will make it public and visible to all users. This action cannot be undone.`;
+            ? `Removing "${personaToToggleDefault.name}" as a featured assistant will not affect its visibility or accessibility.`
+            : `Setting "${personaToToggleDefault.name}" as a featured assistant will make it public and visible to all users. This action cannot be undone.`;
 
           return (
             <ConfirmationModalLayout
@@ -217,7 +217,7 @@ export function PersonasTable({
           "Name",
           "Description",
           "Type",
-          "Featured Agent",
+          "Featured Assistant",
           "Is Visible",
           "Delete",
         ]}

web/src/app/admin/assistants/page.tsx

@@ -47,8 +47,8 @@ function MainContent({
   return (
     <div>
       <Text className="mb-2">
-        Agents are a way to build custom search/question-answering experiences
-        for different use cases.
+        Assistants are a way to build custom search/question-answering
+        experiences for different use cases.
       </Text>
       <Text className="mt-2">They allow you to customize:</Text>
       <div className="text-sm">
@@ -63,21 +63,21 @@ function MainContent({
       <div>
         <Separator />
 
-        <Title>Create an Agent</Title>
+        <Title>Create an Assistant</Title>
         <CreateButton href="/app/agents/create?admin=true">
-          New Agent
+          New Assistant
         </CreateButton>
 
         <Separator />
 
-        <Title>Existing Agents</Title>
+        <Title>Existing Assistants</Title>
         {totalItems > 0 ? (
           <>
             <SubLabel>
-              Agents will be displayed as options on the Chat / Search
-              interfaces in the order they are displayed below. Agents marked as
-              hidden will not be displayed. Editable agents are shown at the
-              top.
+              Assistants will be displayed as options on the Chat / Search
+              interfaces in the order they are displayed below. Assistants
+              marked as hidden will not be displayed. Editable assistants are
+              shown at the top.
             </SubLabel>
             <PersonasTable
               personas={customPersonas}
@@ -96,21 +96,21 @@ function MainContent({
         ) : (
           <div className="mt-6 p-8 border border-border rounded-lg bg-background-weak text-center">
             <Text className="text-lg font-medium mb-2">
-              No custom agents yet
+              No custom assistants yet
             </Text>
             <Text className="text-subtle mb-3">
-              Create your first agent to:
+              Create your first assistant to:
             </Text>
             <ul className="text-subtle text-sm list-disc text-left inline-block mb-3">
               <li>Build department-specific knowledge bases</li>
-              <li>Create specialized research agents</li>
+              <li>Create specialized research assistants</li>
               <li>Set up compliance and policy advisors</li>
             </ul>
             <Text className="text-subtle text-sm mb-4">
               ...and so much more!
             </Text>
             <CreateButton href="/app/agents/create?admin=true">
-              Create Your First Agent
+              Create Your First Assistant
             </CreateButton>
           </div>
         )}
@@ -128,13 +128,13 @@ export default function Page() {
 
   return (
     <>
-      <AdminPageTitle icon={SvgOnyxOctagon} title="Agents" />
+      <AdminPageTitle icon={SvgOnyxOctagon} title="Assistants" />
 
       {isLoading && <ThreeDotsLoader />}
 
       {error && (
         <ErrorCallout
-          errorTitle="Failed to load agents"
+          errorTitle="Failed to load assistants"
           errorMsg={
             error?.info?.message ||
             error?.info?.detail ||

web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigCreationForm.tsx

@@ -156,7 +156,7 @@ export const SlackChannelConfigCreationForm = ({
               is: "assistant",
               then: (schema) =>
                 schema.required(
-                  "An agent is required when using the 'Agent' knowledge source"
+                  "A persona is required when using the'Assistant' knowledge source"
                 ),
             }),
           standard_answer_categories: Yup.array(),

web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigFormFields.tsx

@@ -224,14 +224,14 @@ export function SlackChannelConfigFormFields({
             <RadioGroupItemField
               value="assistant"
               id="assistant"
-              label="Search Agent"
+              label="Search Assistant"
               sublabel="Control both the documents and the prompt to use for answering questions"
             />
             <RadioGroupItemField
               value="non_search_assistant"
               id="non_search_assistant"
-              label="Non-Search Agent"
-              sublabel="Chat with an agent that does not use documents"
+              label="Non-Search Assistant"
+              sublabel="Chat with an assistant that does not use documents"
             />
           </RadioGroup>
         </div>
@@ -327,15 +327,15 @@ export function SlackChannelConfigFormFields({
           <div className="mt-4">
             <SubLabel>
               <>
-                Select the search-enabled agent OnyxBot will use while answering
-                questions in Slack.
+                Select the search-enabled assistant OnyxBot will use while
+                answering questions in Slack.
                 {syncEnabledAssistants.length > 0 && (
                   <>
                     <br />
                     <span className="text-sm text-text-dark/80">
-                      Note: Some of your agents have auto-synced connectors in
-                      their document sets. You cannot select these agents as
-                      they will not be able to answer questions in Slack.{" "}
+                      Note: Some of your assistants have auto-synced connectors
+                      in their document sets. You cannot select these assistants
+                      as they will not be able to answer questions in Slack.{" "}
                       <button
                         type="button"
                         onClick={() =>
@@ -349,7 +349,7 @@ export function SlackChannelConfigFormFields({
                         {viewSyncEnabledAssistants
                           ? "Hide un-selectable "
                           : "View all "}
-                        agents
+                        assistants
                       </button>
                     </span>
                   </>
@@ -367,7 +367,7 @@ export function SlackChannelConfigFormFields({
             {viewSyncEnabledAssistants && syncEnabledAssistants.length > 0 && (
               <div className="mt-4">
                 <p className="text-sm text-text-dark/80">
-                  Un-selectable agents:
+                  Un-selectable assistants:
                 </p>
                 <div className="mb-3 mt-2 flex gap-2 flex-wrap text-sm">
                   {syncEnabledAssistants.map(
@@ -394,15 +394,15 @@ export function SlackChannelConfigFormFields({
           <div className="mt-4">
             <SubLabel>
               <>
-                Select the non-search agent OnyxBot will use while answering
+                Select the non-search assistant OnyxBot will use while answering
                 questions in Slack.
                 {syncEnabledAssistants.length > 0 && (
                   <>
                     <br />
                     <span className="text-sm text-text-dark/80">
-                      Note: Some of your agents have auto-synced connectors in
-                      their document sets. You cannot select these agents as
-                      they will not be able to answer questions in Slack.{" "}
+                      Note: Some of your assistants have auto-synced connectors
+                      in their document sets. You cannot select these assistants
+                      as they will not be able to answer questions in Slack.{" "}
                       <button
                         type="button"
                         onClick={() =>
@@ -416,7 +416,7 @@ export function SlackChannelConfigFormFields({
                         {viewSyncEnabledAssistants
                           ? "Hide un-selectable "
                           : "View all "}
-                        agents
+                        assistants
                       </button>
                     </span>
                   </>
@@ -524,7 +524,7 @@ export function SlackChannelConfigFormFields({
                 name="is_ephemeral"
                 label="Respond to user in a private (ephemeral) message"
                 tooltip="If set, OnyxBot will respond only to the user in a private (ephemeral) message. If you also
-                chose 'Search' Agent above, selecting this option will make documents that are private to the user
+                chose 'Search' Assistant above, selecting this option will make documents that are private to the user
                 available for their queries."
               />
 

web/src/app/admin/configuration/code-interpreter/page.tsx

@@ -1,7 +0,0 @@
-"use client";
-
-import CodeInterpreterPage from "@/refresh-pages/admin/CodeInterpreterPage";
-
-export default function Page() {
-  return <CodeInterpreterPage />;
-}

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

@@ -39,10 +39,10 @@ export function AdvancedOptions({
               agents={agents}
               isLoading={agentsLoading}
               error={agentsError}
-              label="Agent Whitelist"
-              subtext="Restrict this provider to specific agents."
+              label="Assistant Whitelist"
+              subtext="Restrict this provider to specific assistants."
               disabled={formikProps.values.is_public}
-              disabledMessage="This LLM Provider is public and available to all agents."
+              disabledMessage="This LLM Provider is public and available to all assistants."
             />
           </div>
         </>

web/src/app/admin/discord-bot/[guild-id]/page.tsx

@@ -299,11 +299,11 @@ export default function Page({ params }: Props) {
       });
       refreshGuild();
       toast.success(
-        personaId ? "Default agent updated" : "Default agent cleared"
+        personaId ? "Default assistant updated" : "Default assistant cleared"
       );
     } catch (err) {
       toast.error(
-        err instanceof Error ? err.message : "Failed to update agent"
+        err instanceof Error ? err.message : "Failed to update assistant"
       );
     } finally {
       setIsUpdating(false);
@@ -355,7 +355,7 @@ export default function Page({ params }: Props) {
                 <InputSelect.Trigger placeholder="Select agent" />
                 <InputSelect.Content>
                   <InputSelect.Item value="default">
-                    Default Agent
+                    Default Assistant
                   </InputSelect.Item>
                   {personas.map((persona) => (
                     <InputSelect.Item

web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx

@@ -427,7 +427,7 @@ export const GroupDisplay = ({
 
       <Separator />
 
-      <h2 className="text-xl font-bold mt-8 mb-2">Agents</h2>
+      <h2 className="text-xl font-bold mt-8 mb-2">Assistants</h2>
 
       <div>
         {userGroup.document_sets.length > 0 ? (
@@ -445,7 +445,7 @@ export const GroupDisplay = ({
           </div>
         ) : (
           <>
-            <Text>No Agents in this group...</Text>
+            <Text>No Assistants in this group...</Text>
           </>
         )}
       </div>

web/src/app/ee/admin/performance/usage/PersonaMessagesChart.tsx

@@ -152,14 +152,14 @@ export function PersonaMessagesChart({
   } else if (selectedPersonaId === undefined) {
     content = (
       <div className="h-80 text-text-500 flex flex-col">
-        <p className="m-auto">Select an agent to view analytics</p>
+        <p className="m-auto">Select an assistant to view analytics</p>
       </div>
     );
   } else if (!personaMessagesData?.length) {
     content = (
       <div className="h-80 text-text-500 flex flex-col">
         <p className="m-auto">
-          No data found for selected agent in the specified time range
+          No data found for selected assistant in the specified time range
         </p>
       </div>
     );
@@ -178,9 +178,11 @@ export function PersonaMessagesChart({
 
   return (
     <CardSection className="mt-8">
-      <Title>Agent Analytics</Title>
+      <Title>Assistant Analytics</Title>
       <div className="flex flex-col gap-4">
-        <Text>Messages and unique users per day for the selected agent</Text>
+        <Text>
+          Messages and unique users per day for the selected assistant
+        </Text>
         <div className="flex items-center gap-4">
           <Select
             value={selectedPersonaId?.toString() ?? ""}
@@ -189,14 +191,14 @@ export function PersonaMessagesChart({
             }}
           >
             <SelectTrigger className="flex w-full max-w-xs">
-              <SelectValue placeholder="Select an agent to display" />
+              <SelectValue placeholder="Select an assistant to display" />
             </SelectTrigger>
             <SelectContent>
               <div className="flex items-center px-2 pb-2 sticky top-0 bg-background border-b">
                 <Search className="h-4 w-4 mr-2 shrink-0 opacity-50" />
                 <input
                   className="flex h-8 w-full rounded-sm bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50"
-                  placeholder="Search agents..."
+                  placeholder="Search assistants..."
                   value={searchQuery}
                   onChange={(e) => setSearchQuery(e.target.value)}
                   onClick={(e) => e.stopPropagation()}

web/src/app/ee/assistants/stats/[id]/AssistantStats.tsx

@@ -146,7 +146,7 @@ export function AssistantStats({ assistantId }: { assistantId: number }) {
   return (
     <Card className="w-full">
       <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-        <p className="text-base font-normal text-2xl">Agent Analytics</p>
+        <p className="text-base font-normal text-2xl">Assistant Analytics</p>
         <AdminDateRangeSelector
           value={dateRange}
           onValueChange={setDateRange}

web/src/components/modals/NoAssistantModal.tsx

@@ -12,17 +12,17 @@ export default function NoAssistantModal() {
   return (
     <Modal open>
       <Modal.Content width="sm" height="sm">
-        <Modal.Header icon={SvgUser} title="No Agent Available" />
+        <Modal.Header icon={SvgUser} title="No Assistant Available" />
         <Modal.Body>
           <Text as="p">
-            You currently have no agent configured. To use this feature, you
+            You currently have no assistant configured. To use this feature, you
             need to take action.
           </Text>
           {isAdmin ? (
             <>
               <Text as="p">
-                As an administrator, you can create a new agent by visiting the
-                admin panel.
+                As an administrator, you can create a new assistant by visiting
+                the admin panel.
               </Text>
               <Button className="w-full" href="/admin/assistants">
                 Go to Admin Panel
@@ -30,7 +30,8 @@ export default function NoAssistantModal() {
             </>
           ) : (
             <Text as="p">
-              Please contact your administrator to configure an agent for you.
+              Please contact your administrator to configure an assistant for
+              you.
             </Text>
           )}
         </Modal.Body>

web/src/hooks/useCodeInterpreter.ts

@@ -1,44 +0,0 @@
-import useSWR from "swr";
-import { errorHandlingFetcher } from "@/lib/fetcher";
-
-const HEALTH_ENDPOINT = "/api/admin/code-interpreter/health";
-const STATUS_ENDPOINT = "/api/admin/code-interpreter";
-
-interface CodeInterpreterHealth {
-  healthy: boolean;
-}
-
-interface CodeInterpreterStatus {
-  enabled: boolean;
-}
-
-export default function useCodeInterpreter() {
-  const {
-    data: healthData,
-    error: healthError,
-    isLoading: isHealthLoading,
-    mutate: refetchHealth,
-  } = useSWR<CodeInterpreterHealth>(HEALTH_ENDPOINT, errorHandlingFetcher, {
-    refreshInterval: 30000,
-  });
-
-  const {
-    data: statusData,
-    error: statusError,
-    isLoading: isStatusLoading,
-    mutate: refetchStatus,
-  } = useSWR<CodeInterpreterStatus>(STATUS_ENDPOINT, errorHandlingFetcher);
-
-  function refetch() {
-    refetchHealth();
-    refetchStatus();
-  }
-
-  return {
-    isHealthy: healthData?.healthy ?? false,
-    isEnabled: statusData?.enabled ?? false,
-    isLoading: isHealthLoading || isStatusLoading,
-    error: healthError || statusError,
-    refetch,
-  };
-}

web/src/lib/admin/code-interpreter/svc.ts

@@ -1,15 +0,0 @@
-const UPDATE_ENDPOINT = "/api/admin/code-interpreter";
-
-interface CodeInterpreterUpdateRequest {
-  enabled: boolean;
-}
-
-export async function updateCodeInterpreter(
-  request: CodeInterpreterUpdateRequest
-): Promise<Response> {
-  return fetch(UPDATE_ENDPOINT, {
-    method: "PUT",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(request),
-  });
-}

web/src/lib/hooks.ts

@@ -834,8 +834,10 @@ export function useLlmManager(
     }
   };
 
-  // Track if any provider exists (for onboarding checks)
-  const hasAnyProvider = (allUserProviders?.length ?? 0) > 0;
+  // Track if any provider exists for the current persona context.
+  // Uses the persona-aware list so chat input reflects actual access,
+  // falling back to the global list when no persona is selected.
+  const hasAnyProvider = (llmProviders?.length ?? 0) > 0;
 
   return {
     updateModelOverrideBasedOnChatSession,

web/src/refresh-pages/AgentsNavigationPage.tsx

@@ -425,7 +425,7 @@ export default function AgentsNavigationPage() {
     >
       <SettingsLayouts.Header
         icon={SvgOnyxOctagon}
-        title="Agents"
+        title="Agents & Assistants"
         description="Customize AI behavior and knowledge for you and your team's use cases."
         rightChildren={
           <Button

web/src/refresh-pages/admin/CodeInterpreterPage.tsx

@@ -1,241 +0,0 @@
-"use client";
-
-import React, { useState } from "react";
-import * as SettingsLayouts from "@/layouts/settings-layouts";
-import { Card, type CardProps } from "@/refresh-components/cards";
-import {
-  SvgArrowExchange,
-  SvgCheckCircle,
-  SvgRefreshCw,
-  SvgTerminal,
-  SvgUnplug,
-  SvgXOctagon,
-} from "@opal/icons";
-import { Section } from "@/layouts/general-layouts";
-import { Button } from "@opal/components";
-import Text from "@/refresh-components/texts/Text";
-import SimpleLoader from "@/refresh-components/loaders/SimpleLoader";
-import ConfirmationModalLayout from "@/refresh-components/layouts/ConfirmationModalLayout";
-import useCodeInterpreter from "@/hooks/useCodeInterpreter";
-import { updateCodeInterpreter } from "@/lib/admin/code-interpreter/svc";
-import { ContentAction } from "@opal/layouts";
-import { toast } from "@/hooks/useToast";
-
-interface CodeInterpreterCardProps {
-  variant?: CardProps["variant"];
-  title: string;
-  middleText?: string;
-  strikethrough?: boolean;
-  rightContent: React.ReactNode;
-}
-
-function CodeInterpreterCard({
-  variant,
-  title,
-  middleText,
-  strikethrough,
-  rightContent,
-}: CodeInterpreterCardProps) {
-  return (
-    // TODO (@raunakab): Allow Content to accept strikethrough and middleText
-    <Card variant={variant} padding={0.5}>
-      <ContentAction
-        icon={SvgTerminal}
-        title={middleText ? `${title} ${middleText}` : title}
-        description="Built-in Python runtime"
-        variant="section"
-        sizePreset="main-ui"
-        rightChildren={rightContent}
-      />
-    </Card>
-  );
-}
-
-function CheckingStatus() {
-  return (
-    <Section
-      flexDirection="row"
-      justifyContent="end"
-      alignItems="center"
-      gap={0.25}
-      padding={0.5}
-    >
-      <Text mainUiAction text03>
-        Checking...
-      </Text>
-      <SimpleLoader />
-    </Section>
-  );
-}
-
-interface ConnectionStatusProps {
-  healthy: boolean;
-  isLoading: boolean;
-}
-
-function ConnectionStatus({ healthy, isLoading }: ConnectionStatusProps) {
-  if (isLoading) {
-    return <CheckingStatus />;
-  }
-
-  const label = healthy ? "Connected" : "Connection Lost";
-  const Icon = healthy ? SvgCheckCircle : SvgXOctagon;
-  const iconColor = healthy ? "text-status-success-05" : "text-status-error-05";
-
-  return (
-    <Section
-      flexDirection="row"
-      justifyContent="end"
-      alignItems="center"
-      gap={0.25}
-      padding={0.5}
-    >
-      <Text mainUiAction text03>
-        {label}
-      </Text>
-      <Icon size={16} className={iconColor} />
-    </Section>
-  );
-}
-
-interface ActionButtonsProps {
-  onDisconnect: () => void;
-  onRefresh: () => void;
-  disabled?: boolean;
-}
-
-function ActionButtons({
-  onDisconnect,
-  onRefresh,
-  disabled,
-}: ActionButtonsProps) {
-  return (
-    <Section
-      flexDirection="row"
-      justifyContent="end"
-      alignItems="center"
-      gap={0.25}
-      padding={0.25}
-    >
-      <Button
-        prominence="tertiary"
-        size="sm"
-        icon={SvgUnplug}
-        onClick={onDisconnect}
-        tooltip="Disconnect"
-        disabled={disabled}
-      />
-      <Button
-        prominence="tertiary"
-        size="sm"
-        icon={SvgRefreshCw}
-        onClick={onRefresh}
-        tooltip="Refresh"
-        disabled={disabled}
-      />
-    </Section>
-  );
-}
-
-export default function CodeInterpreterPage() {
-  const { isHealthy, isEnabled, isLoading, refetch } = useCodeInterpreter();
-  const [showDisconnectModal, setShowDisconnectModal] = useState(false);
-  const [isReconnecting, setIsReconnecting] = useState(false);
-
-  async function handleToggle(enabled: boolean) {
-    const action = enabled ? "reconnect" : "disconnect";
-    setIsReconnecting(enabled);
-    try {
-      const response = await updateCodeInterpreter({ enabled });
-      if (!response.ok) {
-        toast.error(`Failed to ${action} Code Interpreter`);
-        return;
-      }
-      setShowDisconnectModal(false);
-      refetch();
-    } finally {
-      setIsReconnecting(false);
-    }
-  }
-
-  return (
-    <SettingsLayouts.Root>
-      <SettingsLayouts.Header
-        icon={SvgTerminal}
-        title="Code Interpreter"
-        description="Safe and sandboxed Python runtime available to your LLM. See docs for more details."
-        separator
-      />
-
-      <SettingsLayouts.Body>
-        {isEnabled || isLoading ? (
-          <CodeInterpreterCard
-            title="Code Interpreter"
-            variant={isHealthy ? "primary" : "secondary"}
-            strikethrough={!isHealthy}
-            rightContent={
-              <Section
-                flexDirection="column"
-                justifyContent="center"
-                alignItems="end"
-                gap={0}
-                padding={0}
-              >
-                <ConnectionStatus healthy={isHealthy} isLoading={isLoading} />
-                <ActionButtons
-                  onDisconnect={() => setShowDisconnectModal(true)}
-                  onRefresh={refetch}
-                  disabled={isLoading}
-                />
-              </Section>
-            }
-          />
-        ) : (
-          <CodeInterpreterCard
-            variant="secondary"
-            title="Code Interpreter"
-            middleText="(Disconnected)"
-            strikethrough={true}
-            rightContent={
-              <Section flexDirection="row" alignItems="center" padding={0.5}>
-                {isReconnecting ? (
-                  <CheckingStatus />
-                ) : (
-                  <Button
-                    prominence="tertiary"
-                    rightIcon={SvgArrowExchange}
-                    onClick={() => handleToggle(true)}
-                  >
-                    Reconnect
-                  </Button>
-                )}
-              </Section>
-            }
-          />
-        )}
-      </SettingsLayouts.Body>
-
-      {showDisconnectModal && (
-        <ConfirmationModalLayout
-          icon={SvgUnplug}
-          title="Disconnect Code Interpreter"
-          onClose={() => setShowDisconnectModal(false)}
-          submit={
-            <Button variant="danger" onClick={() => handleToggle(false)}>
-              Disconnect
-            </Button>
-          }
-        >
-          <Text as="p" text03>
-            All running sessions connected to{" "}
-            <Text as="span" mainContentEmphasis text03>
-              Code Interpreter
-            </Text>{" "}
-            will stop working. Note that this will not remove any data from your
-            runtime. You can reconnect to this runtime later if needed.
-          </Text>
-        </ConfirmationModalLayout>
-      )}
-    </SettingsLayouts.Root>
-  );
-}

web/src/sections/modals/NewTenantModal.tsx

@@ -119,7 +119,7 @@ export default function NewTenantModal({
     : `Your request to join ${tenantInfo.number_of_users} other users of ${APP_DOMAIN} has been approved.`;
 
   const description = isInvite
-    ? `By accepting this invitation, you will join the existing ${APP_DOMAIN} team and lose access to your current team. Note: you will lose access to your current agents, prompts, chats, and connected sources.`
+    ? `By accepting this invitation, you will join the existing ${APP_DOMAIN} team and lose access to your current team. Note: you will lose access to your current assistants, prompts, chats, and connected sources.`
     : `To finish joining your team, please reauthenticate with ${user?.email}.`;
 
   return (

web/src/sections/sidebar/AdminSidebar.tsx

@@ -50,7 +50,6 @@ import {
   SvgPaintBrush,
   SvgDiscordMono,
   SvgWallet,
-  SvgTerminal,
 } from "@opal/icons";
 import SvgMcp from "@opal/icons/mcp";
 import UserAvatarPopover from "@/sections/sidebar/UserAvatarPopover";
@@ -92,7 +91,7 @@ const custom_assistants_items = (
 ) => {
   const items = [
     {
-      name: "Agents",
+      name: "Assistants",
       icon: SvgOnyxOctagon,
       link: "/admin/assistants",
     },
@@ -166,7 +165,7 @@ const collections = (
         ]
       : []),
     {
-      name: "Custom Agents",
+      name: "Custom Assistants",
       items: custom_assistants_items(isCurator, enableEnterprise),
     },
     ...(isCurator && enableEnterprise
@@ -208,11 +207,6 @@ const collections = (
                 icon: SvgImage,
                 link: "/admin/configuration/image-generation",
               },
-              {
-                name: "Code Interpreter",
-                icon: SvgTerminal,
-                link: "/admin/configuration/code-interpreter",
-              },
               ...(!enableCloud && vectorDbEnabled
                 ? [
                     {

web/tests/e2e/admin/admin_pages.spec.ts

@@ -29,12 +29,12 @@ const ADMIN_PAGES: AdminPageSnapshot[] = [
     pageTitle: "Add Connector",
   },
   {
-    name: "Custom Agents - Agents",
+    name: "Custom Assistants - Assistants",
     path: "assistants",
-    pageTitle: "Agents",
+    pageTitle: "Assistants",
     options: {
       paragraphText:
-        "Agents are a way to build custom search/question-answering experiences for different use cases.",
+        "Assistants are a way to build custom search/question-answering experiences for different use cases.",
     },
   },
   {
@@ -52,7 +52,7 @@ const ADMIN_PAGES: AdminPageSnapshot[] = [
     },
   },
   {
-    name: "Custom Agents - Slack Bots",
+    name: "Custom Assistants - Slack Bots",
     path: "bots",
     pageTitle: "Slack Bots",
     options: {
@@ -61,7 +61,7 @@ const ADMIN_PAGES: AdminPageSnapshot[] = [
     },
   },
   {
-    name: "Custom Agents - Standard Answers",
+    name: "Custom Assistants - Standard Answers",
     path: "standard-answer",
     pageTitle: "Standard Answers",
   },
@@ -101,12 +101,12 @@ const ADMIN_PAGES: AdminPageSnapshot[] = [
     pageTitle: "Search Settings",
   },
   {
-    name: "Custom Agents - MCP Actions",
+    name: "Custom Assistants - MCP Actions",
     path: "actions/mcp",
     pageTitle: "MCP Actions",
   },
   {
-    name: "Custom Agents - OpenAPI Actions",
+    name: "Custom Assistants - OpenAPI Actions",
     path: "actions/open-api",
     pageTitle: "OpenAPI Actions",
   },

web/tests/e2e/admin/code-interpreter/code_interpreter.spec.ts

@@ -1,268 +0,0 @@
-import { test, expect } from "@playwright/test";
-import type { Page } from "@playwright/test";
-import { loginAs } from "@tests/e2e/utils/auth";
-
-const CODE_INTERPRETER_URL = "/admin/configuration/code-interpreter";
-const API_STATUS_URL = "**/api/admin/code-interpreter";
-const API_HEALTH_URL = "**/api/admin/code-interpreter/health";
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-/**
- * Intercept the status (GET /) and health (GET /health) endpoints with the
- * given values so the page renders deterministically.
- *
- * Also handles PUT requests — by default they succeed (200). Pass
- * `putStatus` to simulate failures.
- */
-async function mockCodeInterpreterApi(
-  page: Page,
-  opts: { enabled: boolean; healthy: boolean; putStatus?: number }
-) {
-  const putStatus = opts.putStatus ?? 200;
-
-  await page.route(API_HEALTH_URL, async (route) => {
-    await route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ healthy: opts.healthy }),
-    });
-  });
-
-  await page.route(API_STATUS_URL, async (route) => {
-    if (route.request().method() === "PUT") {
-      await route.fulfill({
-        status: putStatus,
-        contentType: "application/json",
-        body:
-          putStatus >= 400
-            ? JSON.stringify({ detail: "Server Error" })
-            : JSON.stringify(null),
-      });
-    } else {
-      await route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ enabled: opts.enabled }),
-      });
-    }
-  });
-}
-
-/**
- * The disconnect icon button is an icon-only opal Button whose tooltip text
- * is not exposed as an accessible name. Locate it by finding the first
- * icon-only button (no label span) inside the card area.
- */
-function getDisconnectIconButton(page: Page) {
-  return page
-    .locator("button:has(.opal-button):not(:has(.opal-button-label))")
-    .first();
-}
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-test.describe("Code Interpreter Admin Page", () => {
-  test.beforeEach(async ({ page }) => {
-    await page.context().clearCookies();
-    await loginAs(page, "admin");
-  });
-
-  test("page loads with header and description", async ({ page }) => {
-    await mockCodeInterpreterApi(page, { enabled: true, healthy: true });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.locator('[aria-label="admin-page-title"]')).toHaveText(
-      /^Code Interpreter/,
-      { timeout: 10000 }
-    );
-
-    await expect(page.getByText("Built-in Python runtime")).toBeVisible();
-  });
-
-  test("shows Connected status when enabled and healthy", async ({ page }) => {
-    await mockCodeInterpreterApi(page, { enabled: true, healthy: true });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByText("Connected")).toBeVisible({ timeout: 10000 });
-  });
-
-  test("shows Connection Lost when enabled but unhealthy", async ({ page }) => {
-    await mockCodeInterpreterApi(page, { enabled: true, healthy: false });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByText("Connection Lost")).toBeVisible({
-      timeout: 10000,
-    });
-  });
-
-  test("shows Reconnect button when disabled", async ({ page }) => {
-    await mockCodeInterpreterApi(page, { enabled: false, healthy: false });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByRole("button", { name: "Reconnect" })).toBeVisible({
-      timeout: 10000,
-    });
-    await expect(page.getByText("(Disconnected)")).toBeVisible();
-  });
-
-  test("disconnect flow opens modal and sends PUT request", async ({
-    page,
-  }) => {
-    await mockCodeInterpreterApi(page, { enabled: true, healthy: true });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByText("Connected")).toBeVisible({ timeout: 10000 });
-
-    // Click the disconnect icon button
-    await getDisconnectIconButton(page).click();
-
-    // Modal should appear
-    await expect(page.getByText("Disconnect Code Interpreter")).toBeVisible();
-    await expect(
-      page.getByText("All running sessions connected to")
-    ).toBeVisible();
-
-    // Click the danger Disconnect button in the modal
-    const modal = page.getByRole("dialog");
-    await modal.getByRole("button", { name: "Disconnect" }).click();
-
-    // Modal should close after successful disconnect
-    await expect(page.getByText("Disconnect Code Interpreter")).not.toBeVisible(
-      { timeout: 5000 }
-    );
-  });
-
-  test("disconnect modal can be closed without disconnecting", async ({
-    page,
-  }) => {
-    await mockCodeInterpreterApi(page, { enabled: true, healthy: true });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByText("Connected")).toBeVisible({ timeout: 10000 });
-
-    // Open modal
-    await getDisconnectIconButton(page).click();
-    await expect(page.getByText("Disconnect Code Interpreter")).toBeVisible();
-
-    // Close modal via Cancel button
-    const modal = page.getByRole("dialog");
-    await modal.getByRole("button", { name: "Cancel" }).click();
-
-    // Modal should be gone, page still shows Connected
-    await expect(
-      page.getByText("Disconnect Code Interpreter")
-    ).not.toBeVisible();
-    await expect(page.getByText("Connected")).toBeVisible();
-  });
-
-  test("reconnect flow sends PUT with enabled=true", async ({ page }) => {
-    await mockCodeInterpreterApi(page, { enabled: false, healthy: false });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByRole("button", { name: "Reconnect" })).toBeVisible({
-      timeout: 10000,
-    });
-
-    // Intercept the PUT and verify the payload
-    const putPromise = page.waitForRequest(
-      (req) =>
-        req.url().includes("/api/admin/code-interpreter") &&
-        req.method() === "PUT"
-    );
-
-    await page.getByRole("button", { name: "Reconnect" }).click();
-
-    const putReq = await putPromise;
-    expect(putReq.postDataJSON()).toEqual({ enabled: true });
-  });
-
-  test("shows Checking... while reconnect is in progress", async ({ page }) => {
-    // Use a single route handler that delays PUT responses
-    await page.route(API_HEALTH_URL, async (route) => {
-      await route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({ healthy: false }),
-      });
-    });
-
-    await page.route(API_STATUS_URL, async (route) => {
-      if (route.request().method() === "PUT") {
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        await route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify(null),
-        });
-      } else {
-        await route.fulfill({
-          status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({ enabled: false }),
-        });
-      }
-    });
-
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByRole("button", { name: "Reconnect" })).toBeVisible({
-      timeout: 10000,
-    });
-
-    await page.getByRole("button", { name: "Reconnect" }).click();
-
-    // Should show Checking... while the request is in flight
-    await expect(page.getByText("Checking...")).toBeVisible({ timeout: 3000 });
-  });
-
-  test("shows error toast when disconnect fails", async ({ page }) => {
-    await mockCodeInterpreterApi(page, {
-      enabled: true,
-      healthy: true,
-      putStatus: 500,
-    });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByText("Connected")).toBeVisible({ timeout: 10000 });
-
-    // Open modal and click disconnect
-    await getDisconnectIconButton(page).click();
-    const modal = page.getByRole("dialog");
-    await modal.getByRole("button", { name: "Disconnect" }).click();
-
-    // Error toast should appear
-    await expect(
-      page.getByText("Failed to disconnect Code Interpreter")
-    ).toBeVisible({ timeout: 5000 });
-  });
-
-  test("shows error toast when reconnect fails", async ({ page }) => {
-    await mockCodeInterpreterApi(page, {
-      enabled: false,
-      healthy: false,
-      putStatus: 500,
-    });
-    await page.goto(CODE_INTERPRETER_URL);
-
-    await expect(page.getByRole("button", { name: "Reconnect" })).toBeVisible({
-      timeout: 10000,
-    });
-
-    await page.getByRole("button", { name: "Reconnect" }).click();
-
-    // Error toast should appear
-    await expect(
-      page.getByText("Failed to reconnect Code Interpreter")
-    ).toBeVisible({ timeout: 5000 });
-
-    // Reconnect button should reappear (not stuck in Checking...)
-    await expect(page.getByRole("button", { name: "Reconnect" })).toBeVisible({
-      timeout: 5000,
-    });
-  });
-});

web/tests/e2e/auth/password_managements.spec.ts

@@ -46,7 +46,7 @@ test.skip("User changes password and logs in with new password", async ({
 
   // Verify successful login
   await expect(page).toHaveURL("http://localhost:3000/app");
-  await expect(page.getByText("Explore Agents")).toBeVisible();
+  await expect(page.getByText("Explore Assistants")).toBeVisible();
 });
 
 test.use({ storageState: "admin2_auth.json" });
@@ -115,5 +115,5 @@ test.skip("Admin resets own password and logs in with new password", async ({
 
   // Verify successful login
   await expect(page).toHaveURL("http://localhost:3000/app");
-  await expect(page.getByText("Explore Agents")).toBeVisible();
+  await expect(page.getByText("Explore Assistants")).toBeVisible();
 });

web/tests/e2e/chat/default_assistant.spec.ts

@@ -16,7 +16,7 @@ import { OnyxApiClient } from "@tests/e2e/utils/onyxApiClient";
 
 // Tool-related test selectors now imported from shared utils
 
-test.describe("Default Agent Tests", () => {
+test.describe("Default Assistant Tests", () => {
   let imageGenConfigId: string | null = null;
 
   test.beforeAll(async ({ browser }) => {
@@ -69,7 +69,7 @@ test.describe("Default Agent Tests", () => {
   });
 
   test.describe("Greeting Message Display", () => {
-    test("should display greeting message when opening new chat with default agent", async ({
+    test("should display greeting message when opening new chat with default assistant", async ({
       page,
     }) => {
       // Look for greeting message - should be one from the predefined list
@@ -95,21 +95,23 @@ test.describe("Default Agent Tests", () => {
       expect(GREETING_MESSAGES).toContain(greetingAfterReload?.trim());
     });
 
-    test("greeting should only appear for default agent", async ({ page }) => {
-      // First verify greeting appears for default agent
+    test("greeting should only appear for default assistant", async ({
+      page,
+    }) => {
+      // First verify greeting appears for default assistant
       const greetingElement = await page.waitForSelector(
         '[data-testid="onyx-logo"]',
         { timeout: 5000 }
       );
       expect(greetingElement).toBeTruthy();
 
-      // Create a custom agent to test non-default behavior
+      // Create a custom assistant to test non-default behavior
       await page.getByTestId("AppSidebar/more-agents").click();
       await page.getByLabel("AgentsPage/new-agent-button").click();
       await page
         .locator('input[name="name"]')
         .waitFor({ state: "visible", timeout: 10000 });
-      await page.locator('input[name="name"]').fill("Custom Test Agent");
+      await page.locator('input[name="name"]').fill("Custom Test Assistant");
       await page
         .locator('textarea[name="description"]')
         .fill("Test Description");
@@ -118,17 +120,17 @@ test.describe("Default Agent Tests", () => {
         .fill("Test Instructions");
       await page.getByRole("button", { name: "Create" }).click();
 
-      // Wait for agent to be created and selected
-      await verifyAssistantIsChosen(page, "Custom Test Agent");
+      // Wait for assistant to be created and selected
+      await verifyAssistantIsChosen(page, "Custom Test Assistant");
 
-      // Greeting should NOT appear for custom agent
+      // Greeting should NOT appear for custom assistant
       const customGreeting = await page.$('[data-testid="onyx-logo"]');
       expect(customGreeting).toBeNull();
     });
   });
 
-  test.describe("Default Agent Branding", () => {
-    test("should display Onyx logo for default agent", async ({ page }) => {
+  test.describe("Default Assistant Branding", () => {
+    test("should display Onyx logo for default assistant", async ({ page }) => {
       // Look for Onyx logo
       const logoElement = await page.waitForSelector(
         '[data-testid="onyx-logo"]',
@@ -136,23 +138,23 @@ test.describe("Default Agent Tests", () => {
       );
       expect(logoElement).toBeTruthy();
 
-      // Should NOT show agent name for default agent
+      // Should NOT show assistant name for default assistant
       const assistantNameElement = await page.$(
         '[data-testid="assistant-name-display"]'
       );
       expect(assistantNameElement).toBeNull();
     });
 
-    test("custom agents should show name and icon instead of logo", async ({
+    test("custom assistants should show name and icon instead of logo", async ({
       page,
     }) => {
-      // Create a custom agent
+      // Create a custom assistant
       await page.getByTestId("AppSidebar/more-agents").click();
       await page.getByLabel("AgentsPage/new-agent-button").click();
       await page
         .locator('input[name="name"]')
         .waitFor({ state: "visible", timeout: 10000 });
-      await page.locator('input[name="name"]').fill("Custom Agent");
+      await page.locator('input[name="name"]').fill("Custom Assistant");
       await page
         .locator('textarea[name="description"]')
         .fill("Test Description");
@@ -161,16 +163,16 @@ test.describe("Default Agent Tests", () => {
         .fill("Test Instructions");
       await page.getByRole("button", { name: "Create" }).click();
 
-      // Wait for agent to be created and selected
-      await verifyAssistantIsChosen(page, "Custom Agent");
+      // Wait for assistant to be created and selected
+      await verifyAssistantIsChosen(page, "Custom Assistant");
 
-      // Should show agent name and icon, not Onyx logo
+      // Should show assistant name and icon, not Onyx logo
       const assistantNameElement = await page.waitForSelector(
         '[data-testid="assistant-name-display"]',
         { timeout: 5000 }
       );
       const nameText = await assistantNameElement.textContent();
-      expect(nameText).toContain("Custom Agent");
+      expect(nameText).toContain("Custom Assistant");
 
       // Onyx logo should NOT be shown
       const logoElement = await page.$('[data-testid="onyx-logo"]');
@@ -179,8 +181,10 @@ test.describe("Default Agent Tests", () => {
   });
 
   test.describe("Starter Messages", () => {
-    test("default agent should NOT have starter messages", async ({ page }) => {
-      // Check that starter messages container does not exist for default agent
+    test("default assistant should NOT have starter messages", async ({
+      page,
+    }) => {
+      // Check that starter messages container does not exist for default assistant
       const starterMessagesContainer = await page.$(
         '[data-testid="starter-messages"]'
       );
@@ -191,14 +195,18 @@ test.describe("Default Agent Tests", () => {
       expect(starterButtons.length).toBe(0);
     });
 
-    test("custom agents should display starter messages", async ({ page }) => {
-      // Create a custom agent with starter messages
+    test("custom assistants should display starter messages", async ({
+      page,
+    }) => {
+      // Create a custom assistant with starter messages
       await page.getByTestId("AppSidebar/more-agents").click();
       await page.getByLabel("AgentsPage/new-agent-button").click();
       await page
         .locator('input[name="name"]')
         .waitFor({ state: "visible", timeout: 10000 });
-      await page.locator('input[name="name"]').fill("Test Agent with Starters");
+      await page
+        .locator('input[name="name"]')
+        .fill("Test Assistant with Starters");
       await page
         .locator('textarea[name="description"]')
         .fill("Test Description");
@@ -211,9 +219,9 @@ test.describe("Default Agent Tests", () => {
       await page.getByRole("button", { name: "Create" }).click();
 
       // Wait for assistant to be created and selected
-      await verifyAssistantIsChosen(page, "Test Agent with Starters");
+      await verifyAssistantIsChosen(page, "Test Assistant with Starters");
 
-      // Starter messages container might exist but be empty for custom agents
+      // Starter messages container might exist but be empty for custom assistants
       const starterMessagesContainer = await page.$(
         '[data-testid="starter-messages"]'
       );
@@ -222,22 +230,24 @@ test.describe("Default Agent Tests", () => {
         const starterButtons = await page.$$(
           '[data-testid^="starter-message-"]'
         );
-        // Custom agent without configured starter messages should have none
+        // Custom assistant without configured starter messages should have none
         expect(starterButtons.length).toBe(0);
       }
     });
   });
 
-  test.describe("Agent Selection", () => {
-    test("default agent should be selected for new chats", async ({ page }) => {
-      // Verify the input placeholder indicates default agent (Onyx)
+  test.describe("Assistant Selection", () => {
+    test("default assistant should be selected for new chats", async ({
+      page,
+    }) => {
+      // Verify the input placeholder indicates default assistant (Onyx)
       await verifyDefaultAssistantIsChosen(page);
     });
 
-    test("default agent should NOT appear in agent selector", async ({
+    test("default assistant should NOT appear in assistant selector", async ({
       page,
     }) => {
-      // Open agent selector
+      // Open assistant selector
       await page.getByTestId("AppSidebar/more-agents").click();
 
       // Wait for modal or assistant list to appear
@@ -246,13 +256,13 @@ test.describe("Default Agent Tests", () => {
         .getByLabel("AgentsPage/new-agent-button")
         .waitFor({ state: "visible", timeout: 5000 });
 
-      // Look for default agent by name - it should NOT be there
+      // Look for default assistant by name - it should NOT be there
       const assistantElements = await page.$$('[data-testid^="assistant-"]');
       const assistantTexts = await Promise.all(
         assistantElements.map((el) => el.textContent())
       );
 
-      // Check that the default agent is not in the list
+      // Check that "Assistant" (the default assistant name) is not in the list
       const hasDefaultAssistant = assistantTexts.some(
         (text) =>
           text?.includes("Assistant") &&
@@ -265,16 +275,16 @@ test.describe("Default Agent Tests", () => {
       await page.keyboard.press("Escape");
     });
 
-    test("should be able to switch from default to custom agent", async ({
+    test("should be able to switch from default to custom assistant", async ({
       page,
     }) => {
-      // Create a custom agent
+      // Create a custom assistant
       await page.getByTestId("AppSidebar/more-agents").click();
       await page.getByLabel("AgentsPage/new-agent-button").click();
       await page
         .locator('input[name="name"]')
         .waitFor({ state: "visible", timeout: 10000 });
-      await page.locator('input[name="name"]').fill("Switch Test Agent");
+      await page.locator('input[name="name"]').fill("Switch Test Assistant");
       await page
         .locator('textarea[name="description"]')
         .fill("Test Description");
@@ -283,13 +293,13 @@ test.describe("Default Agent Tests", () => {
         .fill("Test Instructions");
       await page.getByRole("button", { name: "Create" }).click();
 
-      // Verify switched to custom agent
-      await verifyAssistantIsChosen(page, "Switch Test Agent");
+      // Verify switched to custom assistant
+      await verifyAssistantIsChosen(page, "Switch Test Assistant");
 
       // Start new chat to go back to default
       await startNewChat(page);
 
-      // Should be back to default agent
+      // Should be back to default assistant
       await verifyDefaultAssistantIsChosen(page);
     });
   });
@@ -369,7 +379,7 @@ test.describe("Default Agent Tests", () => {
         );
       }
 
-      // Enable the tools in default agent config via API
+      // Enable the tools in default assistant config via API
       // Get current tools to find their IDs
       const toolsListResp = await page.request.get(
         "http://localhost:3000/api/tool"
@@ -532,7 +542,7 @@ test.describe("Default Agent Tests", () => {
   });
 });
 
-test.describe("End-to-End Default Agent Flow", () => {
+test.describe("End-to-End Default Assistant Flow", () => {
   let imageGenConfigId: string | null = null;
 
   test.beforeAll(async ({ browser }) => {
@@ -574,7 +584,7 @@ test.describe("End-to-End Default Agent Flow", () => {
     }
   });
 
-  test("complete user journey with default agent", async ({ page }) => {
+  test("complete user journey with default assistant", async ({ page }) => {
     // Clear cookies and log in as a random user
     await page.context().clearCookies();
     await loginAsRandomUser(page);
@@ -601,7 +611,7 @@ test.describe("End-to-End Default Agent Flow", () => {
     // Start a new chat
     await startNewChat(page);
 
-    // Verify we're back to default agent with greeting
+    // Verify we're back to default assistant with greeting
     await expect(page.locator('[data-testid="onyx-logo"]')).toBeVisible();
   });
 });