From eddaa48108062e88b72f966d06d1b1552c7f3db4 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Mon, 12 Oct 2020 07:33:41 -0700
Subject: [PATCH] updating error types

---
 ...ins-expressions-public.executor.extract.md | 28 +++++++
 ...gins-expressions-public.executor.inject.md | 23 ++++++
 ...gin-plugins-expressions-public.executor.md |  5 +-
 ...s-expressions-public.executor.telemetry.md | 23 ++++++
 ...ns-public.expressionastexpression.chain.md | 11 ---
 ...ressions-public.expressionastexpression.md | 15 ++--
 ...ons-public.expressionastexpression.type.md | 11 ---
 ...-public.expressionastfunction.arguments.md | 11 ---
 ...ions-public.expressionastfunction.debug.md | 13 ----
 ...s-public.expressionastfunction.function.md | 11 ---
 ...xpressions-public.expressionastfunction.md | 19 ++---
 ...ons-public.expressionfunction.disabled.md} |  6 +-
 ...sions-public.expressionfunction.extract.md | 14 ++++
 ...ssions-public.expressionfunction.inject.md | 11 +++
 ...s-expressions-public.expressionfunction.md |  6 +-
 ...ons-public.expressionfunction.telemetry.md | 11 +++
 ...c.expressionfunctiondefinition.disabled.md | 13 ++++
 ...ons-public.expressionfunctiondefinition.md |  3 +-
 ...sions-public.expressionsservice.extract.md | 16 ++++
 ...ssions-public.expressionsservice.inject.md | 13 ++++
 ...s-expressions-public.expressionsservice.md |  5 +-
 ...ons-public.expressionsservice.telemetry.md | 13 ++++
 ...expressions-public.expressionvalueerror.md | 10 +--
 ...ibana-plugin-plugins-expressions-public.md |  4 +-
 ...ins-expressions-server.executor.extract.md | 28 +++++++
 ...gins-expressions-server.executor.inject.md | 23 ++++++
 ...gin-plugins-expressions-server.executor.md |  5 +-
 ...s-expressions-server.executor.telemetry.md | 23 ++++++
 ...ns-server.expressionastexpression.chain.md | 11 ---
 ...ressions-server.expressionastexpression.md | 15 ++--
 ...ons-server.expressionastexpression.type.md | 11 ---
 ...-server.expressionastfunction.arguments.md | 11 ---
 ...ions-server.expressionastfunction.debug.md | 13 ----
 ...s-server.expressionastfunction.function.md | 11 ---
 ...xpressions-server.expressionastfunction.md | 19 ++---
 ...ons-server.expressionfunction.disabled.md} |  6 +-
 ...sions-server.expressionfunction.extract.md | 14 ++++
 ...ssions-server.expressionfunction.inject.md | 11 +++
 ...s-expressions-server.expressionfunction.md |  6 +-
 ...ons-server.expressionfunction.telemetry.md | 11 +++
 ...r.expressionfunctiondefinition.disabled.md | 13 ++++
 ...ons-server.expressionfunctiondefinition.md |  3 +-
 ...expressions-server.expressionvalueerror.md | 10 +--
 ...ibana-plugin-plugins-expressions-server.md |  4 +-
 .../expressions/common/execution/execution.ts |  2 +
 .../common/execution/execution_contract.ts    |  2 +-
 .../common/expression_types/specs/error.ts    |  9 +--
 .../expressions/common/util/create_error.ts   | 14 +++-
 src/plugins/expressions/public/public.api.md  | 77 ++++++++++++-------
 src/plugins/expressions/server/server.api.md  | 69 +++++++++++------
 50 files changed, 463 insertions(+), 253 deletions(-)
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.extract.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.inject.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.telemetry.md
 delete mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md
 delete mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.type.md
 delete mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md
 delete mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md
 delete mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.function.md
 rename docs/development/plugins/expressions/public/{kibana-plugin-plugins-expressions-public.expressionastfunction.type.md => kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md} (52%)
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.extract.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.inject.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.extract.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.inject.md
 create mode 100644 docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.extract.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.inject.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.telemetry.md
 delete mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md
 delete mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.type.md
 delete mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md
 delete mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md
 delete mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.function.md
 rename docs/development/plugins/expressions/server/{kibana-plugin-plugins-expressions-server.expressionastfunction.type.md => kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md} (52%)
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.extract.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.inject.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md
 create mode 100644 docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md

diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.extract.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.extract.md
new file mode 100644
index 0000000000000..6f30bd49013b0
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.extract.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [Executor](./kibana-plugin-plugins-expressions-public.executor.md) &gt; [extract](./kibana-plugin-plugins-expressions-public.executor.extract.md)
+
+## Executor.extract() method
+
+<b>Signature:</b>
+
+```typescript
+extract(ast: ExpressionAstExpression): {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+
+<b>Returns:</b>
+
+`{
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    }`
+
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.inject.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.inject.md
new file mode 100644
index 0000000000000..8f5a8a3e06724
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.inject.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [Executor](./kibana-plugin-plugins-expressions-public.executor.md) &gt; [inject](./kibana-plugin-plugins-expressions-public.executor.inject.md)
+
+## Executor.inject() method
+
+<b>Signature:</b>
+
+```typescript
+inject(ast: ExpressionAstExpression, references: SavedObjectReference[]): ExpressionAstExpression;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+|  references | <code>SavedObjectReference[]</code> |  |
+
+<b>Returns:</b>
+
+`ExpressionAstExpression`
+
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.md
index b71c8c79c068f..2f96ad6e040bd 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-export declare class Executor<Context extends Record<string, unknown> = Record<string, unknown>> 
+export declare class Executor<Context extends Record<string, unknown> = Record<string, unknown>> implements PersistableState<ExpressionAstExpression> 
 ```
 
 ## Constructors
@@ -32,12 +32,15 @@ export declare class Executor<Context extends Record<string, unknown> = Record<s
 |  [createExecution(ast, context, { debug })](./kibana-plugin-plugins-expressions-public.executor.createexecution.md) |  |  |
 |  [createWithDefaults(state)](./kibana-plugin-plugins-expressions-public.executor.createwithdefaults.md) | <code>static</code> |  |
 |  [extendContext(extraContext)](./kibana-plugin-plugins-expressions-public.executor.extendcontext.md) |  |  |
+|  [extract(ast)](./kibana-plugin-plugins-expressions-public.executor.extract.md) |  |  |
 |  [fork()](./kibana-plugin-plugins-expressions-public.executor.fork.md) |  |  |
 |  [getFunction(name)](./kibana-plugin-plugins-expressions-public.executor.getfunction.md) |  |  |
 |  [getFunctions()](./kibana-plugin-plugins-expressions-public.executor.getfunctions.md) |  |  |
 |  [getType(name)](./kibana-plugin-plugins-expressions-public.executor.gettype.md) |  |  |
 |  [getTypes()](./kibana-plugin-plugins-expressions-public.executor.gettypes.md) |  |  |
+|  [inject(ast, references)](./kibana-plugin-plugins-expressions-public.executor.inject.md) |  |  |
 |  [registerFunction(functionDefinition)](./kibana-plugin-plugins-expressions-public.executor.registerfunction.md) |  |  |
 |  [registerType(typeDefinition)](./kibana-plugin-plugins-expressions-public.executor.registertype.md) |  |  |
 |  [run(ast, input, context)](./kibana-plugin-plugins-expressions-public.executor.run.md) |  | Execute expression and return result. |
+|  [telemetry(ast, telemetryData)](./kibana-plugin-plugins-expressions-public.executor.telemetry.md) |  |  |
 
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.telemetry.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.telemetry.md
new file mode 100644
index 0000000000000..de4c640f4fe97
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.executor.telemetry.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [Executor](./kibana-plugin-plugins-expressions-public.executor.md) &gt; [telemetry](./kibana-plugin-plugins-expressions-public.executor.telemetry.md)
+
+## Executor.telemetry() method
+
+<b>Signature:</b>
+
+```typescript
+telemetry(ast: ExpressionAstExpression, telemetryData: Record<string, any>): Record<string, any>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+|  telemetryData | <code>Record&lt;string, any&gt;</code> |  |
+
+<b>Returns:</b>
+
+`Record<string, any>`
+
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md
deleted file mode 100644
index b50ac83036ffe..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md) &gt; [chain](./kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md)
-
-## ExpressionAstExpression.chain property
-
-<b>Signature:</b>
-
-```typescript
-chain: ExpressionAstFunction[];
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.md
index 537659c51dce8..623c49bf08cdd 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.md
@@ -2,18 +2,13 @@
 
 [Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md)
 
-## ExpressionAstExpression interface
+## ExpressionAstExpression type
 
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionAstExpression 
+export declare type ExpressionAstExpression = {
+    type: 'expression';
+    chain: ExpressionAstFunction[];
+};
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [chain](./kibana-plugin-plugins-expressions-public.expressionastexpression.chain.md) | <code>ExpressionAstFunction[]</code> |  |
-|  [type](./kibana-plugin-plugins-expressions-public.expressionastexpression.type.md) | <code>'expression'</code> |  |
-
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.type.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.type.md
deleted file mode 100644
index 34a86e235a911..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastexpression.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md) &gt; [type](./kibana-plugin-plugins-expressions-public.expressionastexpression.type.md)
-
-## ExpressionAstExpression.type property
-
-<b>Signature:</b>
-
-```typescript
-type: 'expression';
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md
deleted file mode 100644
index 72b44e8319542..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) &gt; [arguments](./kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md)
-
-## ExpressionAstFunction.arguments property
-
-<b>Signature:</b>
-
-```typescript
-arguments: Record<string, ExpressionAstArgument[]>;
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md
deleted file mode 100644
index 36101a110979a..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) &gt; [debug](./kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md)
-
-## ExpressionAstFunction.debug property
-
-Debug information added to each function when expression is executed in \*debug mode\*.
-
-<b>Signature:</b>
-
-```typescript
-debug?: ExpressionAstFunctionDebug;
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.function.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.function.md
deleted file mode 100644
index 1840fff4b625f..0000000000000
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.function.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) &gt; [function](./kibana-plugin-plugins-expressions-public.expressionastfunction.function.md)
-
-## ExpressionAstFunction.function property
-
-<b>Signature:</b>
-
-```typescript
-function: string;
-```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.md
index 1004e58759806..d21f2c1750161 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.md
@@ -2,20 +2,15 @@
 
 [Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md)
 
