elastic · stratoula · Jan 14, 2026 · Dec 17, 2025 · Dec 17, 2025 · Dec 17, 2025
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -794,6 +794,7 @@ src/platform/plugins/shared/home @elastic/appex-sharedux
 src/platform/plugins/shared/inspector @elastic/kibana-presentation
 src/platform/plugins/shared/kibana_react @elastic/appex-sharedux
 src/platform/plugins/shared/kibana_utils @elastic/appex-sharedux
+src/platform/plugins/shared/kql @elastic/kibana-presentation
 src/platform/plugins/shared/management @elastic/kibana-management
 src/platform/plugins/shared/navigation @elastic/appex-sharedux
 src/platform/plugins/shared/newsfeed @elastic/kibana-core

@@ -172,7 +172,7 @@
 # =================== Search Autocomplete ===================
 # Time in milliseconds to wait for autocomplete suggestions from Elasticsearch.
 # This value must be a whole number greater than zero. Defaults to 1000ms
-#unifiedSearch.autocomplete.valueSuggestions.timeout: 1000
+# unifiedSearch.autocomplete.valueSuggestions.timeout: 1000
 
 # Maximum number of documents loaded by each shard to generate autocomplete suggestions.
 # This value must be a whole number greater than zero. Defaults to 100_000

diff --git a/docs/extend/plugin-list.md b/docs/extend/plugin-list.md
@@ -64,6 +64,7 @@ mapped_pages:
 | [kibanaReact](https://github.com/elastic/kibana/blob/main/src/platform/plugins/shared/kibana_react/README.md) | Tools for building React applications in Kibana. |
 | [kibanaUsageCollection](https://github.com/elastic/kibana/blob/main/src/platform/plugins/private/kibana_usage_collection/README.md) | This plugin registers the Platform Usage Collectors in Kibana. |
 | [kibanaUtils](https://github.com/elastic/kibana/blob/main/src/platform/plugins/shared/kibana_utils/README.md) | Utilities for building Kibana plugins. |
+| [kql](https://github.com/elastic/kibana/blob/main/src/platform/plugins/shared/kql/README.md) | This plugin contains the kql autocomplete service and the UI KQL searchbar. |
 | [links](https://github.com/elastic/kibana/blob/main/src/platform/plugins/private/links/README.md) | This plugin adds the Links panel which allows authors to create hard links to navigate on click and bring all context from the source dashboard to the destination dashboard. |
 | [management](https://github.com/elastic/kibana/blob/main/src/platform/plugins/shared/management/README.md) | This plugins contains the "Stack Management" page framework. It offers navigation and an API to link individual management section into it. This plugin does not contain any individual management section itself. |
 | [mapsEms](https://github.com/elastic/kibana/blob/main/src/platform/plugins/private/maps_ems/README.md) | Utility plugin: |

diff --git a/package.json b/package.json
@@ -705,6 +705,7 @@
     "@kbn/kibana-react-plugin": "link:src/platform/plugins/shared/kibana_react",
     "@kbn/kibana-usage-collection-plugin": "link:src/platform/plugins/private/kibana_usage_collection",
     "@kbn/kibana-utils-plugin": "link:src/platform/plugins/shared/kibana_utils",
+    "@kbn/kql": "link:src/platform/plugins/shared/kql",
     "@kbn/kubernetes-security-plugin": "link:x-pack/solutions/security/plugins/kubernetes_security",
     "@kbn/langchain": "link:x-pack/platform/packages/shared/kbn-langchain",
     "@kbn/langgraph-checkpoint-saver": "link:x-pack/platform/packages/shared/kbn-langgraph-checkpoint-saver",

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -55,7 +55,7 @@ pageLoadAssetSize:
   embeddableAlertsTable: 6524
   embeddableEnhanced: 8448
   enterpriseSearch: 40244
-  entityStore: 4075
+  entityStore: 1755
   esql: 18224
   esqlDataGrid: 10209
   esUiShared: 101220
@@ -81,7 +81,7 @@ pageLoadAssetSize:
   globalSearch: 6890
   globalSearchBar: 26986
   globalSearchProviders: 4646
-  graph: 9946
+  graph: 9924
   grokdebugger: 5484
   home: 13560
   imageEmbeddable: 6000
@@ -99,6 +99,7 @@ pageLoadAssetSize:
   kibanaReact: 22503
   kibanaUsageCollection: 1736
   kibanaUtils: 54848
+  kql: 15485
   kubernetesSecurity: 6807
   lens: 71718
   licenseManagement: 8265
@@ -130,7 +131,7 @@ pageLoadAssetSize:
   osquery: 47422
   painlessLab: 6299
   presentationPanel: 11418
-  presentationUtil: 9948
+  presentationUtil: 9285
   productDocBase: 5678
   productIntercept: 9860
   profiling: 20716
@@ -185,7 +186,7 @@ pageLoadAssetSize:
   uiActions: 24670
   uiActionsEnhanced: 20189
   unifiedDocViewer: 14513
-  unifiedSearch: 25000
+  unifiedSearch: 19500
   upgradeAssistant: 6898
   uptime: 48171
   urlDrilldown: 18939

diff --git a/src/platform/packages/shared/kbn-alerts-ui-shared/moon.yml b/src/platform/packages/shared/kbn-alerts-ui-shared/moon.yml
@@ -48,6 +48,7 @@ dependsOn:
   - '@kbn/controls-schemas'
   - '@kbn/control-group-renderer'
   - '@kbn/react-query'
+  - '@kbn/kql'
   - '@kbn/es-ui-shared-plugin'
 tags:
   - shared-browser

@@ -9,7 +9,7 @@
 
 import { useCallback, useMemo, useState } from 'react';
 import type { Query, TimeRange } from '@kbn/es-query';
-import type { SuggestionsAbstraction } from '@kbn/unified-search-plugin/public/typeahead/suggestions_component';
+import type { SuggestionsAbstraction } from '@kbn/kql/public/components/typeahead/suggestions_component';
 import { isSiemRuleType } from '@kbn/rule-data-utils';
 import { NO_INDEX_PATTERNS } from './constants';
 import { SEARCH_BAR_PLACEHOLDER } from './translations';

@@ -37,6 +37,7 @@
     "@kbn/controls-schemas",
     "@kbn/control-group-renderer",
     "@kbn/react-query",
+    "@kbn/kql",
     "@kbn/es-ui-shared-plugin"
   ]
 }
@@ -23,7 +23,7 @@ import { act } from 'react-dom/test-utils';
 import { EuiButtonGroup, EuiThemeProvider } from '@elastic/eui';
 import { render, screen } from '@testing-library/react';
 
-jest.mock('@kbn/unified-search-plugin/public', () => ({
+jest.mock('@kbn/kql/public', () => ({
   QueryStringInput: () => {
     return 'QueryStringInput';
   },
@@ -66,7 +66,6 @@ describe('AnnotationsPanel', () => {
     uiSettings: {},
     storage: {},
     dataViews: {},
-    unifiedSearch: {},
     docLinks: {},
     notifications: {},
     data: {},

diff --git a/src/platform/packages/shared/kbn-lens-common/moon.yml b/src/platform/packages/shared/kbn-lens-common/moon.yml
@@ -66,6 +66,7 @@ dependsOn:
   - '@kbn/chart-icons'
   - '@kbn/alerts-ui-shared'
   - '@kbn/cps'
+  - '@kbn/kql'
   - '@kbn/control-group-renderer'
 tags:
   - shared-common

@@ -64,6 +64,7 @@
     "@kbn/chart-icons",
     "@kbn/alerts-ui-shared",
     "@kbn/cps",
+    "@kbn/kql",
     "@kbn/control-group-renderer"
   ]
 }
@@ -71,6 +71,7 @@ import type { NavigationPublicPluginStart, TopNavMenuData } from '@kbn/navigatio
 import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 import type { ServerlessPluginStart } from '@kbn/serverless/public';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { KqlPluginStart } from '@kbn/kql/public';
 import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
@@ -177,6 +178,7 @@ export interface LensAppServices extends StartServices {
   lensDocumentService: ILensDocumentService;
   serverless?: ServerlessPluginStart;
   cps?: CPSPluginStart;
+  kql: KqlPluginStart;
 }
 
 export type StartServices = Pick<

@@ -11,10 +11,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
 import type { Query } from '@kbn/es-query';
-import {
-  type UnifiedSearchPublicPluginStart,
-  QueryStringInput,
-} from '@kbn/unified-search-plugin/public';
+import type { KqlPluginStart } from '@kbn/kql/public';
+import { QueryStringInput } from '@kbn/kql/public';
 import type { HttpStart } from '@kbn/core-http-browser';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
@@ -31,7 +29,7 @@ export interface QueryInputServices {
   data: DataPublicPluginStart;
   uiSettings: IUiSettingsClient;
   notifications: NotificationsStart;
-  unifiedSearch: UnifiedSearchPublicPluginStart;
+  kql: KqlPluginStart;
   docLinks: DocLinksStart;
 }
 
@@ -45,7 +43,7 @@ export const QueryInput = ({
   ['data-test-subj']: dataTestSubj,
   placeholder,
   appName,
-  services: { data, uiSettings, http, notifications, docLinks, storage, unifiedSearch, dataViews },
+  services: { data, uiSettings, http, notifications, docLinks, storage, kql, dataViews },
 }: {
   value: Query;
   onChange: (input: Query) => void;
@@ -93,7 +91,16 @@ export const QueryInput = ({
       }
       languageSwitcherPopoverAnchorPosition="rightDown"
       appName={appName}
-      deps={{ unifiedSearch, notifications, http, docLinks, uiSettings, data, storage, dataViews }}
+      deps={{
+        autocomplete: kql.autocomplete,
+        notifications,
+        http,
+        docLinks,
+        uiSettings,
+        data,
+        storage,
+        dataViews,
+      }}
     />
   );
 };
diff --git a/src/platform/packages/shared/kbn-visualization-ui-components/moon.yml b/src/platform/packages/shared/kbn-visualization-ui-components/moon.yml
@@ -19,7 +19,6 @@ project:
     sourceRoot: src/platform/packages/shared/kbn-visualization-ui-components
 dependsOn:
   - '@kbn/i18n'
-  - '@kbn/unified-search-plugin'
   - '@kbn/utility-types'
   - '@kbn/es-query'
   - '@kbn/core-http-browser'
@@ -36,6 +35,7 @@ dependsOn:
   - '@kbn/calculate-width-from-char-count'
   - '@kbn/visualization-utils'
   - '@kbn/shared-ux-button-toolbar'
+  - '@kbn/kql'
 tags:
   - shared-browser
   - package

@@ -18,7 +18,6 @@
   ],
   "kbn_references": [
     "@kbn/i18n",
-    "@kbn/unified-search-plugin",
     "@kbn/utility-types",
     "@kbn/es-query",
     "@kbn/core-http-browser",
@@ -34,6 +33,7 @@
     "@kbn/field-utils",
     "@kbn/calculate-width-from-char-count",
     "@kbn/visualization-utils",
-    "@kbn/shared-ux-button-toolbar"
+    "@kbn/shared-ux-button-toolbar",
+    "@kbn/kql"
   ],
 }
@@ -18,7 +18,7 @@
       "presentationUtil",
       "visualizations",
       "dataViews",
-      "unifiedSearch",
+      "kql",
       "kibanaUtils",
       "contentManagement"
     ],

diff --git a/src/platform/plugins/private/event_annotation_listing/moon.yml b/src/platform/plugins/private/event_annotation_listing/moon.yml
@@ -33,7 +33,6 @@ dependsOn:
   - '@kbn/saved-objects-tagging-oss-plugin'
   - '@kbn/core-lifecycle-browser'
   - '@kbn/kibana-utils-plugin'
-  - '@kbn/unified-search-plugin'
   - '@kbn/content-management-table-list-view-table'
   - '@kbn/content-management-tabbed-table-list-view'
   - '@kbn/content-management-plugin'
@@ -49,6 +48,7 @@ dependsOn:
   - '@kbn/core-notifications-browser'
   - '@kbn/content-management-table-list-view-common'
   - '@kbn/test-eui-helpers'
+  - '@kbn/kql'
 tags:
   - plugin
   - prod

@@ -16,10 +16,10 @@ import type { ContentManagementPublicStart } from '@kbn/content-management-plugi
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public/types';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
-import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { i18n } from '@kbn/i18n';
 import type { EventAnnotationPluginStart } from '@kbn/event-annotation-plugin/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { KqlPluginStart } from '@kbn/kql/public';
 import type { EventAnnotationListingPageServices } from './get_table_list';
 
 export interface EventAnnotationListingStartDependencies {
@@ -29,7 +29,7 @@ export interface EventAnnotationListingStartDependencies {
   savedObjectsTagging: SavedObjectTaggingPluginStart;
   presentationUtil: PresentationUtilPluginStart;
   dataViews: DataViewsPublicPluginStart;
-  unifiedSearch: UnifiedSearchPublicPluginStart;
+  kql: KqlPluginStart;
   contentManagement: ContentManagementPublicStart;
   lens: LensPublicStart;
 }
@@ -83,7 +83,7 @@ export class EventAnnotationListingPlugin
             notifications: coreStart.notifications,
             uiSettings: coreStart.uiSettings,
             dataViews: pluginsStart.dataViews,
-            unifiedSearch: pluginsStart.unifiedSearch,
+            kql: pluginsStart.kql,
             data: pluginsStart.data,
             storage: new Storage(localStorage),
           },

@@ -24,7 +24,6 @@
     "@kbn/saved-objects-tagging-oss-plugin",
     "@kbn/core-lifecycle-browser",
     "@kbn/kibana-utils-plugin",
-    "@kbn/unified-search-plugin",
     "@kbn/content-management-table-list-view-table",
     "@kbn/content-management-tabbed-table-list-view",
     "@kbn/content-management-plugin",
@@ -39,7 +38,8 @@
     "@kbn/core-notifications-browser-mocks",
     "@kbn/core-notifications-browser",
     "@kbn/content-management-table-list-view-common",
-    "@kbn/test-eui-helpers"
+    "@kbn/test-eui-helpers",
+    "@kbn/kql"
   ],
   "exclude": [
     "target/**/*",

@@ -17,6 +17,7 @@
       "visDefaultEditor",
       "visualizations",
       "unifiedSearch",
+      "kql",
       "uiActions"
     ],
     "requiredBundles": [

diff --git a/src/platform/plugins/private/input_control_vis/moon.yml b/src/platform/plugins/private/input_control_vis/moon.yml
@@ -36,6 +36,7 @@ dependsOn:
   - '@kbn/presentation-publishing'
   - '@kbn/react-kibana-context-render'
   - '@kbn/visualizations-common'
+  - '@kbn/kql'
 tags:
   - plugin
   - prod

@@ -14,6 +14,7 @@ import type {
   UnifiedSearchPublicPluginStart,
   UnifiedSearchPluginSetup,
 } from '@kbn/unified-search-plugin/public';
+import type { KqlPluginSetup, KqlPluginStart } from '@kbn/kql/public';
 import type { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
 import type { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
 import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
@@ -34,6 +35,7 @@ export interface InputControlVisDependencies {
   core: InputControlVisCoreSetup;
   data: DataPublicPluginSetup;
   unifiedSearch: UnifiedSearchPluginSetup;
+  kql: KqlPluginSetup;
   getSettings: () => Promise<InputControlSettings>;
 }
 
@@ -43,6 +45,7 @@ export interface InputControlVisPluginSetupDependencies {
   visualizations: VisualizationsSetup;
   data: DataPublicPluginSetup;
   unifiedSearch: UnifiedSearchPluginSetup;
+  kql: KqlPluginSetup;
 }
 
 /** @internal */
@@ -51,6 +54,7 @@ export interface InputControlVisPluginStartDependencies {
   visualizations: VisualizationsStart;
   data: DataPublicPluginStart;
   unifiedSearch: UnifiedSearchPublicPluginStart;
+  kql: KqlPluginStart;
   uiActions: UiActionsStart;
 }
 
@@ -60,13 +64,20 @@ export class InputControlVisPlugin implements Plugin<void, void> {
 
   public setup(
     core: InputControlVisCoreSetup,
-    { expressions, visualizations, unifiedSearch, data }: InputControlVisPluginSetupDependencies
+    {
+      expressions,
+      visualizations,
+      unifiedSearch,
+      data,
+      kql,
+    }: InputControlVisPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<InputControlVisDependencies> = {
       core,
       unifiedSearch,
+      kql,
       getSettings: async () => {
-        const { timeout, terminateAfter } = unifiedSearch.autocomplete.getAutocompleteSettings();
+        const { timeout, terminateAfter } = kql.autocomplete.getAutocompleteSettings();
         return { autocompleteTimeout: timeout, autocompleteTerminateAfter: terminateAfter };
       },
       data,

@@ -28,6 +28,7 @@
     "@kbn/presentation-publishing",
     "@kbn/react-kibana-context-render",
     "@kbn/visualizations-common",
+    "@kbn/kql",
   ],
   "exclude": [
     "target/**/*",

@@ -13,7 +13,7 @@
     "server": false,
     "requiredPlugins": [
       "dataViews",
-      "unifiedSearch"
+      "kql"
     ],
     "optionalPlugins": [
       "visualizations"