elastic · charlotte-hoblik · Jan 7, 2026 · Jan 7, 2026 · Jan 7, 2026 · Jan 7, 2026
@@ -71,7 +71,7 @@ The [{{es}}](/solutions/search.md) solution view (or project type in {{serverles
 
 ### Agent Builder
 
-[Agent Builder](/solutions/search/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, run queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
+[Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, run queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
 
 ### AI assistant for {{es}}
 

@@ -32,7 +32,7 @@
 
 ## Configuring MCP clients
 
-Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your Kibana URL and API key in the client's configuration file, typically in the following format:
+Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your {{kib}} URL and API key in the client's configuration file, typically in the following format:
 
 ```json
 {

@@ -69,7 +69,7 @@ The following models are not compatible with {{agent-builder}}:
 
 - **OpenAI**: GPT-5-chat
 
-Learn more about [incompatible LLMs](/solutions/search/agent-builder/limitations-known-issues.md#incompatible-llms).
+Learn more about [incompatible LLMs](/explore-analyze/ai-features/agent-builder/limitations-known-issues.md#incompatible-llms).
 
 ### Why model quality matters
 

@@ -10,7 +10,7 @@

 # Tools in {{agent-builder}}

 [Agents](agent-builder-agents.md) use tools to search, retrieve, and take meaningful steps on your behalf.

 Tools can be thought of as functions: modular, reusable actions that agents can call to interact with your {{es}} data.

@@ -191,7 +191,7 @@
 2. Select the edit icon to update the tool or the delete icon to remove it.
 3. For updates, modify the tool properties and save your changes.
 
-Note that built-in tools cannot be modified or deleted.
+Built-in tools cannot be modified or deleted.
 
 ## Tools API
 

@@ -20,7 +20,7 @@ Use custom **Index search tools** when:
 
 * You want agents to handle diverse, exploratory queries
 * The search intent varies significantly across requests
-* Users need flexible, ad-hoc search functionality
+* Users need flexible, dynamic search functionality
 * You want to scope general search capabilities to specific indices
 
 ## Key characteristics

@@ -170,6 +170,24 @@ toc:
       - file: cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md
   - file: ai-features.md
     children:
+      - file: ai-features/elastic-agent-builder.md
+        children:
+          - file: ai-features/agent-builder/get-started.md
+          - file: ai-features/agent-builder/models.md
+          - file: ai-features/agent-builder/chat.md
+          - file: ai-features/agent-builder/agent-builder-agents.md
+          - file: ai-features/agent-builder/tools.md
+            children:
+              - file: ai-features/agent-builder/tools/esql-tools.md
+              - file: ai-features/agent-builder/tools/index-search-tools.md
+          - file: ai-features/agent-builder/programmatic-access.md
+            children:
+               - file: ai-features/agent-builder/kibana-api.md
+               - file: ai-features/agent-builder/a2a-server.md
+               - file: ai-features/agent-builder/mcp-server.md
+          - file: ai-features/agent-builder/monitor-usage.md
+          - file: ai-features/agent-builder/permissions.md
+          - file: ai-features/agent-builder/limitations-known-issues.md
       - file: ai-features/ai-assistant.md
       - file: ai-features/manage-access-to-ai-assistant.md
       - file: ai-features/llm-guides/llm-connectors.md

@@ -631,3 +631,20 @@ redirects:
   # Move CCS feature docs to explore-analyze
   'solutions/search/cross-cluster-search.md': 'explore-analyze/cross-cluster-search.md'
   'solutions/search/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md': 'explore-analyze/cross-cluster-search/using-resolve-cluster-endpoint-before-cross-cluster-search.md'
+
+  # Related to agent builder restructure - moved agent builder docs to explore-analyze/
+  'solutions/search/elastic-agent-builder.md': 'explore-analyze/ai-features/elastic-agent-builder.md'
+  'solutions/search/agent-builder/tools/esql-tools.md': 'explore-analyze/ai-features/agent-builder/tools/esql-tools.md'
+  'solutions/search/agent-builder/tools/index-search-tools.md': 'explore-analyze/ai-features/agent-builder/tools/index-search-tools.md'
+  'solutions/search/agent-builder/a2a-server.md': 'explore-analyze/ai-features/agent-builder/a2a-server.md'
+  'solutions/search/agent-builder/agent-builder-agents.md': 'explore-analyze/ai-features/agent-builder/agent-builder-agents.md'
+  'solutions/search/agent-builder/chat.md': 'explore-analyze/ai-features/agent-builder/chat.md'
+  'solutions/search/agent-builder/get-started.md': 'explore-analyze/ai-features/agent-builder/get-started.md'
+  'solutions/search/agent-builder/kibana-api.md': 'explore-analyze/ai-features/agent-builder/kibana-api.md'
+  'solutions/search/agent-builder/limitations-known-issues.md': 'explore-analyze/ai-features/agent-builder/limitations-known-issues.md'
+  'solutions/search/agent-builder/mcp-server.md': 'explore-analyze/ai-features/agent-builder/mcp-server.md'
+  'solutions/search/agent-builder/models.md': 'explore-analyze/ai-features/agent-builder/models.md'
+  'solutions/search/agent-builder/monitor-usage.md': 'explore-analyze/ai-features/agent-builder/monitor-usage.md'
+  'solutions/search/agent-builder/permissions.md': 'explore-analyze/ai-features/agent-builder/permissions.md'
+  'solutions/search/agent-builder/programmatic-access.md': 'explore-analyze/ai-features/agent-builder/programmatic-access.md'
+  'solutions/search/agent-builder/tools.md': 'explore-analyze/ai-features/agent-builder/tools.md'
@@ -629,7 +629,7 @@ Review the changes, fixes, and more to {{serverless-full}}.
 
 ### Features and enhancements [serverless-changelog-10202025-features-enhancements]
 
-* [Agent Builder](/solutions/search/elastic-agent-builder.md) is now available in technical preview and is enabled by default on {{serverless-full}}
+* [Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) is now available in technical preview and is enabled by default on {{serverless-full}}
 * Lets you remove root privileges from {{fleet}} managed agents [#237790]({{kib-pull}}237790)
 * Adds the `xpack.fleet.experimentalFeatures` setting [#238840]({{kib-pull}}238840)
 * Supports expression suggestions within function parameters [#236343]({{kib-pull}}236343)

@@ -67,7 +67,7 @@ These tools are documented in the **Explore & Analyze** section:
 [Elastic Search UI](./site-or-app/search-ui.md) is a library of JavaScript and React tools for building search experiences, optimized for use with {{es}}.
 
 :::{tip}
-Check out the Elasticsearch Labs [blog](https://www.elastic.co/search-labs) to learn how to use Elastic to build advanced search experiences including generative AI, embedding models, reranking capabilities and more.
+Check out the {{es}} Labs [blog](https://www.elastic.co/search-labs) to learn how to use Elastic to build advanced search experiences including generative AI, embedding models, reranking capabilities and more.
 
 The accompanying [GitHub repository](https://www.github.com/elastic/elasticsearch-labs) contains hands-on Python notebooks and sample apps to help you get started with these advanced search features.
 :::
@@ -76,7 +76,7 @@ The accompanying [GitHub repository](https://www.github.com/elastic/elasticsearc
 
 ### Agent Builder
 
-[Agent Builder](elastic-agent-builder.md) enables you to create AI agents that can interact with your Elasticsearch data, execute queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
+[Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) enables you to create AI agents that can interact with your {{es}} data, execute queries, and provide intelligent responses. It provides a complete framework for building conversational AI experiences on top of your search infrastructure.
 
 ### Playground
 

@@ -14,7 +14,7 @@ Elastic offers two MCP server options for connecting agents to your {{es}} data.
 stack: preview 9.2
 serverless: preview
 ```
-Elastic 9.2.0+ and Serverless deployments provide an [Agent Builder MCP server endpoint](https://www.elastic.co/docs/solutions/search/agent-builder/mcp-server) that exposes all built-in and custom [tools](https://www.elastic.co/docs/solutions/search/agent-builder/tools) you can use to power agentic workflows.
+Elastic 9.2.0+ and Serverless deployments provide an [Agent Builder MCP server endpoint](https://www.elastic.co/docs/solutions/explore-analyze/ai-features/agent-builder/mcp-server) that exposes all built-in and custom [tools](https://www.elastic.co/docs/solutions/explore-analyze/ai-features/agent-builder/tools) you can use to power agentic workflows.
 
 ## {{es}} MCP server
 

@@ -55,7 +55,7 @@ The summary provides a consolidated view of the entity's security posture, helpi
 * Recommended next steps based on the entity's security posture, such as updating vulnerable packages, investigating specific alerts, or implementing additional security controls
 
 ::::{tip}
-If you have [AI Assistant](/solutions/security/ai/ai-assistant.md) or [Agent Builder](/solutions/search/elastic-agent-builder.md) set up, you can select **More actions** ({icon}`boxes_vertical`) → **Ask AI Assistant** or **Add to chat** to continue the conversation about the entity in AI Assistant or Agent Builder.
+If you have [AI Assistant](/solutions/security/ai/ai-assistant.md) or [Agent Builder](/explore-analyze/ai-features/elastic-agent-builder.md) set up, you can select **More actions** ({icon}`boxes_vertical`) → **Ask AI Assistant** or **Add to chat** to continue the conversation about the entity in AI Assistant or Agent Builder.
 ::::
 
 :::{image} /solutions/images/security-entity-summary.png

@@ -1,3 +1,3 @@
 project: "Solutions and use cases"
 toc:
  - file: index.md
@@ -62,24 +62,6 @@
           - file: search/esql-for-search.md
           - file: search/retrievers-overview.md
           - file: search/search-templates.md
-      - file: search/elastic-agent-builder.md
-        children:
-          - file: search/agent-builder/get-started.md
-          - file: search/agent-builder/models.md
-          - file: search/agent-builder/chat.md
-          - file: search/agent-builder/agent-builder-agents.md
-          - file: search/agent-builder/tools.md
-            children:
-              - file: search/agent-builder/tools/esql-tools.md
-              - file: search/agent-builder/tools/index-search-tools.md
-          - file: search/agent-builder/programmatic-access.md
-            children:
-              - file: search/agent-builder/kibana-api.md
-              - file: search/agent-builder/a2a-server.md
-              - file: search/agent-builder/mcp-server.md
-          - file: search/agent-builder/monitor-usage.md
-          - file: search/agent-builder/permissions.md
-          - file: search/agent-builder/limitations-known-issues.md
       - file: search/rag.md
         children:
           - file: search/rag/playground.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
     ## Configuring MCP clients
-    Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your Kibana URL and API key in the client's configuration file, typically in the following format:
+    Most MCP clients (such as Claude Desktop, Cursor, VS Code, etc.) have similar configuration patterns. To connect to your Elastic instance, you need to provide your {{kib}} URL and API key in the client's configuration file, typically in the following format:
     ```json
     {
@@ Expand Down @@