-## ExpressionAstFunction interface
+## ExpressionAstFunction type
 
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionAstFunction 
+export declare type ExpressionAstFunction = {
+    type: 'function';
+    function: string;
+    arguments: Record<string, ExpressionAstArgument[]>;
+    debug?: ExpressionAstFunctionDebug;
+};
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [arguments](./kibana-plugin-plugins-expressions-public.expressionastfunction.arguments.md) | <code>Record&lt;string, ExpressionAstArgument[]&gt;</code> |  |
-|  [debug](./kibana-plugin-plugins-expressions-public.expressionastfunction.debug.md) | <code>ExpressionAstFunctionDebug</code> | Debug information added to each function when expression is executed in \*debug mode\*. |
-|  [function](./kibana-plugin-plugins-expressions-public.expressionastfunction.function.md) | <code>string</code> |  |
-|  [type](./kibana-plugin-plugins-expressions-public.expressionastfunction.type.md) | <code>'function'</code> |  |
-
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.type.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md
similarity index 52%
rename from docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.type.md
rename to docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md
index f7f8786430191..f07d5b3b36d04 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionastfunction.type.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md
@@ -1,11 +1,11 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) &gt; [type](./kibana-plugin-plugins-expressions-public.expressionastfunction.type.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-public.expressionfunction.md) &gt; [disabled](./kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md)
 
-## ExpressionAstFunction.type property
+## ExpressionFunction.disabled property
 
 <b>Signature:</b>
 
 ```typescript
-type: 'function';
+disabled: boolean;
 ```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.extract.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.extract.md
new file mode 100644
index 0000000000000..c5d726849cdc2
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.extract.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-public.expressionfunction.md) &gt; [extract](./kibana-plugin-plugins-expressions-public.expressionfunction.extract.md)
+
+## ExpressionFunction.extract property
+
+<b>Signature:</b>
+
+```typescript
+extract: (state: ExpressionAstFunction['arguments']) => {
+        state: ExpressionAstFunction['arguments'];
+        references: SavedObjectReference[];
+    };
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.inject.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.inject.md
new file mode 100644
index 0000000000000..6f27a6fbab96a
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.inject.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-public.expressionfunction.md) &gt; [inject](./kibana-plugin-plugins-expressions-public.expressionfunction.inject.md)
+
+## ExpressionFunction.inject property
+
+<b>Signature:</b>
+
+```typescript
+inject: (state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) => ExpressionAstFunction['arguments'];
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.md
index 5ca67e40c93ec..1815d63d804b1 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-export declare class ExpressionFunction 
+export declare class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> 
 ```
 
 ## Constructors
@@ -23,9 +23,13 @@ export declare class ExpressionFunction
 |  [accepts](./kibana-plugin-plugins-expressions-public.expressionfunction.accepts.md) |  | <code>(type: string) =&gt; boolean</code> |  |
 |  [aliases](./kibana-plugin-plugins-expressions-public.expressionfunction.aliases.md) |  | <code>string[]</code> | Aliases that can be used instead of <code>name</code>. |
 |  [args](./kibana-plugin-plugins-expressions-public.expressionfunction.args.md) |  | <code>Record&lt;string, ExpressionFunctionParameter&gt;</code> | Specification of expression function parameters. |
+|  [disabled](./kibana-plugin-plugins-expressions-public.expressionfunction.disabled.md) |  | <code>boolean</code> |  |
+|  [extract](./kibana-plugin-plugins-expressions-public.expressionfunction.extract.md) |  | <code>(state: ExpressionAstFunction['arguments']) =&gt; {</code><br/><code>        state: ExpressionAstFunction['arguments'];</code><br/><code>        references: SavedObjectReference[];</code><br/><code>    }</code> |  |
 |  [fn](./kibana-plugin-plugins-expressions-public.expressionfunction.fn.md) |  | <code>(input: ExpressionValue, params: Record&lt;string, any&gt;, handlers: object) =&gt; ExpressionValue</code> | Function to run function (context, args) |
 |  [help](./kibana-plugin-plugins-expressions-public.expressionfunction.help.md) |  | <code>string</code> | A short help text. |
+|  [inject](./kibana-plugin-plugins-expressions-public.expressionfunction.inject.md) |  | <code>(state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) =&gt; ExpressionAstFunction['arguments']</code> |  |
 |  [inputTypes](./kibana-plugin-plugins-expressions-public.expressionfunction.inputtypes.md) |  | <code>string[] &#124; undefined</code> | Type of inputs that this function supports. |
 |  [name](./kibana-plugin-plugins-expressions-public.expressionfunction.name.md) |  | <code>string</code> | Name of function |
+|  [telemetry](./kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md) |  | <code>(state: ExpressionAstFunction['arguments'], telemetryData: Record&lt;string, any&gt;) =&gt; Record&lt;string, any&gt;</code> |  |
 |  [type](./kibana-plugin-plugins-expressions-public.expressionfunction.type.md) |  | <code>string</code> | Return type of function. This SHOULD be supplied. We use it for UI and autocomplete hinting. We may also use it for optimizations in the future. |
 
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md
new file mode 100644
index 0000000000000..249c99f50fc7b
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-public.expressionfunction.md) &gt; [telemetry](./kibana-plugin-plugins-expressions-public.expressionfunction.telemetry.md)
+
+## ExpressionFunction.telemetry property
+
+<b>Signature:</b>
+
+```typescript
+telemetry: (state: ExpressionAstFunction['arguments'], telemetryData: Record<string, any>) => Record<string, any>;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md
new file mode 100644
index 0000000000000..e6aefd17fceb2
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionFunctionDefinition](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md) &gt; [disabled](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md)
+
+## ExpressionFunctionDefinition.disabled property
+
+if set to true function will be disabled (but its migrate function will still be available)
+
+<b>Signature:</b>
+
+```typescript
+disabled?: boolean;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md
index bc801542f81ac..449cc66cb3335 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md
@@ -9,7 +9,7 @@
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> 
+export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> extends PersistableStateDefinition<ExpressionAstFunction['arguments']> 
 ```
 
 ## Properties
