elastic · sphilipse · Mar 24, 2026 · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1001,6 +1001,7 @@ x-pack/platform/packages/shared/kbn-failure-store-modal @elastic/kibana-manageme
 x-pack/platform/packages/shared/kbn-fs @elastic/kibana-security
 x-pack/platform/packages/shared/kbn-grok-heuristics @elastic/obs-onboarding-team
 x-pack/platform/packages/shared/kbn-inference-cli @elastic/appex-ai-infra @elastic/search-inference-team
+x-pack/platform/packages/shared/kbn-inference-connectors @elastic/search-kibana
 x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common @elastic/search-kibana
 x-pack/platform/packages/shared/kbn-inference-prompt-utils @elastic/appex-ai-infra
 x-pack/platform/packages/shared/kbn-inference-tracing @elastic/appex-ai-infra

diff --git a/package.json b/package.json
@@ -716,6 +716,7 @@
     "@kbn/index-patterns-test-plugin": "link:src/platform/test/plugin_functional/plugins/index_patterns",
     "@kbn/indices-metadata-plugin": "link:x-pack/platform/plugins/private/indices_metadata",
     "@kbn/inference-common": "link:x-pack/platform/packages/shared/ai-infra/inference-common",
+    "@kbn/inference-connectors": "link:x-pack/platform/packages/shared/kbn-inference-connectors",
     "@kbn/inference-endpoint-plugin": "link:x-pack/platform/plugins/shared/inference_endpoint",
     "@kbn/inference-endpoint-ui-common": "link:x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common",
     "@kbn/inference-langchain": "link:x-pack/platform/packages/shared/ai-infra/inference-langchain",

@@ -26,6 +26,7 @@ describe('resolveConnectorId', () => {
     config: {},
     capabilities: {},
     isInferenceEndpoint: false,
+    isPreconfigured: false,
     ...partial,
   });
 

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -1366,6 +1366,8 @@
       "@kbn/inference-cli/*": ["x-pack/platform/packages/shared/kbn-inference-cli/*"],
       "@kbn/inference-common": ["x-pack/platform/packages/shared/ai-infra/inference-common"],
       "@kbn/inference-common/*": ["x-pack/platform/packages/shared/ai-infra/inference-common/*"],
+      "@kbn/inference-connectors": ["x-pack/platform/packages/shared/kbn-inference-connectors"],
+      "@kbn/inference-connectors/*": ["x-pack/platform/packages/shared/kbn-inference-connectors/*"],
       "@kbn/inference-endpoint-plugin": ["x-pack/platform/plugins/shared/inference_endpoint"],
       "@kbn/inference-endpoint-plugin/*": ["x-pack/platform/plugins/shared/inference_endpoint/*"],
       "@kbn/inference-endpoint-ui-common": ["x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common"],

@@ -150,6 +150,8 @@ export {
   contextWindowFromModelName,
   type InferenceConnector,
   type InferenceConnectorCapabilities,
+  type RawConnector,
+  type RawInferenceConnector,
 } from './src/connectors';
 export {
   defaultInferenceEndpoints,

@@ -19,6 +19,7 @@ const createConnector = (parts: Partial<InferenceConnector>): InferenceConnector
     config: {},
     capabilities: {},
     isInferenceEndpoint: false,
+    isPreconfigured: false,
     ...parts,
   };
 };

@@ -16,6 +16,7 @@ const createConnector = (parts: Partial<InferenceConnector>): InferenceConnector
     connectorId: 'connectorId',
     config: {},
     isInferenceEndpoint: false,
+    isPreconfigured: false,
     capabilities: {},
     ...parts,
   };

@@ -30,6 +30,7 @@ export const connectorToInference = (connector: RawConnector): InferenceConnecto
     config: connector.config ?? {},
     capabilities: {},
     isInferenceEndpoint: false,
+    isPreconfigured: connector.isPreconfigured ?? false,
   };
 
   inferenceConnector.capabilities.contextWindowSize = getContextWindowSize(inferenceConnector);