@@ -19,6 +19,7 @@ export interface ExpressionFunctionDefinition<Name extends string, Input, Argume
 |  [aliases](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.aliases.md) | <code>string[]</code> |  What is this? |
 |  [args](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.args.md) | <code>{</code><br/><code>        [key in keyof Arguments]: ArgumentType&lt;Arguments[key]&gt;;</code><br/><code>    }</code> | Specification of arguments that function supports. This list will also be used for autocomplete functionality when your function is being edited. |
 |  [context](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.context.md) | <code>{</code><br/><code>        types: AnyExpressionFunctionDefinition['inputTypes'];</code><br/><code>    }</code> |  |
+|  [disabled](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.disabled.md) | <code>boolean</code> | if set to true function will be disabled (but its migrate function will still be available) |
 |  [help](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.help.md) | <code>string</code> | Help text displayed in the Expression editor. This text should be internationalized. |
 |  [inputTypes](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.inputtypes.md) | <code>Array&lt;TypeToString&lt;Input&gt;&gt;</code> | List of allowed type names for input value of this function. If this property is set the input of function will be cast to the first possible type in this list. If this property is missing the input will be provided to the function as-is. |
 |  [name](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.name.md) | <code>Name</code> | The name of the function, as will be used in expression. |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.extract.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.extract.md
new file mode 100644
index 0000000000000..90f1f59c90dea
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.extract.md
@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionsService](./kibana-plugin-plugins-expressions-public.expressionsservice.md) &gt; [extract](./kibana-plugin-plugins-expressions-public.expressionsservice.extract.md)
+
+## ExpressionsService.extract property
+
+Extracts saved object references from expression AST
+
+<b>Signature:</b>
+
+```typescript
+readonly extract: (state: ExpressionAstExpression) => {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.inject.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.inject.md
new file mode 100644
index 0000000000000..8ccc673ef24db
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.inject.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionsService](./kibana-plugin-plugins-expressions-public.expressionsservice.md) &gt; [inject](./kibana-plugin-plugins-expressions-public.expressionsservice.inject.md)
+
+## ExpressionsService.inject property
+
+Injects saved object references into expression AST
+
+<b>Signature:</b>
+
+```typescript
+readonly inject: (state: ExpressionAstExpression, references: SavedObjectReference[]) => ExpressionAstExpression;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.md
index fa93435bffc38..041d66b22dd50 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.md
@@ -15,7 +15,7 @@ so that JSDoc appears in developers IDE when they use those `plugins.expressions
 <b>Signature:</b>
 
 ```typescript
-export declare class ExpressionsService 
+export declare class ExpressionsService implements PersistableState<ExpressionAstExpression> 
 ```
 
 ## Constructors
@@ -30,6 +30,7 @@ export declare class ExpressionsService
 |  --- | --- | --- | --- |
 |  [execute](./kibana-plugin-plugins-expressions-public.expressionsservice.execute.md) |  | <code>ExpressionsServiceStart['execute']</code> |  |
 |  [executor](./kibana-plugin-plugins-expressions-public.expressionsservice.executor.md) |  | <code>Executor</code> |  |
+|  [extract](./kibana-plugin-plugins-expressions-public.expressionsservice.extract.md) |  | <code>(state: ExpressionAstExpression) =&gt; {</code><br/><code>        state: ExpressionAstExpression;</code><br/><code>        references: SavedObjectReference[];</code><br/><code>    }</code> | Extracts saved object references from expression AST |
 |  [fork](./kibana-plugin-plugins-expressions-public.expressionsservice.fork.md) |  | <code>() =&gt; ExpressionsService</code> |  |
 |  [getFunction](./kibana-plugin-plugins-expressions-public.expressionsservice.getfunction.md) |  | <code>ExpressionsServiceStart['getFunction']</code> |  |
 |  [getFunctions](./kibana-plugin-plugins-expressions-public.expressionsservice.getfunctions.md) |  | <code>() =&gt; ReturnType&lt;Executor['getFunctions']&gt;</code> | Returns POJO map of all registered expression functions, where keys are names of the functions and values are <code>ExpressionFunction</code> instances. |
@@ -37,6 +38,7 @@ export declare class ExpressionsService
 |  [getRenderers](./kibana-plugin-plugins-expressions-public.expressionsservice.getrenderers.md) |  | <code>() =&gt; ReturnType&lt;ExpressionRendererRegistry['toJS']&gt;</code> | Returns POJO map of all registered expression renderers, where keys are names of the renderers and values are <code>ExpressionRenderer</code> instances. |
 |  [getType](./kibana-plugin-plugins-expressions-public.expressionsservice.gettype.md) |  | <code>ExpressionsServiceStart['getType']</code> |  |
 |  [getTypes](./kibana-plugin-plugins-expressions-public.expressionsservice.gettypes.md) |  | <code>() =&gt; ReturnType&lt;Executor['getTypes']&gt;</code> | Returns POJO map of all registered expression types, where keys are names of the types and values are <code>ExpressionType</code> instances. |
+|  [inject](./kibana-plugin-plugins-expressions-public.expressionsservice.inject.md) |  | <code>(state: ExpressionAstExpression, references: SavedObjectReference[]) =&gt; ExpressionAstExpression</code> | Injects saved object references into expression AST |
 |  [registerFunction](./kibana-plugin-plugins-expressions-public.expressionsservice.registerfunction.md) |  | <code>(functionDefinition: AnyExpressionFunctionDefinition &#124; (() =&gt; AnyExpressionFunctionDefinition)) =&gt; void</code> | Register an expression function, which will be possible to execute as part of the expression pipeline.<!-- -->Below we register a function which simply sleeps for given number of milliseconds to delay the execution and outputs its input as-is.
 ```ts
 expressions.registerFunction({
@@ -61,6 +63,7 @@ The actual function is defined in the <code>fn</code> key. The function can be \
 |  [registerType](./kibana-plugin-plugins-expressions-public.expressionsservice.registertype.md) |  | <code>(typeDefinition: AnyExpressionTypeDefinition &#124; (() =&gt; AnyExpressionTypeDefinition)) =&gt; void</code> |  |
 |  [renderers](./kibana-plugin-plugins-expressions-public.expressionsservice.renderers.md) |  | <code>ExpressionRendererRegistry</code> |  |
 |  [run](./kibana-plugin-plugins-expressions-public.expressionsservice.run.md) |  | <code>ExpressionsServiceStart['run']</code> |  |
+|  [telemetry](./kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md) |  | <code>(state: ExpressionAstExpression, telemetryData?: Record&lt;string, any&gt;) =&gt; Record&lt;string, any&gt;</code> | Extracts telemetry from expression AST |
 
 ## Methods
 
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md
new file mode 100644
index 0000000000000..5f28eb732e389
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) &gt; [ExpressionsService](./kibana-plugin-plugins-expressions-public.expressionsservice.md) &gt; [telemetry](./kibana-plugin-plugins-expressions-public.expressionsservice.telemetry.md)
+
+## ExpressionsService.telemetry property
+
+Extracts telemetry from expression AST
+
+<b>Signature:</b>
+
+```typescript
+readonly telemetry: (state: ExpressionAstExpression, telemetryData?: Record<string, any>) => Record<string, any>;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionvalueerror.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionvalueerror.md
index 4a714fe62424f..1dee4a139c660 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionvalueerror.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionvalueerror.md
@@ -8,13 +8,7 @@
 
 ```typescript
 export declare type ExpressionValueError = ExpressionValueBoxed<'error', {
-    error: {
-        message: string;
-        type?: string;
-        name?: string;
-        stack?: string;
-        original?: Error;
-    };
-    info?: unknown;
+    error: ErrorLike;
+    info?: SerializableState;
 }>;
 ```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
index ead6f14e0d1d7..b0c732188a46e 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.md
@@ -55,9 +55,7 @@
 |  [ExecutionParams](./kibana-plugin-plugins-expressions-public.executionparams.md) |  |
 |  [ExecutionState](./kibana-plugin-plugins-expressions-public.executionstate.md) |  |
 |  [ExecutorState](./kibana-plugin-plugins-expressions-public.executorstate.md) |  |
-|  [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md) |  |
 |  [ExpressionAstExpressionBuilder](./kibana-plugin-plugins-expressions-public.expressionastexpressionbuilder.md) |  |
-|  [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) |  |
 |  [ExpressionAstFunctionBuilder](./kibana-plugin-plugins-expressions-public.expressionastfunctionbuilder.md) |  |
 |  [ExpressionExecutor](./kibana-plugin-plugins-expressions-public.expressionexecutor.md) |  |
 |  [ExpressionFunctionDefinition](./kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md) | <code>ExpressionFunctionDefinition</code> is the interface plugins have to implement to register a function in <code>expressions</code> plugin. |
@@ -102,6 +100,8 @@
 |  [ExecutionContainer](./kibana-plugin-plugins-expressions-public.executioncontainer.md) |  |
 |  [ExecutorContainer](./kibana-plugin-plugins-expressions-public.executorcontainer.md) |  |
 |  [ExpressionAstArgument](./kibana-plugin-plugins-expressions-public.expressionastargument.md) |  |
+|  [ExpressionAstExpression](./kibana-plugin-plugins-expressions-public.expressionastexpression.md) |  |
+|  [ExpressionAstFunction](./kibana-plugin-plugins-expressions-public.expressionastfunction.md) |  |
 |  [ExpressionAstNode](./kibana-plugin-plugins-expressions-public.expressionastnode.md) |  |
 |  [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-public.expressionfunctionkibana.md) |  |
 |  [ExpressionRendererComponent](./kibana-plugin-plugins-expressions-public.expressionrenderercomponent.md) |  |
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.extract.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.extract.md
new file mode 100644
index 0000000000000..0829824732e74
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.extract.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [Executor](./kibana-plugin-plugins-expressions-server.executor.md) &gt; [extract](./kibana-plugin-plugins-expressions-server.executor.extract.md)
+
+## Executor.extract() method
+
+<b>Signature:</b>
+
+```typescript
+extract(ast: ExpressionAstExpression): {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+
+<b>Returns:</b>
+
+`{
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    }`
+
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.inject.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.inject.md
new file mode 100644
index 0000000000000..bbc5f7a3cece7
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.inject.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [Executor](./kibana-plugin-plugins-expressions-server.executor.md) &gt; [inject](./kibana-plugin-plugins-expressions-server.executor.inject.md)
+
+## Executor.inject() method
+
+<b>Signature:</b>
+
+```typescript
+inject(ast: ExpressionAstExpression, references: SavedObjectReference[]): ExpressionAstExpression;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+|  references | <code>SavedObjectReference[]</code> |  |
+
+<b>Returns:</b>
+
+`ExpressionAstExpression`
+
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.md
index 7e6bb8c7ded5e..ec4e0bdcc4569 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-export declare class Executor<Context extends Record<string, unknown> = Record<string, unknown>> 
+export declare class Executor<Context extends Record<string, unknown> = Record<string, unknown>> implements PersistableState<ExpressionAstExpression> 
 ```
 
 ## Constructors
@@ -32,12 +32,15 @@ export declare class Executor<Context extends Record<string, unknown> = Record<s
 |  [createExecution(ast, context, { debug })](./kibana-plugin-plugins-expressions-server.executor.createexecution.md) |  |  |
 |  [createWithDefaults(state)](./kibana-plugin-plugins-expressions-server.executor.createwithdefaults.md) | <code>static</code> |  |
 |  [extendContext(extraContext)](./kibana-plugin-plugins-expressions-server.executor.extendcontext.md) |  |  |
+|  [extract(ast)](./kibana-plugin-plugins-expressions-server.executor.extract.md) |  |  |
 |  [fork()](./kibana-plugin-plugins-expressions-server.executor.fork.md) |  |  |
 |  [getFunction(name)](./kibana-plugin-plugins-expressions-server.executor.getfunction.md) |  |  |
 |  [getFunctions()](./kibana-plugin-plugins-expressions-server.executor.getfunctions.md) |  |  |
 |  [getType(name)](./kibana-plugin-plugins-expressions-server.executor.gettype.md) |  |  |
 |  [getTypes()](./kibana-plugin-plugins-expressions-server.executor.gettypes.md) |  |  |
+|  [inject(ast, references)](./kibana-plugin-plugins-expressions-server.executor.inject.md) |  |  |
 |  [registerFunction(functionDefinition)](./kibana-plugin-plugins-expressions-server.executor.registerfunction.md) |  |  |
 |  [registerType(typeDefinition)](./kibana-plugin-plugins-expressions-server.executor.registertype.md) |  |  |
 |  [run(ast, input, context)](./kibana-plugin-plugins-expressions-server.executor.run.md) |  | Execute expression and return result. |
+|  [telemetry(ast, telemetryData)](./kibana-plugin-plugins-expressions-server.executor.telemetry.md) |  |  |
 
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.telemetry.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.telemetry.md
new file mode 100644
index 0000000000000..68100c38cfa5b
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.executor.telemetry.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [Executor](./kibana-plugin-plugins-expressions-server.executor.md) &gt; [telemetry](./kibana-plugin-plugins-expressions-server.executor.telemetry.md)
+
+## Executor.telemetry() method
+
+<b>Signature:</b>
+
+```typescript
+telemetry(ast: ExpressionAstExpression, telemetryData: Record<string, any>): Record<string, any>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  ast | <code>ExpressionAstExpression</code> |  |
+|  telemetryData | <code>Record&lt;string, any&gt;</code> |  |
+
+<b>Returns:</b>
+
+`Record<string, any>`
+
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md
deleted file mode 100644
index cc8006b918dec..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md) &gt; [chain](./kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md)
-
-## ExpressionAstExpression.chain property
-
-<b>Signature:</b>
-
-```typescript
-chain: ExpressionAstFunction[];
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.md
index b5f83d1af7cb7..9606cb9e36960 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.md
@@ -2,18 +2,13 @@
 
 [Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md)
 
-## ExpressionAstExpression interface
+## ExpressionAstExpression type
 
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionAstExpression 
+export declare type ExpressionAstExpression = {
+    type: 'expression';
+    chain: ExpressionAstFunction[];
+};
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [chain](./kibana-plugin-plugins-expressions-server.expressionastexpression.chain.md) | <code>ExpressionAstFunction[]</code> |  |
-|  [type](./kibana-plugin-plugins-expressions-server.expressionastexpression.type.md) | <code>'expression'</code> |  |
-
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.type.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.type.md
deleted file mode 100644
index 46cd60cecaa84..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastexpression.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md) &gt; [type](./kibana-plugin-plugins-expressions-server.expressionastexpression.type.md)
-
-## ExpressionAstExpression.type property
-
-<b>Signature:</b>
-
-```typescript
-type: 'expression';
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md
deleted file mode 100644
index 052cadffb9bdb..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) &gt; [arguments](./kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md)
-
-## ExpressionAstFunction.arguments property
-
-<b>Signature:</b>
-
-```typescript
-arguments: Record<string, ExpressionAstArgument[]>;
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md
deleted file mode 100644
index b3227c2ac5822..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) &gt; [debug](./kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md)
-
-## ExpressionAstFunction.debug property
-
-Debug information added to each function when expression is executed in \*debug mode\*.
-
-<b>Signature:</b>
-
-```typescript
-debug?: ExpressionAstFunctionDebug;
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.function.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.function.md
deleted file mode 100644
index 9964409f49119..0000000000000
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.function.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) &gt; [function](./kibana-plugin-plugins-expressions-server.expressionastfunction.function.md)
-
-## ExpressionAstFunction.function property
-
-<b>Signature:</b>
-
-```typescript
-function: string;
-```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.md
index 1d49de44b571d..7fbcf2dcfd141 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.md
@@ -2,20 +2,15 @@
 
 [Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md)
 
-## ExpressionAstFunction interface
+## ExpressionAstFunction type
 
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionAstFunction 
+export declare type ExpressionAstFunction = {
+    type: 'function';
+    function: string;
+    arguments: Record<string, ExpressionAstArgument[]>;
+    debug?: ExpressionAstFunctionDebug;
+};
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [arguments](./kibana-plugin-plugins-expressions-server.expressionastfunction.arguments.md) | <code>Record&lt;string, ExpressionAstArgument[]&gt;</code> |  |
-|  [debug](./kibana-plugin-plugins-expressions-server.expressionastfunction.debug.md) | <code>ExpressionAstFunctionDebug</code> | Debug information added to each function when expression is executed in \*debug mode\*. |
-|  [function](./kibana-plugin-plugins-expressions-server.expressionastfunction.function.md) | <code>string</code> |  |
-|  [type](./kibana-plugin-plugins-expressions-server.expressionastfunction.type.md) | <code>'function'</code> |  |
-
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.type.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md
similarity index 52%
rename from docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.type.md
rename to docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md
index 3fd10524c1599..8ae51645f5df9 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionastfunction.type.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md
@@ -1,11 +1,11 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) &gt; [type](./kibana-plugin-plugins-expressions-server.expressionastfunction.type.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-server.expressionfunction.md) &gt; [disabled](./kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md)
 
-## ExpressionAstFunction.type property
+## ExpressionFunction.disabled property
 
 <b>Signature:</b>
 
 ```typescript
-type: 'function';
+disabled: boolean;
 ```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.extract.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.extract.md
new file mode 100644
index 0000000000000..e7ecad4a6c9e4
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.extract.md
@@ -0,0 +1,14 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-server.expressionfunction.md) &gt; [extract](./kibana-plugin-plugins-expressions-server.expressionfunction.extract.md)
+
+## ExpressionFunction.extract property
+
+<b>Signature:</b>
+
+```typescript
+extract: (state: ExpressionAstFunction['arguments']) => {
+        state: ExpressionAstFunction['arguments'];
+        references: SavedObjectReference[];
+    };
+```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.inject.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.inject.md
new file mode 100644
index 0000000000000..85c98ef9193da
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.inject.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-server.expressionfunction.md) &gt; [inject](./kibana-plugin-plugins-expressions-server.expressionfunction.inject.md)
+
+## ExpressionFunction.inject property
+
+<b>Signature:</b>
+
+```typescript
+inject: (state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) => ExpressionAstFunction['arguments'];
+```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.md
index aac3878b8c859..7fcda94968d13 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-export declare class ExpressionFunction 
+export declare class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> 
 ```
 
 ## Constructors
@@ -23,9 +23,13 @@ export declare class ExpressionFunction
 |  [accepts](./kibana-plugin-plugins-expressions-server.expressionfunction.accepts.md) |  | <code>(type: string) =&gt; boolean</code> |  |
 |  [aliases](./kibana-plugin-plugins-expressions-server.expressionfunction.aliases.md) |  | <code>string[]</code> | Aliases that can be used instead of <code>name</code>. |
 |  [args](./kibana-plugin-plugins-expressions-server.expressionfunction.args.md) |  | <code>Record&lt;string, ExpressionFunctionParameter&gt;</code> | Specification of expression function parameters. |
+|  [disabled](./kibana-plugin-plugins-expressions-server.expressionfunction.disabled.md) |  | <code>boolean</code> |  |
+|  [extract](./kibana-plugin-plugins-expressions-server.expressionfunction.extract.md) |  | <code>(state: ExpressionAstFunction['arguments']) =&gt; {</code><br/><code>        state: ExpressionAstFunction['arguments'];</code><br/><code>        references: SavedObjectReference[];</code><br/><code>    }</code> |  |
 |  [fn](./kibana-plugin-plugins-expressions-server.expressionfunction.fn.md) |  | <code>(input: ExpressionValue, params: Record&lt;string, any&gt;, handlers: object) =&gt; ExpressionValue</code> | Function to run function (context, args) |
 |  [help](./kibana-plugin-plugins-expressions-server.expressionfunction.help.md) |  | <code>string</code> | A short help text. |
+|  [inject](./kibana-plugin-plugins-expressions-server.expressionfunction.inject.md) |  | <code>(state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) =&gt; ExpressionAstFunction['arguments']</code> |  |
 |  [inputTypes](./kibana-plugin-plugins-expressions-server.expressionfunction.inputtypes.md) |  | <code>string[] &#124; undefined</code> | Type of inputs that this function supports. |
 |  [name](./kibana-plugin-plugins-expressions-server.expressionfunction.name.md) |  | <code>string</code> | Name of function |
+|  [telemetry](./kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md) |  | <code>(state: ExpressionAstFunction['arguments'], telemetryData: Record&lt;string, any&gt;) =&gt; Record&lt;string, any&gt;</code> |  |
 |  [type](./kibana-plugin-plugins-expressions-server.expressionfunction.type.md) |  | <code>string</code> | Return type of function. This SHOULD be supplied. We use it for UI and autocomplete hinting. We may also use it for optimizations in the future. |
 
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md
new file mode 100644
index 0000000000000..2894486847b27
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionFunction](./kibana-plugin-plugins-expressions-server.expressionfunction.md) &gt; [telemetry](./kibana-plugin-plugins-expressions-server.expressionfunction.telemetry.md)
+
+## ExpressionFunction.telemetry property
+
+<b>Signature:</b>
+
+```typescript
+telemetry: (state: ExpressionAstFunction['arguments'], telemetryData: Record<string, any>) => Record<string, any>;
+```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md
new file mode 100644
index 0000000000000..88456c8700aec
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) &gt; [ExpressionFunctionDefinition](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md) &gt; [disabled](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md)
+
+## ExpressionFunctionDefinition.disabled property
+
+if set to true function will be disabled (but its migrate function will still be available)
+
+<b>Signature:</b>
+
+```typescript
+disabled?: boolean;
+```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md
index 6463c6ac537b9..51240f094b181 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md
@@ -9,7 +9,7 @@
 <b>Signature:</b>
 
 ```typescript
-export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> 
+export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> extends PersistableStateDefinition<ExpressionAstFunction['arguments']> 
 ```
 
 ## Properties