@@ -41,6 +41,12 @@ export interface InferenceConnector {
    * rather than a Kibana stack connector. `connectorId` holds the inference endpoint ID.
    */
   isInferenceEndpoint: boolean;
+  /**
+   * When true, this connector is preconfigured (i.e. managed by Elastic).
+   * For native inference endpoints this is determined by the presence of
+   * `metadata.display.name` on the underlying ES inference endpoint.
+   */
+  isPreconfigured: boolean;
 }
 
 export interface InferenceConnectorCapabilities {
@@ -60,11 +66,13 @@ export interface RawConnector {
   actionTypeId: string;
   name: string;
   config?: Record<string, any>;
+  isPreconfigured?: boolean;
 }
 
 export interface RawInferenceConnector {
   id: string;
   actionTypeId: InferenceConnectorType;
   name: string;
   config?: Record<string, any>;
+  isPreconfigured?: boolean;
 }
@@ -18,6 +18,8 @@ export {
   InferenceConnectorType,
   type InferenceConnector,
   type InferenceConnectorCapabilities,
+  type RawConnector,
+  type RawInferenceConnector,
 } from './connectors';
 export { getModelDefinition } from './known_models';
 export { getContextWindowSize, contextWindowFromModelName } from './connector_capabilities';
@@ -40,6 +40,7 @@ const createConnector = (parts: Partial<InferenceConnector> = {}): InferenceConn
     config: {},
     capabilities: {},
     isInferenceEndpoint: false,
+    isPreconfigured: false,
     ...parts,
   };
 };