@@ -19,6 +19,7 @@ export interface ExpressionFunctionDefinition<Name extends string, Input, Argume
 |  [aliases](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.aliases.md) | <code>string[]</code> |  What is this? |
 |  [args](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.args.md) | <code>{</code><br/><code>        [key in keyof Arguments]: ArgumentType&lt;Arguments[key]&gt;;</code><br/><code>    }</code> | Specification of arguments that function supports. This list will also be used for autocomplete functionality when your function is being edited. |
 |  [context](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.context.md) | <code>{</code><br/><code>        types: AnyExpressionFunctionDefinition['inputTypes'];</code><br/><code>    }</code> |  |
+|  [disabled](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.disabled.md) | <code>boolean</code> | if set to true function will be disabled (but its migrate function will still be available) |
 |  [help](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.help.md) | <code>string</code> | Help text displayed in the Expression editor. This text should be internationalized. |
 |  [inputTypes](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.inputtypes.md) | <code>Array&lt;TypeToString&lt;Input&gt;&gt;</code> | List of allowed type names for input value of this function. If this property is set the input of function will be cast to the first possible type in this list. If this property is missing the input will be provided to the function as-is. |
 |  [name](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.name.md) | <code>Name</code> | The name of the function, as will be used in expression. |
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionvalueerror.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionvalueerror.md
index b90e4360e055a..c8132948a8993 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionvalueerror.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionvalueerror.md
@@ -8,13 +8,7 @@
 
 ```typescript
 export declare type ExpressionValueError = ExpressionValueBoxed<'error', {
-    error: {
-        message: string;
-        type?: string;
-        name?: string;
-        stack?: string;
-        original?: Error;
-    };
-    info?: unknown;
+    error: ErrorLike;
+    info?: SerializableState;
 }>;
 ```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
index c9fed2e00c66c..dd7c7af466bd0 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.md
@@ -52,9 +52,7 @@
 |  [ExecutionParams](./kibana-plugin-plugins-expressions-server.executionparams.md) |  |
 |  [ExecutionState](./kibana-plugin-plugins-expressions-server.executionstate.md) |  |
 |  [ExecutorState](./kibana-plugin-plugins-expressions-server.executorstate.md) |  |
-|  [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md) |  |
 |  [ExpressionAstExpressionBuilder](./kibana-plugin-plugins-expressions-server.expressionastexpressionbuilder.md) |  |
-|  [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) |  |
 |  [ExpressionAstFunctionBuilder](./kibana-plugin-plugins-expressions-server.expressionastfunctionbuilder.md) |  |
 |  [ExpressionFunctionDefinition](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinition.md) | <code>ExpressionFunctionDefinition</code> is the interface plugins have to implement to register a function in <code>expressions</code> plugin. |
 |  [ExpressionFunctionDefinitions](./kibana-plugin-plugins-expressions-server.expressionfunctiondefinitions.md) | A mapping of <code>ExpressionFunctionDefinition</code>s for functions which the Expressions services provides out-of-the-box. Any new functions registered by the Expressions plugin should have their types added here. |
@@ -86,6 +84,8 @@
 |  [ExecutionContainer](./kibana-plugin-plugins-expressions-server.executioncontainer.md) |  |
 |  [ExecutorContainer](./kibana-plugin-plugins-expressions-server.executorcontainer.md) |  |
 |  [ExpressionAstArgument](./kibana-plugin-plugins-expressions-server.expressionastargument.md) |  |