@@ -77,8 +77,8 @@ export function ChatActionsMenu({
     if (!connectors.connectors) return [[], []];
 
     return connectors.connectors.reduce<ConnectorLists>(
-      ([pre, custom], { id, name, isPreconfigured }) => {
-        const item = { value: id, label: name };
+      ([pre, custom], { connectorId, name, isPreconfigured }) => {
+        const item = { value: connectorId, label: name };
         return isPreconfigured ? [[...pre, item], custom] : [pre, [...custom, item]];
       },
       [[], []]
@@ -128,7 +128,11 @@ export function ChatActionsMenu({
             defaultMessage: 'Connector',
           })}{' '}
           <strong>
-            {connectors.connectors?.find(({ id }) => id === connectors.selectedConnector)?.name}
+            {
+              connectors.connectors?.find(
+                ({ connectorId }) => connectorId === connectors.selectedConnector
+              )?.name
+            }
           </strong>
         </div>
       ),

@@ -34,7 +34,6 @@ import {
   type ChatActionClickPayload,
   type Feedback,
   aiAssistantSimulatedFunctionCalling,
-  getElasticManagedLlmConnector,
   InferenceModelState,
 } from '@kbn/observability-ai-assistant-plugin/public';
 import type { AuthenticatedUser } from '@kbn/security-plugin/common';
@@ -413,13 +412,13 @@ export function ChatBody({
     conversation.refresh();
   };
 
-  const elasticManagedLlm = getElasticManagedLlmConnector(connectors.connectors);
   const { conversationCalloutDismissed } = useElasticLlmCalloutsStatus(false);
 
   const showElasticLlmCalloutInChat =
-    !!elasticManagedLlm &&
-    connectors.selectedConnector === elasticManagedLlm.id &&
-    !conversationCalloutDismissed;
+    (connectors.connectors || []).some(
+      (connector) =>
+        connector.connectorId === connectors.selectedConnector && connector.isPreconfigured
+    ) && !conversationCalloutDismissed;
 
   const showKnowledgeBaseReIndexingCallout =
     knowledgeBase.status.value?.enabled === true &&

@@ -46,15 +46,15 @@ export const ElasticLlmConversationCallout = () => {
       onDismiss={onDismiss}
       iconType="info"
       title={i18n.translate('xpack.aiAssistant.elasticLlmCallout.title', {
-        defaultMessage: `You're using the Elastic Managed LLM connector`,
+        defaultMessage: `You're using an Elastic Managed LLM connector`,
       })}
       size="s"
       className={elasticLlmCalloutClassName}
     >
       <p>
         <FormattedMessage
           id="xpack.aiAssistant.tour.elasticLlmDescription"
-          defaultMessage="Elastic AI Assistant and other AI features are powered by an LLM. The Elastic Managed LLM connector is used by default (<costLink>additional costs incur</costLink>) when no custom connectors are available. You can configure a <connectorLink>custom connector</connectorLink> if you prefer."
+          defaultMessage="Elastic AI Assistant and other AI features are powered by an LLM. An Elastic Managed LLM connector is used by default (<costLink>additional costs incur</costLink>) when no custom connectors are available. You can configure a <connectorLink>custom connector</connectorLink> if you prefer."
           values={{
             costLink: (...chunks: React.ReactNode[]) => (
               <EuiLink

@@ -8,19 +8,22 @@
 import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { InferenceModelState } from '@kbn/observability-ai-assistant-plugin/public';
+import { InferenceConnectorType } from '@kbn/inference-common';
 import { WelcomeMessage } from './welcome_message';
 import type { UseKnowledgeBaseResult } from '../hooks/use_knowledge_base';
 import type { UseGenAIConnectorsResult } from '../hooks/use_genai_connectors';
-import { createMockConnectorFindResult } from '@kbn/actions-plugin/server/application/connector/mocks';
 
 const mockConnectors: UseGenAIConnectorsResult = {
   connectors: [
-    createMockConnectorFindResult({
-      id: 'test-connector',
+    {
+      connectorId: 'test-connector',
       name: 'Test Connector',
-      actionTypeId: '.gen-ai',
-      referencedByCount: 0,
-    }),
+      type: InferenceConnectorType.OpenAI,
+      config: {},
+      capabilities: {},
+      isInferenceEndpoint: false,
+      isPreconfigured: false,
+    },
   ],
   loading: false,
   selectedConnector: 'test-connector',

@@ -7,12 +7,16 @@
 
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { useChatComplete } from './use_chat_complete';
-import { useAssistantContext, useLoadConnectors } from '../../../..';
+import { useLoadConnectors } from '@kbn/inference-connectors';
+import { useAssistantContext } from '../../../..';
 import type { ChatCompleteResponse } from './post_chat_complete';
 import { postChatComplete } from './post_chat_complete';
 
 jest.mock('../../../..', () => ({
   useAssistantContext: jest.fn(),
+}));
+
+jest.mock('@kbn/inference-connectors', () => ({
   useLoadConnectors: jest.fn(),
 }));
 

@@ -8,9 +8,10 @@
 import { useCallback, useMemo, useRef, useState } from 'react';
 import type { PromptIds, Replacements } from '@kbn/elastic-assistant-common';
 import type { HttpFetchQuery } from '@kbn/core-http-browser';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import type { ChatCompleteResponse } from './post_chat_complete';
 import { postChatComplete } from './post_chat_complete';
-import { useAssistantContext, useLoadConnectors } from '../../../..';
+import { useAssistantContext } from '../../../..';
 
 interface SendMessageProps {
   message: string;
@@ -30,7 +31,11 @@ export const useChatComplete = ({ connectorId }: { connectorId: string }): UseCh
   const { alertsIndexPattern, http, traceOptions, settings } = useAssistantContext();
   const [isLoading, setIsLoading] = useState(false);
   const abortController = useRef(new AbortController());
-  const { data: connectors } = useLoadConnectors({ http, inferenceEnabled: true, settings });
+  const { data: connectors } = useLoadConnectors({
+    http,
+    featureId: 'elastic_assistant',
+    settings,
+  });
   const actionTypeId = useMemo(
     () => connectors?.find(({ id }) => id === connectorId)?.actionTypeId ?? '.gen-ai',
     [connectors, connectorId]

@@ -11,7 +11,7 @@ import { act, fireEvent, render, screen, within } from '@testing-library/react';
 import { AssistantHeader } from '.';
 import { TestProviders } from '../../mock/test_providers/test_providers';
 import { alertConvo, welcomeConvo } from '../../mock/conversation';
-import { useLoadConnectors } from '../../connectorland/use_load_connectors';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import { mockConnectors } from '../../mock/connectors';
 import { CLOSE } from './translations';
 import { ConversationSharedState } from '@kbn/elastic-assistant-common';
@@ -55,7 +55,7 @@ const testProps = {
   setCurrentConversation: jest.fn(),
 };
 
-jest.mock('../../connectorland/use_load_connectors', () => ({
+jest.mock('@kbn/inference-connectors', () => ({
   useLoadConnectors: jest.fn(() => {
     return {
       data: [],

@@ -16,6 +16,7 @@ import {
   getCurrentConversationOwner,
   ConversationSharedState,
 } from '@kbn/elastic-assistant-common';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import { ShareSelect } from '../../share_conversation/share_select';
 import { useAssistantContext, type Conversation } from '../../../..';
 import * as i18n from './translations';
@@ -25,7 +26,6 @@ import type { AIConnector } from '../../../connectorland/connector_selector';
 import { ConnectorSelector } from '../../../connectorland/connector_selector';
 import { SelectSystemPrompt } from '../../prompt_editor/system_prompt/select_system_prompt';
 import { ModelSelector } from '../../../connectorland/models/model_selector/model_selector';
-import { useLoadConnectors } from '../../../connectorland/use_load_connectors';
 import { getGenAiConfig } from '../../../connectorland/helpers';
 import type { ConversationsBulkActions } from '../../api';
 import { getDefaultSystemPrompt } from '../../use_conversation/helpers';
@@ -60,6 +60,7 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
     const { settings } = useAssistantContext();
     const { data: connectors, isSuccess: areConnectorsFetched } = useLoadConnectors({
       http,
+      featureId: 'elastic_assistant',
       settings,
     });
     const [conversationUpdates, setConversationUpdates] =

@@ -11,7 +11,7 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { Assistant } from '.';
 import type { IHttpFetchError } from '@kbn/core/public';
 
-import { useLoadConnectors } from '../connectorland/use_load_connectors';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 
 import type { UseQueryResult } from '@kbn/react-query';
 
@@ -37,7 +37,7 @@ import {
   STREAMING_LOCAL_STORAGE_KEY,
 } from '../assistant_context/constants';
 
-jest.mock('../connectorland/use_load_connectors');
+jest.mock('@kbn/inference-connectors');
 jest.mock('../connectorland/connector_setup');
 jest.mock('react-use/lib/useLocalStorage');
 jest.mock('react-use/lib/useSessionStorage');

@@ -22,6 +22,7 @@ import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import useEvent from 'react-use/lib/useEvent';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import { SharedConversationCallout } from './shared_conversation_callout';
 import { AssistantBody } from './assistant_body';
 import { useCurrentConversation } from './use_current_conversation';
@@ -35,7 +36,6 @@ import { ContextPills } from './context_pills';
 import { getNewSelectedPromptContext } from '../data_anonymization/get_new_selected_prompt_context';
 import type { PromptContext, SelectedPromptContext } from './prompt_context/types';
 import { QuickPrompts } from './quick_prompts/quick_prompts';
-import { useLoadConnectors } from '../connectorland/use_load_connectors';
 import { ConversationSidePanel } from './conversations/conversation_sidepanel';
 import { SelectedPromptContexts } from './prompt_editor/selected_prompt_contexts';
 import { AssistantHeader } from './assistant_header';
@@ -124,6 +124,7 @@ const AssistantComponent: React.FC<Props> = ({
   // Connector details
   const { data: connectors, isFetchedAfterMount: isFetchedConnectors } = useLoadConnectors({
     http,
+    featureId: 'elastic_assistant',
     settings,
   });
   const defaultConnector = useMemo(

@@ -76,7 +76,7 @@ const testProps = {
   setPaginationObserver: jest.fn(),
 };
 jest.mock('../../assistant_context');
-jest.mock('../../..', () => ({
+jest.mock('@kbn/inference-connectors', () => ({
   useLoadConnectors: jest.fn(() => {
     return {
       data: [],

@@ -18,10 +18,10 @@ import {
 
 import styled from 'styled-components';
 import { css } from '@emotion/react';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import { useConversationsUpdater } from './use_settings_updater/use_conversations_updater';
 import type { AIConnector } from '../../connectorland/connector_selector';
 import type { Conversation } from '../../..';
-import { useLoadConnectors } from '../../..';
 import * as i18n from './translations';
 import { useAssistantContext } from '../../assistant_context';
 import { TEST_IDS } from '../constants';
@@ -86,6 +86,7 @@ export const AssistantSettings: React.FC<Props> = React.memo(
 
     const { data: connectors } = useLoadConnectors({
       http,
+      featureId: 'elastic_assistant',
       settings,
     });
     const {

@@ -99,7 +99,7 @@ jest.mock('.', () => {
   };
 });
 
-jest.mock('../../connectorland/use_load_connectors', () => ({
+jest.mock('@kbn/inference-connectors', () => ({
   useLoadConnectors: jest.fn().mockReturnValue({ data: [] }),
 }));
 

@@ -16,9 +16,9 @@ import {
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { useLoadConnectors } from '@kbn/inference-connectors';
 import * as i18n from './translations';
 import { useAssistantContext } from '../../assistant_context';
-import { useLoadConnectors } from '../../connectorland/use_load_connectors';
 import { getDefaultConnector } from '../helpers';
 import { ConversationSettingsManagement } from '../conversations/conversation_settings_management';
 import { QuickPromptSettingsManagement } from '../quick_prompts/quick_prompt_settings_management';
@@ -69,6 +69,7 @@ export const AssistantSettingsManagement: React.FC<Props> = React.memo(
 
     const { data: connectors } = useLoadConnectors({
       http,
+      featureId: 'elastic_assistant',
       settings,
     });
     const defaultConnector = useMemo(
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ jest.mock('.', () => { @@
       };
     });
-    jest.mock('../../connectorland/use_load_connectors', () => ({
+    jest.mock('@kbn/inference-connectors', () => ({
       useLoadConnectors: jest.fn().mockReturnValue({ data: [] }),
     }));
@@ Expand Down @@