+|  [ExpressionAstExpression](./kibana-plugin-plugins-expressions-server.expressionastexpression.md) |  |
+|  [ExpressionAstFunction](./kibana-plugin-plugins-expressions-server.expressionastfunction.md) |  |
 |  [ExpressionAstNode](./kibana-plugin-plugins-expressions-server.expressionastnode.md) |  |
 |  [ExpressionFunctionKibana](./kibana-plugin-plugins-expressions-server.expressionfunctionkibana.md) |  |
 |  [ExpressionsServerSetup](./kibana-plugin-plugins-expressions-server.expressionsserversetup.md) |  |
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index a56334a467c5b..69140453f486d 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -219,6 +219,7 @@ export class Execution<
 
       if (!fn) {
         return createError({
+          name: 'fn not found',
           message: i18n.translate('expressions.execution.functionNotFound', {
             defaultMessage: `Function {fnName} could not be found.`,
             values: {
@@ -230,6 +231,7 @@ export class Execution<
 
       if (fn.disabled) {
         return createError({
+          name: 'fn is disabled',
           message: i18n.translate('expressions.execution.functionDisabled', {
             defaultMessage: `Function {fnName} is disabled.`,
             values: {
diff --git a/src/plugins/expressions/common/execution/execution_contract.ts b/src/plugins/expressions/common/execution/execution_contract.ts
index 20c5b2dd434b5..79bb4c58ab48d 100644
--- a/src/plugins/expressions/common/execution/execution_contract.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.ts
@@ -62,7 +62,7 @@ export class ExecutionContract<
       return {
         type: 'error',
         error: {
-          type: e.type,
+          name: e.name,
           message: e.message,
           stack: e.stack,
         },
diff --git a/src/plugins/expressions/common/expression_types/specs/error.ts b/src/plugins/expressions/common/expression_types/specs/error.ts
index 5ff719b9616b3..7607945d8a664 100644
--- a/src/plugins/expressions/common/expression_types/specs/error.ts
+++ b/src/plugins/expressions/common/expression_types/specs/error.ts
@@ -21,19 +21,14 @@ import { ExpressionTypeDefinition, ExpressionValueBoxed } from '../types';
 import { ExpressionValueRender } from './render';
 import { getType } from '../get_type';
 import { SerializableState } from '../../../../kibana_utils/common';
+import { ErrorLike } from '../../util';
 
 const name = 'error';
 
 export type ExpressionValueError = ExpressionValueBoxed<
   'error',
   {
-    error: {
-      message: string;
-      type?: string;
-      name?: string;
-      stack?: string;
-      original?: SerializableState;
-    };
+    error: ErrorLike;
     info?: SerializableState;
   }
 >;
diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
index 9bdab74efd6f9..46306d3fbbf66 100644
--- a/src/plugins/expressions/common/util/create_error.ts
+++ b/src/plugins/expressions/common/util/create_error.ts
@@ -19,9 +19,17 @@
 
 import { ExpressionValueError } from '../../common';
 
-type ErrorLike = Partial<Pick<Error, 'name' | 'message' | 'stack'>>;
+export type SerializedError = {
+  name: string;
+  message: string;
+  stack?: string;
+};
 
-export const createError = (err: string | Error | ErrorLike): ExpressionValueError => ({
+export type ErrorLike = SerializedError & {
+  original?: SerializedError;
+};
+
+export const createError = (err: string | ErrorLike): ExpressionValueError => ({
   type: 'error',
   error: {
     stack:
@@ -32,6 +40,6 @@ export const createError = (err: string | Error | ErrorLike): ExpressionValueErr
         : undefined,
     message: typeof err === 'string' ? err : String(err.message),
     name: typeof err === 'object' ? err.name || 'Error' : 'Error',
-    original: err instanceof Error ? err : undefined,
+    original: err instanceof Error ? (err as SerializedError) : undefined,
   },
 });
diff --git a/src/plugins/expressions/public/public.api.md b/src/plugins/expressions/public/public.api.md
index 763147df6d922..355bd502df3be 100644
--- a/src/plugins/expressions/public/public.api.md
+++ b/src/plugins/expressions/public/public.api.md
@@ -189,10 +189,11 @@ export interface ExecutionState<Output = ExpressionValue> extends ExecutorState
     state: 'not-started' | 'pending' | 'result' | 'error';
 }
 
+// Warning: (ae-forgotten-export) The symbol "PersistableState" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "Executor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export class Executor<Context extends Record<string, unknown> = Record<string, unknown>> {
+export class Executor<Context extends Record<string, unknown> = Record<string, unknown>> implements PersistableState<ExpressionAstExpression> {
     constructor(state?: ExecutorState<Context>);
     // (undocumented)
     get context(): Record<string, unknown>;
@@ -203,6 +204,11 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     // (undocumented)
     extendContext(extraContext: Record<string, unknown>): void;
     // (undocumented)
+    extract(ast: ExpressionAstExpression): {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
+    // (undocumented)
     fork(): Executor<Context>;
     // @deprecated (undocumented)
     readonly functions: FunctionsRegistry;
@@ -214,6 +220,10 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     getType(name: string): ExpressionType | undefined;
     // (undocumented)
     getTypes(): Record<string, ExpressionType>;
+    // Warning: (ae-forgotten-export) The symbol "SavedObjectReference" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    inject(ast: ExpressionAstExpression, references: SavedObjectReference[]): ExpressionAstExpression;
     // (undocumented)
     registerFunction(functionDefinition: AnyExpressionFunctionDefinition | (() => AnyExpressionFunctionDefinition)): void;
     // (undocumented)
@@ -221,9 +231,11 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     run<Input, Output, ExtraContext extends Record<string, unknown> = Record<string, unknown>>(ast: string | ExpressionAstExpression, input: Input, context?: ExtraContext): Promise<Output>;
     // (undocumented)
     readonly state: ExecutorContainer<Context>;
+    // (undocumented)
+    telemetry(ast: ExpressionAstExpression, telemetryData: Record<string, any>): Record<string, any>;
     // @deprecated (undocumented)
     readonly types: TypesRegistry;
-}
+    }
 
 // Warning: (ae-forgotten-export) The symbol "ExecutorPureTransitions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "ExecutorPureSelectors" needs to be exported by the entry point index.d.ts
@@ -252,12 +264,10 @@ export type ExpressionAstArgument = string | boolean | number | ExpressionAstExp
 // Warning: (ae-missing-release-tag) "ExpressionAstExpression" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export interface ExpressionAstExpression {
-    // (undocumented)
-    chain: ExpressionAstFunction[];
-    // (undocumented)
+export type ExpressionAstExpression = {
     type: 'expression';
-}
+    chain: ExpressionAstFunction[];
+};
 
 // Warning: (ae-missing-release-tag) "ExpressionAstExpressionBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -273,16 +283,12 @@ export interface ExpressionAstExpressionBuilder {
 // Warning: (ae-missing-release-tag) "ExpressionAstFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export interface ExpressionAstFunction {
-    // (undocumented)
+export type ExpressionAstFunction = {
+    type: 'function';
+    function: string;
     arguments: Record<string, ExpressionAstArgument[]>;
-    // Warning: (ae-forgotten-export) The symbol "ExpressionAstFunctionDebug" needs to be exported by the entry point index.d.ts
     debug?: ExpressionAstFunctionDebug;
-    // (undocumented)
-    function: string;
-    // (undocumented)
-    type: 'function';
-}
+};
 
 // Warning: (ae-missing-release-tag) "ExpressionAstFunctionBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -320,23 +326,35 @@ export interface ExpressionExecutor {
 // Warning: (ae-missing-release-tag) "ExpressionFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export class ExpressionFunction {
+export class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> {
     constructor(functionDefinition: AnyExpressionFunctionDefinition);
     // (undocumented)
     accepts: (type: string) => boolean;
     aliases: string[];
     args: Record<string, ExpressionFunctionParameter>;
+    // (undocumented)
+    disabled: boolean;
+    // (undocumented)
+    extract: (state: ExpressionAstFunction['arguments']) => {
+        state: ExpressionAstFunction['arguments'];
+        references: SavedObjectReference[];
+    };
     fn: (input: ExpressionValue, params: Record<string, any>, handlers: object) => ExpressionValue;
     help: string;
+    // (undocumented)
+    inject: (state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) => ExpressionAstFunction['arguments'];
     inputTypes: string[] | undefined;
     name: string;
+    // (undocumented)
+    telemetry: (state: ExpressionAstFunction['arguments'], telemetryData: Record<string, any>) => Record<string, any>;
     type: string;
 }
 
+// Warning: (ae-forgotten-export) The symbol "PersistableStateDefinition" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "ExpressionFunctionDefinition" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
-export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> {
+export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> extends PersistableStateDefinition<ExpressionAstFunction['arguments']> {
     aliases?: string[];
     args: {
         [key in keyof Arguments]: ArgumentType<Arguments[key]>;
@@ -345,6 +363,7 @@ export interface ExpressionFunctionDefinition<Name extends string, Input, Argume
     context?: {
         types: AnyExpressionFunctionDefinition['inputTypes'];
     };
+    disabled?: boolean;
     fn(input: Input, args: Arguments, context: Context): Output;
     help: string;
     inputTypes?: Array<TypeToString<Input>>;
@@ -540,13 +559,17 @@ export { ExpressionsPublicPlugin as Plugin }
 // Warning: (ae-missing-release-tag) "ExpressionsService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
-export class ExpressionsService {
+export class ExpressionsService implements PersistableState<ExpressionAstExpression> {
     // Warning: (ae-forgotten-export) The symbol "ExpressionServiceParams" needs to be exported by the entry point index.d.ts
     constructor({ executor, renderers, }?: ExpressionServiceParams);
     // (undocumented)
     readonly execute: ExpressionsServiceStart['execute'];
     // (undocumented)
     readonly executor: Executor;
+    readonly extract: (state: ExpressionAstExpression) => {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
     // (undocumented)
     readonly fork: () => ExpressionsService;
     // (undocumented)
@@ -558,6 +581,7 @@ export class ExpressionsService {
     // (undocumented)
     readonly getType: ExpressionsServiceStart['getType'];
     readonly getTypes: () => ReturnType<Executor['getTypes']>;
+    readonly inject: (state: ExpressionAstExpression, references: SavedObjectReference[]) => ExpressionAstExpression;
     readonly registerFunction: (functionDefinition: AnyExpressionFunctionDefinition | (() => AnyExpressionFunctionDefinition)) => void;
     // (undocumented)
     readonly registerRenderer: (definition: AnyExpressionRenderDefinition | (() => AnyExpressionRenderDefinition)) => void;
@@ -571,6 +595,7 @@ export class ExpressionsService {
     start(): ExpressionsServiceStart;
     // (undocumented)
     stop(): void;
+    readonly telemetry: (state: ExpressionAstExpression, telemetryData?: Record<string, any>) => Record<string, any>;
 }
 
 // Warning: (ae-missing-release-tag) "ExpressionsServiceSetup" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -705,14 +730,8 @@ export type ExpressionValueConverter<I extends ExpressionValue, O extends Expres
 //
 // @public (undocumented)
 export type ExpressionValueError = ExpressionValueBoxed<'error', {
-    error: {
-        message: string;
-        type?: string;
-        name?: string;
-        stack?: string;
-        original?: Error;
-    };
-    info?: unknown;
+    error: ErrorLike;
+    info?: SerializableState;
 }>;
 
 // Warning: (ae-missing-release-tag) "ExpressionValueFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -1162,6 +1181,12 @@ export type TypeToString<T> = KnownTypeToString<T> | UnmappedTypeStrings;
 export type UnmappedTypeStrings = 'date' | 'filter';
 
 
+// Warnings were encountered during analysis:
+//
+// src/plugins/expressions/common/ast/types.ts:40:3 - (ae-forgotten-export) The symbol "ExpressionAstFunctionDebug" needs to be exported by the entry point index.d.ts
+// src/plugins/expressions/common/expression_types/specs/error.ts:31:5 - (ae-forgotten-export) The symbol "ErrorLike" needs to be exported by the entry point index.d.ts
+// src/plugins/expressions/common/expression_types/specs/error.ts:32:5 - (ae-forgotten-export) The symbol "SerializableState" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 
 ```
diff --git a/src/plugins/expressions/server/server.api.md b/src/plugins/expressions/server/server.api.md
index 8266789664d44..1a905de4a3bdf 100644
--- a/src/plugins/expressions/server/server.api.md
+++ b/src/plugins/expressions/server/server.api.md
@@ -171,10 +171,11 @@ export interface ExecutionState<Output = ExpressionValue> extends ExecutorState
     state: 'not-started' | 'pending' | 'result' | 'error';
 }
 
+// Warning: (ae-forgotten-export) The symbol "PersistableState" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "Executor" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export class Executor<Context extends Record<string, unknown> = Record<string, unknown>> {
+export class Executor<Context extends Record<string, unknown> = Record<string, unknown>> implements PersistableState<ExpressionAstExpression> {
     constructor(state?: ExecutorState<Context>);
     // (undocumented)
     get context(): Record<string, unknown>;
@@ -185,6 +186,11 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     // (undocumented)
     extendContext(extraContext: Record<string, unknown>): void;
     // (undocumented)
+    extract(ast: ExpressionAstExpression): {
+        state: ExpressionAstExpression;
+        references: SavedObjectReference[];
+    };
+    // (undocumented)
     fork(): Executor<Context>;
     // @deprecated (undocumented)
     readonly functions: FunctionsRegistry;
@@ -196,6 +202,10 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     getType(name: string): ExpressionType | undefined;
     // (undocumented)
     getTypes(): Record<string, ExpressionType>;
+    // Warning: (ae-forgotten-export) The symbol "SavedObjectReference" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    inject(ast: ExpressionAstExpression, references: SavedObjectReference[]): ExpressionAstExpression;
     // (undocumented)
     registerFunction(functionDefinition: AnyExpressionFunctionDefinition | (() => AnyExpressionFunctionDefinition)): void;
     // (undocumented)
@@ -203,9 +213,11 @@ export class Executor<Context extends Record<string, unknown> = Record<string, u
     run<Input, Output, ExtraContext extends Record<string, unknown> = Record<string, unknown>>(ast: string | ExpressionAstExpression, input: Input, context?: ExtraContext): Promise<Output>;
     // (undocumented)
     readonly state: ExecutorContainer<Context>;
+    // (undocumented)
+    telemetry(ast: ExpressionAstExpression, telemetryData: Record<string, any>): Record<string, any>;
     // @deprecated (undocumented)
     readonly types: TypesRegistry;
-}
+    }
 
 // Warning: (ae-forgotten-export) The symbol "ExecutorPureTransitions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "ExecutorPureSelectors" needs to be exported by the entry point index.d.ts
@@ -234,12 +246,10 @@ export type ExpressionAstArgument = string | boolean | number | ExpressionAstExp
 // Warning: (ae-missing-release-tag) "ExpressionAstExpression" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export interface ExpressionAstExpression {
-    // (undocumented)
-    chain: ExpressionAstFunction[];
-    // (undocumented)
+export type ExpressionAstExpression = {
     type: 'expression';
-}
+    chain: ExpressionAstFunction[];
+};
 
 // Warning: (ae-missing-release-tag) "ExpressionAstExpressionBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -255,16 +265,12 @@ export interface ExpressionAstExpressionBuilder {
 // Warning: (ae-missing-release-tag) "ExpressionAstFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export interface ExpressionAstFunction {
-    // (undocumented)
+export type ExpressionAstFunction = {
+    type: 'function';
+    function: string;
     arguments: Record<string, ExpressionAstArgument[]>;
-    // Warning: (ae-forgotten-export) The symbol "ExpressionAstFunctionDebug" needs to be exported by the entry point index.d.ts
     debug?: ExpressionAstFunctionDebug;
-    // (undocumented)
-    function: string;
-    // (undocumented)
-    type: 'function';
-}
+};
 
 // Warning: (ae-missing-release-tag) "ExpressionAstFunctionBuilder" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -292,23 +298,35 @@ export type ExpressionAstNode = ExpressionAstExpression | ExpressionAstFunction
 // Warning: (ae-missing-release-tag) "ExpressionFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export class ExpressionFunction {
+export class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> {
     constructor(functionDefinition: AnyExpressionFunctionDefinition);
     // (undocumented)
     accepts: (type: string) => boolean;
     aliases: string[];
     args: Record<string, ExpressionFunctionParameter>;
+    // (undocumented)
+    disabled: boolean;
+    // (undocumented)
+    extract: (state: ExpressionAstFunction['arguments']) => {
+        state: ExpressionAstFunction['arguments'];
+        references: SavedObjectReference[];
+    };
     fn: (input: ExpressionValue, params: Record<string, any>, handlers: object) => ExpressionValue;
     help: string;
+    // (undocumented)
+    inject: (state: ExpressionAstFunction['arguments'], references: SavedObjectReference[]) => ExpressionAstFunction['arguments'];
     inputTypes: string[] | undefined;
     name: string;
+    // (undocumented)
+    telemetry: (state: ExpressionAstFunction['arguments'], telemetryData: Record<string, any>) => Record<string, any>;
     type: string;
 }
 
+// Warning: (ae-forgotten-export) The symbol "PersistableStateDefinition" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "ExpressionFunctionDefinition" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
-export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> {
+export interface ExpressionFunctionDefinition<Name extends string, Input, Arguments extends Record<string, any>, Output, Context extends ExecutionContext = ExecutionContext> extends PersistableStateDefinition<ExpressionAstFunction['arguments']> {
     aliases?: string[];
     args: {
         [key in keyof Arguments]: ArgumentType<Arguments[key]>;
@@ -317,6 +335,7 @@ export interface ExpressionFunctionDefinition<Name extends string, Input, Argume
     context?: {
         types: AnyExpressionFunctionDefinition['inputTypes'];
     };
+    disabled?: boolean;
     fn(input: Input, args: Arguments, context: Context): Output;
     help: string;
     inputTypes?: Array<TypeToString<Input>>;
@@ -565,14 +584,8 @@ export type ExpressionValueConverter<I extends ExpressionValue, O extends Expres
 //
 // @public (undocumented)
 export type ExpressionValueError = ExpressionValueBoxed<'error', {
-    error: {
-        message: string;
-        type?: string;
-        name?: string;
-        stack?: string;
-        original?: Error;
-    };
-    info?: unknown;
+    error: ErrorLike;
+    info?: SerializableState;
 }>;
 
 // Warning: (ae-missing-release-tag) "ExpressionValueFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -966,6 +979,12 @@ export type TypeToString<T> = KnownTypeToString<T> | UnmappedTypeStrings;
 export type UnmappedTypeStrings = 'date' | 'filter';
 
 
+// Warnings were encountered during analysis:
+//
+// src/plugins/expressions/common/ast/types.ts:40:3 - (ae-forgotten-export) The symbol "ExpressionAstFunctionDebug" needs to be exported by the entry point index.d.ts
+// src/plugins/expressions/common/expression_types/specs/error.ts:31:5 - (ae-forgotten-export) The symbol "ErrorLike" needs to be exported by the entry point index.d.ts
+// src/plugins/expressions/common/expression_types/specs/error.ts:32:5 - (ae-forgotten-export) The symbol "SerializableState" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 
 ```