From 3561ccb6cae83fc5b1fa495dd50ea3d1acee7bac Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 8 May 2026 13:41:07 -0700
Subject: [PATCH 01/38] Initial ChatModal

---
 packages/components/src/internal/actions.ts   |   6 +
 packages/components/src/internal/app/utils.ts |   4 +
 .../CalculatedFieldOptions.tsx                | 120 +++++++++++-------
 .../ExpressionAssistantModal.tsx              |  27 ++++
 .../src/internal/components/mcp/ChatModal.tsx |  90 +++++++++++++
 .../src/internal/query/APIWrapper.ts          |   4 +
 .../src/theme/domainproperties.scss           |  96 ++++++++++++++
 7 files changed, 302 insertions(+), 45 deletions(-)
 create mode 100644 packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
 create mode 100644 packages/components/src/internal/components/mcp/ChatModal.tsx

diff --git a/packages/components/src/internal/actions.ts b/packages/components/src/internal/actions.ts
index 77a10200dd..fd64682f0a 100644
--- a/packages/components/src/internal/actions.ts
+++ b/packages/components/src/internal/actions.ts
@@ -784,3 +784,9 @@ export function renameGridView(
         });
     });
 }
+
+export function expressionAssist(prompt: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+        console.log('Expression assisting...');
+    });
+}
diff --git a/packages/components/src/internal/app/utils.ts b/packages/components/src/internal/app/utils.ts
index ab948a1f6f..9fdb8287dc 100644
--- a/packages/components/src/internal/app/utils.ts
+++ b/packages/components/src/internal/app/utils.ts
@@ -390,6 +390,10 @@ export function isAdvancedWorkflowEnabled(moduleContext?: ModuleContext): boolea
     );
 }
 
+export function isAIAssistanceEnabled(): boolean {
+    return getServerContext()['mcpReady'] === true;
+}
+
 export function isDataChangeCommentRequirementFeatureEnabled(moduleContext?: ModuleContext): boolean {
     return isFeatureEnabled(ProductFeature.DataChangeCommentRequirement, moduleContext);
 }
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index 7c6fa8d4bb..3a9744cbfb 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -14,6 +14,10 @@ import { SectionHeading } from './SectionHeading';
 import { isFieldFullyLocked, isFieldPartiallyLocked } from './propertiesUtil';
 import { CALCULATED_TYPE, MULTI_CHOICE_TYPE, PropDescType } from './PropDescType';
 import { parseCalculatedColumn } from './actions';
+import { SVGIcon } from '../base/SVGIcon';
+import { isAIAssistanceEnabled } from '../../app/utils';
+import { useModalState } from '../../hooks';
+import { ExpressionAssistantModal } from './ExpressionAssistantModal';
 
 // export for jest testing
 export const typeToDisplay = (type: string): string => {
@@ -90,10 +94,19 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
     const [loading, setLoading] = useState<boolean>(!field.isNew());
     const [error, setError] = useState<string>(undefined);
     const [parsedType, setParsedType] = useState<string>(undefined);
+    const { close, open, show } = useModalState();
+    const assistanceEnabled = isAIAssistanceEnabled();
     const isNew = useMemo(() => field.isNew(), [field]);
+    const { headingId, inputId } = useMemo(
+        () => ({
+            headingId: `expression-label-${domainIndex}-${index}`,
+            inputId: createFormInputId(DOMAIN_FIELD_VALUE_EXPRESSION, domainIndex, index),
+        }),
+        [domainIndex, index]
+    );
 
-    const handleChange = useCallback(
-        (evt: any): void => {
+    const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(
+        evt => {
             onChange(evt.target.id, evt.target.value);
             setError(undefined);
             setParsedType(undefined);
@@ -136,24 +149,18 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         [domainIndex, field.name, getDomainFields, index, onChange]
     );
 
-    const handleBlur = useCallback(
-        (evt: any): void => {
-            const value = evt.target.value;
-            validateExpression(value, true);
+    const handleBlur = useCallback<React.FocusEventHandler<HTMLTextAreaElement>>(
+        evt => {
+            validateExpression(evt.target.value, true);
         },
         [validateExpression]
     );
 
-    useEffect(
-        () => {
-            if (!isNew) {
-                validateExpression(field.valueExpression, false);
-            }
-        },
-        [
-            /* on mount only */
-        ]
-    );
+    useEffect(() => {
+        if (!isNew) {
+            validateExpression(field.valueExpression, false);
+        }
+    }, []); //eslint-disable-line react-hooks/exhaustive-deps -- on mount only
 
     return (
         <div
@@ -162,22 +169,24 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
             })}
         >
             <div className="row">
-                <div className="col-xs-12 col-md-6">
+                <div className="col-xs-12">
                     <SectionHeading
                         cls="bottom-padding"
                         helpTipBody={HELP_TIP_BODY}
-                        id={'expression-label-' + domainIndex + '-' + index}
+                        id={headingId}
                         title="Expression"
                     />
+                </div>
+                <div className="col-xs-12 col-md-7">
                     <textarea
-                        aria-labelledby={'expression-label-' + domainIndex + '-' + index}
+                        aria-labelledby={headingId}
                         className="form-control"
                         disabled={
                             isFieldPartiallyLocked(field.lockType) ||
                             isFieldFullyLocked(field.lockType) ||
                             field.lockExistingField
                         }
-                        id={createFormInputId(DOMAIN_FIELD_VALUE_EXPRESSION, domainIndex, index)}
+                        id={inputId}
                         name={createFormInputName(DOMAIN_FIELD_VALUE_EXPRESSION)}
                         onBlur={handleBlur}
                         onChange={handleChange}
@@ -197,33 +206,54 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                         )}
                     </div>
                 </div>
-                <div className="col-xs-12 col-md-6 domain-field-calc-examples">
-                    <b>Examples</b>
-                    <table>
-                        <tbody>
-                            <tr>
-                                <td>Addition:</td>
-                                <td className="code">numericField1 + numericField2</td>
-                            </tr>
-                            <tr>
-                                <td>Subtraction:</td>
-                                <td className="code">numericField1 - numericField2</td>
-                            </tr>
-                            <tr>
-                                <td>Multiplication:</td>
-                                <td className="code">numericField1 * numericField2</td>
-                            </tr>
-                            <tr>
-                                <td>Division:</td>
-                                <td className="code">numericField1 / nonZeroField1</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <HelpLink topic={FIELD_EDITOR_CALC_COLS_TOPIC}>Click for more examples</HelpLink>
-                </div>
+                {assistanceEnabled && (
+                    <div className="col-xs-12 col-md-5">
+                        <div className="margin-bottom">
+                            The AI Assistant can help you create or validate an expression. You can describe the
+                            calculation you want, or get help with an existing expression.
+                        </div>
+                        <div className="margin-bottom">
+                            <button className="btn btn-default" onClick={open} type="button">
+                                <SVGIcon
+                                    height="16px"
+                                    iconSrc="ai_stars_icon"
+                                    style={{ marginRight: '4px', marginTop: '-4px' }}
+                                    width="16px"
+                                />
+                                AI Assistant
+                            </button>
+                        </div>
+                        <HelpLink topic={FIELD_EDITOR_CALC_COLS_TOPIC}>See calculation examples</HelpLink>
+                    </div>
+                )}
+                {!assistanceEnabled && (
+                    <div className="col-xs-12 col-md-5 domain-field-calc-examples">
+                        <table>
+                            <tbody>
+                                <tr>
+                                    <td>Addition:</td>
+                                    <td className="code">numericField1 + numericField2</td>
+                                </tr>
+                                <tr>
+                                    <td>Subtraction:</td>
+                                    <td className="code">numericField1 - numericField2</td>
+                                </tr>
+                                <tr>
+                                    <td>Multiplication:</td>
+                                    <td className="code">numericField1 * numericField2</td>
+                                </tr>
+                                <tr>
+                                    <td>Division:</td>
+                                    <td className="code">numericField1 / nonZeroField1</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <HelpLink topic={FIELD_EDITOR_CALC_COLS_TOPIC}>Click for more examples</HelpLink>
+                    </div>
+                )}
             </div>
+            {show && <ExpressionAssistantModal field={field} onCancel={close} />}
         </div>
     );
 });
-
 CalculatedFieldOptions.displayName = 'CalculatedFieldOptions';
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
new file mode 100644
index 0000000000..ff95ed7a5a
--- /dev/null
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -0,0 +1,27 @@
+import React, { FC, memo, useCallback } from 'react';
+import { DomainField } from './models';
+import { ChatModal } from '../mcp/ChatModal';
+import { useAppContext } from '../../AppContext';
+
+interface Props {
+    field: DomainField;
+    onCancel: () => void;
+}
+
+export const ExpressionAssistantModal: FC<Props> = memo(({ field, onCancel }) => {
+    const { api } = useAppContext();
+
+    const onSubmit = useCallback(
+        async (prompt: string) => {
+            try {
+                const beep = await api.query.expressionAssist(prompt);
+            } catch (e) {
+
+            }
+        },
+        [api]
+    );
+
+    return <ChatModal onCancel={onCancel} onSubmit={onSubmit} title="Expression AI Assistant" />;
+});
+ExpressionAssistantModal.displayName = 'ExpressionAssistantModal';
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
new file mode 100644
index 0000000000..a3022303f4
--- /dev/null
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -0,0 +1,90 @@
+import React, { FC, memo, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
+import { BaseModal } from '../../Modal';
+
+interface Props {
+    onCancel: () => void;
+    onSubmit?: (prompt: string) => void;
+    title: ReactNode;
+}
+
+export const ChatModal: FC<Props> = memo(({ onCancel, onSubmit, title }) => {
+    const [prompt, setPrompt] = useState('');
+    const textAreaRef = useRef<HTMLTextAreaElement>(null);
+
+    // Fix for autoFocus not working in Modals
+    useEffect(() => {
+        const timeout = setTimeout(() => {
+            textAreaRef.current?.focus();
+        }, 100);
+        return () => clearTimeout(timeout);
+    }, []);
+
+    const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(evt => {
+        setPrompt(evt.target.value);
+    }, []);
+
+    const handleSend = useCallback(() => {
+        if (!prompt.trim()) return;
+
+        onSubmit?.(prompt);
+        setPrompt('');
+    }, [prompt, onSubmit]);
+
+    const handleKeyDown = useCallback<React.KeyboardEventHandler<HTMLTextAreaElement>>(
+        evt => {
+            if (evt.key === 'Enter' && !evt.shiftKey) {
+                evt.preventDefault();
+                handleSend();
+            }
+        },
+        [handleSend]
+    );
+
+    const handleSubmit = useCallback<React.FormEventHandler<HTMLFormElement>>(
+        evt => {
+            evt.preventDefault();
+            handleSend();
+        },
+        [handleSend]
+    );
+
+    return (
+        <BaseModal className="chat-modal">
+            <div className="modal-header">
+                <h4 className="modal-title text__wrap">{title}</h4>
+                <button className="btn btn-sm btn-default" onClick={onCancel} type="button">
+                    End Chat
+                </button>
+            </div>
+            <div className="modal-body">
+                Explain the calculation you would like and I'll help you write the expression. You can also ask
+                questions about what fields can be used and what calculations can be done.
+            </div>
+            <div className="modal-footer">
+                <form className="form-inline" onSubmit={handleSubmit}>
+                    <div className="form-group">
+                        <div className="col-xs-12">
+                            <textarea
+                                aria-label="Expression Assistant Prompt"
+                                className="form-control prompt-input"
+                                name="expression-assistant-prompt"
+                                onChange={handleChange}
+                                onKeyDown={handleKeyDown}
+                                placeholder="Enter a prompt"
+                                ref={textAreaRef}
+                                value={prompt}
+                            />
+                        </div>
+                    </div>
+                    <button className="btn btn-default prompt-button" disabled={!prompt.trim()} type="submit">
+                        <i className="fa fa-arrow-up" />
+                    </button>
+                </form>
+                <div className="caution-text">
+                    Your data and chats are private. AI can make mistakes. Double check any suggestions.
+                </div>
+            </div>
+        </BaseModal>
+    );
+});
+ChatModal.displayName = 'ChatModal';
diff --git a/packages/components/src/internal/query/APIWrapper.ts b/packages/components/src/internal/query/APIWrapper.ts
index f1af6a7ddc..0dc45b0aff 100644
--- a/packages/components/src/internal/query/APIWrapper.ts
+++ b/packages/components/src/internal/query/APIWrapper.ts
@@ -18,6 +18,7 @@ import {
     clearSelected,
     ClearSelectedOptions,
     deleteView,
+    expressionAssist,
     getGridViews,
     GetSelectedResponse,
     getSnapshotSelections,
@@ -76,6 +77,7 @@ export interface QueryAPIWrapper {
     deleteRowsByContainer: (options: DeleteRowsOptions, containerField: string) => Promise<QueryCommandResponse>;
     deleteView: (schemaQuery: SchemaQuery, containerPath: string, viewName?: string, revert?: boolean) => Promise<void>;
     executeSql: <T extends ExecuteSqlOptions>(options: T) => Promise<ExecuteSqlResponse<T>>;
+    expressionAssist: (prompt: string) => Promise<void>;
     getDataTypeFolderDataCount: (
         entityDataType: EntityDataType,
         dataTypeRowId: number,
@@ -176,6 +178,7 @@ export class QueryServerAPIWrapper implements QueryAPIWrapper {
     deleteRowsByContainer = deleteRowsByContainer;
     deleteView = deleteView;
     executeSql = executeSql;
+    expressionAssist = expressionAssist;
     getDataTypeFolderDataCount = getDataTypeFolderDataCount;
     getEntityTypeOptions = getEntityTypeOptionsWithExclusions;
     getGridViews = getGridViews;
@@ -217,6 +220,7 @@ export function getQueryTestAPIWrapper(
         deleteRowsByContainer: mockFn(),
         deleteView: mockFn(),
         executeSql: mockFn(),
+        expressionAssist: mockFn(),
         getDataTypeFolderDataCount: mockFn(),
         getEntityTypeOptions: mockFn(),
         getGridViews: mockFn(),
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index b5e4b48add..1a0c20d79d 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -944,3 +944,99 @@
     margin: 0;
     margin-left: 15px;
 }
+
+.lk-modal .chat-modal {
+    height: 100dvh;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    padding: 40px 0;
+    box-sizing: border-box;
+
+    .modal-content {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        background-color: #FFFFFF;
+        border: 1px solid #DDDDDD;
+        border-radius: 8px;
+        overflow: hidden;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+    }
+
+    .modal-header {
+        flex-shrink: 0;
+
+        .modal-title {
+            display: inline;
+        }
+
+        .btn {
+            float: right;
+        }
+    }
+
+    .modal-body {
+        flex-grow: 1;
+        overflow-y: auto;
+        padding: 20px;
+    }
+
+    .modal-footer {
+        flex-shrink: 0;
+        background-color: #F3F3F4;
+        line-height: 20px;
+        padding: 15px;
+        border-top: 1px solid #EEEEEE;
+    }
+
+    .form-inline {
+        display: flex;
+        align-items: flex-end;
+        gap: 10px;
+        width: 100%;
+
+        .form-group,
+        .col-xs-12 {
+            display: contents;
+        }
+    }
+
+    .prompt-input {
+        flex-grow: 1;
+        width: 0;
+
+        field-sizing: content;
+        line-height: 1.2;
+        min-height: 1.2lh;
+        max-height: 9lh;
+
+        padding: 10px;
+        box-sizing: border-box;
+        resize: none;
+        border: 1px solid #CCCCCC;
+        border-radius: 3px;
+        margin: 0;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+    }
+
+    .prompt-button {
+        height: 38px;
+        flex-shrink: 0;
+        margin: 0;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        color: #333333;
+        border-color: #CCCCCC;
+    }
+
+    .caution-text {
+        width: 100%;
+        text-align: center;
+        color: #777777;
+        font-size: 11px;
+        margin-top: 12px;
+    }
+}

From 7667ec8d6ed5f5539dfe33369400cec912206750 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 8 May 2026 16:09:55 -0700
Subject: [PATCH 02/38] Wire up expression assistant modal

---
 packages/components/src/internal/actions.ts   |  29 +++-
 .../CalculatedFieldOptions.tsx                |  24 +++-
 .../ExpressionAssistantModal.tsx              | 133 ++++++++++++++++--
 .../components/domainproperties/models.tsx    |   2 +
 .../src/internal/components/mcp/ChatModal.tsx | 105 +++++++++++---
 .../src/internal/components/mcp/models.ts     |  15 ++
 .../src/internal/query/APIWrapper.ts          |  10 +-
 .../src/internal/util/RequestHandler.ts       |  16 +--
 .../src/theme/domainproperties.scss           |  67 ++++++++-
 9 files changed, 353 insertions(+), 48 deletions(-)
 create mode 100644 packages/components/src/internal/components/mcp/models.ts

diff --git a/packages/components/src/internal/actions.ts b/packages/components/src/internal/actions.ts
index fd64682f0a..f84680b1e2 100644
--- a/packages/components/src/internal/actions.ts
+++ b/packages/components/src/internal/actions.ts
@@ -785,8 +785,31 @@ export function renameGridView(
     });
 }
 
-export function expressionAssist(prompt: string): Promise<void> {
-    return new Promise((resolve, reject) => {
-        console.log('Expression assisting...');
+export interface ExpressionAssistOptions {
+    containerPath?: string;
+    prompt: string;
+    requestHandler?: RequestHandler;
+}
+
+export interface ExpressionAssistResponse {
+    error?: string;
+    html?: string;
+    sql?: string;
+    success: boolean;
+    text?: string;
+}
+
+export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
+    const { containerPath, prompt, requestHandler } = options;
+    return request<ExpressionAssistResponse>({
+        // TODO: Replace with new endpoint, this returns a shape we like but not the results we want :-)
+        url: ActionURL.buildURL('query', 'queryAgent.api', containerPath),
+        method: 'POST',
+        jsonData: {
+            schemaName: 'exp.data',
+            prompt,
+        },
+        errorLogMsg: 'Failed to assist with expression',
+        requestHandler,
     });
 }
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index 3a9744cbfb..e492e8bb24 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -9,7 +9,7 @@ import { resolveErrorMessage } from '../../util/messaging';
 
 import { createFormInputId, createFormInputName } from './utils';
 import { DOMAIN_FIELD_CLIENT_SIDE_ERROR, DOMAIN_FIELD_VALUE_EXPRESSION, SEVERITY_LEVEL_WARN } from './constants';
-import { DomainField, DomainFieldError, SystemField } from './models';
+import { DomainField, DomainFieldError, GetDomainFields, SystemField } from './models';
 import { SectionHeading } from './SectionHeading';
 import { isFieldFullyLocked, isFieldPartiallyLocked } from './propertiesUtil';
 import { CALCULATED_TYPE, MULTI_CHOICE_TYPE, PropDescType } from './PropDescType';
@@ -84,7 +84,7 @@ const HELP_TIP_BODY = (
 interface Props {
     domainIndex: number;
     field: DomainField;
-    getDomainFields: () => { domainFields: List<DomainField>; systemFields: SystemField[] };
+    getDomainFields: GetDomainFields;
     index: number;
     onChange: (fieldId: string, value: any, index?: number, expand?: boolean, skipDirtyCheck?: boolean) => void;
 }
@@ -156,6 +156,17 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         [validateExpression]
     );
 
+    const handleApply = useCallback(
+        (analysis: string) => {
+            onChange(inputId, analysis);
+            setError(undefined);
+            setParsedType(undefined);
+            validateExpression(analysis, true);
+            close();
+        },
+        [close, inputId, onChange, validateExpression]
+    );
+
     useEffect(() => {
         if (!isNew) {
             validateExpression(field.valueExpression, false);
@@ -252,7 +263,14 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                     </div>
                 )}
             </div>
-            {show && <ExpressionAssistantModal field={field} onCancel={close} />}
+            {show && (
+                <ExpressionAssistantModal
+                    field={field}
+                    getDomainFields={getDomainFields}
+                    onCancel={close}
+                    onComplete={handleApply}
+                />
+            )}
         </div>
     );
 });
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index ff95ed7a5a..246a25c7b3 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -1,27 +1,140 @@
-import React, { FC, memo, useCallback } from 'react';
-import { DomainField } from './models';
-import { ChatModal } from '../mcp/ChatModal';
+import React, { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useAppContext } from '../../AppContext';
+import { generateId } from '../../util/utils';
+import { ChatModal } from '../mcp/ChatModal';
+import { ChatMessage, ChatRole } from '../mcp/models';
+import { DomainField, GetDomainFields } from './models';
+import { useRequestHandler } from '../../util/RequestHandler';
 
 interface Props {
     field: DomainField;
+    getDomainFields: GetDomainFields;
     onCancel: () => void;
+    onComplete?: (analysis: string) => void;
 }
 
-export const ExpressionAssistantModal: FC<Props> = memo(({ field, onCancel }) => {
+const GENERATE_INTRO =
+    "Explain the calculation you would like and I'll help you write the expression. You can also ask questions about what fields can be used and what calculations can be done.";
+
+function useExpressionAssistance(domainFields: DomainField[], existingExpression?: string) {
+    const [messages, setMessages] = useState<ChatMessage[]>([]);
+    const [isPending, setIsPending] = useState(false);
+    const firstChatRef = useRef(true);
+    const autoEvalRef = useRef(false);
     const { api } = useAppContext();
+    const { abortRequest, requestHandler, resetRequestHandler } = useRequestHandler();
 
-    const onSubmit = useCallback(
-        async (prompt: string) => {
+    const fieldsBlock = useMemo(
+        () =>
+            [
+                'The following JSON blob enumerates the available columns and their types:',
+                JSON.stringify(domainFields),
+            ].join('\n'),
+        [domainFields]
+    );
+
+    const generatePreamble = useMemo(
+        () => `${fieldsBlock}\nGenerate a calculated column expression that matches the following description:`,
+        [fieldsBlock]
+    );
+
+    const evaluatePrompt = useMemo(() => {
+        if (!existingExpression) return undefined;
+        return [
+            fieldsBlock,
+            'The user already has the following calculated column expression:',
+            '```',
+            existingExpression,
+            '```',
+            'Evaluate this expression. If you find errors or issues, point them out and propose corrections. If the expression is valid, ask the user what they would like to change. Also flag edge cases the user may want to handle, such as empty data, division by zero, or null values.',
+        ].join('\n');
+    }, [existingExpression, fieldsBlock]);
+
+    const onInterrupt = useCallback(() => {
+        abortRequest();
+        setIsPending(false);
+    }, [abortRequest]);
+
+    const runRequest = useCallback(
+        async (fullPrompt: string) => {
+            setIsPending(true);
+            let aborted = false;
             try {
-                const beep = await api.query.expressionAssist(prompt);
+                const response = await api.query.expressionAssistant({ prompt: fullPrompt, requestHandler });
+                resetRequestHandler();
+                setMessages(prev => [
+                    ...prev,
+                    {
+                        id: generateId('chat-'),
+                        role: ChatRole.assistant,
+                        timestamp: Date.now(),
+                        error: response.success ? response.error : (response.error ?? 'Request failed.'),
+                        html: response.html,
+                        sql: response.sql,
+                        text: response.text,
+                    },
+                ]);
             } catch (e) {
-
+                aborted = !e.status;
+                if (!aborted) {
+                    setMessages(prev => [
+                        ...prev,
+                        {
+                            id: generateId('chat-'),
+                            role: ChatRole.assistant,
+                            timestamp: Date.now(),
+                            error: 'Request failed. Please try again.',
+                        },
+                    ]);
+                }
+            } finally {
+                if (!aborted) {
+                    setIsPending(false);
+                }
             }
         },
-        [api]
+        [api, requestHandler, resetRequestHandler]
+    );
+
+    const sendPrompt = useCallback(
+        async (prompt: string) => {
+            setMessages(prev => [
+                ...prev,
+                { id: generateId('chat-'), role: ChatRole.user, text: prompt, timestamp: Date.now() },
+            ]);
+            const fullPrompt = firstChatRef.current ? `${generatePreamble}\n${prompt}` : prompt;
+            firstChatRef.current = false;
+            await runRequest(fullPrompt);
+        },
+        [generatePreamble, runRequest]
     );
 
-    return <ChatModal onCancel={onCancel} onSubmit={onSubmit} title="Expression AI Assistant" />;
+    useEffect(() => {
+        if (!evaluatePrompt || autoEvalRef.current) return;
+        autoEvalRef.current = true;
+        firstChatRef.current = false;
+        runRequest(evaluatePrompt);
+    }, [evaluatePrompt, runRequest]);
+
+    return { messages, isPending, onInterrupt, sendPrompt };
+}
+
+export const ExpressionAssistantModal: FC<Props> = memo(({ field, getDomainFields, onCancel, onComplete }) => {
+    const domainFields = useMemo(() => getDomainFields().domainFields.toArray(), [getDomainFields]);
+    const existingExpression = field.valueExpression?.trim();
+    const { isPending, messages, onInterrupt, sendPrompt } = useExpressionAssistance(domainFields, existingExpression);
+
+    return (
+        <ChatModal
+            intro={existingExpression ? undefined : GENERATE_INTRO}
+            isPending={isPending}
+            messages={messages}
+            onCancel={onCancel}
+            onComplete={onComplete}
+            onInterrupt={onInterrupt}
+            sendPrompt={sendPrompt}
+            title="Expression AI Assistant"
+        />
+    );
 });
 ExpressionAssistantModal.displayName = 'ExpressionAssistantModal';
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 39653d35b6..30aa27193b 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1564,6 +1564,8 @@ export class DomainField
     }
 }
 
+export type GetDomainFields = () => { domainFields: List<DomainField>; systemFields: SystemField[] };
+
 export function isValidTextChoiceValue(v: string): boolean {
     return v !== null && v !== undefined && v.trim() !== '';
 }
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index a3022303f4..ac8374ac5f 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -1,39 +1,90 @@
 import React, { FC, memo, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
 import { BaseModal } from '../../Modal';
+import { LoadingSpinner } from '../base/LoadingSpinner';
+import { ChatMessage, ChatRole } from './models';
+import { cancelEvent } from '../../events';
+import { useTimeout } from '../../hooks';
+
+interface ChatBubbleProps {
+    message: ChatMessage;
+    onComplete?: (analysis: string) => void;
+}
+
+const ChatBubble: FC<ChatBubbleProps> = memo(({ message, onComplete }) => {
+    const handleApply = useCallback((): void => {
+        if (message.sql) onComplete?.(message.sql);
+    }, [message.sql, onComplete]);
+
+    if (message.role === ChatRole.user) {
+        return <div className="chat-item user-prompt">{message.text}</div>;
+    }
+
+    if (message.error) {
+        return <div className="chat-item assistant-response error-response">{message.error}</div>;
+    }
+
+    return (
+        <div className="chat-item assistant-response">
+            {message.text && <div className="assistant-text">{message.text}</div>}
+            {message.html && <div className="assistant-text" dangerouslySetInnerHTML={{ __html: message.html }} />}
+            {message.sql && <div className="assistant-expression">{message.sql}</div>}
+            {message.sql && onComplete && (
+                <a className="apply-expression" onClick={handleApply} role="button" tabIndex={0}>
+                    <i className="fa fa-check" /> Apply Expression
+                </a>
+            )}
+        </div>
+    );
+});
+ChatBubble.displayName = 'ChatBubble';
 
 interface Props {
+    intro?: ReactNode;
+    isPending: boolean;
+    messages: ChatMessage[];
     onCancel: () => void;
-    onSubmit?: (prompt: string) => void;
+    onComplete?: (analysis: string) => void;
+    onInterrupt: () => void;
+    sendPrompt: (prompt: string) => Promise<void>;
     title: ReactNode;
 }
 
-export const ChatModal: FC<Props> = memo(({ onCancel, onSubmit, title }) => {
+export const ChatModal: FC<Props> = memo(props => {
+    const { intro, isPending, messages, onCancel, onComplete, onInterrupt, sendPrompt, title } = props;
     const [prompt, setPrompt] = useState('');
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
+    const historyRef = useRef<HTMLDivElement>(null);
+    const timer = useTimeout();
 
-    // Fix for autoFocus not working in Modals
+    // Autofocus the prompt on mount
     useEffect(() => {
-        const timeout = setTimeout(() => {
+        timer.set(() => {
             textAreaRef.current?.focus();
-        }, 100);
-        return () => clearTimeout(timeout);
-    }, []);
+        });
+        return timer.clear;
+    }, [timer]);
+
+    useEffect(() => {
+        const el = historyRef.current;
+        if (el) el.scrollTo({ top: el.scrollHeight, behavior: 'smooth' });
+    }, [messages, isPending]);
 
     const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(evt => {
         setPrompt(evt.target.value);
     }, []);
 
     const handleSend = useCallback(() => {
-        if (!prompt.trim()) return;
-
-        onSubmit?.(prompt);
+        const trimmed = prompt.trim();
+        if (!trimmed || isPending) return;
         setPrompt('');
-    }, [prompt, onSubmit]);
+        // sendPrompt manages its own errors; ignore the returned promise
+        sendPrompt(trimmed);
+    }, [prompt, isPending, sendPrompt]);
 
     const handleKeyDown = useCallback<React.KeyboardEventHandler<HTMLTextAreaElement>>(
         evt => {
             if (evt.key === 'Enter' && !evt.shiftKey) {
-                evt.preventDefault();
+                cancelEvent(evt);
                 handleSend();
             }
         },
@@ -42,7 +93,7 @@ export const ChatModal: FC<Props> = memo(({ onCancel, onSubmit, title }) => {
 
     const handleSubmit = useCallback<React.FormEventHandler<HTMLFormElement>>(
         evt => {
-            evt.preventDefault();
+            cancelEvent(evt);
             handleSend();
         },
         [handleSend]
@@ -57,8 +108,17 @@ export const ChatModal: FC<Props> = memo(({ onCancel, onSubmit, title }) => {
                 </button>
             </div>
             <div className="modal-body">
-                Explain the calculation you would like and I'll help you write the expression. You can also ask
-                questions about what fields can be used and what calculations can be done.
+                <div className="chat-history" ref={historyRef}>
+                    {intro && <div className="chat-item assistant-response chat-intro">{intro}</div>}
+                    {messages.map(message => (
+                        <ChatBubble key={message.id} message={message} onComplete={onComplete} />
+                    ))}
+                    {isPending && (
+                        <div className="chat-item assistant-response pending">
+                            <LoadingSpinner msg="Thinking..." />
+                        </div>
+                    )}
+                </div>
             </div>
             <div className="modal-footer">
                 <form className="form-inline" onSubmit={handleSubmit}>
@@ -76,11 +136,18 @@ export const ChatModal: FC<Props> = memo(({ onCancel, onSubmit, title }) => {
                             />
                         </div>
                     </div>
-                    <button className="btn btn-default prompt-button" disabled={!prompt.trim()} type="submit">
-                        <i className="fa fa-arrow-up" />
-                    </button>
+                    {isPending && (
+                        <button className="btn btn-default prompt-button" onClick={onInterrupt} type="button">
+                            <i className="fa fa-stop" />
+                        </button>
+                    )}
+                    {!isPending && (
+                        <button className="btn btn-default prompt-button" disabled={!prompt.trim()} type="submit">
+                            <i className="fa fa-arrow-up" />
+                        </button>
+                    )}
                 </form>
-                <div className="caution-text">
+                <div className="chat-modal__caution">
                     Your data and chats are private. AI can make mistakes. Double check any suggestions.
                 </div>
             </div>
diff --git a/packages/components/src/internal/components/mcp/models.ts b/packages/components/src/internal/components/mcp/models.ts
new file mode 100644
index 0000000000..d7a2c1863c
--- /dev/null
+++ b/packages/components/src/internal/components/mcp/models.ts
@@ -0,0 +1,15 @@
+export enum ChatRole {
+    assistant = 'assistant',
+    user = 'user',
+}
+
+export interface ChatMessage {
+    error?: string;
+    html?: string;
+    id: string;
+    role: ChatRole;
+    sql?: string;
+    text?: string;
+    timestamp: number;
+}
+
diff --git a/packages/components/src/internal/query/APIWrapper.ts b/packages/components/src/internal/query/APIWrapper.ts
index 0dc45b0aff..59900ba680 100644
--- a/packages/components/src/internal/query/APIWrapper.ts
+++ b/packages/components/src/internal/query/APIWrapper.ts
@@ -18,7 +18,9 @@ import {
     clearSelected,
     ClearSelectedOptions,
     deleteView,
-    expressionAssist,
+    expressionAssistant,
+    ExpressionAssistOptions,
+    ExpressionAssistResponse,
     getGridViews,
     GetSelectedResponse,
     getSnapshotSelections,
@@ -77,7 +79,7 @@ export interface QueryAPIWrapper {
     deleteRowsByContainer: (options: DeleteRowsOptions, containerField: string) => Promise<QueryCommandResponse>;
     deleteView: (schemaQuery: SchemaQuery, containerPath: string, viewName?: string, revert?: boolean) => Promise<void>;
     executeSql: <T extends ExecuteSqlOptions>(options: T) => Promise<ExecuteSqlResponse<T>>;
-    expressionAssist: (prompt: string) => Promise<void>;
+    expressionAssistant: (options: ExpressionAssistOptions) => Promise<ExpressionAssistResponse>;
     getDataTypeFolderDataCount: (
         entityDataType: EntityDataType,
         dataTypeRowId: number,
@@ -178,7 +180,7 @@ export class QueryServerAPIWrapper implements QueryAPIWrapper {
     deleteRowsByContainer = deleteRowsByContainer;
     deleteView = deleteView;
     executeSql = executeSql;
-    expressionAssist = expressionAssist;
+    expressionAssistant = expressionAssistant;
     getDataTypeFolderDataCount = getDataTypeFolderDataCount;
     getEntityTypeOptions = getEntityTypeOptionsWithExclusions;
     getGridViews = getGridViews;
@@ -220,7 +222,7 @@ export function getQueryTestAPIWrapper(
         deleteRowsByContainer: mockFn(),
         deleteView: mockFn(),
         executeSql: mockFn(),
-        expressionAssist: mockFn(),
+        expressionAssistant: mockFn(),
         getDataTypeFolderDataCount: mockFn(),
         getEntityTypeOptions: mockFn(),
         getGridViews: mockFn(),
diff --git a/packages/components/src/internal/util/RequestHandler.ts b/packages/components/src/internal/util/RequestHandler.ts
index 4b17019351..99e3b058dc 100644
--- a/packages/components/src/internal/util/RequestHandler.ts
+++ b/packages/components/src/internal/util/RequestHandler.ts
@@ -3,6 +3,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { RequestHandler } from '../request';
 
 export interface UseRequestHandler {
+    abortRequest: () => void;
     requestHandler: RequestHandler;
     resetRequestHandler: () => void;
 }
@@ -59,6 +60,11 @@ export interface UseRequestHandler {
 export function useRequestHandler(abortOnDismount = false): UseRequestHandler {
     const requestRef = useRef<XMLHttpRequest>(undefined);
 
+    const abortRequest = useCallback(() => {
+        requestRef.current?.abort();
+        requestRef.current = undefined;
+    }, []);
+
     // This requestHandler aborts prior search requests in the event that another request is made
     const requestHandler = useCallback<RequestHandler>(request => {
         requestRef.current?.abort();
@@ -71,15 +77,9 @@ export function useRequestHandler(abortOnDismount = false): UseRequestHandler {
 
     useEffect(() => {
         if (!abortOnDismount) return;
-
-        // eslint-disable-next-line consistent-return
-        return () => {
-            requestRef.current?.abort();
-            requestRef.current = undefined;
-        };
-
+        return abortRequest;
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    return { requestHandler, resetRequestHandler };
+    return { abortRequest, requestHandler, resetRequestHandler };
 }
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index 1a0c20d79d..988396e18c 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -980,6 +980,71 @@
         flex-grow: 1;
         overflow-y: auto;
         padding: 20px;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .chat-intro {
+        margin-bottom: 12px;
+    }
+
+    .chat-history {
+        flex-grow: 1;
+        overflow-y: auto;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+    }
+
+    .chat-item {
+        white-space: pre-wrap;
+        word-wrap: break-word;
+    }
+
+    .user-prompt {
+        align-self: flex-end;
+        max-width: 80%;
+        padding: 8px 12px;
+        background-color: #F1F9FC;
+        border: 1px solid rgba(201, 230, 242, 0.8);
+        border-radius: 8px 8px 0 8px;
+        color: #0088CC;
+    }
+
+    .assistant-response {
+        align-self: stretch;
+        color: #333333;
+    }
+
+    .assistant-response.pending {
+        color: #777777;
+    }
+
+    .assistant-text {
+        margin-bottom: 8px;
+    }
+
+    .assistant-expression {
+        font-family: monospace;
+        margin-bottom: 8px;
+    }
+
+    .apply-expression {
+        color: #2980B9;
+        cursor: pointer;
+        display: inline-block;
+
+        &:hover {
+            text-decoration: underline;
+        }
+
+        .fa-check {
+            margin-right: 6px;
+        }
+    }
+
+    .error-response {
+        color: #C62828;
     }
 
     .modal-footer {
@@ -1032,7 +1097,7 @@
         border-color: #CCCCCC;
     }
 
-    .caution-text {
+    .chat-modal__caution {
         width: 100%;
         text-align: center;
         color: #777777;

From 2e84efbdabe2c44995ad371cd1175b7e2e688184 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 11 May 2026 09:23:07 -0700
Subject: [PATCH 03/38] Introduce query-expressionAssistantAgent.api

---
 packages/components/src/internal/actions.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/components/src/internal/actions.ts b/packages/components/src/internal/actions.ts
index f84680b1e2..85e32b6642 100644
--- a/packages/components/src/internal/actions.ts
+++ b/packages/components/src/internal/actions.ts
@@ -802,8 +802,7 @@ export interface ExpressionAssistResponse {
 export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
     const { containerPath, prompt, requestHandler } = options;
     return request<ExpressionAssistResponse>({
-        // TODO: Replace with new endpoint, this returns a shape we like but not the results we want :-)
-        url: ActionURL.buildURL('query', 'queryAgent.api', containerPath),
+        url: ActionURL.buildURL('query', 'expressionAssistantAgent.api', containerPath),
         method: 'POST',
         jsonData: {
             schemaName: 'exp.data',

From a4b338ef25aef4217b408914309617907b3f9918 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 11 May 2026 09:53:18 -0700
Subject: [PATCH 04/38] Client-side metrics

---
 .../CalculatedFieldOptions.tsx                | 31 ++++++++++++++++---
 .../ExpressionAssistantModal.tsx              |  9 ++++--
 .../src/theme/domainproperties.scss           |  4 ++-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index e492e8bb24..b5a9b08d29 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -17,7 +17,8 @@ import { parseCalculatedColumn } from './actions';
 import { SVGIcon } from '../base/SVGIcon';
 import { isAIAssistanceEnabled } from '../../app/utils';
 import { useModalState } from '../../hooks';
-import { ExpressionAssistantModal } from './ExpressionAssistantModal';
+import { EXPR_ASST_METRIC_FEATURE_AREA, ExpressionAssistantModal } from './ExpressionAssistantModal';
+import { incrementClientSideMetricCount } from '../../actions';
 
 // export for jest testing
 export const typeToDisplay = (type: string): string => {
@@ -156,17 +157,28 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         [validateExpression]
     );
 
-    const handleApply = useCallback(
+    const handleApplyExpression = useCallback(
         (analysis: string) => {
             onChange(inputId, analysis);
             setError(undefined);
             setParsedType(undefined);
             validateExpression(analysis, true);
             close();
+            incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'applyExpression');
         },
         [close, inputId, onChange, validateExpression]
     );
 
+    const onOpenAssistant = useCallback(() => {
+        open();
+        incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'clickButton');
+    }, [open]);
+
+    const onValidateAssistant = useCallback(() => {
+        open();
+        incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'clickValidate');
+    }, [open]);
+
     useEffect(() => {
         if (!isNew) {
             validateExpression(field.valueExpression, false);
@@ -205,7 +217,16 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                         value={field.valueExpression || ''}
                     />
                     <div className="domain-field-calc-footer">
-                        {error && <div className="error">{error}</div>}
+                        {error && (
+                            <div>
+                                <span className="error">{error}</span>
+                                {assistanceEnabled && (
+                                    <span className="clickable-text validate-link-ai" onClick={onValidateAssistant}>
+                                        Get help from AI
+                                    </span>
+                                )}
+                            </div>
+                        )}
                         {!error && parsedType && (
                             <div className="validated">
                                 Validated. Calculated data type is "{typeToDisplay(parsedType)}".
@@ -224,7 +245,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                             calculation you want, or get help with an existing expression.
                         </div>
                         <div className="margin-bottom">
-                            <button className="btn btn-default" onClick={open} type="button">
+                            <button className="btn btn-default" onClick={onOpenAssistant} type="button">
                                 <SVGIcon
                                     height="16px"
                                     iconSrc="ai_stars_icon"
@@ -268,7 +289,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                     field={field}
                     getDomainFields={getDomainFields}
                     onCancel={close}
-                    onComplete={handleApply}
+                    onComplete={handleApplyExpression}
                 />
             )}
         </div>
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index 246a25c7b3..90ca501ac0 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -5,6 +5,11 @@ import { ChatModal } from '../mcp/ChatModal';
 import { ChatMessage, ChatRole } from '../mcp/models';
 import { DomainField, GetDomainFields } from './models';
 import { useRequestHandler } from '../../util/RequestHandler';
+import { incrementClientSideMetricCount } from '../../actions';
+
+export const EXPR_ASST_METRIC_FEATURE_AREA = 'expressionAssistant';
+const GENERATE_INTRO =
+    "Explain the calculation you would like and I'll help you write the expression. You can also ask questions about what fields can be used and what calculations can be done.";
 
 interface Props {
     field: DomainField;
@@ -13,9 +18,6 @@ interface Props {
     onComplete?: (analysis: string) => void;
 }
 
-const GENERATE_INTRO =
-    "Explain the calculation you would like and I'll help you write the expression. You can also ask questions about what fields can be used and what calculations can be done.";
-
 function useExpressionAssistance(domainFields: DomainField[], existingExpression?: string) {
     const [messages, setMessages] = useState<ChatMessage[]>([]);
     const [isPending, setIsPending] = useState(false);
@@ -74,6 +76,7 @@ function useExpressionAssistance(domainFields: DomainField[], existingExpression
                         text: response.text,
                     },
                 ]);
+                incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
             } catch (e) {
                 aborted = !e.status;
                 if (!aborted) {
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index 988396e18c..da30a6ab2c 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -898,7 +898,9 @@
 .domain-field-calc-footer .error {
     color: $brand-danger;
 }
-
+.domain-field-calc-footer .validate-link-ai {
+    margin-left: 4px;
+}
 .domain-field-calc-examples table {
     margin-top: 15px;
 }

From e6f5129fc1fa973397d4dc604944c14eb75e07fe Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 11 May 2026 09:59:28 -0700
Subject: [PATCH 05/38] Interrupt on cancel

---
 .../components/src/internal/components/mcp/ChatModal.tsx   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index ac8374ac5f..75f067604b 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -69,6 +69,11 @@ export const ChatModal: FC<Props> = memo(props => {
         if (el) el.scrollTo({ top: el.scrollHeight, behavior: 'smooth' });
     }, [messages, isPending]);
 
+    const handleCancel = useCallback(() => {
+        onInterrupt();
+        onCancel();
+    }, [onCancel, onInterrupt]);
+
     const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(evt => {
         setPrompt(evt.target.value);
     }, []);
@@ -103,7 +108,7 @@ export const ChatModal: FC<Props> = memo(props => {
         <BaseModal className="chat-modal">
             <div className="modal-header">
                 <h4 className="modal-title text__wrap">{title}</h4>
-                <button className="btn btn-sm btn-default" onClick={onCancel} type="button">
+                <button className="btn btn-sm btn-default" onClick={handleCancel} type="button">
                     End Chat
                 </button>
             </div>

From 4a285cd53ccb6b23f0cbee2796dc1c7029b0b96e Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 11 May 2026 10:07:42 -0700
Subject: [PATCH 06/38] Interrupt message

---
 .../ExpressionAssistantModal.tsx              | 24 +++++++++++++++----
 .../src/internal/components/mcp/ChatModal.tsx | 10 +++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index 90ca501ac0..c0003cd203 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -52,10 +52,26 @@ function useExpressionAssistance(domainFields: DomainField[], existingExpression
         ].join('\n');
     }, [existingExpression, fieldsBlock]);
 
-    const onInterrupt = useCallback(() => {
-        abortRequest();
-        setIsPending(false);
-    }, [abortRequest]);
+    const onInterrupt = useCallback(
+        (isUser?: boolean) => {
+            abortRequest();
+            setIsPending(false);
+
+            // If the user interrupted then request, then display a message confirming that it is no longer thinking
+            if (isUser === true) {
+                setMessages(prev => [
+                    ...prev,
+                    {
+                        id: generateId('chat-'),
+                        role: ChatRole.assistant,
+                        timestamp: Date.now(),
+                        text: 'Stopped.',
+                    },
+                ]);
+            }
+        },
+        [abortRequest]
+    );
 
     const runRequest = useCallback(
         async (fullPrompt: string) => {
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 75f067604b..758fa3abf6 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -44,7 +44,7 @@ interface Props {
     messages: ChatMessage[];
     onCancel: () => void;
     onComplete?: (analysis: string) => void;
-    onInterrupt: () => void;
+    onInterrupt: (isUser?: boolean) => void;
     sendPrompt: (prompt: string) => Promise<void>;
     title: ReactNode;
 }
@@ -70,7 +70,7 @@ export const ChatModal: FC<Props> = memo(props => {
     }, [messages, isPending]);
 
     const handleCancel = useCallback(() => {
-        onInterrupt();
+        onInterrupt(false);
         onCancel();
     }, [onCancel, onInterrupt]);
 
@@ -78,6 +78,10 @@ export const ChatModal: FC<Props> = memo(props => {
         setPrompt(evt.target.value);
     }, []);
 
+    const handleInterrupt = useCallback(() => {
+        onInterrupt(true);
+    }, [onInterrupt]);
+
     const handleSend = useCallback(() => {
         const trimmed = prompt.trim();
         if (!trimmed || isPending) return;
@@ -142,7 +146,7 @@ export const ChatModal: FC<Props> = memo(props => {
                         </div>
                     </div>
                     {isPending && (
-                        <button className="btn btn-default prompt-button" onClick={onInterrupt} type="button">
+                        <button className="btn btn-default prompt-button" onClick={handleInterrupt} type="button">
                             <i className="fa fa-stop" />
                         </button>
                     )}

From 7dc8ca512e32a10d15bacc53fe63c1c840093da3 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Mon, 11 May 2026 15:50:44 -0700
Subject: [PATCH 07/38] Improvements

---
 .../components/src/internal/APIWrapper.ts     |   3 +-
 packages/components/src/internal/actions.ts   |  28 ---
 .../components/domainproperties/APIWrapper.ts |  36 ++--
 .../CalculatedFieldOptions.test.tsx           | 101 +++++------
 .../CalculatedFieldOptions.tsx                |  34 ++--
 .../DomainRowExpandedOptions.tsx              |   4 +-
 .../ExpressionAssistantModal.tsx              | 156 ++++++++++-------
 .../domainproperties/actions.test.ts          |   4 +-
 .../components/domainproperties/actions.ts    |  52 +++++-
 .../components/domainproperties/models.tsx    |   2 +
 .../src/internal/components/mcp/ChatModal.tsx |  19 ++-
 .../src/internal/components/mcp/models.ts     |   2 +-
 .../src/internal/query/APIWrapper.ts          |   6 -
 packages/components/src/theme/chat.scss       | 150 ++++++++++++++++
 .../src/theme/domainproperties.scss           | 161 ------------------
 packages/components/src/theme/index.scss      |   2 +
 packages/components/src/theme/markdown.scss   |  11 ++
 17 files changed, 405 insertions(+), 366 deletions(-)
 create mode 100644 packages/components/src/theme/chat.scss
 create mode 100644 packages/components/src/theme/markdown.scss

diff --git a/packages/components/src/internal/APIWrapper.ts b/packages/components/src/internal/APIWrapper.ts
index 2344c377ea..ea9d7d3029 100644
--- a/packages/components/src/internal/APIWrapper.ts
+++ b/packages/components/src/internal/APIWrapper.ts
@@ -17,6 +17,7 @@ import {
 } from './components/security/APIWrapper';
 import {
     DomainPropertiesAPIWrapper,
+    DomainPropertiesServerAPIWrapper,
     getDomainPropertiesTestAPIWrapper,
 } from './components/domainproperties/APIWrapper';
 import { getQueryTestAPIWrapper, QueryAPIWrapper, QueryServerAPIWrapper } from './query/APIWrapper';
@@ -55,7 +56,7 @@ export function getDefaultAPIWrapper(): ComponentsAPIWrapper {
     if (!DEFAULT_WRAPPER) {
         DEFAULT_WRAPPER = {
             assay: new AssayServerAPIWrapper(),
-            domain: new DomainPropertiesAPIWrapper(),
+            domain: new DomainPropertiesServerAPIWrapper(),
             entity: new EntityServerAPIWrapper(),
             folder: new ServerFolderAPIWrapper(),
             query: new QueryServerAPIWrapper(),
diff --git a/packages/components/src/internal/actions.ts b/packages/components/src/internal/actions.ts
index 85e32b6642..77a10200dd 100644
--- a/packages/components/src/internal/actions.ts
+++ b/packages/components/src/internal/actions.ts
@@ -784,31 +784,3 @@ export function renameGridView(
         });
     });
 }
-
-export interface ExpressionAssistOptions {
-    containerPath?: string;
-    prompt: string;
-    requestHandler?: RequestHandler;
-}
-
-export interface ExpressionAssistResponse {
-    error?: string;
-    html?: string;
-    sql?: string;
-    success: boolean;
-    text?: string;
-}
-
-export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
-    const { containerPath, prompt, requestHandler } = options;
-    return request<ExpressionAssistResponse>({
-        url: ActionURL.buildURL('query', 'expressionAssistantAgent.api', containerPath),
-        method: 'POST',
-        jsonData: {
-            schemaName: 'exp.data',
-            prompt,
-        },
-        errorLogMsg: 'Failed to assist with expression',
-        requestHandler,
-    });
-}
diff --git a/packages/components/src/internal/components/domainproperties/APIWrapper.ts b/packages/components/src/internal/components/domainproperties/APIWrapper.ts
index 973e8a234d..b430a016a0 100644
--- a/packages/components/src/internal/components/domainproperties/APIWrapper.ts
+++ b/packages/components/src/internal/components/domainproperties/APIWrapper.ts
@@ -5,39 +5,51 @@ import { OntologyModel } from '../ontology/models';
 import { Container } from '../base/models/Container';
 
 import {
-    getDomainNamePreviews,
-    validateDomainNameExpressions,
-    getGenId,
-    setGenId,
+    expressionAssistant,
+    ExpressionAssistOptions,
+    ExpressionAssistResponse,
     fetchDomainDetails,
     FetchDomainDetailsOptions,
-    getMaxPhiLevel,
     fetchOntologies,
+    getDomainNamePreviews,
+    getGenId,
+    getMaxPhiLevel,
+    getRequiredParentTypes,
+    parseCalculatedColumn,
+    ParseCalculatedColumnResponse,
     saveDomain,
     SaveDomainOptions,
-    getRequiredParentTypes,
+    setGenId,
+    validateDomainNameExpressions,
 } from './actions';
 import { getValidPublishTargets } from './assay/actions';
 import { PHILEVEL_FULL_PHI } from './constants';
 import { getDataClassDetails } from './dataclasses/actions';
-import { DomainDesign, DomainDetails, NameExpressionsValidationResults } from './models';
+import { DomainDesign, DomainDetails, DomainField, NameExpressionsValidationResults, SystemField } from './models';
 
 export interface DomainPropertiesAPIWrapper {
+    expressionAssistant: (options: ExpressionAssistOptions) => Promise<ExpressionAssistResponse>;
     fetchDomainDetails: (options: FetchDomainDetailsOptions) => Promise<DomainDetails>;
     fetchOntologies: (containerPath?: string) => Promise<OntologyModel[]>;
     getDataClassDetails: (query?: SchemaQuery, domainId?: number, containerPath?: string) => Promise<DomainDetails>;
     getDomainNamePreviews: (schemaQuery?: SchemaQuery, domainId?: number, containerPath?: string) => Promise<string[]>;
-    getGenId: (rowId: number, kindName: 'SampleSet' | 'DataClass', containerPath?: string) => Promise<number>;
+    getGenId: (rowId: number, kindName: 'DataClass' | 'SampleSet', containerPath?: string) => Promise<number>;
     getMaxPhiLevel: (containerPath?: string) => Promise<string>;
     getRequiredParentTypes: (
         query: SchemaQuery,
         containerPath?: string
     ) => Promise<{ dataClasses: string[]; sampleTypes: string[] }>;
     getValidPublishTargets: (containerPath?: string) => Promise<Container[]>;
+    parseCalculatedColumn: (
+        expression: string,
+        domainFields: DomainField[],
+        systemFields: SystemField[],
+        containerPath?: string
+    ) => Promise<ParseCalculatedColumnResponse>;
     saveDomain: (options: SaveDomainOptions) => Promise<DomainDesign>;
     setGenId: (
         rowId: number,
-        kindName: 'SampleSet' | 'DataClass',
+        kindName: 'DataClass' | 'SampleSet',
         genId: number,
         containerPath?: string
     ) => Promise<any>;
@@ -49,7 +61,8 @@ export interface DomainPropertiesAPIWrapper {
     ) => Promise<NameExpressionsValidationResults>;
 }
 
-export class DomainPropertiesAPIWrapper implements DomainPropertiesAPIWrapper {
+export class DomainPropertiesServerAPIWrapper implements DomainPropertiesAPIWrapper {
+    expressionAssistant = expressionAssistant;
     fetchDomainDetails = fetchDomainDetails;
     fetchOntologies = fetchOntologies;
     getDataClassDetails = getDataClassDetails;
@@ -58,6 +71,7 @@ export class DomainPropertiesAPIWrapper implements DomainPropertiesAPIWrapper {
     getMaxPhiLevel = getMaxPhiLevel;
     getRequiredParentTypes = getRequiredParentTypes;
     getValidPublishTargets = getValidPublishTargets;
+    parseCalculatedColumn = parseCalculatedColumn;
     saveDomain = saveDomain;
     setGenId = setGenId;
     validateDomainNameExpressions = validateDomainNameExpressions;
@@ -71,6 +85,7 @@ export function getDomainPropertiesTestAPIWrapper(
     overrides: Partial<DomainPropertiesAPIWrapper> = {}
 ): DomainPropertiesAPIWrapper {
     return {
+        expressionAssistant: mockFn(),
         fetchDomainDetails: mockFn(),
         fetchOntologies: mockFn(),
         getDataClassDetails: mockFn(),
@@ -82,6 +97,7 @@ export function getDomainPropertiesTestAPIWrapper(
         getMaxPhiLevel: () => Promise.resolve(PHILEVEL_FULL_PHI),
         getRequiredParentTypes: mockFn(),
         getValidPublishTargets: mockFn(),
+        parseCalculatedColumn: mockFn(),
         saveDomain: mockFn(),
         setGenId: mockFn(),
         validateDomainNameExpressions: mockFn(),
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
index ceb17ca18d..e05f51d672 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
@@ -1,6 +1,4 @@
-import React, { act } from 'react';
-
-import { List } from 'immutable';
+import React from 'react';
 
 import { renderWithAppContext } from '../../test/reactTestLibraryHelpers';
 
@@ -16,63 +14,57 @@ import {
 
 describe('CalculatedFieldOptions', () => {
     test('default properties', async () => {
-        await act(async () => {
-            renderWithAppContext(
-                <CalculatedFieldOptions
-                    domainIndex={0}
-                    field={DomainField.create({ rangeURI: STRING_RANGE_URI })}
-                    getDomainFields={jest.fn()}
-                    index={0}
-                    onChange={jest.fn()}
-                />
-            );
-        });
+        renderWithAppContext(
+            <CalculatedFieldOptions
+                domainIndex={0}
+                field={DomainField.create({ rangeURI: STRING_RANGE_URI })}
+                getDomainFields={jest.fn()}
+                index={0}
+                onChange={jest.fn()}
+            />
+        );
 
-        expect(document.querySelector('.domain-field-section-heading').textContent).toBe('Expression');
+        expect(document.querySelector('.domain-field-section-heading')).toHaveTextContent('Expression');
         expect(document.querySelectorAll('.margin-bottom')).toHaveLength(0);
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
         expect(document.querySelectorAll('.domain-field-calc-footer')).toHaveLength(1);
-        expect(document.querySelector('textarea').textContent).toBe('');
+        expect(document.querySelector('textarea')).toHaveTextContent('');
         expect(document.querySelector('textarea').getAttribute('disabled')).toBe(null);
     });
 
     test('with existing expression', async () => {
-        await act(async () => {
-            renderWithAppContext(
-                <CalculatedFieldOptions
-                    domainIndex={0}
-                    field={DomainField.create({ valueExpression: '1=0', rangeURI: INT_RANGE_URI })}
-                    getDomainFields={jest.fn()}
-                    index={0}
-                    onChange={jest.fn()}
-                />
-            );
-        });
+        renderWithAppContext(
+            <CalculatedFieldOptions
+                domainIndex={0}
+                field={DomainField.create({ valueExpression: '1=0', rangeURI: INT_RANGE_URI })}
+                getDomainFields={jest.fn()}
+                index={0}
+                onChange={jest.fn()}
+            />
+        );
 
-        expect(document.querySelector('.domain-field-section-heading').textContent).toBe('Expression');
+        expect(document.querySelector('.domain-field-section-heading')).toHaveTextContent('Expression');
         expect(document.querySelectorAll('.margin-bottom')).toHaveLength(1);
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
         expect(document.querySelectorAll('.domain-field-calc-footer')).toHaveLength(1);
-        expect(document.querySelector('textarea').textContent).toBe('1=0');
+        expect(document.querySelector('textarea')).toHaveTextContent('1=0');
         expect(document.querySelector('textarea').getAttribute('disabled')).toBe(null);
     });
 
     test('disabled from lockType', async () => {
-        await act(async () => {
-            renderWithAppContext(
-                <CalculatedFieldOptions
-                    domainIndex={0}
-                    field={DomainField.create({ valueExpression: '1=0', lockType: DOMAIN_FIELD_PARTIALLY_LOCKED })}
-                    getDomainFields={jest.fn()}
-                    index={0}
-                    onChange={jest.fn()}
-                />
-            );
-        });
+        renderWithAppContext(
+            <CalculatedFieldOptions
+                domainIndex={0}
+                field={DomainField.create({ valueExpression: '1=0', lockType: DOMAIN_FIELD_PARTIALLY_LOCKED })}
+                getDomainFields={jest.fn()}
+                index={0}
+                onChange={jest.fn()}
+            />
+        );
 
-        expect(document.querySelector('.domain-field-section-heading').textContent).toBe('Expression');
+        expect(document.querySelector('.domain-field-section-heading')).toHaveTextContent('Expression');
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
-        expect(document.querySelector('textarea').textContent).toBe('1=0');
+        expect(document.querySelector('textarea')).toHaveTextContent('1=0');
         expect(document.querySelector('textarea').getAttribute('disabled')).toBe('');
     });
 
@@ -93,11 +85,11 @@ describe('CalculatedFieldOptions', () => {
 
     test('getPHIColumnNames', () => {
         expect(getPHIColumnNames(undefined)).toEqual([]);
-        expect(getPHIColumnNames(List.of())).toEqual([]);
-        expect(getPHIColumnNames(List.of(DomainField.create({ name: 'a' })))).toEqual([]);
-        expect(getPHIColumnNames(List.of(DomainField.create({ name: 'a', PHI: undefined })))).toEqual([]);
-        expect(getPHIColumnNames(List.of(DomainField.create({ name: 'a', PHI: PHILEVEL_NOT_PHI })))).toEqual([]);
-        expect(getPHIColumnNames(List.of(DomainField.create({ name: 'a', PHI: PHILEVEL_LIMITED_PHI })))).toEqual(['a']);
+        expect(getPHIColumnNames([])).toEqual([]);
+        expect(getPHIColumnNames([DomainField.create({ name: 'a' })])).toEqual([]);
+        expect(getPHIColumnNames([DomainField.create({ name: 'a', PHI: undefined })])).toEqual([]);
+        expect(getPHIColumnNames([DomainField.create({ name: 'a', PHI: PHILEVEL_NOT_PHI })])).toEqual([]);
+        expect(getPHIColumnNames([DomainField.create({ name: 'a', PHI: PHILEVEL_LIMITED_PHI })])).toEqual(['a']);
     });
 
     test('getColumnTypeMap', () => {
@@ -108,11 +100,12 @@ describe('CalculatedFieldOptions', () => {
             ModifiedBy: 'INTEGER',
         };
         expect(getColumnTypeMap(undefined, undefined)).toEqual({ ...defaultTypeMap });
-        expect(getColumnTypeMap(List.of(), [])).toEqual({ ...defaultTypeMap });
+        expect(getColumnTypeMap([], [])).toEqual({ ...defaultTypeMap });
         expect(
-            getColumnTypeMap(List.of({ name: 'b', dataType: { name: 'text' } } as DomainField), [
-                { Name: 'a', DataType: 'integer' } as SystemField,
-            ])
+            getColumnTypeMap(
+                [{ name: 'b', dataType: { name: 'text' } } as DomainField],
+                [{ Name: 'a', DataType: 'integer' } as SystemField]
+            )
         ).toEqual({
             ...defaultTypeMap,
             a: 'INTEGER',
@@ -120,12 +113,12 @@ describe('CalculatedFieldOptions', () => {
         });
         expect(
             getColumnTypeMap(
-                List.of(
+                [
                     { name: 'b', dataType: { name: 'text' } } as DomainField,
                     { name: 'c', dataType: { name: 'calculation' } } as DomainField,
                     { name: 'c', dataType: { name: 'multiChoice' } } as DomainField,
-                    { name: 'd', dataType: { name: 'INT' } } as DomainField
-                ),
+                    { name: 'd', dataType: { name: 'INT' } } as DomainField,
+                ],
                 [{ Name: 'a', DataType: 'integer' } as SystemField]
             )
         ).toEqual({
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index b5a9b08d29..6aec3c10f1 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -13,12 +13,12 @@ import { DomainField, DomainFieldError, GetDomainFields, SystemField } from './m
 import { SectionHeading } from './SectionHeading';
 import { isFieldFullyLocked, isFieldPartiallyLocked } from './propertiesUtil';
 import { CALCULATED_TYPE, MULTI_CHOICE_TYPE, PropDescType } from './PropDescType';
-import { parseCalculatedColumn } from './actions';
 import { SVGIcon } from '../base/SVGIcon';
 import { isAIAssistanceEnabled } from '../../app/utils';
 import { useModalState } from '../../hooks';
 import { EXPR_ASST_METRIC_FEATURE_AREA, ExpressionAssistantModal } from './ExpressionAssistantModal';
 import { incrementClientSideMetricCount } from '../../actions';
+import { useAppContext } from '../../AppContext';
 
 // export for jest testing
 export const typeToDisplay = (type: string): string => {
@@ -37,10 +37,7 @@ export const typeToDisplay = (type: string): string => {
 };
 
 // export for jest testing
-export const getColumnTypeMap = (
-    domainFields: List<DomainField>,
-    systemFields: SystemField[]
-): Record<string, string> => {
+export const getColumnTypeMap = (domainFields: DomainField[], systemFields: SystemField[]): Record<string, string> => {
     const colTypeMap = {};
     // Issue 51169: add some default system fields
     colTypeMap['Created'] = 'DATETIME';
@@ -59,13 +56,9 @@ export const getColumnTypeMap = (
     return colTypeMap;
 };
 
-export const getPHIColumnNames = (domainFields: List<DomainField>): string[] => {
+export const getPHIColumnNames = (domainFields: DomainField[]): string[] => {
     if (!domainFields) return [];
-
-    return domainFields
-        .filter(df => df.isPHI())
-        .map(df => df.name)
-        .toArray();
+    return domainFields.filter(df => df.isPHI()).map(df => df.name);
 };
 
 const HELP_TIP_BODY = (
@@ -105,6 +98,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         }),
         [domainIndex, index]
     );
+    const { api } = useAppContext();
 
     const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(
         evt => {
@@ -116,15 +110,17 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
     );
 
     const validateExpression = useCallback(
-        async (value: string, isExpressionChange = true): Promise<void> => {
+        async (expression: string, isExpressionChange = true): Promise<void> => {
             setLoading(true);
             setError(undefined);
             setParsedType(undefined);
             const { domainFields, systemFields } = getDomainFields();
-            const colTypeMap = getColumnTypeMap(domainFields, systemFields);
-            const phiColumns = getPHIColumnNames(domainFields);
             try {
-                const response = await parseCalculatedColumn(value, colTypeMap, phiColumns);
+                const response = await api.domain.parseCalculatedColumn(
+                    expression,
+                    domainFields.toArray(),
+                    systemFields
+                );
                 setError(response.error);
                 setParsedType(response.type);
 
@@ -147,7 +143,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                 setLoading(false);
             }
         },
-        [domainIndex, field.name, getDomainFields, index, onChange]
+        [api, domainIndex, field.name, getDomainFields, index, onChange]
     );
 
     const handleBlur = useCallback<React.FocusEventHandler<HTMLTextAreaElement>>(
@@ -176,7 +172,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
 
     const onValidateAssistant = useCallback(() => {
         open();
-        incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'clickValidate');
+        incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'clickHelpWithValidate');
     }, [open]);
 
     useEffect(() => {
@@ -286,7 +282,9 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
             </div>
             {show && (
                 <ExpressionAssistantModal
-                    field={field}
+                    // Only inform the modal of the error if there is an invalid expression
+                    fieldError={field.valueExpression ? error : undefined}
+                    fieldExpression={field.valueExpression}
                     getDomainFields={getDomainFields}
                     onCancel={close}
                     onComplete={handleApplyExpression}
diff --git a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
index 2a22c9031d..63cf814d3f 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
@@ -19,7 +19,7 @@ import { List } from 'immutable';
 
 import { OntologyLookupOptions } from '../ontology/OntologyLookupOptions';
 
-import { DomainField, IDomainFormDisplayOptions, IFieldChange, SystemField } from './models';
+import { DomainField, GetDomainFields, IDomainFormDisplayOptions, IFieldChange } from './models';
 import { NameAndLinkingOptions } from './NameAndLinkingOptions';
 import { TextFieldOptions } from './TextFieldOptions';
 import { BooleanFieldOptions } from './BooleanFieldOptions';
@@ -42,7 +42,7 @@ interface Props {
     domainFormDisplayOptions?: IDomainFormDisplayOptions;
     domainIndex: number;
     field: DomainField;
-    getDomainFields?: () => { domainFields: List<DomainField>; systemFields: SystemField[] };
+    getDomainFields?: GetDomainFields;
     index: number;
     onChange: (fieldId: string, value: any, index?: number, expand?: boolean, skipDirtyCheck?: boolean) => void;
     onMultiChange: (changes: List<IFieldChange>) => void;
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index c0003cd203..73939c78eb 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -3,54 +3,87 @@ import { useAppContext } from '../../AppContext';
 import { generateId } from '../../util/utils';
 import { ChatModal } from '../mcp/ChatModal';
 import { ChatMessage, ChatRole } from '../mcp/models';
-import { DomainField, GetDomainFields } from './models';
+import { DomainField, GetDomainFields, SystemField } from './models';
 import { useRequestHandler } from '../../util/RequestHandler';
 import { incrementClientSideMetricCount } from '../../actions';
+import { getColumnTypeMap, getPHIColumnNames } from './CalculatedFieldOptions';
 
 export const EXPR_ASST_METRIC_FEATURE_AREA = 'expressionAssistant';
-const GENERATE_INTRO =
+const CHANGE_INTRO =
+    "Explain how you would like to change this calculation and I'll help you write the expression. You can also ask questions about what fields can be used and what calculations can be done. The current expression:";
+const NEW_INTRO =
     "Explain the calculation you would like and I'll help you write the expression. You can also ask questions about what fields can be used and what calculations can be done.";
+const VALIDATE_INTRO = 'Let me take a look at this expression and see how I can help.';
+
+function createChatMessage(message: Partial<ChatMessage>): ChatMessage {
+    return {
+        ...message,
+        id: generateId('chat-'),
+        timestamp: Date.now(),
+    } as ChatMessage;
+}
 
 interface Props {
-    field: DomainField;
+    fieldError?: string;
+    fieldExpression?: string;
     getDomainFields: GetDomainFields;
     onCancel: () => void;
     onComplete?: (analysis: string) => void;
 }
 
-function useExpressionAssistance(domainFields: DomainField[], existingExpression?: string) {
-    const [messages, setMessages] = useState<ChatMessage[]>([]);
+function useExpressionAssistance(
+    domainFields: DomainField[],
+    systemFields: SystemField[],
+    fieldExpression?: string,
+    fieldError?: string
+) {
+    const [messages, setMessages] = useState<ChatMessage[]>(() => {
+        let sql: string;
+        let text: string;
+        if (fieldError) {
+            text = VALIDATE_INTRO;
+        } else if (fieldExpression) {
+            text = CHANGE_INTRO;
+            sql = fieldExpression;
+        } else {
+            text = NEW_INTRO;
+        }
+        return [createChatMessage({ allowApplySql: false, sql, text })];
+    });
     const [isPending, setIsPending] = useState(false);
     const firstChatRef = useRef(true);
     const autoEvalRef = useRef(false);
     const { api } = useAppContext();
     const { abortRequest, requestHandler, resetRequestHandler } = useRequestHandler();
 
-    const fieldsBlock = useMemo(
-        () =>
-            [
-                'The following JSON blob enumerates the available columns and their types:',
-                JSON.stringify(domainFields),
-            ].join('\n'),
-        [domainFields]
-    );
+    const pushMessage = useCallback((message: Partial<ChatMessage>) => {
+        setMessages(prev => [...prev, createChatMessage(message)]);
+    }, []);
 
-    const generatePreamble = useMemo(
-        () => `${fieldsBlock}\nGenerate a calculated column expression that matches the following description:`,
-        [fieldsBlock]
+    const { columnMap, fieldsBlock, phiColumns } = useMemo(
+        () => ({
+            columnMap: getColumnTypeMap(domainFields, systemFields),
+            fieldsBlock: `The following enumerates the available columns and their types:\n\`\`\`json\n${JSON.stringify(domainFields)}\`\`\``,
+            phiColumns: getPHIColumnNames(domainFields),
+        }),
+        [domainFields, systemFields]
     );
 
     const evaluatePrompt = useMemo(() => {
-        if (!existingExpression) return undefined;
+        if (!fieldError) return undefined;
         return [
             fieldsBlock,
             'The user already has the following calculated column expression:',
             '```',
-            existingExpression,
+            fieldExpression,
+            '```',
+            'This expression contains an error:',
             '```',
-            'Evaluate this expression. If you find errors or issues, point them out and propose corrections. If the expression is valid, ask the user what they would like to change. Also flag edge cases the user may want to handle, such as empty data, division by zero, or null values.',
+            fieldError,
+            '```',
+            'Evaluate this expression and see if you can determine how to fix this error. If you can, point them out and propose corrections.',
         ].join('\n');
-    }, [existingExpression, fieldsBlock]);
+    }, [fieldError, fieldExpression, fieldsBlock]);
 
     const onInterrupt = useCallback(
         (isUser?: boolean) => {
@@ -59,52 +92,36 @@ function useExpressionAssistance(domainFields: DomainField[], existingExpression
 
             // If the user interrupted then request, then display a message confirming that it is no longer thinking
             if (isUser === true) {
-                setMessages(prev => [
-                    ...prev,
-                    {
-                        id: generateId('chat-'),
-                        role: ChatRole.assistant,
-                        timestamp: Date.now(),
-                        text: 'Stopped.',
-                    },
-                ]);
+                pushMessage({ role: ChatRole.assistant, text: 'Stopped.' });
             }
         },
-        [abortRequest]
+        [abortRequest, pushMessage]
     );
 
     const runRequest = useCallback(
-        async (fullPrompt: string) => {
+        async (prompt: string) => {
             setIsPending(true);
             let aborted = false;
             try {
-                const response = await api.query.expressionAssistant({ prompt: fullPrompt, requestHandler });
+                const response = await api.domain.expressionAssistant({
+                    columnMap,
+                    phiColumns,
+                    prompt,
+                    requestHandler,
+                });
                 resetRequestHandler();
-                setMessages(prev => [
-                    ...prev,
-                    {
-                        id: generateId('chat-'),
-                        role: ChatRole.assistant,
-                        timestamp: Date.now(),
-                        error: response.success ? response.error : (response.error ?? 'Request failed.'),
-                        html: response.html,
-                        sql: response.sql,
-                        text: response.text,
-                    },
-                ]);
+                pushMessage({
+                    error: response.success ? response.error : (response.error ?? 'Request failed.'),
+                    html: response.html,
+                    role: ChatRole.assistant,
+                    sql: response.sql,
+                    text: response.text,
+                });
                 incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
             } catch (e) {
                 aborted = !e.status;
                 if (!aborted) {
-                    setMessages(prev => [
-                        ...prev,
-                        {
-                            id: generateId('chat-'),
-                            role: ChatRole.assistant,
-                            timestamp: Date.now(),
-                            error: 'Request failed. Please try again.',
-                        },
-                    ]);
+                    pushMessage({ error: 'Request failed. Please try again.', role: ChatRole.assistant });
                 }
             } finally {
                 if (!aborted) {
@@ -112,20 +129,20 @@ function useExpressionAssistance(domainFields: DomainField[], existingExpression
                 }
             }
         },
-        [api, requestHandler, resetRequestHandler]
+        [api, columnMap, phiColumns, pushMessage, requestHandler, resetRequestHandler]
     );
 
     const sendPrompt = useCallback(
         async (prompt: string) => {
-            setMessages(prev => [
-                ...prev,
-                { id: generateId('chat-'), role: ChatRole.user, text: prompt, timestamp: Date.now() },
-            ]);
-            const fullPrompt = firstChatRef.current ? `${generatePreamble}\n${prompt}` : prompt;
+            pushMessage({ role: ChatRole.user, text: prompt });
+            let fullPrompt = prompt;
+            if (firstChatRef.current) {
+                fullPrompt = `${fieldsBlock}\nGenerate a calculated column expression that matches the following description:\n${prompt}`;
+            }
             firstChatRef.current = false;
             await runRequest(fullPrompt);
         },
-        [generatePreamble, runRequest]
+        [fieldsBlock, pushMessage, runRequest]
     );
 
     useEffect(() => {
@@ -135,17 +152,24 @@ function useExpressionAssistance(domainFields: DomainField[], existingExpression
         runRequest(evaluatePrompt);
     }, [evaluatePrompt, runRequest]);
 
-    return { messages, isPending, onInterrupt, sendPrompt };
+    return { isPending, messages, onInterrupt, sendPrompt };
 }
 
-export const ExpressionAssistantModal: FC<Props> = memo(({ field, getDomainFields, onCancel, onComplete }) => {
-    const domainFields = useMemo(() => getDomainFields().domainFields.toArray(), [getDomainFields]);
-    const existingExpression = field.valueExpression?.trim();
-    const { isPending, messages, onInterrupt, sendPrompt } = useExpressionAssistance(domainFields, existingExpression);
+export const ExpressionAssistantModal: FC<Props> = memo(props => {
+    const { fieldError, fieldExpression, getDomainFields, onCancel, onComplete } = props;
+    const { domainFields, systemFields } = useMemo(() => {
+        const { domainFields, systemFields } = getDomainFields();
+        return { domainFields: domainFields.toArray(), systemFields };
+    }, [getDomainFields]);
+    const { isPending, messages, onInterrupt, sendPrompt } = useExpressionAssistance(
+        domainFields,
+        systemFields,
+        fieldExpression,
+        fieldError
+    );
 
     return (
         <ChatModal
-            intro={existingExpression ? undefined : GENERATE_INTRO}
             isPending={isPending}
             messages={messages}
             onCancel={onCancel}
diff --git a/packages/components/src/internal/components/domainproperties/actions.test.ts b/packages/components/src/internal/components/domainproperties/actions.test.ts
index cb578fad2c..2ae23a1156 100644
--- a/packages/components/src/internal/components/domainproperties/actions.test.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.test.ts
@@ -962,11 +962,11 @@ describe('domain properties actions', () => {
     });
 
     test('parseCalculatedColumn', async () => {
-        let response = await parseCalculatedColumn(undefined, {}, []);
+        let response = await parseCalculatedColumn(undefined, [], []);
         expect(response.error).toBe('Error: an expression value is required.');
         expect(response.type).toBeUndefined();
 
-        response = await parseCalculatedColumn('    ', {}, []);
+        response = await parseCalculatedColumn('    ', [], []);
         expect(response.error).toBe('Error: an expression value is required.');
         expect(response.type).toBeUndefined();
     });
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index b8e2443bb0..41b7c755a3 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -15,7 +15,7 @@
  */
 import classNames from 'classnames';
 import { List, Map } from 'immutable';
-import { Ajax, Domain, Experiment, Filter, Query, Security, Utils } from '@labkey/api';
+import { ActionURL, Ajax, Domain, Experiment, Filter, Query, Security, Utils } from '@labkey/api';
 
 import { processSchemas } from '../../query/utils';
 
@@ -34,7 +34,7 @@ import { SchemaQuery } from '../../../public/SchemaQuery';
 import { SCHEMAS } from '../../schemas';
 
 import { caseInsensitive } from '../../util/utils';
-import { handleRequestFailure } from '../../request';
+import { handleRequestFailure, request, RequestHandler } from '../../request';
 
 import { getExcludedDataTypeNames } from '../entities/actions';
 
@@ -101,13 +101,14 @@ import {
     isValidTextChoiceValue,
     LOOKUP_VALIDATOR,
     NameExpressionsValidationResults,
-    QueryInfoLite,
+    QueryInfoLite, SystemField,
     updateSampleField,
 } from './models';
 import { createFormInputId, createFormInputName, getIndexFromId, getNameFromId } from './utils';
 import { DomainPropertiesAPIWrapper } from './APIWrapper';
 import { executeSql } from '../../query/executeSql';
 import { getLegalIdentifier } from '../../query/filter';
+import { getColumnTypeMap, getPHIColumnNames } from './CalculatedFieldOptions';
 
 let sharedCache = Map<string, Promise<any>>();
 
@@ -442,12 +443,20 @@ export function getCastStatement(key: string, type: string): string {
     }
 }
 
+export type ParseCalculatedColumnResponse = {
+    error: string;
+    type: string;
+};
+
 export async function parseCalculatedColumn(
     expression: string,
-    columnMap: Record<string, string>,
-    phiColumns: string[],
+    domainFields: DomainField[],
+    systemFields: SystemField[],
     containerPath?: string
-): Promise<{ error: string; type: string }> {
+): Promise<ParseCalculatedColumnResponse> {
+    const columnMap = getColumnTypeMap(domainFields, systemFields);
+    const phiColumns = getPHIColumnNames(domainFields);
+
     if (!expression || expression?.trim()?.length === 0) {
         return { error: 'Error: an expression value is required.', type: undefined };
     }
@@ -502,10 +511,10 @@ export function _parseCalculatedColumn(
     columnMap: Record<string, string>,
     phiColumns: string[],
     containerPath?: string
-): Promise<{ error: string; type: string }> {
+): Promise<ParseCalculatedColumnResponse> {
     return new Promise((resolve, reject) => {
         Ajax.request({
-            url: buildURL('query', 'parseCalculatedColumn.api', undefined, { container: containerPath }),
+            url: ActionURL.buildURL('query', 'parseCalculatedColumn.api', containerPath),
             jsonData: {
                 expression,
                 columnMap,
@@ -1516,3 +1525,30 @@ export function setGenId(
 export function scrollDomainErrorIntoView(): void {
     document.querySelector('#' + DOMAIN_ERROR_ID)?.scrollIntoView();
 }
+
+export interface ExpressionAssistOptions {
+    columnMap: Record<string, string>;
+    containerPath?: string;
+    phiColumns: string[];
+    prompt: string;
+    requestHandler?: RequestHandler;
+}
+
+export interface ExpressionAssistResponse {
+    error?: string;
+    html?: string;
+    sql?: string;
+    success: boolean;
+    text?: string;
+}
+
+export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
+    const { containerPath, columnMap, phiColumns, prompt, requestHandler } = options;
+    return request<ExpressionAssistResponse>({
+        url: ActionURL.buildURL('query', 'expressionAssistantAgent.api', containerPath),
+        method: 'POST',
+        jsonData: { columnMap, phiColumns, prompt },
+        errorLogMsg: 'Failed to assist with expression',
+        requestHandler,
+    });
+}
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 30aa27193b..322481f406 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1564,6 +1564,8 @@ export class DomainField
     }
 }
 
+// TODO: Refactor List<DomainField> to DomainField[].
+//  Additionally, get rid of getDomainFields() in general and replace with domainField and systemField props.
 export type GetDomainFields = () => { domainFields: List<DomainField>; systemFields: SystemField[] };
 
 export function isValidTextChoiceValue(v: string): boolean {
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 758fa3abf6..045a1280bc 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -27,8 +27,14 @@ const ChatBubble: FC<ChatBubbleProps> = memo(({ message, onComplete }) => {
         <div className="chat-item assistant-response">
             {message.text && <div className="assistant-text">{message.text}</div>}
             {message.html && <div className="assistant-text" dangerouslySetInnerHTML={{ __html: message.html }} />}
-            {message.sql && <div className="assistant-expression">{message.sql}</div>}
-            {message.sql && onComplete && (
+            {message.sql && (
+                <div className="assistant-expression">
+                    <pre>
+                        <code className="language-sql">{message.sql}</code>
+                    </pre>
+                </div>
+            )}
+            {message.sql && message.allowApplySql !== false && onComplete && (
                 <a className="apply-expression" onClick={handleApply} role="button" tabIndex={0}>
                     <i className="fa fa-check" /> Apply Expression
                 </a>
@@ -39,7 +45,6 @@ const ChatBubble: FC<ChatBubbleProps> = memo(({ message, onComplete }) => {
 ChatBubble.displayName = 'ChatBubble';
 
 interface Props {
-    intro?: ReactNode;
     isPending: boolean;
     messages: ChatMessage[];
     onCancel: () => void;
@@ -50,7 +55,7 @@ interface Props {
 }
 
 export const ChatModal: FC<Props> = memo(props => {
-    const { intro, isPending, messages, onCancel, onComplete, onInterrupt, sendPrompt, title } = props;
+    const { isPending, messages, onCancel, onComplete, onInterrupt, sendPrompt, title } = props;
     const [prompt, setPrompt] = useState('');
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
     const historyRef = useRef<HTMLDivElement>(null);
@@ -58,9 +63,7 @@ export const ChatModal: FC<Props> = memo(props => {
 
     // Autofocus the prompt on mount
     useEffect(() => {
-        timer.set(() => {
-            textAreaRef.current?.focus();
-        });
+        timer.set(() => textAreaRef.current?.focus());
         return timer.clear;
     }, [timer]);
 
@@ -86,7 +89,6 @@ export const ChatModal: FC<Props> = memo(props => {
         const trimmed = prompt.trim();
         if (!trimmed || isPending) return;
         setPrompt('');
-        // sendPrompt manages its own errors; ignore the returned promise
         sendPrompt(trimmed);
     }, [prompt, isPending, sendPrompt]);
 
@@ -118,7 +120,6 @@ export const ChatModal: FC<Props> = memo(props => {
             </div>
             <div className="modal-body">
                 <div className="chat-history" ref={historyRef}>
-                    {intro && <div className="chat-item assistant-response chat-intro">{intro}</div>}
                     {messages.map(message => (
                         <ChatBubble key={message.id} message={message} onComplete={onComplete} />
                     ))}
diff --git a/packages/components/src/internal/components/mcp/models.ts b/packages/components/src/internal/components/mcp/models.ts
index d7a2c1863c..de195d5576 100644
--- a/packages/components/src/internal/components/mcp/models.ts
+++ b/packages/components/src/internal/components/mcp/models.ts
@@ -4,6 +4,7 @@ export enum ChatRole {
 }
 
 export interface ChatMessage {
+    allowApplySql?: boolean;
     error?: string;
     html?: string;
     id: string;
@@ -12,4 +13,3 @@ export interface ChatMessage {
     text?: string;
     timestamp: number;
 }
-
diff --git a/packages/components/src/internal/query/APIWrapper.ts b/packages/components/src/internal/query/APIWrapper.ts
index 59900ba680..f1af6a7ddc 100644
--- a/packages/components/src/internal/query/APIWrapper.ts
+++ b/packages/components/src/internal/query/APIWrapper.ts
@@ -18,9 +18,6 @@ import {
     clearSelected,
     ClearSelectedOptions,
     deleteView,
-    expressionAssistant,
-    ExpressionAssistOptions,
-    ExpressionAssistResponse,
     getGridViews,
     GetSelectedResponse,
     getSnapshotSelections,
@@ -79,7 +76,6 @@ export interface QueryAPIWrapper {
     deleteRowsByContainer: (options: DeleteRowsOptions, containerField: string) => Promise<QueryCommandResponse>;
     deleteView: (schemaQuery: SchemaQuery, containerPath: string, viewName?: string, revert?: boolean) => Promise<void>;
     executeSql: <T extends ExecuteSqlOptions>(options: T) => Promise<ExecuteSqlResponse<T>>;
-    expressionAssistant: (options: ExpressionAssistOptions) => Promise<ExpressionAssistResponse>;
     getDataTypeFolderDataCount: (
         entityDataType: EntityDataType,
         dataTypeRowId: number,
@@ -180,7 +176,6 @@ export class QueryServerAPIWrapper implements QueryAPIWrapper {
     deleteRowsByContainer = deleteRowsByContainer;
     deleteView = deleteView;
     executeSql = executeSql;
-    expressionAssistant = expressionAssistant;
     getDataTypeFolderDataCount = getDataTypeFolderDataCount;
     getEntityTypeOptions = getEntityTypeOptionsWithExclusions;
     getGridViews = getGridViews;
@@ -222,7 +217,6 @@ export function getQueryTestAPIWrapper(
         deleteRowsByContainer: mockFn(),
         deleteView: mockFn(),
         executeSql: mockFn(),
-        expressionAssistant: mockFn(),
         getDataTypeFolderDataCount: mockFn(),
         getEntityTypeOptions: mockFn(),
         getGridViews: mockFn(),
diff --git a/packages/components/src/theme/chat.scss b/packages/components/src/theme/chat.scss
new file mode 100644
index 0000000000..b2140ece8b
--- /dev/null
+++ b/packages/components/src/theme/chat.scss
@@ -0,0 +1,150 @@
+.lk-modal .chat-modal {
+    height: 100dvh;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    padding: 40px 0;
+    box-sizing: border-box;
+
+    .modal-content {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        background-color: #FFFFFF;
+        border: 1px solid #DDDDDD;
+        border-radius: 8px;
+        overflow: hidden;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+    }
+
+    .modal-header {
+        flex-shrink: 0;
+
+        .modal-title {
+            display: inline;
+        }
+
+        .btn {
+            float: right;
+        }
+    }
+
+    .modal-body {
+        flex-grow: 1;
+        overflow-y: auto;
+        padding: 15px;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .chat-history {
+        flex-grow: 1;
+        overflow-y: auto;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+    }
+
+    .chat-item {
+        word-wrap: break-word;
+    }
+
+    .user-prompt {
+        align-self: flex-end;
+        max-width: 80%;
+        padding: 8px 12px;
+        background-color: #F1F9FC;
+        border: 1px solid rgba(201, 230, 242, 0.8);
+        border-radius: 8px 8px 0 8px;
+        color: #0088CC;
+    }
+
+    .assistant-response {
+        align-self: stretch;
+        color: #333333;
+    }
+
+    .assistant-response.pending {
+        color: #777777;
+    }
+
+    .assistant-text {
+        margin-bottom: 8px;
+    }
+
+    .apply-expression {
+        color: #2980B9;
+        cursor: pointer;
+        display: inline-block;
+
+        &:hover {
+            text-decoration: underline;
+        }
+
+        .fa-check {
+            margin-right: 6px;
+        }
+    }
+
+    .error-response {
+        color: #C62828;
+    }
+
+    .modal-footer {
+        flex-shrink: 0;
+        background-color: #F3F3F4;
+        line-height: 20px;
+        padding: 15px;
+        border-top: 1px solid #EEEEEE;
+    }
+
+    .form-inline {
+        display: flex;
+        align-items: flex-end;
+        gap: 10px;
+        width: 100%;
+
+        .form-group,
+        .col-xs-12 {
+            display: contents;
+        }
+    }
+
+    .prompt-input {
+        flex-grow: 1;
+        width: 0;
+
+        field-sizing: content;
+        line-height: 1.2;
+        min-height: 1.2lh;
+        max-height: 9lh;
+
+        padding: 10px;
+        box-sizing: border-box;
+        resize: none;
+        border: 1px solid #CCCCCC;
+        border-radius: 3px;
+        margin: 0;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+    }
+
+    .prompt-button {
+        height: 38px;
+        flex-shrink: 0;
+        margin: 0;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        color: #333333;
+        border-color: #CCCCCC;
+    }
+
+    .chat-modal__caution {
+        width: 100%;
+        text-align: center;
+        color: #777777;
+        font-size: 11px;
+        margin-top: 12px;
+    }
+}
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index da30a6ab2c..97194d0bcc 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -946,164 +946,3 @@
     margin: 0;
     margin-left: 15px;
 }
-
-.lk-modal .chat-modal {
-    height: 100dvh;
-    margin: 0 auto;
-    display: flex;
-    flex-direction: column;
-    padding: 40px 0;
-    box-sizing: border-box;
-
-    .modal-content {
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        background-color: #FFFFFF;
-        border: 1px solid #DDDDDD;
-        border-radius: 8px;
-        overflow: hidden;
-        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-    }
-
-    .modal-header {
-        flex-shrink: 0;
-
-        .modal-title {
-            display: inline;
-        }
-
-        .btn {
-            float: right;
-        }
-    }
-
-    .modal-body {
-        flex-grow: 1;
-        overflow-y: auto;
-        padding: 20px;
-        display: flex;
-        flex-direction: column;
-    }
-
-    .chat-intro {
-        margin-bottom: 12px;
-    }
-
-    .chat-history {
-        flex-grow: 1;
-        overflow-y: auto;
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-    }
-
-    .chat-item {
-        white-space: pre-wrap;
-        word-wrap: break-word;
-    }
-
-    .user-prompt {
-        align-self: flex-end;
-        max-width: 80%;
-        padding: 8px 12px;
-        background-color: #F1F9FC;
-        border: 1px solid rgba(201, 230, 242, 0.8);
-        border-radius: 8px 8px 0 8px;
-        color: #0088CC;
-    }
-
-    .assistant-response {
-        align-self: stretch;
-        color: #333333;
-    }
-
-    .assistant-response.pending {
-        color: #777777;
-    }
-
-    .assistant-text {
-        margin-bottom: 8px;
-    }
-
-    .assistant-expression {
-        font-family: monospace;
-        margin-bottom: 8px;
-    }
-
-    .apply-expression {
-        color: #2980B9;
-        cursor: pointer;
-        display: inline-block;
-
-        &:hover {
-            text-decoration: underline;
-        }
-
-        .fa-check {
-            margin-right: 6px;
-        }
-    }
-
-    .error-response {
-        color: #C62828;
-    }
-
-    .modal-footer {
-        flex-shrink: 0;
-        background-color: #F3F3F4;
-        line-height: 20px;
-        padding: 15px;
-        border-top: 1px solid #EEEEEE;
-    }
-
-    .form-inline {
-        display: flex;
-        align-items: flex-end;
-        gap: 10px;
-        width: 100%;
-
-        .form-group,
-        .col-xs-12 {
-            display: contents;
-        }
-    }
-
-    .prompt-input {
-        flex-grow: 1;
-        width: 0;
-
-        field-sizing: content;
-        line-height: 1.2;
-        min-height: 1.2lh;
-        max-height: 9lh;
-
-        padding: 10px;
-        box-sizing: border-box;
-        resize: none;
-        border: 1px solid #CCCCCC;
-        border-radius: 3px;
-        margin: 0;
-        white-space: pre-wrap;
-        word-wrap: break-word;
-    }
-
-    .prompt-button {
-        height: 38px;
-        flex-shrink: 0;
-        margin: 0;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        color: #333333;
-        border-color: #CCCCCC;
-    }
-
-    .chat-modal__caution {
-        width: 100%;
-        text-align: center;
-        color: #777777;
-        font-size: 11px;
-        margin-top: 12px;
-    }
-}
diff --git a/packages/components/src/theme/index.scss b/packages/components/src/theme/index.scss
index 5f9be00ea7..a08a017a6a 100644
--- a/packages/components/src/theme/index.scss
+++ b/packages/components/src/theme/index.scss
@@ -56,3 +56,5 @@
 @import "overlay";
 @import "dropdowns";
 @import "modal";
+@import "chat";
+@import "markdown";
diff --git a/packages/components/src/theme/markdown.scss b/packages/components/src/theme/markdown.scss
new file mode 100644
index 0000000000..811d5d481f
--- /dev/null
+++ b/packages/components/src/theme/markdown.scss
@@ -0,0 +1,11 @@
+// Styling for LabKey generated markdown
+.lk-markdown-container {
+    code {
+        background-color: #F3F3F4;
+        color: #333333;
+    }
+
+    h3 {
+        font-size: 18px;
+    }
+}

From 1d45c88595fdcc8ad540b762135fda2229b2eaf9 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 08:25:25 -0700
Subject: [PATCH 08/38] Bump @labkey/api

---
 packages/components/package-lock.json | 8 ++++----
 packages/components/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index a9d4eeddd3..9a845b7f1d 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -10,7 +10,7 @@
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.51.2",
+        "@labkey/api": "1.51.3-fb-mcp-calc-cols.0",
         "@testing-library/dom": "~10.4.1",
         "@testing-library/jest-dom": "~6.9.1",
         "@testing-library/react": "~16.3.2",
@@ -3774,9 +3774,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.51.2",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.2.tgz",
-      "integrity": "sha512-WvP7cR/0taJYM2Tr9Cx4PC1EgearUVBk5+CbpUu57c9vN4z8aHnIcwJDuMaORM5DoUKGeqL70IOn8Z+QmPWTHw==",
+      "version": "1.51.3-fb-mcp-calc-cols.0",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.3-fb-mcp-calc-cols.0.tgz",
+      "integrity": "sha512-irA1mdns6EADwHYumFkniwN8Bmi2+XkPvF8p3tqLXc4A9VoSMbAPa4PeIPw5Mv1wEFT8wZ/yw6dlyn04bRbmqg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 3accd5aeaf..36cf97386e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -53,7 +53,7 @@
   "homepage": "https://github.com/LabKey/labkey-ui-components#readme",
   "dependencies": {
     "@hello-pangea/dnd": "18.0.1",
-    "@labkey/api": "1.51.2",
+    "@labkey/api": "1.51.3-fb-mcp-calc-cols.0",
     "@testing-library/dom": "~10.4.1",
     "@testing-library/jest-dom": "~6.9.1",
     "@testing-library/react": "~16.3.2",

From 46050e6497a74357380231ac355d5b2d40ba6eac Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 12:10:50 -0700
Subject: [PATCH 09/38] conversationId

---
 .../ExpressionAssistantModal.tsx              |  9 +++++++-
 .../components/domainproperties/actions.ts    |  6 ++++--
 .../src/internal/components/mcp/ChatModal.tsx | 21 ++++++++++++++++++-
 packages/components/src/theme/chat.scss       |  6 +++---
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index 73939c78eb..c10d1c9b7f 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -37,6 +37,7 @@ function useExpressionAssistance(
     fieldExpression?: string,
     fieldError?: string
 ) {
+    const [conversationId, setConversationId] = useState<string>();
     const [messages, setMessages] = useState<ChatMessage[]>(() => {
         let sql: string;
         let text: string;
@@ -104,12 +105,18 @@ function useExpressionAssistance(
             let aborted = false;
             try {
                 const response = await api.domain.expressionAssistant({
+                    conversationId,
                     columnMap,
                     phiColumns,
                     prompt,
                     requestHandler,
                 });
                 resetRequestHandler();
+
+                if (response.conversationId !== conversationId) {
+                    setConversationId(response.conversationId);
+                }
+
                 pushMessage({
                     error: response.success ? response.error : (response.error ?? 'Request failed.'),
                     html: response.html,
@@ -129,7 +136,7 @@ function useExpressionAssistance(
                 }
             }
         },
-        [api, columnMap, phiColumns, pushMessage, requestHandler, resetRequestHandler]
+        [api, columnMap, conversationId, phiColumns, pushMessage, requestHandler, resetRequestHandler]
     );
 
     const sendPrompt = useCallback(
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 41b7c755a3..d4cdf27677 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -1529,12 +1529,14 @@ export function scrollDomainErrorIntoView(): void {
 export interface ExpressionAssistOptions {
     columnMap: Record<string, string>;
     containerPath?: string;
+    conversationId?: string;
     phiColumns: string[];
     prompt: string;
     requestHandler?: RequestHandler;
 }
 
 export interface ExpressionAssistResponse {
+    conversationId: string;
     error?: string;
     html?: string;
     sql?: string;
@@ -1543,11 +1545,11 @@ export interface ExpressionAssistResponse {
 }
 
 export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
-    const { containerPath, columnMap, phiColumns, prompt, requestHandler } = options;
+    const { columnMap, containerPath, conversationId, phiColumns, prompt, requestHandler } = options;
     return request<ExpressionAssistResponse>({
         url: ActionURL.buildURL('query', 'expressionAssistantAgent.api', containerPath),
         method: 'POST',
-        jsonData: { columnMap, phiColumns, prompt },
+        jsonData: { columnMap, conversationId, phiColumns, prompt },
         errorLogMsg: 'Failed to assist with expression',
         requestHandler,
     });
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 045a1280bc..5591061255 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -1,10 +1,12 @@
-import React, { FC, memo, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { BaseModal } from '../../Modal';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 import { ChatMessage, ChatRole } from './models';
 import { cancelEvent } from '../../events';
 import { useTimeout } from '../../hooks';
 
+const fieldSizingSupported = CSS.supports('field-sizing', 'content');
+
 interface ChatBubbleProps {
     message: ChatMessage;
     onComplete?: (analysis: string) => void;
@@ -67,6 +69,22 @@ export const ChatModal: FC<Props> = memo(props => {
         return timer.clear;
     }, [timer]);
 
+    // Firefox does not support the CSS property "field-sizing" which allows for the height of the textarea
+    // to increase up to "max-height" based on the textarea content. Here we use a layout effect to mimic this
+    // behavior in JavaScript.
+    useLayoutEffect(() => {
+        if (fieldSizingSupported || !textAreaRef.current) return;
+
+        const el = textAreaRef.current;
+        el.style.height = 'inherit';
+
+        // Calculate height
+        const computed = getComputedStyle(el);
+        const nextHeight = el.scrollHeight + parseInt(computed.borderTopWidth) + parseInt(computed.borderBottomWidth);
+
+        el.style.height = `${nextHeight}px`;
+    }, [prompt]);
+
     useEffect(() => {
         const el = historyRef.current;
         if (el) el.scrollTo({ top: el.scrollHeight, behavior: 'smooth' });
@@ -142,6 +160,7 @@ export const ChatModal: FC<Props> = memo(props => {
                                 onKeyDown={handleKeyDown}
                                 placeholder="Enter a prompt"
                                 ref={textAreaRef}
+                                rows={1}
                                 value={prompt}
                             />
                         </div>
diff --git a/packages/components/src/theme/chat.scss b/packages/components/src/theme/chat.scss
index b2140ece8b..adea8e9436 100644
--- a/packages/components/src/theme/chat.scss
+++ b/packages/components/src/theme/chat.scss
@@ -10,7 +10,7 @@
         height: 100%;
         display: flex;
         flex-direction: column;
-        background-color: #FFFFFF;
+        background-color: $white;
         border: 1px solid #DDDDDD;
         border-radius: 8px;
         overflow: hidden;
@@ -57,6 +57,7 @@
         border: 1px solid rgba(201, 230, 242, 0.8);
         border-radius: 8px 8px 0 8px;
         color: #0088CC;
+        white-space: pre-wrap;
     }
 
     .assistant-response {
@@ -117,13 +118,12 @@
         field-sizing: content;
         line-height: 1.2;
         min-height: 1.2lh;
-        max-height: 9lh;
+        max-height: 12lh;
 
         padding: 10px;
         box-sizing: border-box;
         resize: none;
         border: 1px solid #CCCCCC;
-        border-radius: 3px;
         margin: 0;
         white-space: pre-wrap;
         word-wrap: break-word;

From 0873d417608e7f014a3dcbe97955d2ebf1754e13 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 17:41:46 -0700
Subject: [PATCH 10/38] Use segments

---
 .../ExpressionAssistantModal.tsx              | 52 ++++++++++++++---
 .../components/domainproperties/actions.ts    | 10 +++-
 .../src/internal/components/mcp/ChatModal.tsx | 57 +++++++++++--------
 .../src/internal/components/mcp/models.ts     | 15 ++++-
 4 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index c10d1c9b7f..e3e4b7044a 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -1,8 +1,8 @@
 import React, { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useAppContext } from '../../AppContext';
 import { generateId } from '../../util/utils';
-import { ChatModal } from '../mcp/ChatModal';
-import { ChatMessage, ChatRole } from '../mcp/models';
+import { ChatModal, RenderSegment } from '../mcp/ChatModal';
+import { ChatMessage, ChatRole, ChatSegment } from '../mcp/models';
 import { DomainField, GetDomainFields, SystemField } from './models';
 import { useRequestHandler } from '../../util/RequestHandler';
 import { incrementClientSideMetricCount } from '../../actions';
@@ -23,6 +23,29 @@ function createChatMessage(message: Partial<ChatMessage>): ChatMessage {
     } as ChatMessage;
 }
 
+interface SqlSnippetProps {
+    onApply?: (sql: string) => void;
+    readOnly?: boolean;
+    sql: string;
+}
+
+const SqlExpression: FC<SqlSnippetProps> = memo(({ onApply, readOnly, sql }) => {
+    const handleApply = useCallback(() => onApply?.(sql), [onApply, sql]);
+    return (
+        <div className="assistant-expression">
+            <pre>
+                <code className="language-sql">{sql}</code>
+            </pre>
+            {!readOnly && onApply && (
+                <a className="apply-expression" onClick={handleApply} role="button" tabIndex={0}>
+                    <i className="fa fa-check" /> Apply Expression
+                </a>
+            )}
+        </div>
+    );
+});
+SqlExpression.displayName = 'SqlExpression';
+
 interface Props {
     fieldError?: string;
     fieldExpression?: string;
@@ -39,17 +62,17 @@ function useExpressionAssistance(
 ) {
     const [conversationId, setConversationId] = useState<string>();
     const [messages, setMessages] = useState<ChatMessage[]>(() => {
-        let sql: string;
         let text: string;
+        let segments: ChatSegment[] | undefined;
         if (fieldError) {
             text = VALIDATE_INTRO;
         } else if (fieldExpression) {
             text = CHANGE_INTRO;
-            sql = fieldExpression;
+            segments = [{ type: 'sql', sql: fieldExpression }];
         } else {
             text = NEW_INTRO;
         }
-        return [createChatMessage({ allowApplySql: false, sql, text })];
+        return [createChatMessage({ role: ChatRole.assistant, segments, text })];
     });
     const [isPending, setIsPending] = useState(false);
     const firstChatRef = useRef(true);
@@ -70,6 +93,7 @@ function useExpressionAssistance(
         [domainFields, systemFields]
     );
 
+    // This prompt is used when the user has an erroneous expression, and we want the agent to help in triaging
     const evaluatePrompt = useMemo(() => {
         if (!fieldError) return undefined;
         return [
@@ -119,9 +143,8 @@ function useExpressionAssistance(
 
                 pushMessage({
                     error: response.success ? response.error : (response.error ?? 'Request failed.'),
-                    html: response.html,
                     role: ChatRole.assistant,
-                    sql: response.sql,
+                    segments: response.segments,
                     text: response.text,
                 });
                 incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
@@ -175,13 +198,26 @@ export const ExpressionAssistantModal: FC<Props> = memo(props => {
         fieldError
     );
 
+    const renderSegment = useCallback<RenderSegment>(
+        (segment, index) => {
+            if (segment.type === 'expression' && segment.sql) {
+                return <SqlExpression key={index} onApply={onComplete} sql={segment.sql} />;
+            }
+            if (segment.type === 'sql' && segment.sql) {
+                return <SqlExpression key={index} readOnly sql={segment.sql} />;
+            }
+            return undefined;
+        },
+        [onComplete]
+    );
+
     return (
         <ChatModal
             isPending={isPending}
             messages={messages}
             onCancel={onCancel}
-            onComplete={onComplete}
             onInterrupt={onInterrupt}
+            renderSegment={renderSegment}
             sendPrompt={sendPrompt}
             title="Expression AI Assistant"
         />
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index d4cdf27677..5334736da9 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -1535,11 +1535,17 @@ export interface ExpressionAssistOptions {
     requestHandler?: RequestHandler;
 }
 
+export interface ExpressionAssistSegment {
+    // 'html' for prose; 'expression' for validated, applyable SQL; 'sql' for illustrative SQL.
+    type: 'html' | 'expression' | 'sql' | string;
+    html?: string;
+    sql?: string;
+}
+
 export interface ExpressionAssistResponse {
     conversationId: string;
     error?: string;
-    html?: string;
-    sql?: string;
+    segments?: ExpressionAssistSegment[];
     success: boolean;
     text?: string;
 }
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 5591061255..3a7b75a0b0 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -1,22 +1,39 @@
 import React, { FC, memo, ReactNode, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { BaseModal } from '../../Modal';
 import { LoadingSpinner } from '../base/LoadingSpinner';
-import { ChatMessage, ChatRole } from './models';
+import { ChatMessage, ChatRole, ChatSegment } from './models';
 import { cancelEvent } from '../../events';
 import { useTimeout } from '../../hooks';
 
 const fieldSizingSupported = CSS.supports('field-sizing', 'content');
 
+export type RenderSegment = (segment: ChatSegment, index: number) => ReactNode | undefined;
+
+/**
+ * Default rendering for built-in segment types. Returns undefined for unknown types so callers can take over via `renderSegment`.
+ * @param segment
+ * @param index
+ */
+function renderDefaultSegment(segment: ChatSegment, index: number): ReactNode | undefined {
+    if (segment.type === 'html' && segment.html) {
+        return <div className="assistant-text" dangerouslySetInnerHTML={{ __html: segment.html }} key={index} />;
+    }
+    if (segment.type === 'text' && segment.text) {
+        return (
+            <div className="assistant-text" key={index}>
+                {segment.text}
+            </div>
+        );
+    }
+    return undefined;
+}
+
 interface ChatBubbleProps {
     message: ChatMessage;
-    onComplete?: (analysis: string) => void;
+    renderSegment?: RenderSegment;
 }
 
-const ChatBubble: FC<ChatBubbleProps> = memo(({ message, onComplete }) => {
-    const handleApply = useCallback((): void => {
-        if (message.sql) onComplete?.(message.sql);
-    }, [message.sql, onComplete]);
-
+const ChatItem: FC<ChatBubbleProps> = memo(({ message, renderSegment }) => {
     if (message.role === ChatRole.user) {
         return <div className="chat-item user-prompt">{message.text}</div>;
     }
@@ -28,36 +45,28 @@ const ChatBubble: FC<ChatBubbleProps> = memo(({ message, onComplete }) => {
     return (
         <div className="chat-item assistant-response">
             {message.text && <div className="assistant-text">{message.text}</div>}
-            {message.html && <div className="assistant-text" dangerouslySetInnerHTML={{ __html: message.html }} />}
-            {message.sql && (
-                <div className="assistant-expression">
-                    <pre>
-                        <code className="language-sql">{message.sql}</code>
-                    </pre>
-                </div>
-            )}
-            {message.sql && message.allowApplySql !== false && onComplete && (
-                <a className="apply-expression" onClick={handleApply} role="button" tabIndex={0}>
-                    <i className="fa fa-check" /> Apply Expression
-                </a>
-            )}
+            {message.segments?.map((segment, index) => {
+                const custom = renderSegment?.(segment, index);
+                if (custom !== undefined) return <React.Fragment key={index}>{custom}</React.Fragment>;
+                return <React.Fragment key={index}>{renderDefaultSegment(segment, index)}</React.Fragment>;
+            })}
         </div>
     );
 });
-ChatBubble.displayName = 'ChatBubble';
+ChatItem.displayName = 'ChatItem';
 
 interface Props {
     isPending: boolean;
     messages: ChatMessage[];
     onCancel: () => void;
-    onComplete?: (analysis: string) => void;
     onInterrupt: (isUser?: boolean) => void;
+    renderSegment?: RenderSegment;
     sendPrompt: (prompt: string) => Promise<void>;
     title: ReactNode;
 }
 
 export const ChatModal: FC<Props> = memo(props => {
-    const { isPending, messages, onCancel, onComplete, onInterrupt, sendPrompt, title } = props;
+    const { isPending, messages, onCancel, onInterrupt, renderSegment, sendPrompt, title } = props;
     const [prompt, setPrompt] = useState('');
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
     const historyRef = useRef<HTMLDivElement>(null);
@@ -139,7 +148,7 @@ export const ChatModal: FC<Props> = memo(props => {
             <div className="modal-body">
                 <div className="chat-history" ref={historyRef}>
                     {messages.map(message => (
-                        <ChatBubble key={message.id} message={message} onComplete={onComplete} />
+                        <ChatItem key={message.id} message={message} renderSegment={renderSegment} />
                     ))}
                     {isPending && (
                         <div className="chat-item assistant-response pending">
diff --git a/packages/components/src/internal/components/mcp/models.ts b/packages/components/src/internal/components/mcp/models.ts
index de195d5576..9558fedc02 100644
--- a/packages/components/src/internal/components/mcp/models.ts
+++ b/packages/components/src/internal/components/mcp/models.ts
@@ -3,13 +3,22 @@ export enum ChatRole {
     user = 'user',
 }
 
+// Ordered content produced by an assistant response. ChatModal renders these via a default
+// renderer; callers can supply `renderSegment` to handle additional segment types or override
+// defaults. ChatModal itself is intentionally agnostic to any feature-specific segment types
+// (e.g., an applicable SQL expression).
+export interface ChatSegment {
+    html?: string;
+    sql?: string;
+    text?: string;
+    type: string;
+}
+
 export interface ChatMessage {
-    allowApplySql?: boolean;
     error?: string;
-    html?: string;
     id: string;
     role: ChatRole;
-    sql?: string;
+    segments?: ChatSegment[];
     text?: string;
     timestamp: number;
 }

From 81201646d33fa87d96775a6606c0fd10664f8c68 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 17:45:18 -0700
Subject: [PATCH 11/38] Update jest.setup.ts

---
 packages/components/src/test/jest.setup.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/components/src/test/jest.setup.ts b/packages/components/src/test/jest.setup.ts
index 43eedb586e..7deafc9ef2 100644
--- a/packages/components/src/test/jest.setup.ts
+++ b/packages/components/src/test/jest.setup.ts
@@ -8,3 +8,8 @@ enablePatches();
 
 // JSDom does not provide an implementation for scrollIntoView(). See https://github.com/jsdom/jsdom/issues/1695
 Element.prototype.scrollIntoView = jest.fn();
+
+// JSDom does not provide an implementation for CSS.supports().
+Object.defineProperty(window, 'CSS', {
+    value: { supports: jest.fn().mockReturnValue(true) },
+});

From 0ef487b20da30e748f4f0ba7257f5b27aa3be8d0 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 21:54:16 -0700
Subject: [PATCH 12/38] Jest tests

---
 .../ExpressionAssistantModal.test.tsx         | 375 ++++++++++++++++++
 .../ExpressionAssistantModal.tsx              |   8 +-
 .../components/mcp/ChatModal.test.tsx         | 236 +++++++++++
 .../src/internal/components/mcp/ChatModal.tsx |  18 +-
 packages/components/src/test/jest.setup.ts    |   1 +
 packages/components/src/theme/chat.scss       |  28 +-
 6 files changed, 627 insertions(+), 39 deletions(-)
 create mode 100644 packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
 create mode 100644 packages/components/src/internal/components/mcp/ChatModal.test.tsx

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
new file mode 100644
index 0000000000..d33c898d42
--- /dev/null
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
@@ -0,0 +1,375 @@
+import React, { act } from 'react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { List } from 'immutable';
+
+import { renderWithAppContext } from '../../test/reactTestLibraryHelpers';
+import { AppContextTestProviderProps } from '../../test/testHelpers';
+import { getTestAPIWrapper } from '../../APIWrapper';
+
+import { ChatMessage, ChatRole } from '../mcp/models';
+
+import { DomainField } from './models';
+import { getDomainPropertiesTestAPIWrapper } from './APIWrapper';
+import {
+    EXPR_ASST_METRIC_FEATURE_AREA,
+    ExpressionAssistantModal,
+    ExpressionAssistantModalProps,
+} from './ExpressionAssistantModal';
+
+// Capture the props ChatModal is rendered with so we can drive ExpressionAssistantModal's logic
+// without depending on ChatModal's UI internals.
+let chatModalProps: any;
+jest.mock('../mcp/ChatModal', () => ({
+    __esModule: true,
+    ChatModal: (props: any) => {
+        chatModalProps = props;
+        return <div data-testid="chat-modal-mock" />;
+    },
+}));
+
+const abortRequest = jest.fn();
+const resetRequestHandler = jest.fn();
+jest.mock('../../util/RequestHandler', () => ({
+    useRequestHandler: () => ({
+        abortRequest,
+        requestHandler: { current: undefined },
+        resetRequestHandler,
+    }),
+}));
+
+const incrementMetric = jest.fn();
+jest.mock('../../actions', () => ({
+    incrementClientSideMetricCount: (...args: any[]) => incrementMetric(...args),
+}));
+
+function makeField(name: string, rangeURI = 'http://www.w3.org/2001/XMLSchema#string', phi?: string): DomainField {
+    return DomainField.create({ name, rangeURI, PHI: phi });
+}
+
+const DEFAULT_FIELDS = [makeField('A'), makeField('B', 'http://www.w3.org/2001/XMLSchema#int')];
+function getDomainFields(fields = DEFAULT_FIELDS) {
+    return () => ({
+        domainFields: List<DomainField>(fields),
+        systemFields: [] as any[],
+    });
+}
+
+function defaultProps(overrides?: Partial<ExpressionAssistantModalProps>): ExpressionAssistantModalProps {
+    return {
+        getDomainFields: getDomainFields(),
+        onCancel: jest.fn(),
+        ...overrides,
+    };
+}
+
+function makeApiContext(expressionAssistant = jest.fn()): AppContextTestProviderProps {
+    return {
+        appContext: {
+            api: getTestAPIWrapper(jest.fn, {
+                domain: getDomainPropertiesTestAPIWrapper(jest.fn, { expressionAssistant }),
+            }),
+        },
+    };
+}
+
+beforeEach(() => {
+    chatModalProps = undefined;
+    abortRequest.mockClear();
+    resetRequestHandler.mockClear();
+    incrementMetric.mockClear();
+});
+
+describe('ExpressionAssistantModal', () => {
+    describe('initial intro message', () => {
+        test('shows the NEW intro when there is no expression or error', () => {
+            // Arrange
+            const expressionAssistant = jest.fn();
+
+            // Act
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
+
+            // Assert - one assistant intro message with the NEW prompt text and no SQL segment
+            const messages = chatModalProps.messages as ChatMessage[];
+            expect(messages).toHaveLength(1);
+            expect(messages[0].role).toBe(ChatRole.assistant);
+            expect(messages[0].text).toMatch(/^Explain the calculation you would like/);
+            expect(messages[0].segments).toBeUndefined();
+            expect(expressionAssistant).not.toHaveBeenCalled();
+        });
+
+        test('shows the CHANGE intro with a SQL segment when fieldExpression is provided', () => {
+            // Arrange / Act
+            renderWithAppContext(
+                <ExpressionAssistantModal {...defaultProps()} fieldExpression="SELECT 1" />,
+                makeApiContext()
+            );
+
+            // Assert - intro begins with the CHANGE prompt and includes a sql segment containing the existing expression
+            const intro = (chatModalProps.messages as ChatMessage[])[0];
+            expect(intro.text).toMatch(/^Explain how you would like to change this calculation/);
+            expect(intro.segments).toEqual([{ type: 'sql', sql: 'SELECT 1' }]);
+        });
+
+        test('shows the VALIDATE intro when fieldError is provided and triggers auto-evaluation', async () => {
+            // Arrange
+            const expressionAssistant = jest.fn().mockResolvedValue({
+                conversationId: 'conv-1',
+                success: true,
+                text: 'Looks like a syntax error.',
+            });
+
+            // Act
+            renderWithAppContext(
+                <ExpressionAssistantModal {...defaultProps()} fieldError="boom" fieldExpression="SELECT bad" />,
+                makeApiContext(expressionAssistant)
+            );
+
+            // Assert - intro is VALIDATE text, and expressionAssistant was auto-invoked with a prompt that includes the
+            // error, the expression, and the fields block (i.e., evaluatePrompt); the assistant response is appended.
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1].text).toBe('Looks like a syntax error.');
+            });
+            const messages = chatModalProps.messages as ChatMessage[];
+            expect(messages[0].text).toBe('Let me take a look at this expression and see how I can help.');
+            expect(expressionAssistant).toHaveBeenCalledTimes(1);
+            const callArg = expressionAssistant.mock.calls[0][0];
+            expect(callArg.prompt).toContain('boom');
+            expect(callArg.prompt).toContain('SELECT bad');
+            expect(callArg.prompt).toContain('available columns');
+        });
+    });
+
+    describe('sendPrompt', () => {
+        test('first user prompt is wrapped with the fields preamble; subsequent prompts are sent verbatim', async () => {
+            // Arrange
+            const expressionAssistant = jest
+                .fn()
+                .mockResolvedValueOnce({ conversationId: 'c1', success: true, text: 'first reply' })
+                .mockResolvedValueOnce({ conversationId: 'c1', success: true, text: 'second reply' });
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
+
+            // Act - first prompt
+            act(() => {
+                chatModalProps.sendPrompt('compute sum of A');
+            });
+            // Assert - first call is prefixed with the field preamble and the user message is appended unmodified
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1].text).toBe('first reply');
+            });
+            const firstCall = expressionAssistant.mock.calls[0][0];
+            expect(firstCall.prompt).toContain('available columns');
+            expect(firstCall.prompt).toContain('compute sum of A');
+            expect(firstCall.conversationId).toBeUndefined();
+            const messagesAfterFirst = chatModalProps.messages as ChatMessage[];
+            expect(messagesAfterFirst.find(m => m.role === ChatRole.user)?.text).toBe('compute sum of A');
+            expect(incrementMetric).toHaveBeenCalledWith(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
+
+            // Act - second prompt reuses the conversationId and is NOT re-prefixed
+            act(() => {
+                chatModalProps.sendPrompt('and also B');
+            });
+            // Assert - second call passes the bare prompt and the previously returned conversationId
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1].text).toBe('second reply');
+            });
+            const secondCall = expressionAssistant.mock.calls[1][0];
+            expect(secondCall.prompt).toBe('and also B');
+            expect(secondCall.conversationId).toBe('c1');
+        });
+
+        test('passes columnMap and PHI columns derived from the provided domain fields', async () => {
+            // Arrange
+            const fields = [
+                makeField('plain', 'http://www.w3.org/2001/XMLSchema#string'),
+                makeField('secret', 'http://www.w3.org/2001/XMLSchema#string', 'Restricted'),
+            ];
+            const expressionAssistant = jest.fn().mockResolvedValue({ conversationId: 'c', success: true, text: 'ok' });
+            renderWithAppContext(
+                <ExpressionAssistantModal getDomainFields={getDomainFields(fields)} onCancel={jest.fn()} />,
+                makeApiContext(expressionAssistant)
+            );
+
+            // Act
+            act(() => {
+                chatModalProps.sendPrompt('go');
+            });
+
+            // Assert - columnMap contains both field names and phiColumns lists only the PHI-tagged column
+            await waitFor(() => expect(expressionAssistant).toHaveBeenCalledTimes(1));
+            const arg = expressionAssistant.mock.calls[0][0];
+            expect(Object.keys(arg.columnMap)).toEqual(expect.arrayContaining(['plain', 'secret']));
+            expect(arg.phiColumns).toEqual(['secret']);
+        });
+
+        test('non-success response surfaces the response error in the appended message', async () => {
+            // Arrange
+            const expressionAssistant = jest
+                .fn()
+                .mockResolvedValue({ conversationId: 'c', success: false, error: 'rate limited' });
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
+
+            // Act
+            act(() => {
+                chatModalProps.sendPrompt('go');
+            });
+
+            // Assert - the assistant reply carries the response error and isPending settles to false
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1].error).toBe('rate limited');
+            });
+            expect(chatModalProps.isPending).toBe(false);
+        });
+
+        test('thrown non-abort error appends a generic failure message', async () => {
+            // Arrange - error with truthy status simulates a non-abort failure
+            const expressionAssistant = jest.fn().mockRejectedValue(Object.assign(new Error('nope'), { status: 500 }));
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
+
+            // Act
+            act(() => {
+                chatModalProps.sendPrompt('go');
+            });
+
+            // Assert - appended assistant message uses the generic failure text and not the raw exception
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1].error).toBe('Request failed. Please try again.');
+            });
+            expect(chatModalProps.isPending).toBe(false);
+            expect(incrementMetric).not.toHaveBeenCalled();
+        });
+
+        test('aborted request (falsy status) does not append a message and leaves isPending true', async () => {
+            // Arrange - status undefined / 0 marks an abort
+            const expressionAssistant = jest.fn().mockRejectedValue(Object.assign(new Error('aborted'), { status: 0 }));
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
+            const initialMessageCount = (chatModalProps.messages as ChatMessage[]).length;
+
+            // Act
+            let sendPromise: Promise<void>;
+            act(() => {
+                sendPromise = chatModalProps.sendPrompt('go');
+            });
+
+            // Assert - only the user prompt was appended (no error/response message), and isPending was NOT reset
+            await waitFor(() => expect(expressionAssistant).toHaveBeenCalledTimes(1));
+            await sendPromise;
+            const messages = chatModalProps.messages as ChatMessage[];
+            expect(messages.length).toBe(initialMessageCount + 1);
+            expect(messages[messages.length - 1].role).toBe(ChatRole.user);
+            expect(chatModalProps.isPending).toBe(true);
+        });
+    });
+
+    describe('onInterrupt', () => {
+        test('user-initiated interrupt aborts the request and appends a "Stopped." assistant message', async () => {
+            // Arrange
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext());
+
+            // Act
+            act(() => {
+                chatModalProps.onInterrupt(true);
+            });
+
+            // Assert - abortRequest fired and a "Stopped." assistant message was appended
+            await waitFor(() => {
+                const m = chatModalProps.messages as ChatMessage[];
+                expect(m[m.length - 1]).toMatchObject({ role: ChatRole.assistant, text: 'Stopped.' });
+            });
+            expect(abortRequest).toHaveBeenCalledTimes(1);
+        });
+
+        test('non-user interrupt aborts without appending a message', async () => {
+            // Arrange
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext());
+            const initialCount = (chatModalProps.messages as ChatMessage[]).length;
+
+            // Act
+            act(() => {
+                chatModalProps.onInterrupt(false);
+            });
+
+            // Assert - abort fired, no new message appended
+            expect(abortRequest).toHaveBeenCalledTimes(1);
+            expect((chatModalProps.messages as ChatMessage[]).length).toBe(initialCount);
+        });
+    });
+
+    describe('renderSegment / SqlExpression', () => {
+        test('expression segments render an Apply Expression action that calls onComplete with the SQL', () => {
+            // Arrange
+            const onComplete = jest.fn();
+            renderWithAppContext(
+                <ExpressionAssistantModal {...defaultProps()} onComplete={onComplete} />,
+                makeApiContext()
+            );
+            // Render the segment ourselves into a container so we can interact with it
+            const node = chatModalProps.renderSegment({ type: 'expression', sql: 'SELECT 1' }, 0);
+
+            // Act
+            const { unmount } = render(<div>{node}</div>);
+            fireEvent.click(screen.getByRole('button', { name: /apply expression/i }));
+
+            // Assert - the SQL is shown and clicking Apply forwards the expression to onComplete
+            expect(screen.getByText('SELECT 1')).toBeInTheDocument();
+            expect(onComplete).toHaveBeenCalledTimes(1);
+            expect(onComplete).toHaveBeenCalledWith('SELECT 1');
+            unmount();
+        });
+
+        test('sql segments render read-only without an Apply action', () => {
+            // Arrange
+            renderWithAppContext(
+                <ExpressionAssistantModal {...defaultProps()} onComplete={jest.fn()} />,
+                makeApiContext()
+            );
+            const node = chatModalProps.renderSegment({ type: 'sql', sql: 'SELECT 2' }, 0);
+
+            // Act
+            render(<div>{node}</div>);
+
+            // Assert - SQL text is rendered, but the Apply Expression action is not available
+            expect(screen.getByText('SELECT 2')).toBeInTheDocument();
+            expect(screen.queryByRole('button', { name: /apply expression/i })).not.toBeInTheDocument();
+        });
+
+        test('expression segment without onComplete still renders read-only', () => {
+            // Arrange - omit onComplete
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext());
+            const node = chatModalProps.renderSegment({ type: 'expression', sql: 'SELECT 3' }, 0);
+
+            // Act
+            render(<div>{node}</div>);
+
+            // Assert - SQL still renders, but there is no Apply action when no onComplete is supplied
+            expect(screen.getByText('SELECT 3')).toBeInTheDocument();
+            expect(screen.queryByRole('button', { name: /apply expression/i })).not.toBeInTheDocument();
+        });
+
+        test('unknown / empty segments return undefined so ChatModal falls back to default rendering', () => {
+            // Arrange
+            renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext());
+
+            // Act & Assert - both unrecognized type and missing SQL return undefined
+            expect(chatModalProps.renderSegment({ type: 'text', text: 'hello' }, 0)).toBeUndefined();
+            expect(chatModalProps.renderSegment({ type: 'expression' }, 0)).toBeUndefined();
+            expect(chatModalProps.renderSegment({ type: 'sql' }, 0)).toBeUndefined();
+        });
+    });
+
+    test('passes through onCancel to the chat modal', () => {
+        // Arrange
+        const onCancel = jest.fn();
+
+        // Act
+        renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} onCancel={onCancel} />, makeApiContext());
+
+        // Assert - onCancel is wired straight through to ChatModal, so closing the modal invokes the caller's handler
+        expect(chatModalProps.onCancel).toBe(onCancel);
+        expect(chatModalProps.title).toBe('Expression AI Assistant');
+    });
+});
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index e3e4b7044a..e88e2831d5 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -37,16 +37,16 @@ const SqlExpression: FC<SqlSnippetProps> = memo(({ onApply, readOnly, sql }) =>
                 <code className="language-sql">{sql}</code>
             </pre>
             {!readOnly && onApply && (
-                <a className="apply-expression" onClick={handleApply} role="button" tabIndex={0}>
+                <span className="clickable-text" onClick={handleApply} role="button">
                     <i className="fa fa-check" /> Apply Expression
-                </a>
+                </span>
             )}
         </div>
     );
 });
 SqlExpression.displayName = 'SqlExpression';
 
-interface Props {
+export interface ExpressionAssistantModalProps {
     fieldError?: string;
     fieldExpression?: string;
     getDomainFields: GetDomainFields;
@@ -185,7 +185,7 @@ function useExpressionAssistance(
     return { isPending, messages, onInterrupt, sendPrompt };
 }
 
-export const ExpressionAssistantModal: FC<Props> = memo(props => {
+export const ExpressionAssistantModal: FC<ExpressionAssistantModalProps> = memo(props => {
     const { fieldError, fieldExpression, getDomainFields, onCancel, onComplete } = props;
     const { domainFields, systemFields } = useMemo(() => {
         const { domainFields, systemFields } = getDomainFields();
diff --git a/packages/components/src/internal/components/mcp/ChatModal.test.tsx b/packages/components/src/internal/components/mcp/ChatModal.test.tsx
new file mode 100644
index 0000000000..b18db56d61
--- /dev/null
+++ b/packages/components/src/internal/components/mcp/ChatModal.test.tsx
@@ -0,0 +1,236 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { userEvent } from '@testing-library/user-event';
+
+import { ChatModal, ChatModalProps, RenderSegment } from './ChatModal';
+import { ChatMessage, ChatRole, ChatSegment } from './models';
+
+function makeMessage(overrides?: Partial<ChatMessage>): ChatMessage {
+    return {
+        id: overrides.id ?? `msg-${Math.random()}`,
+        role: ChatRole.assistant,
+        timestamp: 0,
+        ...overrides,
+    };
+}
+
+function getDefaultProps(overrides?: Partial<ChatModalProps>) {
+    return {
+        isPending: false,
+        messages: [],
+        onCancel: jest.fn(),
+        onInterrupt: jest.fn(),
+        sendPrompt: jest.fn().mockResolvedValue(undefined),
+        title: 'Test Chat',
+        ...overrides,
+    };
+}
+
+function getTextarea(): HTMLTextAreaElement {
+    return screen.getByLabelText('Test Chat Prompt') as HTMLTextAreaElement;
+}
+
+describe('ChatModal', () => {
+    describe('message rendering', () => {
+        test('renders user messages as user-prompt and assistant text', () => {
+            // Arrange
+            const messages = [
+                makeMessage({ id: 'u1', role: ChatRole.user, text: 'Hello there' }),
+                makeMessage({ id: 'a1', role: ChatRole.assistant, text: 'Hi back' }),
+            ];
+
+            // Act
+            render(<ChatModal {...getDefaultProps({ messages })} />);
+
+            // Assert - user message is in user-prompt bubble; assistant message is in assistant-response with its text
+            const userBubble = document.querySelector('.chat-item.user-prompt');
+            expect(userBubble).toHaveTextContent('Hello there');
+            const assistantBubble = document.querySelector('.chat-item.assistant-response');
+            expect(assistantBubble).toHaveTextContent('Hi back');
+            expect(assistantBubble).not.toHaveClass('error-response');
+        });
+
+        test('renders assistant error and suppresses text/segments', () => {
+            // Arrange
+            const messages = [
+                makeMessage({
+                    id: 'e1',
+                    role: ChatRole.assistant,
+                    error: 'Something broke',
+                    text: 'should not be shown',
+                    segments: [{ type: 'text', text: 'also not shown' }],
+                }),
+            ];
+
+            // Act
+            render(<ChatModal {...getDefaultProps({ messages })} />);
+
+            // Assert - the error-response bubble shows the error and nothing else from text/segments
+            const errorBubble = document.querySelector('.chat-item.assistant-response.error-response');
+            expect(errorBubble).toHaveTextContent('Something broke');
+            expect(screen.queryByText('should not be shown')).not.toBeInTheDocument();
+            expect(screen.queryByText('also not shown')).not.toBeInTheDocument();
+        });
+    });
+
+    describe('segment rendering', () => {
+        test('renders default html and text segments', () => {
+            // Arrange
+            const messages = [
+                makeMessage({
+                    id: 'a1',
+                    segments: [
+                        { type: 'html', html: '<strong>bold</strong>' },
+                        { type: 'text', text: 'plain text segment' },
+                    ],
+                }),
+            ];
+
+            // Act
+            render(<ChatModal {...getDefaultProps({ messages })} />);
+
+            // Assert - html segment renders via innerHTML; text segment renders as text node
+            const htmlSegment = document.querySelector('.assistant-text strong');
+            expect(htmlSegment).toHaveTextContent('bold');
+            expect(screen.getByText('plain text segment')).toBeInTheDocument();
+        });
+
+        test('custom renderSegment overrides default rendering when defined', () => {
+            // Arrange
+            const renderSegment: RenderSegment = (segment, index) =>
+                segment.type === 'text' ? <span key={index} data-testid="custom">CUSTOM:{segment.text}</span> : undefined;
+            const messages = [
+                makeMessage({
+                    id: 'a1',
+                    segments: [
+                        { type: 'text', text: 'one' },
+                        { type: 'html', html: '<em>two</em>' },
+                    ],
+                }),
+            ];
+
+            // Act
+            render(<ChatModal {...getDefaultProps({ messages, renderSegment })} />);
+
+            // Assert - text segment uses custom renderer; html segment falls through to default
+            expect(screen.getByTestId('custom')).toHaveTextContent('CUSTOM:one');
+            const htmlSegment = document.querySelector('.assistant-text em');
+            expect(htmlSegment).toHaveTextContent('two');
+        });
+
+        test('unknown segment types render nothing', () => {
+            // Arrange
+            const messages = [
+                makeMessage({
+                    id: 'a1',
+                    segments: [{ type: 'mystery', sql: 'select 1' } as ChatSegment],
+                }),
+            ];
+
+            // Act
+            render(<ChatModal {...getDefaultProps({ messages })} />);
+
+            // Assert - assistant response bubble exists but has no segment content rendered
+            const bubble = document.querySelector('.chat-item.assistant-response');
+            expect(bubble).toBeInTheDocument();
+            expect(bubble?.textContent).toBe('');
+        });
+    });
+
+    describe('send behavior', () => {
+        test('submit calls sendPrompt with trimmed value and clears the textarea', async () => {
+            // Arrange
+            const sendPrompt = jest.fn().mockResolvedValue(undefined);
+            render(<ChatModal {...getDefaultProps({ sendPrompt })} />);
+            const user = userEvent.setup();
+
+            // Act
+            await user.type(getTextarea(), '  hello world  ');
+            await user.click(screen.getByRole('button', { name: '' }).closest('.btn') as HTMLElement);
+
+            // Assert - sendPrompt receives the trimmed value once and the textarea is reset
+            expect(sendPrompt).toHaveBeenCalledTimes(1);
+            expect(sendPrompt).toHaveBeenCalledWith('hello world');
+            expect(getTextarea()).toHaveValue('');
+        });
+
+        test('Enter without shift submits, Shift+Enter does not', async () => {
+            // Arrange
+            const sendPrompt = jest.fn().mockResolvedValue(undefined);
+            render(<ChatModal {...getDefaultProps({ sendPrompt })} />);
+            const textarea = getTextarea();
+
+            // Act - Shift+Enter first (should not submit), then plain Enter (should submit)
+            fireEvent.change(textarea, { target: { value: 'line one' } });
+            fireEvent.keyDown(textarea, { key: 'Enter', shiftKey: true });
+            // Assert - Shift+Enter did not call sendPrompt and did not clear input
+            expect(sendPrompt).not.toHaveBeenCalled();
+            expect(textarea).toHaveValue('line one');
+
+            // Act - plain Enter
+            fireEvent.keyDown(textarea, { key: 'Enter' });
+            // Assert - plain Enter submits the trimmed prompt
+            expect(sendPrompt).toHaveBeenCalledTimes(1);
+            expect(sendPrompt).toHaveBeenCalledWith('line one');
+        });
+
+        test('empty / whitespace-only prompt does not send and submit is disabled', () => {
+            // Arrange
+            const sendPrompt = jest.fn().mockResolvedValue(undefined);
+            render(<ChatModal {...getDefaultProps({ sendPrompt })} />);
+            const textarea = getTextarea();
+
+            // Act & Assert - with no input, the submit button is disabled
+            const submitBtn = document.querySelector('button[type="submit"]') as HTMLButtonElement;
+            expect(submitBtn).toBeDisabled();
+
+            // Act - typing whitespace and pressing Enter should still not send
+            fireEvent.change(textarea, { target: { value: '   ' } });
+            fireEvent.keyDown(textarea, { key: 'Enter' });
+
+            // Assert - sendPrompt never called and submit remains disabled (trim() empty)
+            expect(sendPrompt).not.toHaveBeenCalled();
+            expect(submitBtn).toBeDisabled();
+        });
+
+        test('while isPending: stop button shown, submit hidden, send blocked', () => {
+            // Arrange
+            const sendPrompt = jest.fn().mockResolvedValue(undefined);
+            const onInterrupt = jest.fn();
+            render(<ChatModal {...getDefaultProps({ isPending: true, sendPrompt, onInterrupt })} />);
+
+            // Act
+            const textarea = getTextarea();
+            fireEvent.change(textarea, { target: { value: 'queued prompt' } });
+            fireEvent.keyDown(textarea, { key: 'Enter' });
+
+            // Assert - submit button absent; pending spinner shown; sendPrompt not called; stop button calls onInterrupt(true)
+            expect(document.querySelector('button[type="submit"]')).toBeNull();
+            expect(document.querySelector('.chat-item.pending')).toBeInTheDocument();
+            expect(sendPrompt).not.toHaveBeenCalled();
+
+            const stopBtn = document.querySelector('.prompt-button') as HTMLButtonElement;
+            expect(stopBtn.querySelector('.fa-stop')).toBeInTheDocument();
+            fireEvent.click(stopBtn);
+            expect(onInterrupt).toHaveBeenCalledTimes(1);
+            expect(onInterrupt).toHaveBeenCalledWith(true);
+        });
+    });
+
+    describe('cancel behavior', () => {
+        test('End Chat calls onInterrupt(false) then onCancel', () => {
+            // Arrange
+            const onCancel = jest.fn();
+            const onInterrupt = jest.fn();
+            render(<ChatModal {...getDefaultProps({ onCancel, onInterrupt })} />);
+
+            // Act
+            fireEvent.click(screen.getByRole('button', { name: /end chat/i }));
+
+            // Assert - both handlers fire, interrupt receives false (non-user dismissal)
+            expect(onInterrupt).toHaveBeenCalledTimes(1);
+            expect(onInterrupt).toHaveBeenCalledWith(false);
+            expect(onCancel).toHaveBeenCalledTimes(1);
+        });
+    });
+});
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 3a7b75a0b0..dd4cc4a703 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -9,12 +9,7 @@ const fieldSizingSupported = CSS.supports('field-sizing', 'content');
 
 export type RenderSegment = (segment: ChatSegment, index: number) => ReactNode | undefined;
 
-/**
- * Default rendering for built-in segment types. Returns undefined for unknown types so callers can take over via `renderSegment`.
- * @param segment
- * @param index
- */
-function renderDefaultSegment(segment: ChatSegment, index: number): ReactNode | undefined {
+function renderSegmentDefault(segment: ChatSegment, index: number): ReactNode | undefined {
     if (segment.type === 'html' && segment.html) {
         return <div className="assistant-text" dangerouslySetInnerHTML={{ __html: segment.html }} key={index} />;
     }
@@ -47,15 +42,14 @@ const ChatItem: FC<ChatBubbleProps> = memo(({ message, renderSegment }) => {
             {message.text && <div className="assistant-text">{message.text}</div>}
             {message.segments?.map((segment, index) => {
                 const custom = renderSegment?.(segment, index);
-                if (custom !== undefined) return <React.Fragment key={index}>{custom}</React.Fragment>;
-                return <React.Fragment key={index}>{renderDefaultSegment(segment, index)}</React.Fragment>;
+                return <React.Fragment key={index}>{custom ?? renderSegmentDefault(segment, index)}</React.Fragment>;
             })}
         </div>
     );
 });
 ChatItem.displayName = 'ChatItem';
 
-interface Props {
+export interface ChatModalProps {
     isPending: boolean;
     messages: ChatMessage[];
     onCancel: () => void;
@@ -65,7 +59,7 @@ interface Props {
     title: ReactNode;
 }
 
-export const ChatModal: FC<Props> = memo(props => {
+export const ChatModal: FC<ChatModalProps> = memo(props => {
     const { isPending, messages, onCancel, onInterrupt, renderSegment, sendPrompt, title } = props;
     const [prompt, setPrompt] = useState('');
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
@@ -162,9 +156,9 @@ export const ChatModal: FC<Props> = memo(props => {
                     <div className="form-group">
                         <div className="col-xs-12">
                             <textarea
-                                aria-label="Expression Assistant Prompt"
+                                aria-label={`${title} Prompt`}
                                 className="form-control prompt-input"
-                                name="expression-assistant-prompt"
+                                name="chat-prompt"
                                 onChange={handleChange}
                                 onKeyDown={handleKeyDown}
                                 placeholder="Enter a prompt"
diff --git a/packages/components/src/test/jest.setup.ts b/packages/components/src/test/jest.setup.ts
index 7deafc9ef2..13e88fdba7 100644
--- a/packages/components/src/test/jest.setup.ts
+++ b/packages/components/src/test/jest.setup.ts
@@ -8,6 +8,7 @@ enablePatches();
 
 // JSDom does not provide an implementation for scrollIntoView(). See https://github.com/jsdom/jsdom/issues/1695
 Element.prototype.scrollIntoView = jest.fn();
+Element.prototype.scrollTo = jest.fn();
 
 // JSDom does not provide an implementation for CSS.supports().
 Object.defineProperty(window, 'CSS', {
diff --git a/packages/components/src/theme/chat.scss b/packages/components/src/theme/chat.scss
index adea8e9436..dea7f60fb1 100644
--- a/packages/components/src/theme/chat.scss
+++ b/packages/components/src/theme/chat.scss
@@ -17,16 +17,12 @@
         box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
     }
 
-    .modal-header {
-        flex-shrink: 0;
-
-        .modal-title {
-            display: inline;
-        }
+    .modal-header .modal-title {
+        display: inline;
+    }
 
-        .btn {
-            float: right;
-        }
+    .modal-header .btn {
+        float: right;
     }
 
     .modal-body {
@@ -73,20 +69,6 @@
         margin-bottom: 8px;
     }
 
-    .apply-expression {
-        color: #2980B9;
-        cursor: pointer;
-        display: inline-block;
-
-        &:hover {
-            text-decoration: underline;
-        }
-
-        .fa-check {
-            margin-right: 6px;
-        }
-    }
-
     .error-response {
         color: #C62828;
     }

From 7e891e857bf910cd68add2c69717c59f420489b9 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 22:09:28 -0700
Subject: [PATCH 13/38] nits

---
 .../src/internal/components/domainproperties/actions.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 5334736da9..833d9d750a 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -101,7 +101,8 @@ import {
     isValidTextChoiceValue,
     LOOKUP_VALIDATOR,
     NameExpressionsValidationResults,
-    QueryInfoLite, SystemField,
+    QueryInfoLite,
+    SystemField,
     updateSampleField,
 } from './models';
 import { createFormInputId, createFormInputName, getIndexFromId, getNameFromId } from './utils';
@@ -1536,10 +1537,9 @@ export interface ExpressionAssistOptions {
 }
 
 export interface ExpressionAssistSegment {
-    // 'html' for prose; 'expression' for validated, applyable SQL; 'sql' for illustrative SQL.
-    type: 'html' | 'expression' | 'sql' | string;
     html?: string;
     sql?: string;
+    type: 'expression' | 'html' | 'sql' | string;
 }
 
 export interface ExpressionAssistResponse {

From 7a7d27082cf331ce181d8dbf13f26124d0eb1f37 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 22:35:13 -0700
Subject: [PATCH 14/38] styling

---
 packages/components/src/theme/chat.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/theme/chat.scss b/packages/components/src/theme/chat.scss
index dea7f60fb1..0dbf3b4c6a 100644
--- a/packages/components/src/theme/chat.scss
+++ b/packages/components/src/theme/chat.scss
@@ -65,7 +65,8 @@
         color: #777777;
     }
 
-    .assistant-text {
+    .assistant-text,
+    .assistant-expression .clickable-text {
         margin-bottom: 8px;
     }
 

From 3ee3755fc5aa6b33e53a18aa112e4f849e4e8bcc Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Tue, 12 May 2026 23:00:21 -0700
Subject: [PATCH 15/38] nits

---
 packages/components/src/internal/app/utils.ts                  | 2 +-
 .../components/domainproperties/CalculatedFieldOptions.tsx     | 3 +++
 packages/components/src/theme/domainproperties.scss            | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/app/utils.ts b/packages/components/src/internal/app/utils.ts
index 9fdb8287dc..c96b842330 100644
--- a/packages/components/src/internal/app/utils.ts
+++ b/packages/components/src/internal/app/utils.ts
@@ -391,7 +391,7 @@ export function isAdvancedWorkflowEnabled(moduleContext?: ModuleContext): boolea
 }
 
 export function isAIAssistanceEnabled(): boolean {
-    return getServerContext()['mcpReady'] === true;
+    return getServerContext().mcpReady === true;
 }
 
 export function isDataChangeCommentRequirementFeatureEnabled(moduleContext?: ModuleContext): boolean {
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index 6aec3c10f1..fc75bf4667 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -258,6 +258,9 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                     <div className="col-xs-12 col-md-5 domain-field-calc-examples">
                         <table>
                             <tbody>
+                                <tr>
+                                    <td>Examples:</td>
+                                </tr>
                                 <tr>
                                     <td>Addition:</td>
                                     <td className="code">numericField1 + numericField2</td>
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index 97194d0bcc..052b83e8ce 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -901,9 +901,6 @@
 .domain-field-calc-footer .validate-link-ai {
     margin-left: 4px;
 }
-.domain-field-calc-examples table {
-    margin-top: 15px;
-}
 .domain-field-calc-examples td {
     padding-bottom: 8px;
 }

From 8b8054c51093616ebab4ff9bcd48dbfc3f4adc16 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 09:37:56 -0700
Subject: [PATCH 16/38] fence/lines

---
 .../ExpressionAssistantModal.test.tsx         | 43 ++++++++++++++++
 .../ExpressionAssistantModal.tsx              | 49 ++++++++++++-------
 2 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
index d33c898d42..f29a7981c1 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
@@ -14,6 +14,8 @@ import {
     EXPR_ASST_METRIC_FEATURE_AREA,
     ExpressionAssistantModal,
     ExpressionAssistantModalProps,
+    fence,
+    lines,
 } from './ExpressionAssistantModal';
 
 // Capture the props ChatModal is rendered with so we can drive ExpressionAssistantModal's logic
@@ -372,4 +374,45 @@ describe('ExpressionAssistantModal', () => {
         expect(chatModalProps.onCancel).toBe(onCancel);
         expect(chatModalProps.title).toBe('Expression AI Assistant');
     });
+
+    describe('fence', () => {
+        test('wraps the term in a triple-backtick block with no language tag by default', () => {
+            // Closing fence sits flush with the term — the helper does not append a trailing newline before it.
+            expect(fence('SELECT 1')).toBe('```\nSELECT 1```');
+        });
+
+        test('includes the language tag immediately after the opening fence', () => {
+            expect(fence('{"a":1}', 'json')).toBe('```json\n{"a":1}```');
+        });
+
+        test('preserves embedded newlines in the fenced content', () => {
+            expect(fence('line1\nline2', 'sql')).toBe('```sql\nline1\nline2```');
+        });
+
+        test('handles an empty term', () => {
+            expect(fence('', 'json')).toBe('```json\n```');
+        });
+    });
+
+    describe('lines', () => {
+        test('joins arguments with newlines', () => {
+            expect(lines('a', 'b', 'c')).toBe('a\nb\nc');
+        });
+
+        test('returns an empty string when called with no arguments', () => {
+            expect(lines()).toBe('');
+        });
+
+        test('returns the single argument unchanged', () => {
+            expect(lines('only')).toBe('only');
+        });
+
+        test('preserves empty-string arguments as blank lines', () => {
+            expect(lines('a', '', 'b')).toBe('a\n\nb');
+        });
+
+        test('composes with fence to build a labeled block', () => {
+            expect(lines('header:', fence('{"k":1}', 'json'))).toBe('header:\n```json\n{"k":1}```');
+        });
+    });
 });
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index e88e2831d5..2c88b67fe7 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -23,6 +23,14 @@ function createChatMessage(message: Partial<ChatMessage>): ChatMessage {
     } as ChatMessage;
 }
 
+export function fence(term: string, tag = ''): string {
+    return '```' + tag + '\n' + term + '```';
+}
+
+export function lines(...lines: string[]): string {
+    return lines.join('\n');
+}
+
 interface SqlSnippetProps {
     onApply?: (sql: string) => void;
     readOnly?: boolean;
@@ -84,31 +92,30 @@ function useExpressionAssistance(
         setMessages(prev => [...prev, createChatMessage(message)]);
     }, []);
 
-    const { columnMap, fieldsBlock, phiColumns } = useMemo(
+    const { columnMap, fieldsPrompt, phiColumns } = useMemo(
         () => ({
             columnMap: getColumnTypeMap(domainFields, systemFields),
-            fieldsBlock: `The following enumerates the available columns and their types:\n\`\`\`json\n${JSON.stringify(domainFields)}\`\`\``,
+            fieldsPrompt: lines(
+                'The following enumerates the available columns and their types:',
+                fence(JSON.stringify(domainFields), 'json')
+            ),
             phiColumns: getPHIColumnNames(domainFields),
         }),
         [domainFields, systemFields]
     );
 
     // This prompt is used when the user has an erroneous expression, and we want the agent to help in triaging
-    const evaluatePrompt = useMemo(() => {
+    const fieldErrorPrompt = useMemo(() => {
         if (!fieldError) return undefined;
-        return [
-            fieldsBlock,
+        return lines(
+            fieldsPrompt,
             'The user already has the following calculated column expression:',
-            '```',
-            fieldExpression,
-            '```',
+            fence(fieldExpression),
             'This expression contains an error:',
-            '```',
-            fieldError,
-            '```',
-            'Evaluate this expression and see if you can determine how to fix this error. If you can, point them out and propose corrections.',
-        ].join('\n');
-    }, [fieldError, fieldExpression, fieldsBlock]);
+            fence(fieldError),
+            'Evaluate this expression and see if you can determine how to fix this error. If you can, point them out and propose corrections.'
+        );
+    }, [fieldError, fieldExpression, fieldsPrompt]);
 
     const onInterrupt = useCallback(
         (isUser?: boolean) => {
@@ -167,20 +174,24 @@ function useExpressionAssistance(
             pushMessage({ role: ChatRole.user, text: prompt });
             let fullPrompt = prompt;
             if (firstChatRef.current) {
-                fullPrompt = `${fieldsBlock}\nGenerate a calculated column expression that matches the following description:\n${prompt}`;
+                fullPrompt = lines(
+                    fieldsPrompt,
+                    'Generate a calculated column expression that matches the following description:',
+                    prompt
+                );
             }
             firstChatRef.current = false;
             await runRequest(fullPrompt);
         },
-        [fieldsBlock, pushMessage, runRequest]
+        [fieldsPrompt, pushMessage, runRequest]
     );
 
     useEffect(() => {
-        if (!evaluatePrompt || autoEvalRef.current) return;
+        if (!fieldErrorPrompt || autoEvalRef.current) return;
         autoEvalRef.current = true;
         firstChatRef.current = false;
-        runRequest(evaluatePrompt);
-    }, [evaluatePrompt, runRequest]);
+        runRequest(fieldErrorPrompt);
+    }, [fieldErrorPrompt, runRequest]);
 
     return { isPending, messages, onInterrupt, sendPrompt };
 }

From c9ab67036c54945582ee91f3cf3aa41f1b3d690c Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 09:40:06 -0700
Subject: [PATCH 17/38] 7.36.1-fb-mcp-calc-cols.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 9a845b7f1d..eea2264b47 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.0",
+  "version": "7.36.1-fb-mcp-calc-cols.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.0",
+      "version": "7.36.1-fb-mcp-calc-cols.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 36cf97386e..0a28dd783e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.0",
+  "version": "7.36.1-fb-mcp-calc-cols.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 8e22853d9a618ab6aa537f4a31f00f63dea81b30 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 13:03:02 -0700
Subject: [PATCH 18/38] Styling updates

---
 .../components/src/theme/app/variables.scss   | 11 ++-
 packages/components/src/theme/markdown.scss   | 19 ++--
 packages/components/src/theme/variables.scss  | 89 +++++++++----------
 3 files changed, 63 insertions(+), 56 deletions(-)

diff --git a/packages/components/src/theme/app/variables.scss b/packages/components/src/theme/app/variables.scss
index b3a0c4cdba..418b55a429 100644
--- a/packages/components/src/theme/app/variables.scss
+++ b/packages/components/src/theme/app/variables.scss
@@ -1,6 +1,3 @@
-
-
-//
 // Bootstrap Variable Overrides
 // ** Full list of Bootstrap Variables located here
 // ** https://github.com/twbs/bootstrap-sass/blob/bb7dbf8af72b455b51936bc07e51efcaf6220bcc/assets/stylesheets/bootstrap/_variables.scss
@@ -19,7 +16,6 @@ $text-muted: #767676;
 //== Scaffolding
 $body-bg:               #f3f3f4 !default;
 
-
 //== Typography
 $font-family-sans-serif:  "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 
@@ -69,4 +65,11 @@ $alert-danger-border: #FBD1D0;
 // Button
 $btn-disabled-opacity: .4;
 
+// Code
+$code-bg: #E6E6E6;
+$code-color: #333333;
+
+// Pre
+$pre-bg: $code-bg;
+
 @import "bootstrap-sass/assets/stylesheets/bootstrap/_variables";
diff --git a/packages/components/src/theme/markdown.scss b/packages/components/src/theme/markdown.scss
index 811d5d481f..37a35bd37c 100644
--- a/packages/components/src/theme/markdown.scss
+++ b/packages/components/src/theme/markdown.scss
@@ -1,11 +1,20 @@
 // Styling for LabKey generated markdown
 .lk-markdown-container {
-    code {
-        background-color: #F3F3F4;
-        color: #333333;
-    }
-
     h3 {
         font-size: 18px;
     }
+
+    h4 {
+        font-size: 16px;
+    }
+
+    table {
+        th, td {
+            padding: 5px;
+        }
+    }
+
+    ul, ol {
+        padding-inline-start: 32px;
+    }
 }
diff --git a/packages/components/src/theme/variables.scss b/packages/components/src/theme/variables.scss
index 8ddf6885d4..c8b61d8a4e 100644
--- a/packages/components/src/theme/variables.scss
+++ b/packages/components/src/theme/variables.scss
@@ -1,53 +1,54 @@
 @use "sass:color";
 
-$brand-primary: #2679AD;
+$brand-primary:   #2679AD;
 $brand-secondary: #116596;
 $brand-danger:    #D43F3A;
-$brand-warning:   #f0ad4e;
-$brand-success: #238722;
-
-$light-gray: #d3d3d3;
-$white: #fff;
-
-$gray-base:              #000 !default;
-$gray-darker:            color.adjust($gray-base, $lightness: 13.5%) !default; // #222
-$gray-dark:              color.adjust($gray-base, $lightness: 20%)   !default; // #333
-$gray:                   color.adjust($gray-base, $lightness: 33.5%) !default; // #555
-$gray-light:             color.adjust($gray-base, $lightness: 46.7%) !default; // #777
-$gray-lighten:           color.adjust($gray-base, $lightness: 60%)   !default; // #999
-$gray-lighter:           color.adjust($gray-base, $lightness: 93.5%) !default; // #eee
-
-$border-color:    #cccccc;
-$navbar-border-color: #cbccce;
-$badge-color:   #D43F3A;
+$brand-warning:   #F0AF4E;
+$brand-success:   #238722;
+
+$light-gray: #D3D3D3;
+$white:      #FFF;
+$purple:     #A63AAF;
+$orange:     #DA803D;
+
+$gray-base:    #000 !default;
+$gray-darker:  color.adjust($gray-base, $lightness: 13.5%) !default; // #222
+$gray-dark:    color.adjust($gray-base, $lightness: 20%)   !default; // #333
+$gray:         color.adjust($gray-base, $lightness: 33.5%) !default; // #555
+$gray-light:   color.adjust($gray-base, $lightness: 46.7%) !default; // #777
+$gray-lighten: color.adjust($gray-base, $lightness: 60%)   !default; // #999
+$gray-lighter: color.adjust($gray-base, $lightness: 93.5%) !default; // #eee
+
+$border-color:        #CCCCCC;
+$navbar-border-color: #CBCCCE;
+$badge-color:         #D43F3A;
 
 $blue-highlight:       #2980B9;
 $gray-no-highlight:    $gray-lighten;
 $blue-icon-background: #CCE5FF;
 
-$blue-dark:   #1e4f6f;
-$text-color-gray:   #9d9d9d;
-$text-color-light:   #6B6B6B;
-$text-muted: #767676;
+$blue-dark:        #1e4f6f;
+$text-color-gray:  #9d9d9d;
+$text-color-light: #6B6B6B;
+$text-muted:       #767676;
 
-$text-color:            $gray-dark !default;
-$link-color: #0F72C2;
-$link-hover-color:      color.adjust($link-color, $lightness: 15%) !default;
+$text-color:       $gray-dark !default;
+$link-color:       #0F72C2;
+$link-hover-color: color.adjust($link-color, $lightness: 15%) !default;
 
 $font-family-sans-serif:  "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 
 // Alert variables
-$alert-info-bg: #F1F9FC;
-$alert-info-text: #0B73B7;
-$alert-info-border: #C9E6F2;
-$alert-danger-bg: #FDE6E6;
-$alert-danger-text: #BF3939;
+$alert-info-bg:       #F1F9FC;
+$alert-info-text:     #0B73B7;
+$alert-info-border:   #C9E6F2;
+$alert-danger-bg:     #FDE6E6;
+$alert-danger-text:   #BF3939;
 $alert-danger-border: #FBD1D0;
 
-// Domain properties variables
-$gray-border:           #cccccc;
-$gray-border-light:     #dddddd;
-$gray-shadow:           #F3F3F4;
+$gray-border:       #CCCCCC;
+$gray-border-light: #DDDDDD;
+$gray-shadow:       #F3F3F4;
 
 $red-border:            rgba(220, 53, 69, 1);
 $red-shadow:            rgba(220, 53, 69, 0.5);
@@ -59,7 +60,6 @@ $blue-border:           rgba(41, 128, 185, 0.5);
 $blue-border-solid:     rgba(41, 128, 185, 1);
 $blue-bkgrd-selected:   rgba(41, 128, 185, 0.1);
 
-// Grid ActionValues variables
 @mixin border-top-radius($radius)
 {
   border-top-right-radius: $radius;
@@ -81,17 +81,14 @@ $blue-bkgrd-selected:   rgba(41, 128, 185, 0.1);
   border-top-left-radius: $radius;
 }
 
-$grid-action-item-color:                $alert-info-text;
-$grid-action-item-bg:                   $alert-info-bg;
-$grid-action-item-border-color:         $alert-info-border;
-$grid-action-item-hover-bg:             color.adjust($grid-action-item-bg, $lightness: 5%);
-$grid-action-item-disabled-color:       #333;
-$grid-action-item-disabled-bg:          #fcfcfc;
+$grid-action-item-color:                 $alert-info-text;
+$grid-action-item-bg:                    $alert-info-bg;
+$grid-action-item-border-color:          $alert-info-border;
+$grid-action-item-hover-bg:              color.adjust($grid-action-item-bg, $lightness: 5%);
+$grid-action-item-disabled-color:        #333;
+$grid-action-item-disabled-bg:           #FCFCFC;
 $grid-action-item-disabled-border-color: color.adjust($grid-action-item-disabled-bg, $lightness: 10%);
 
-
-// Navigation variables
-
 //-- Z-index master list
 $zindex-navbar: 1000 !default;
 
@@ -104,6 +101,4 @@ $panel-content-text: $text-color !default;
 $panel-content-border: $gray-border-light !default;
 $panel-content-heading-bg: $white !default;
 
-$purple:                #A63AAF;
-
-$orange:                #DA803D;
+$pre-bg: red;

From f2afb811ba8fc116172eefd4410d66a12889247d Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 13:50:06 -0700
Subject: [PATCH 19/38] Fix circular dependency

---
 .../components/domainproperties/constants.ts  |   2 -
 .../components/domainproperties/models.tsx    |   3 +-
 .../components/forms/BulkUpdateForm.tsx       |   2 +-
 .../internal/components/forms/utils.test.ts   | 557 +++++++++++++++++-
 .../src/internal/components/forms/utils.ts    | 127 ++++
 .../internal/components/samples/constants.ts  |   4 +-
 .../src/internal/util/utils.test.ts           | 557 +-----------------
 .../components/src/internal/util/utils.ts     | 126 ----
 8 files changed, 686 insertions(+), 692 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/constants.ts b/packages/components/src/internal/components/domainproperties/constants.ts
index eaa144c869..bdee62c3b3 100644
--- a/packages/components/src/internal/components/domainproperties/constants.ts
+++ b/packages/components/src/internal/components/domainproperties/constants.ts
@@ -235,8 +235,6 @@ export const DERIVATION_DATA_SCOPES = {
 export const MAX_VALID_TEXT_CHOICES = 500;
 export const MAX_TEXT_CHOICE_VALUE_LENGTH = 200; // GitHub Issue 955: limit option length to 200
 
-export const LOOKUP_VALIDATOR_VALUES = { type: 'Lookup', name: 'Lookup Validator' };
-
 export const DOMAIN_ERROR_ID = 'domain-error';
 
 export const CALCULATED_COLUMN_SQL_TAG = '/* CALCULATED-EXPRESSION-COLUMN-QUERY */';
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 322481f406..8afe33396b 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -54,7 +54,6 @@ import {
     FILE_CONVERT_URIS,
     INT_RANGE_URI,
     LONG_RANGE_URI,
-    LOOKUP_VALIDATOR_VALUES,
     MAX_TEXT_LENGTH,
     MULTI_CHOICE_RANGE_URI,
     MULTILINE_RANGE_URI,
@@ -872,7 +871,7 @@ export const DEFAULT_TEXT_CHOICE_VALIDATOR = new PropertyValidator({
     properties: { validValues: [] },
 });
 
-export const LOOKUP_VALIDATOR = new PropertyValidator(LOOKUP_VALIDATOR_VALUES);
+export const LOOKUP_VALIDATOR = new PropertyValidator({ type: 'Lookup', name: 'Lookup Validator' });
 
 interface ILookupConfig {
     lookupContainer?: string;
diff --git a/packages/components/src/internal/components/forms/BulkUpdateForm.tsx b/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
index 7e93c82484..f791aea047 100644
--- a/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
+++ b/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
@@ -13,10 +13,10 @@ import {
     capitalizeFirstChar,
     caseInsensitive,
     getCommonDataValues,
-    getUpdatedData,
     makeCommaSeparatedString,
     pronoun,
 } from '../../util/utils';
+import { getUpdatedData } from './utils';
 
 import { ComponentsAPIWrapper } from '../../APIWrapper';
 
diff --git a/packages/components/src/internal/components/forms/utils.test.ts b/packages/components/src/internal/components/forms/utils.test.ts
index 44d5442647..daa2290fdd 100644
--- a/packages/components/src/internal/components/forms/utils.test.ts
+++ b/packages/components/src/internal/components/forms/utils.test.ts
@@ -13,9 +13,562 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { fromJS } from 'immutable';
+import { fromJS, List, Map } from 'immutable';
 
-import { resolveDetailFieldValue } from './utils';
+import { QueryInfo } from '../../../public/QueryInfo';
+import { ExtendedMap } from '../../../public/ExtendedMap';
+import { QueryColumn } from '../../../public/QueryColumn';
+
+import { getUpdatedData, hasAmountOrUnitChanged, resolveDetailFieldValue } from './utils';
+
+describe('getUpdatedData', () => {
+    const originalData = fromJS({
+        '448': {
+            RowId: {
+                value: 448,
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+            },
+            Value: {
+                value: null,
+            },
+            Data: {
+                value: 'data1',
+            },
+            'And,./Again': {
+                value: 'again',
+            },
+            Name: {
+                value: 'S-20190516-9042',
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+            },
+            Other: {
+                value: 'other1',
+            },
+        },
+        '447': {
+            RowId: {
+                value: 447,
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=447',
+            },
+            Value: {
+                value: null,
+            },
+            Data: {
+                value: 'data1',
+            },
+            'And,./Again': {
+                value: 'again',
+            },
+            Name: {
+                value: 'S-20190516-4622',
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=447',
+            },
+            Other: {
+                value: 'other2',
+            },
+        },
+        '446': {
+            RowId: {
+                value: 446,
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=446',
+            },
+            Value: {
+                value: 'val',
+            },
+            Data: {
+                value: 'data1',
+            },
+            'And,./Again': {
+                value: 'again',
+            },
+            Name: {
+                value: 'S-20190516-2368',
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=446',
+            },
+            Other: {
+                value: 'other3',
+            },
+        },
+        '445': {
+            RowId: {
+                value: 445,
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=445',
+            },
+            Value: {
+                value: 'val',
+            },
+            Data: {
+                value: 'data1',
+            },
+            'And,./Again': {
+                value: 'again',
+            },
+            Name: {
+                value: 'S-20190516-9512',
+                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=445',
+            },
+            Other: {
+                value: null,
+            },
+            StoredAmount: {
+                value: 1,
+            },
+            Units: {
+                value: 'mL',
+            },
+        },
+    });
+
+    const queryInfo = new QueryInfo({
+        pkCols: ['RowId'],
+        columns: new ExtendedMap({
+            rowid: new QueryColumn({
+                name: 'RowId',
+                fieldKey: 'RowId',
+            }),
+            name: new QueryColumn({
+                name: 'Name',
+                fieldKey: 'Name',
+            }),
+            alias: new QueryColumn({
+                name: 'Alias',
+                fieldKey: 'Alias',
+            }),
+            data: new QueryColumn({
+                name: 'Data',
+                fieldKey: 'Data',
+            }),
+            and$c$d$sagain: new QueryColumn({
+                name: 'And,./Again',
+                fieldKey: 'And$C$D$SAgain',
+            }),
+            value: new QueryColumn({
+                name: 'Value',
+                fieldKey: 'Value',
+            }),
+            other: new QueryColumn({
+                name: 'Other',
+                fieldKey: 'Other',
+            }),
+            intvalue: new QueryColumn({
+                name: 'IntValue',
+                fieldKey: 'IntValue',
+            }),
+            storedamount: new QueryColumn({
+                name: 'StoredAmount',
+                fieldKey: 'StoredAmount',
+            }),
+            units: new QueryColumn({
+                name: 'Units',
+                fieldKey: 'Units',
+            }),
+        }),
+    });
+
+    test('empty updates', () => {
+        const updatedData = getUpdatedData(originalData, {}, queryInfo);
+        expect(updatedData).toHaveLength(0);
+    });
+
+    test('updated values did not change', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Data: 'data1',
+                And$C$D$SAgain: 'again',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(0);
+    });
+
+    test('changed values for some', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Value: 'val',
+                Data: 'data1',
+                And$C$D$SAgain: 'again',
+                Other: 'other3',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(3);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 445,
+            Other: 'other3',
+        });
+        expect(updatedData[1]).toStrictEqual({
+            RowId: 447,
+            Value: 'val',
+            Other: 'other3',
+        });
+        expect(updatedData[2]).toStrictEqual({
+            RowId: 448,
+            Value: 'val',
+            Other: 'other3',
+        });
+    });
+
+    test('changed value for amount but not units', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                StoredAmount: 2,
+                Units: 'mL',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 445,
+            StoredAmount: 2,
+            Units: 'mL',
+        });
+    });
+
+    test('changed value for units but not amount', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                StoredAmount: 1,
+                Units: 'uL',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 445,
+            StoredAmount: 1,
+            Units: 'uL',
+        });
+    });
+
+    test('changed values for all', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Value: 'val2',
+                Data: 'data2',
+                And$C$D$SAgain: 'again2',
+                Other: 'not another',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(4);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 445,
+            Value: 'val2',
+            Data: 'data2',
+            'And,./Again': 'again2',
+            Other: 'not another',
+        });
+        expect(updatedData[1]).toStrictEqual({
+            RowId: 446,
+            Value: 'val2',
+            Data: 'data2',
+            'And,./Again': 'again2',
+            Other: 'not another',
+        });
+        expect(updatedData[2]).toStrictEqual({
+            RowId: 447,
+            Value: 'val2',
+            Data: 'data2',
+            'And,./Again': 'again2',
+            Other: 'not another',
+        });
+        expect(updatedData[3]).toStrictEqual({
+            RowId: 448,
+            Value: 'val2',
+            Data: 'data2',
+            'And,./Again': 'again2',
+            Other: 'not another',
+        });
+    });
+
+    test('removed values', () => {
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Value: null,
+                And$C$D$SAgain: undefined,
+                Other: 'not another',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(4);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 445,
+            Value: null,
+            'And,./Again': null,
+            Other: 'not another',
+        });
+        expect(updatedData[1]).toStrictEqual({
+            RowId: 446,
+            Value: null,
+            'And,./Again': null,
+            Other: 'not another',
+        });
+        expect(updatedData[2]).toStrictEqual({
+            RowId: 447,
+            'And,./Again': null,
+            Other: 'not another',
+        });
+        expect(updatedData[3]).toStrictEqual({
+            RowId: 448,
+            'And,./Again': null,
+            Other: 'not another',
+        });
+    });
+
+    test('same int value with string', () => {
+        const originalData = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                IntValue: {
+                    value: 123,
+                },
+            },
+        });
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                IntValue: '123',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(0);
+    });
+
+    test('different int value with string', () => {
+        const originalData = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                IntValue: {
+                    value: 123,
+                },
+            },
+        });
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                IntValue: '234',
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            IntValue: '234',
+        });
+    });
+
+    test('Update multi value by displayValue', () => {
+        const originalData = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Alias: List<string>([
+                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
+                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
+                ]),
+            },
+        });
+
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Alias: ['alias3'],
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            Alias: ['alias3'],
+        });
+    });
+
+    test('Update multi value by value', () => {
+        const originalData = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Alias: List<string>([
+                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
+                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
+                ]),
+            },
+        });
+
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Alias: [2],
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            Alias: ['alias2'],
+        });
+    });
+
+    test('Delete multi value', () => {
+        const originalData = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Alias: List<string>([
+                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
+                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
+                ]),
+            },
+        });
+
+        const updatedData = getUpdatedData(
+            originalData,
+            {
+                Alias: [],
+            },
+            queryInfo
+        );
+        expect(updatedData).toHaveLength(1);
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            Alias: [],
+        });
+    });
+
+    test('with folder', () => {
+        const originalData_ = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Value: {
+                    value: null,
+                },
+                Data: {
+                    value: 'data1',
+                },
+                'And,./Again': {
+                    value: 'again',
+                },
+                Name: {
+                    value: 'S-20190516-9042',
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Other: {
+                    value: 'other1',
+                },
+                Folder: {
+                    displayValue: 'ProjectA',
+                    value: 'ENTITYID-A',
+                },
+            },
+        });
+
+        const updatedData = getUpdatedData(
+            originalData_,
+            {
+                Value: 'val',
+                And$C$D$SAgain: 'again',
+                Other: 'other3',
+            },
+            queryInfo
+        );
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            Value: 'val',
+            Other: 'other3',
+            Folder: 'ENTITYID-A',
+        });
+    });
+
+    test('with container', () => {
+        const originalData_ = fromJS({
+            '448': {
+                RowId: {
+                    value: 448,
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Value: {
+                    value: null,
+                },
+                Data: {
+                    value: 'data1',
+                },
+                'And,./Again': {
+                    value: 'again',
+                },
+                Name: {
+                    value: 'S-20190516-9042',
+                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
+                },
+                Other: {
+                    value: 'other1',
+                },
+                Container: {
+                    displayValue: 'ProjectA',
+                    value: 'ENTITYID-A',
+                },
+            },
+        });
+
+        const updatedData = getUpdatedData(
+            originalData_,
+            {
+                Value: 'val',
+                And$C$D$SAgain: 'again changed',
+                Other: 'other3',
+            },
+            queryInfo
+        );
+        expect(updatedData[0]).toStrictEqual({
+            RowId: 448,
+            Value: 'val',
+            'And,./Again': 'again changed',
+            Other: 'other3',
+            Container: 'ENTITYID-A',
+        });
+    });
+});
+
+describe('hasAmountOrUnitChanged', () => {
+    test('updated amount', () => {
+        const originalRowMap = fromJS({ StoredAmount: { value: 5 }, Units: { value: 'mg' } });
+        expect(hasAmountOrUnitChanged(Map({ Amount: 10, Units: 'mg' }), originalRowMap)).toBe(false);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'mg' }), originalRowMap)).toBe(false);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5.1, Units: 'mg' }), originalRowMap)).toBe(true);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 10, Units: 'mg' }), originalRowMap)).toBe(true);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: null, Units: 'mg' }), originalRowMap)).toBe(true);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: undefined, Units: 'mg' }), originalRowMap)).toBe(true);
+    });
+
+    test('updated unit', () => {
+        const originalRowMap = fromJS({ StoredAmount: { value: 5 }, Units: { value: 'mg' } });
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, RawUnits: 'mg' }), originalRowMap)).toBe(false);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'mg' }), originalRowMap)).toBe(false);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'g' }), originalRowMap)).toBe(true);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: null }), originalRowMap)).toBe(true);
+        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: undefined }), originalRowMap)).toBe(true);
+    });
+});
 
 describe('resolveDetailFieldValue', () => {
     test('data value undefined', () => {
diff --git a/packages/components/src/internal/components/forms/utils.ts b/packages/components/src/internal/components/forms/utils.ts
index 7fd4055d51..cdbfc58ee3 100644
--- a/packages/components/src/internal/components/forms/utils.ts
+++ b/packages/components/src/internal/components/forms/utils.ts
@@ -1,6 +1,9 @@
 import { List, Map } from 'immutable';
 
 import { QueryColumn } from '../../../public/QueryColumn';
+import { QueryInfo } from '../../../public/QueryInfo';
+import { STORED_AMOUNT_FIELDS } from '../samples/constants';
+import { isSameWithStringCompare } from '../../util/utils';
 
 const LABEL_FIELD_SUFFIX = '::label';
 
@@ -17,6 +20,130 @@ export const getFieldEnabledFieldName = function (column: QueryColumn, fieldName
     return name + '::enabled';
 };
 
+// exported for jest testing
+export function hasAmountOrUnitChanged(updatedValuesMap: Map<string, any>, originalRowMap: Map<string, any>): boolean {
+    // If we have an updated value for amount, and it has been changed, return true
+    if (
+        updatedValuesMap.has(STORED_AMOUNT_FIELDS.AMOUNT) &&
+        !isSameWithStringCompare(
+            updatedValuesMap.get(STORED_AMOUNT_FIELDS.AMOUNT),
+            originalRowMap.get(STORED_AMOUNT_FIELDS.AMOUNT)?.get('value')
+        )
+    ) {
+        return true;
+    }
+    // If we have an updated value for units, and it has been changed, return true
+    if (
+        updatedValuesMap.has(STORED_AMOUNT_FIELDS.UNITS) &&
+        !isSameWithStringCompare(
+            updatedValuesMap.get(STORED_AMOUNT_FIELDS.UNITS),
+            originalRowMap.get(STORED_AMOUNT_FIELDS.UNITS)?.get('value')
+        )
+    ) {
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Constructs an array of objects, suitable for the "rows" parameter of updateRows, where each object contains the
+ * values that are different from the ones in the originalData object as well as the primary key values for that row.
+ * If updatedValues are empty, or all the originalData values are the same as the updatedValues, then it returns an
+ * empty array.
+ *
+ * @param originalData a map from an id field to a Map from fieldKeys to an object with a 'value' field
+ * @param updatedValues an object mapping fieldKeys to values that are being updated
+ * @param queryInfo the queryInfo to get column information from
+ */
+export function getUpdatedData(
+    originalData: Map<string, any>, // the rows in the original data have column names as keys
+    updatedValues: Record<string, any>, // the keys here are column fieldKeys
+    queryInfo: QueryInfo
+): any[] {
+    const updateValuesMap = Map<any, any>(updatedValues);
+    const pkColsLc = new Set<string>();
+    const pkColsInUse = new Set<string>();
+    queryInfo.pkCols.forEach(key => pkColsLc.add(key.toLowerCase()));
+
+    // if the originalData has the container/folder values, keep those as well (i.e., treat it as a primary key)
+    const folderKey = originalData
+        .first()
+        .keySeq()
+        .find(key => key.toLowerCase() === 'folder' || key.toLowerCase() === 'container');
+    if (folderKey) pkColsLc.add(folderKey.toLowerCase());
+
+    const updatedData = originalData.map(originalRowMap => {
+        const amountOrUnitChanged = hasAmountOrUnitChanged(updateValuesMap, originalRowMap);
+
+        return originalRowMap.reduce((m, fieldValueMap, key) => {
+            const isPKCol = pkColsLc.has(key.toLowerCase());
+
+            // Issue 42672: The original data has keys that are column names. Need to get the QueryColumn object from that
+            // name so that we can get the fieldKey for the column to get the updated value from the updateValuesMap.
+            // (e.g., "U g$Sl" instead of "U g/l")
+            const col = queryInfo.getColumnFromName(key);
+            if (!col && !isPKCol) {
+                if (fieldValueMap) {
+                    throw new Error(`Unable to find column for key ${key}.`);
+                } else {
+                    return m;
+                }
+            }
+
+            if (fieldValueMap?.has('value')) {
+                if (isPKCol) {
+                    pkColsInUse.add(key.toLowerCase());
+                    return m.set(key, fieldValueMap.get('value'));
+                }
+
+                const colValueIsIncluded = updateValuesMap.has(col.fieldKey);
+                const updatedValue =
+                    updateValuesMap.get(col.fieldKey) == undefined ? null : updateValuesMap.get(col.fieldKey);
+                const valueIsChanged = !isSameWithStringCompare(
+                    updateValuesMap.get(col.fieldKey),
+                    fieldValueMap.get('value')
+                );
+                const isStoredAmountField =
+                    col.fieldKey === STORED_AMOUNT_FIELDS.AMOUNT || col.fieldKey === STORED_AMOUNT_FIELDS.UNITS;
+                if (colValueIsIncluded && valueIsChanged) {
+                    return m.set(key, updatedValue);
+                } else if (colValueIsIncluded && isStoredAmountField) {
+                    // If you update amount or units, the saved row has to include both so include even if the value hasn't changed
+                    if (amountOrUnitChanged) {
+                        return m.set(key, updatedValue);
+                    } else {
+                        return m;
+                    }
+                } else {
+                    return m;
+                }
+            }
+            // Handle multi-value select
+            else if (List.isList(fieldValueMap)) {
+                let updatedVal = updateValuesMap.get(col.fieldKey);
+                if (Array.isArray(updatedVal)) {
+                    updatedVal = updatedVal.map(val => {
+                        const match = fieldValueMap.find(original => original.get('value') === val);
+                        if (match !== undefined) {
+                            return match.get('displayValue');
+                        }
+                        return val;
+                    });
+
+                    return m.set(key, updatedVal);
+                } else if (updateValuesMap.has(col.fieldKey) && updatedVal === undefined) {
+                    return m.set(key, []);
+                } else return m;
+            } else return m;
+        }, Map<string, any>());
+    });
+    // we want the rows that contain more than just the primaryKeys
+    return updatedData
+        .filter(rowData => rowData.size > pkColsInUse.size)
+        .map(rowData => rowData.toJS())
+        .toArray();
+}
+
 interface FieldValue {
     displayValue?: any;
     formattedValue?: any;
diff --git a/packages/components/src/internal/components/samples/constants.ts b/packages/components/src/internal/components/samples/constants.ts
index 544220bfcf..facc3d503e 100644
--- a/packages/components/src/internal/components/samples/constants.ts
+++ b/packages/components/src/internal/components/samples/constants.ts
@@ -1,11 +1,9 @@
+import { List } from 'immutable';
 import { Filter } from '@labkey/api';
 
 import { IDomainField, LOOKUP_VALIDATOR } from '../domainproperties/models';
-
 import { SAMPLE_TYPE } from '../domainproperties/PropDescType';
-
 import { FindField, SampleStateType } from './models';
-import { List } from 'immutable';
 
 export enum ALIQUOT_FILTER_MODE {
     aliquots = 'aliquots',
diff --git a/packages/components/src/internal/util/utils.test.ts b/packages/components/src/internal/util/utils.test.ts
index 2aba53a654..4a4ecc4b8b 100644
--- a/packages/components/src/internal/util/utils.test.ts
+++ b/packages/components/src/internal/util/utils.test.ts
@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { fromJS, List, Map } from 'immutable';
-
-import { QueryInfo } from '../../public/QueryInfo';
-import { ExtendedMap } from '../../public/ExtendedMap';
-import { QueryColumn } from '../../public/QueryColumn';
+import { fromJS, Map } from 'immutable';
 
 import getDomainDetailsJSON from '../../test/data/dataclass-getDomainDetails.json';
 
@@ -32,10 +28,8 @@ import {
     getDataStyling,
     getIconFontCls,
     getInvalidSampleAmountMessage,
-    getUpdatedData,
     getValueFromRow,
     getValuesSummary,
-    hasAmountOrUnitChanged,
     isAllowedSampleAmount,
     isBlankValue,
     isBoolean,
@@ -502,534 +496,6 @@ describe('getCommonDataForSelection', () => {
     });
 });
 
-describe('getUpdatedData', () => {
-    const originalData = fromJS({
-        '448': {
-            RowId: {
-                value: 448,
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-            },
-            Value: {
-                value: null,
-            },
-            Data: {
-                value: 'data1',
-            },
-            'And,./Again': {
-                value: 'again',
-            },
-            Name: {
-                value: 'S-20190516-9042',
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-            },
-            Other: {
-                value: 'other1',
-            },
-        },
-        '447': {
-            RowId: {
-                value: 447,
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=447',
-            },
-            Value: {
-                value: null,
-            },
-            Data: {
-                value: 'data1',
-            },
-            'And,./Again': {
-                value: 'again',
-            },
-            Name: {
-                value: 'S-20190516-4622',
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=447',
-            },
-            Other: {
-                value: 'other2',
-            },
-        },
-        '446': {
-            RowId: {
-                value: 446,
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=446',
-            },
-            Value: {
-                value: 'val',
-            },
-            Data: {
-                value: 'data1',
-            },
-            'And,./Again': {
-                value: 'again',
-            },
-            Name: {
-                value: 'S-20190516-2368',
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=446',
-            },
-            Other: {
-                value: 'other3',
-            },
-        },
-        '445': {
-            RowId: {
-                value: 445,
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=445',
-            },
-            Value: {
-                value: 'val',
-            },
-            Data: {
-                value: 'data1',
-            },
-            'And,./Again': {
-                value: 'again',
-            },
-            Name: {
-                value: 'S-20190516-9512',
-                url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=445',
-            },
-            Other: {
-                value: null,
-            },
-            StoredAmount: {
-                value: 1,
-            },
-            Units: {
-                value: 'mL',
-            },
-        },
-    });
-
-    const queryInfo = new QueryInfo({
-        pkCols: ['RowId'],
-        columns: new ExtendedMap({
-            rowid: new QueryColumn({
-                name: 'RowId',
-                fieldKey: 'RowId',
-            }),
-            name: new QueryColumn({
-                name: 'Name',
-                fieldKey: 'Name',
-            }),
-            alias: new QueryColumn({
-                name: 'Alias',
-                fieldKey: 'Alias',
-            }),
-            data: new QueryColumn({
-                name: 'Data',
-                fieldKey: 'Data',
-            }),
-            and$c$d$sagain: new QueryColumn({
-                name: 'And,./Again',
-                fieldKey: 'And$C$D$SAgain',
-            }),
-            value: new QueryColumn({
-                name: 'Value',
-                fieldKey: 'Value',
-            }),
-            other: new QueryColumn({
-                name: 'Other',
-                fieldKey: 'Other',
-            }),
-            intvalue: new QueryColumn({
-                name: 'IntValue',
-                fieldKey: 'IntValue',
-            }),
-            storedamount: new QueryColumn({
-                name: 'StoredAmount',
-                fieldKey: 'StoredAmount',
-            }),
-            units: new QueryColumn({
-                name: 'Units',
-                fieldKey: 'Units',
-            }),
-        }),
-    });
-
-    test('empty updates', () => {
-        const updatedData = getUpdatedData(originalData, {}, queryInfo);
-        expect(updatedData).toHaveLength(0);
-    });
-
-    test('updated values did not change', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Data: 'data1',
-                And$C$D$SAgain: 'again',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(0);
-    });
-
-    test('changed values for some', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Value: 'val',
-                Data: 'data1',
-                And$C$D$SAgain: 'again',
-                Other: 'other3',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(3);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 445,
-            Other: 'other3',
-        });
-        expect(updatedData[1]).toStrictEqual({
-            RowId: 447,
-            Value: 'val',
-            Other: 'other3',
-        });
-        expect(updatedData[2]).toStrictEqual({
-            RowId: 448,
-            Value: 'val',
-            Other: 'other3',
-        });
-    });
-
-    test('changed value for amount but not units', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                StoredAmount: 2,
-                Units: 'mL',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 445,
-            StoredAmount: 2,
-            Units: 'mL',
-        });
-    });
-
-    test('changed value for units but not amount', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                StoredAmount: 1,
-                Units: 'uL',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 445,
-            StoredAmount: 1,
-            Units: 'uL',
-        });
-    });
-
-    test('changed values for all', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Value: 'val2',
-                Data: 'data2',
-                And$C$D$SAgain: 'again2',
-                Other: 'not another',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(4);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 445,
-            Value: 'val2',
-            Data: 'data2',
-            'And,./Again': 'again2',
-            Other: 'not another',
-        });
-        expect(updatedData[1]).toStrictEqual({
-            RowId: 446,
-            Value: 'val2',
-            Data: 'data2',
-            'And,./Again': 'again2',
-            Other: 'not another',
-        });
-        expect(updatedData[2]).toStrictEqual({
-            RowId: 447,
-            Value: 'val2',
-            Data: 'data2',
-            'And,./Again': 'again2',
-            Other: 'not another',
-        });
-        expect(updatedData[3]).toStrictEqual({
-            RowId: 448,
-            Value: 'val2',
-            Data: 'data2',
-            'And,./Again': 'again2',
-            Other: 'not another',
-        });
-    });
-
-    test('removed values', () => {
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Value: null,
-                And$C$D$SAgain: undefined,
-                Other: 'not another',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(4);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 445,
-            Value: null,
-            'And,./Again': null,
-            Other: 'not another',
-        });
-        expect(updatedData[1]).toStrictEqual({
-            RowId: 446,
-            Value: null,
-            'And,./Again': null,
-            Other: 'not another',
-        });
-        expect(updatedData[2]).toStrictEqual({
-            RowId: 447,
-            'And,./Again': null,
-            Other: 'not another',
-        });
-        expect(updatedData[3]).toStrictEqual({
-            RowId: 448,
-            'And,./Again': null,
-            Other: 'not another',
-        });
-    });
-
-    test('same int value with string', () => {
-        const originalData = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                IntValue: {
-                    value: 123,
-                },
-            },
-        });
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                IntValue: '123',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(0);
-    });
-
-    test('different int value with string', () => {
-        const originalData = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                IntValue: {
-                    value: 123,
-                },
-            },
-        });
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                IntValue: '234',
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            IntValue: '234',
-        });
-    });
-
-    test('Update multi value by displayValue', () => {
-        const originalData = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Alias: List<string>([
-                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
-                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
-                ]),
-            },
-        });
-
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Alias: ['alias3'],
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            Alias: ['alias3'],
-        });
-    });
-
-    test('Update multi value by value', () => {
-        const originalData = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Alias: List<string>([
-                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
-                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
-                ]),
-            },
-        });
-
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Alias: [2],
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            Alias: ['alias2'],
-        });
-    });
-
-    test('Delete multi value', () => {
-        const originalData = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Alias: List<string>([
-                    Map<string, number>({ displayValue: 'alias1', value: 1 }),
-                    Map<string, number>({ displayValue: 'alias2', value: 2 }),
-                ]),
-            },
-        });
-
-        const updatedData = getUpdatedData(
-            originalData,
-            {
-                Alias: [],
-            },
-            queryInfo
-        );
-        expect(updatedData).toHaveLength(1);
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            Alias: [],
-        });
-    });
-
-    test('with folder', () => {
-        const originalData_ = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Value: {
-                    value: null,
-                },
-                Data: {
-                    value: 'data1',
-                },
-                'And,./Again': {
-                    value: 'again',
-                },
-                Name: {
-                    value: 'S-20190516-9042',
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Other: {
-                    value: 'other1',
-                },
-                Folder: {
-                    displayValue: 'ProjectA',
-                    value: 'ENTITYID-A',
-                },
-            },
-        });
-
-        const updatedData = getUpdatedData(
-            originalData_,
-            {
-                Value: 'val',
-                And$C$D$SAgain: 'again',
-                Other: 'other3',
-            },
-            queryInfo
-        );
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            Value: 'val',
-            Other: 'other3',
-            Folder: 'ENTITYID-A',
-        });
-    });
-
-    test('with container', () => {
-        const originalData_ = fromJS({
-            '448': {
-                RowId: {
-                    value: 448,
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Value: {
-                    value: null,
-                },
-                Data: {
-                    value: 'data1',
-                },
-                'And,./Again': {
-                    value: 'again',
-                },
-                Name: {
-                    value: 'S-20190516-9042',
-                    url: '/labkey/Sample%20Management/experiment-showMaterial.view?rowId=448',
-                },
-                Other: {
-                    value: 'other1',
-                },
-                Container: {
-                    displayValue: 'ProjectA',
-                    value: 'ENTITYID-A',
-                },
-            },
-        });
-
-        const updatedData = getUpdatedData(
-            originalData_,
-            {
-                Value: 'val',
-                And$C$D$SAgain: 'again changed',
-                Other: 'other3',
-            },
-            queryInfo
-        );
-        expect(updatedData[0]).toStrictEqual({
-            RowId: 448,
-            Value: 'val',
-            'And,./Again': 'again changed',
-            Other: 'other3',
-            Container: 'ENTITYID-A',
-        });
-    });
-});
-
 describe('CaseInsensitive', () => {
     test('Empty values', () => {
         expect(caseInsensitive(undefined, undefined)).toBeUndefined();
@@ -1973,27 +1439,6 @@ describe('isSetEqual', () => {
     });
 });
 
-describe('hasAmountOrUnitChanged', () => {
-    test('updated amount', () => {
-        const originalRowMap = fromJS({ StoredAmount: { value: 5 }, Units: { value: 'mg' } });
-        expect(hasAmountOrUnitChanged(Map({ Amount: 10, Units: 'mg' }), originalRowMap)).toBe(false);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'mg' }), originalRowMap)).toBe(false);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5.1, Units: 'mg' }), originalRowMap)).toBe(true);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 10, Units: 'mg' }), originalRowMap)).toBe(true);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: null, Units: 'mg' }), originalRowMap)).toBe(true);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: undefined, Units: 'mg' }), originalRowMap)).toBe(true);
-    });
-
-    test('updated unit', () => {
-        const originalRowMap = fromJS({ StoredAmount: { value: 5 }, Units: { value: 'mg' } });
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, RawUnits: 'mg' }), originalRowMap)).toBe(false);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'mg' }), originalRowMap)).toBe(false);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: 'g' }), originalRowMap)).toBe(true);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: null }), originalRowMap)).toBe(true);
-        expect(hasAmountOrUnitChanged(Map({ StoredAmount: 5, Units: undefined }), originalRowMap)).toBe(true);
-    });
-});
-
 describe('isSameWithStringCompare', () => {
     test('both empty', () => {
         expect(isSameWithStringCompare(undefined, undefined)).toBe(true);
diff --git a/packages/components/src/internal/util/utils.ts b/packages/components/src/internal/util/utils.ts
index 480ffd365e..3128703505 100644
--- a/packages/components/src/internal/util/utils.ts
+++ b/packages/components/src/internal/util/utils.ts
@@ -19,8 +19,6 @@ import { ChangeEvent, CSSProperties } from 'react';
 import Papa from 'papaparse';
 
 import { hasParameter, toggleParameter } from '../url/ActionURL';
-import { QueryInfo } from '../../public/QueryInfo';
-import { STORED_AMOUNT_FIELDS } from '../components/samples/constants';
 import { SchemaQuery } from '../../public/SchemaQuery';
 import { SCHEMAS } from '../schemas';
 
@@ -301,31 +299,6 @@ export function getCommonDataValues(
     };
 }
 
-// exported for jest testing
-export function hasAmountOrUnitChanged(updatedValuesMap: Map<string, any>, originalRowMap: Map<string, any>): boolean {
-    // if we have an updated value for amount and it has been changed, return true
-    if (
-        updatedValuesMap.has(STORED_AMOUNT_FIELDS.AMOUNT) &&
-        !isSameWithStringCompare(
-            updatedValuesMap.get(STORED_AMOUNT_FIELDS.AMOUNT),
-            originalRowMap.get(STORED_AMOUNT_FIELDS.AMOUNT)?.get('value')
-        )
-    ) {
-        return true;
-    }
-    // if we have an updated value for units and it has been changed, return true
-    if (
-        updatedValuesMap.has(STORED_AMOUNT_FIELDS.UNITS) &&
-        !isSameWithStringCompare(
-            updatedValuesMap.get(STORED_AMOUNT_FIELDS.UNITS),
-            originalRowMap.get(STORED_AMOUNT_FIELDS.UNITS)?.get('value')
-        )
-    ) {
-        return true;
-    }
-    return false;
-}
-
 // export for jest testing
 export function isSameWithStringCompare(value1: any, value2: any): boolean {
     if (value1 === value2 || (valueIsEmpty(value1) && valueIsEmpty(value2))) return true;
@@ -337,105 +310,6 @@ export function isSameWithStringCompare(value1: any, value2: any): boolean {
     return false; // one value is empty and the other is not.
 }
 
-/**
- * Constructs an array of objects, suitable for the "rows" parameter of updateRows, where each object contains the
- * values that are different from the ones in the originalData object as well as the primary key values for that row.
- * If updatedValues are empty, or all the originalData values are the same as the updatedValues, then it returns an
- * empty array.
- *
- * @param originalData a map from an id field to a Map from fieldKeys to an object with a 'value' field
- * @param updatedValues an object mapping fieldKeys to values that are being updated
- * @param queryInfo the queryInfo to get column information from
- */
-export function getUpdatedData(
-    originalData: Map<string, any>, // the rows in the original data have column names as keys
-    updatedValues: Record<string, any>, // the keys here are column fieldKeys
-    queryInfo: QueryInfo
-): any[] {
-    const updateValuesMap = Map<any, any>(updatedValues);
-    const pkColsLc = new Set<string>();
-    const pkColsInUse = new Set<string>();
-    queryInfo.pkCols.forEach(key => pkColsLc.add(key.toLowerCase()));
-
-    // if the originalData has the container/folder values, keep those as well (i.e., treat it as a primary key)
-    const folderKey = originalData
-        .first()
-        .keySeq()
-        .find(key => key.toLowerCase() === 'folder' || key.toLowerCase() === 'container');
-    if (folderKey) pkColsLc.add(folderKey.toLowerCase());
-
-    const updatedData = originalData.map(originalRowMap => {
-        const amountOrUnitChanged = hasAmountOrUnitChanged(updateValuesMap, originalRowMap);
-
-        return originalRowMap.reduce((m, fieldValueMap, key) => {
-            const isPKCol = pkColsLc.has(key.toLowerCase());
-
-            // Issue 42672: The original data has keys that are column names. Need to get the QueryColumn object from that
-            // name so that we can get the fieldKey for the column to get the updated value from the updateValuesMap.
-            // (e.g., "U g$Sl" instead of "U g/l")
-            const col = queryInfo.getColumnFromName(key);
-            if (!col && !isPKCol) {
-                if (fieldValueMap) {
-                    throw new Error(`Unable to find column for key ${key}.`);
-                } else {
-                    return m;
-                }
-            }
-
-            if (fieldValueMap?.has('value')) {
-                if (isPKCol) {
-                    pkColsInUse.add(key.toLowerCase());
-                    return m.set(key, fieldValueMap.get('value'));
-                }
-
-                const colValueIsIncluded = updateValuesMap.has(col.fieldKey);
-                const updatedValue =
-                    updateValuesMap.get(col.fieldKey) == undefined ? null : updateValuesMap.get(col.fieldKey);
-                const valueIsChanged = !isSameWithStringCompare(
-                    updateValuesMap.get(col.fieldKey),
-                    fieldValueMap.get('value')
-                );
-                const isStoredAmountField =
-                    col.fieldKey === STORED_AMOUNT_FIELDS.AMOUNT || col.fieldKey === STORED_AMOUNT_FIELDS.UNITS;
-                if (colValueIsIncluded && valueIsChanged) {
-                    return m.set(key, updatedValue);
-                } else if (colValueIsIncluded && isStoredAmountField) {
-                    // If you update amount or units, the saved row has to include both so include even if the value hasn't changed
-                    if (amountOrUnitChanged) {
-                        return m.set(key, updatedValue);
-                    } else {
-                        return m;
-                    }
-                } else {
-                    return m;
-                }
-            }
-            // Handle multi-value select
-            else if (List.isList(fieldValueMap)) {
-                let updatedVal = updateValuesMap.get(col.fieldKey);
-                if (Array.isArray(updatedVal)) {
-                    updatedVal = updatedVal.map(val => {
-                        const match = fieldValueMap.find(original => original.get('value') === val);
-                        if (match !== undefined) {
-                            return match.get('displayValue');
-                        }
-                        return val;
-                    });
-
-                    return m.set(key, updatedVal);
-                } else if (updateValuesMap.has(col.fieldKey) && updatedVal === undefined) {
-                    return m.set(key, []);
-                } else return m;
-            } else return m;
-        }, Map<string, any>());
-    });
-    // we want the rows that contain more than just the primaryKeys
-    return updatedData
-        .filter(rowData => rowData.size > pkColsInUse.size)
-        .map(rowData => rowData.toJS())
-        .toArray();
-}
-
 /**
  * This forces tooltips to close and menus to stop showing pressed state after you close them on Chrome. We likely will
  * not need this if/when we upgrade React Bootstrap to something beyond the pre-release version we are using.

From 0238f2ecb622c97b30fe5551dd0841352df4ae33 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 13:51:42 -0700
Subject: [PATCH 20/38] AppContexts.includeGlobalState

---
 .../components/src/internal/AppContext.tsx    |  3 +--
 .../components/src/internal/AppContexts.tsx   | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/components/src/internal/AppContext.tsx b/packages/components/src/internal/AppContext.tsx
index 6f512f1df3..b33fcfce40 100644
--- a/packages/components/src/internal/AppContext.tsx
+++ b/packages/components/src/internal/AppContext.tsx
@@ -22,7 +22,6 @@ import {
     NotebookNotificationSettings,
     WorkflowNotificationSettings,
 } from './app/models';
-import { DomainDetails } from './components/domainproperties/models';
 import { EntityDataType } from './components/entities/models';
 import { DetailRenderer } from './components/forms/detail/DetailDisplay';
 import { SchemaQuery } from '../public/SchemaQuery';
@@ -80,7 +79,7 @@ export interface AppContext {
 export type ExtendableAppContext<T> = AppContext & T;
 
 // The "any" used here should be fine, it gets re-typed in useAppContext, so as long as you're using that and providing
-// a type (e.g. useAppContext<MyAppContextType>()) you'll be fine.
+// a type (e.g., useAppContext<MyAppContextType>()) you'll be fine.
 const Context = createContext<ExtendableAppContext<any>>(undefined);
 
 export interface AppContextProviderProps<T> {
diff --git a/packages/components/src/internal/AppContexts.tsx b/packages/components/src/internal/AppContexts.tsx
index cd57e8a8fa..840d45843b 100644
--- a/packages/components/src/internal/AppContexts.tsx
+++ b/packages/components/src/internal/AppContexts.tsx
@@ -1,5 +1,5 @@
+import React, { FC, PropsWithChildren, useMemo } from 'react';
 import { getServerContext } from '@labkey/api';
-import React, { FC, ReactNode, useMemo } from 'react';
 
 import { AppContextProvider, ExtendableAppContext } from './AppContext';
 import { GlobalStateContextProvider } from './GlobalStateContext';
@@ -7,27 +7,30 @@ import { ServerContextProvider, withAppUser } from './components/base/ServerCont
 import { NotificationsContextProvider } from './components/notifications/NotificationsContext';
 import { LabelPrintingContextProvider } from './components/labelPrinting/LabelPrintingContextProvider';
 
-interface Props<T = {}> {
+interface Props<T = {}> extends PropsWithChildren {
+    includeGlobalState?: boolean;
     initialAppContext?: ExtendableAppContext<T>;
-    children?: ReactNode | undefined
 }
 
 /**
  * AppContexts is where you should add any additional contexts needed by our applications. At the moment all of our
- * apps share the same basic context configurations, and this component makes it easy for us to update all of our Apps
- * at once, and reduce the level of nesting needed in our Route configurations.
+ * apps share the same basic context configurations. This component makes it easy for us to update all of our Apps
+ * at once and reduce the level of nesting needed in our Route configurations.
  */
 export const AppContexts: FC<Props> = props => {
-    const { children, initialAppContext } = props;
+    const { children, includeGlobalState = true, initialAppContext } = props;
     const initialServerContext = useMemo(() => withAppUser(getServerContext()), []);
     return (
         <ServerContextProvider initialContext={initialServerContext}>
             <AppContextProvider initialContext={initialAppContext}>
-                <GlobalStateContextProvider>
-                    <NotificationsContextProvider>
-                        <LabelPrintingContextProvider>{children}</LabelPrintingContextProvider>
-                    </NotificationsContextProvider>
-                </GlobalStateContextProvider>
+                {includeGlobalState && (
+                    <GlobalStateContextProvider>
+                        <NotificationsContextProvider>
+                            <LabelPrintingContextProvider>{children}</LabelPrintingContextProvider>
+                        </NotificationsContextProvider>
+                    </GlobalStateContextProvider>
+                )}
+                {!includeGlobalState && <>{children}</>}
             </AppContextProvider>
         </ServerContextProvider>
     );

From ba974732762712df1626c4a7b7756f6991511f27 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 13:53:16 -0700
Subject: [PATCH 21/38] 7.36.1-fb-mcp-calc-cols.1

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index eea2264b47..9d74f385eb 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.0",
+  "version": "7.36.1-fb-mcp-calc-cols.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.0",
+      "version": "7.36.1-fb-mcp-calc-cols.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 0a28dd783e..8b025e6d54 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.0",
+  "version": "7.36.1-fb-mcp-calc-cols.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From f3818d7a2338bba50c2921505f0e25425a133450 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 13:54:26 -0700
Subject: [PATCH 22/38] 7.36.1-fb-mcp-calc-cols.2

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 9d74f385eb..662a9d59f0 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.1",
+  "version": "7.36.1-fb-mcp-calc-cols.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.1",
+      "version": "7.36.1-fb-mcp-calc-cols.2",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 8b025e6d54..1fc88de8ac 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.1",
+  "version": "7.36.1-fb-mcp-calc-cols.2",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From f5ed36088ce0d4fcc9a3ebd4a09ef4f201e96150 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 14:14:58 -0700
Subject: [PATCH 23/38] docs

---
 packages/components/src/internal/AppContexts.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/components/src/internal/AppContexts.tsx b/packages/components/src/internal/AppContexts.tsx
index 840d45843b..d1c94bfa73 100644
--- a/packages/components/src/internal/AppContexts.tsx
+++ b/packages/components/src/internal/AppContexts.tsx
@@ -8,6 +8,21 @@ import { NotificationsContextProvider } from './components/notifications/Notific
 import { LabelPrintingContextProvider } from './components/labelPrinting/LabelPrintingContextProvider';
 
 interface Props<T = {}> extends PropsWithChildren {
+    /**
+     * When true (the default), wraps children in GlobalStateContextProvider (and its dependent
+     * NotificationsContextProvider / LabelPrintingContextProvider), making app-wide state like
+     * the navigation context available via useGlobalStateContext.
+     *
+     * Set this to false when mounting AppContexts outside of one of our full applications (LKB,
+     * LKSM, etc.) — for example, a standalone designer page rendered directly into a
+     * LabKey Server view (see DataClassDesigner, ListDesigner, SampleTypeDesigner, etc.). Those
+     * entry points do not have app-level routing/navigation and do not consume global state, so
+     * initializing GlobalStateContext is unnecessary overhead and pulls in providers (like
+     * navigation) that assume an app context that isn't there.
+     *
+     * Rule of thumb: leave this true inside any app that uses our shared navigation/routing;
+     * set it to false for one-off React entry points embedded in a server-rendered page.
+     */
     includeGlobalState?: boolean;
     initialAppContext?: ExtendableAppContext<T>;
 }

From b8394bc2187b97be34bff10227f0f12c6fe2d75b Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 14:30:26 -0700
Subject: [PATCH 24/38] 4000 character prompt limit (client only)

---
 packages/components/src/internal/components/mcp/ChatModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index dd4cc4a703..30982779ce 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -158,6 +158,7 @@ export const ChatModal: FC<ChatModalProps> = memo(props => {
                             <textarea
                                 aria-label={`${title} Prompt`}
                                 className="form-control prompt-input"
+                                maxLength={4000}
                                 name="chat-prompt"
                                 onChange={handleChange}
                                 onKeyDown={handleKeyDown}

From 31933da4b192a8801e872cc77cd0266187cc84f2 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 15:28:47 -0700
Subject: [PATCH 25/38] Compose prompt on server

---
 .../ExpressionAssistantModal.test.tsx         | 69 ++++-------------
 .../ExpressionAssistantModal.tsx              | 76 ++++++++-----------
 .../components/domainproperties/actions.ts    |  7 +-
 3 files changed, 52 insertions(+), 100 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
index f29a7981c1..0586c32531 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
@@ -14,8 +14,6 @@ import {
     EXPR_ASST_METRIC_FEATURE_AREA,
     ExpressionAssistantModal,
     ExpressionAssistantModalProps,
-    fence,
-    lines,
 } from './ExpressionAssistantModal';
 
 // Capture the props ChatModal is rendered with so we can drive ExpressionAssistantModal's logic
@@ -126,8 +124,8 @@ describe('ExpressionAssistantModal', () => {
                 makeApiContext(expressionAssistant)
             );
 
-            // Assert - intro is VALIDATE text, and expressionAssistant was auto-invoked with a prompt that includes the
-            // error, the expression, and the fields block (i.e., evaluatePrompt); the assistant response is appended.
+            // Assert - intro is VALIDATE text, and expressionAssistant was auto-invoked with an empty prompt plus the
+            // structured context fields. Server-side composePrompt synthesizes the "evaluate this expression" turn.
             await waitFor(() => {
                 const m = chatModalProps.messages as ChatMessage[];
                 expect(m[m.length - 1].text).toBe('Looks like a syntax error.');
@@ -136,14 +134,16 @@ describe('ExpressionAssistantModal', () => {
             expect(messages[0].text).toBe('Let me take a look at this expression and see how I can help.');
             expect(expressionAssistant).toHaveBeenCalledTimes(1);
             const callArg = expressionAssistant.mock.calls[0][0];
-            expect(callArg.prompt).toContain('boom');
-            expect(callArg.prompt).toContain('SELECT bad');
-            expect(callArg.prompt).toContain('available columns');
+            expect(callArg.prompt).toBe('');
+            expect(callArg.fieldError).toBe('boom');
+            expect(callArg.fieldExpression).toBe('SELECT bad');
+            expect(callArg.domainFields).toBeDefined();
+            expect(callArg.conversationId).toBeUndefined();
         });
     });
 
     describe('sendPrompt', () => {
-        test('first user prompt is wrapped with the fields preamble; subsequent prompts are sent verbatim', async () => {
+        test('first user prompt sends the bare text plus first-turn context; follow-up turns drop the context', async () => {
             // Arrange
             const expressionAssistant = jest
                 .fn()
@@ -155,24 +155,24 @@ describe('ExpressionAssistantModal', () => {
             act(() => {
                 chatModalProps.sendPrompt('compute sum of A');
             });
-            // Assert - first call is prefixed with the field preamble and the user message is appended unmodified
+            // Assert - prompt is the user's text verbatim; domainFields rides alongside; conversationId is absent
             await waitFor(() => {
                 const m = chatModalProps.messages as ChatMessage[];
                 expect(m[m.length - 1].text).toBe('first reply');
             });
             const firstCall = expressionAssistant.mock.calls[0][0];
-            expect(firstCall.prompt).toContain('available columns');
-            expect(firstCall.prompt).toContain('compute sum of A');
+            expect(firstCall.prompt).toBe('compute sum of A');
+            expect(firstCall.domainFields).toBeDefined();
             expect(firstCall.conversationId).toBeUndefined();
             const messagesAfterFirst = chatModalProps.messages as ChatMessage[];
             expect(messagesAfterFirst.find(m => m.role === ChatRole.user)?.text).toBe('compute sum of A');
             expect(incrementMetric).toHaveBeenCalledWith(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
 
-            // Act - second prompt reuses the conversationId and is NOT re-prefixed
+            // Act - second prompt with a conversationId set from the first response
             act(() => {
                 chatModalProps.sendPrompt('and also B');
             });
-            // Assert - second call passes the bare prompt and the previously returned conversationId
+            // Assert - bare prompt, no first-turn context fields, and the previously returned conversationId
             await waitFor(() => {
                 const m = chatModalProps.messages as ChatMessage[];
                 expect(m[m.length - 1].text).toBe('second reply');
@@ -180,6 +180,9 @@ describe('ExpressionAssistantModal', () => {
             const secondCall = expressionAssistant.mock.calls[1][0];
             expect(secondCall.prompt).toBe('and also B');
             expect(secondCall.conversationId).toBe('c1');
+            expect(secondCall.domainFields).toBeUndefined();
+            expect(secondCall.fieldExpression).toBeUndefined();
+            expect(secondCall.fieldError).toBeUndefined();
         });
 
         test('passes columnMap and PHI columns derived from the provided domain fields', async () => {
@@ -375,44 +378,4 @@ describe('ExpressionAssistantModal', () => {
         expect(chatModalProps.title).toBe('Expression AI Assistant');
     });
 
-    describe('fence', () => {
-        test('wraps the term in a triple-backtick block with no language tag by default', () => {
-            // Closing fence sits flush with the term — the helper does not append a trailing newline before it.
-            expect(fence('SELECT 1')).toBe('```\nSELECT 1```');
-        });
-
-        test('includes the language tag immediately after the opening fence', () => {
-            expect(fence('{"a":1}', 'json')).toBe('```json\n{"a":1}```');
-        });
-
-        test('preserves embedded newlines in the fenced content', () => {
-            expect(fence('line1\nline2', 'sql')).toBe('```sql\nline1\nline2```');
-        });
-
-        test('handles an empty term', () => {
-            expect(fence('', 'json')).toBe('```json\n```');
-        });
-    });
-
-    describe('lines', () => {
-        test('joins arguments with newlines', () => {
-            expect(lines('a', 'b', 'c')).toBe('a\nb\nc');
-        });
-
-        test('returns an empty string when called with no arguments', () => {
-            expect(lines()).toBe('');
-        });
-
-        test('returns the single argument unchanged', () => {
-            expect(lines('only')).toBe('only');
-        });
-
-        test('preserves empty-string arguments as blank lines', () => {
-            expect(lines('a', '', 'b')).toBe('a\n\nb');
-        });
-
-        test('composes with fence to build a labeled block', () => {
-            expect(lines('header:', fence('{"k":1}', 'json'))).toBe('header:\n```json\n{"k":1}```');
-        });
-    });
 });
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index 2c88b67fe7..d39e2e7906 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -7,6 +7,7 @@ import { DomainField, GetDomainFields, SystemField } from './models';
 import { useRequestHandler } from '../../util/RequestHandler';
 import { incrementClientSideMetricCount } from '../../actions';
 import { getColumnTypeMap, getPHIColumnNames } from './CalculatedFieldOptions';
+import { ExpressionAssistOptions } from './actions';
 
 export const EXPR_ASST_METRIC_FEATURE_AREA = 'expressionAssistant';
 const CHANGE_INTRO =
@@ -23,14 +24,6 @@ function createChatMessage(message: Partial<ChatMessage>): ChatMessage {
     } as ChatMessage;
 }
 
-export function fence(term: string, tag = ''): string {
-    return '```' + tag + '\n' + term + '```';
-}
-
-export function lines(...lines: string[]): string {
-    return lines.join('\n');
-}
-
 interface SqlSnippetProps {
     onApply?: (sql: string) => void;
     readOnly?: boolean;
@@ -83,7 +76,6 @@ function useExpressionAssistance(
         return [createChatMessage({ role: ChatRole.assistant, segments, text })];
     });
     const [isPending, setIsPending] = useState(false);
-    const firstChatRef = useRef(true);
     const autoEvalRef = useRef(false);
     const { api } = useAppContext();
     const { abortRequest, requestHandler, resetRequestHandler } = useRequestHandler();
@@ -92,31 +84,15 @@ function useExpressionAssistance(
         setMessages(prev => [...prev, createChatMessage(message)]);
     }, []);
 
-    const { columnMap, fieldsPrompt, phiColumns } = useMemo(
+    const { columnMap, combinedFields, phiColumns } = useMemo(
         () => ({
             columnMap: getColumnTypeMap(domainFields, systemFields),
-            fieldsPrompt: lines(
-                'The following enumerates the available columns and their types:',
-                fence(JSON.stringify(domainFields), 'json')
-            ),
+            combinedFields: [...(domainFields ?? []), ...(systemFields ?? [])],
             phiColumns: getPHIColumnNames(domainFields),
         }),
         [domainFields, systemFields]
     );
 
-    // This prompt is used when the user has an erroneous expression, and we want the agent to help in triaging
-    const fieldErrorPrompt = useMemo(() => {
-        if (!fieldError) return undefined;
-        return lines(
-            fieldsPrompt,
-            'The user already has the following calculated column expression:',
-            fence(fieldExpression),
-            'This expression contains an error:',
-            fence(fieldError),
-            'Evaluate this expression and see if you can determine how to fix this error. If you can, point them out and propose corrections.'
-        );
-    }, [fieldError, fieldExpression, fieldsPrompt]);
-
     const onInterrupt = useCallback(
         (isUser?: boolean) => {
             abortRequest();
@@ -135,13 +111,21 @@ function useExpressionAssistance(
             setIsPending(true);
             let aborted = false;
             try {
-                const response = await api.domain.expressionAssistant({
+                const options: ExpressionAssistOptions = {
                     conversationId,
                     columnMap,
                     phiColumns,
                     prompt,
                     requestHandler,
-                });
+                };
+
+                if (conversationId === undefined) {
+                    options.domainFields = combinedFields;
+                    options.fieldError = fieldError;
+                    options.fieldExpression = fieldExpression;
+                }
+
+                const response = await api.domain.expressionAssistant(options);
                 resetRequestHandler();
 
                 if (response.conversationId !== conversationId) {
@@ -154,6 +138,7 @@ function useExpressionAssistance(
                     segments: response.segments,
                     text: response.text,
                 });
+
                 incrementClientSideMetricCount(EXPR_ASST_METRIC_FEATURE_AREA, 'submitPrompt');
             } catch (e) {
                 aborted = !e.status;
@@ -166,32 +151,33 @@ function useExpressionAssistance(
                 }
             }
         },
-        [api, columnMap, conversationId, phiColumns, pushMessage, requestHandler, resetRequestHandler]
+        [
+            api,
+            columnMap,
+            combinedFields,
+            conversationId,
+            fieldError,
+            fieldExpression,
+            phiColumns,
+            pushMessage,
+            requestHandler,
+            resetRequestHandler,
+        ]
     );
 
     const sendPrompt = useCallback(
         async (prompt: string) => {
             pushMessage({ role: ChatRole.user, text: prompt });
-            let fullPrompt = prompt;
-            if (firstChatRef.current) {
-                fullPrompt = lines(
-                    fieldsPrompt,
-                    'Generate a calculated column expression that matches the following description:',
-                    prompt
-                );
-            }
-            firstChatRef.current = false;
-            await runRequest(fullPrompt);
+            await runRequest(prompt);
         },
-        [fieldsPrompt, pushMessage, runRequest]
+        [pushMessage, runRequest]
     );
 
     useEffect(() => {
-        if (!fieldErrorPrompt || autoEvalRef.current) return;
+        if (!fieldError || autoEvalRef.current) return;
         autoEvalRef.current = true;
-        firstChatRef.current = false;
-        runRequest(fieldErrorPrompt);
-    }, [fieldErrorPrompt, runRequest]);
+        runRequest('');
+    }, [fieldError, runRequest]);
 
     return { isPending, messages, onInterrupt, sendPrompt };
 }
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 833d9d750a..9aa1f1f502 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -1531,6 +1531,9 @@ export interface ExpressionAssistOptions {
     columnMap: Record<string, string>;
     containerPath?: string;
     conversationId?: string;
+    domainFields?: (DomainField | SystemField)[];
+    fieldError?: string;
+    fieldExpression?: string;
     phiColumns: string[];
     prompt: string;
     requestHandler?: RequestHandler;
@@ -1551,11 +1554,11 @@ export interface ExpressionAssistResponse {
 }
 
 export function expressionAssistant(options: ExpressionAssistOptions): Promise<ExpressionAssistResponse> {
-    const { columnMap, containerPath, conversationId, phiColumns, prompt, requestHandler } = options;
+    const { containerPath, requestHandler, ...jsonData } = options;
     return request<ExpressionAssistResponse>({
         url: ActionURL.buildURL('query', 'expressionAssistantAgent.api', containerPath),
         method: 'POST',
-        jsonData: { columnMap, conversationId, phiColumns, prompt },
+        jsonData,
         errorLogMsg: 'Failed to assist with expression',
         requestHandler,
     });

From 3e6b18949a7b0ab9e90f2e362d1834fe80a09ba1 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Wed, 13 May 2026 15:29:15 -0700
Subject: [PATCH 26/38] 7.36.1-fb-mcp-calc-cols.3

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 662a9d59f0..54898d24bd 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.2",
+  "version": "7.36.1-fb-mcp-calc-cols.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.2",
+      "version": "7.36.1-fb-mcp-calc-cols.3",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 1fc88de8ac..5a114a9552 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.2",
+  "version": "7.36.1-fb-mcp-calc-cols.3",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 98bff5d5266c12a2f5467e2e1fbde23750eb2ca1 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 14 May 2026 08:33:07 -0700
Subject: [PATCH 27/38] Remove variable

---
 packages/components/src/theme/variables.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/components/src/theme/variables.scss b/packages/components/src/theme/variables.scss
index c8b61d8a4e..888eec216b 100644
--- a/packages/components/src/theme/variables.scss
+++ b/packages/components/src/theme/variables.scss
@@ -100,5 +100,3 @@ $header-spacing-no-scroll: 104px;
 $panel-content-text: $text-color !default;
 $panel-content-border: $gray-border-light !default;
 $panel-content-heading-bg: $white !default;
-
-$pre-bg: red;

From 24865a898ef097684b588545984ac38fd7874d8b Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 14 May 2026 09:48:17 -0700
Subject: [PATCH 28/38] Styling variables

---
 packages/components/src/theme/chat.scss | 27 +++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/packages/components/src/theme/chat.scss b/packages/components/src/theme/chat.scss
index 0dbf3b4c6a..22ea843341 100644
--- a/packages/components/src/theme/chat.scss
+++ b/packages/components/src/theme/chat.scss
@@ -10,11 +10,7 @@
         height: 100%;
         display: flex;
         flex-direction: column;
-        background-color: $white;
-        border: 1px solid #DDDDDD;
-        border-radius: 8px;
         overflow: hidden;
-        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
     }
 
     .modal-header .modal-title {
@@ -49,37 +45,36 @@
         align-self: flex-end;
         max-width: 80%;
         padding: 8px 12px;
-        background-color: #F1F9FC;
-        border: 1px solid rgba(201, 230, 242, 0.8);
+        background-color: $alert-info-bg;
+        border: 1px solid $alert-info-border;
         border-radius: 8px 8px 0 8px;
-        color: #0088CC;
+        color: $alert-info-text;
         white-space: pre-wrap;
     }
 
     .assistant-response {
         align-self: stretch;
-        color: #333333;
+        color: $text-color;
     }
 
     .assistant-response.pending {
-        color: #777777;
+        color: $gray-light;
     }
 
     .assistant-text,
-    .assistant-expression .clickable-text {
+    .assistant-expression {
         margin-bottom: 8px;
     }
 
     .error-response {
-        color: #C62828;
+        color: $brand-danger;
     }
 
     .modal-footer {
         flex-shrink: 0;
-        background-color: #F3F3F4;
+        background-color: $body-bg;
         line-height: 20px;
         padding: 15px;
-        border-top: 1px solid #EEEEEE;
     }
 
     .form-inline {
@@ -106,7 +101,6 @@
         padding: 10px;
         box-sizing: border-box;
         resize: none;
-        border: 1px solid #CCCCCC;
         margin: 0;
         white-space: pre-wrap;
         word-wrap: break-word;
@@ -119,14 +113,13 @@
         display: inline-flex;
         align-items: center;
         justify-content: center;
-        color: #333333;
-        border-color: #CCCCCC;
+        color: $text-color;
     }
 
     .chat-modal__caution {
         width: 100%;
         text-align: center;
-        color: #777777;
+        color: $gray-light;
         font-size: 11px;
         margin-top: 12px;
     }

From d8fe2e6c51e89908511249bb8e8f6cc72cfd0199 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 14 May 2026 09:49:19 -0700
Subject: [PATCH 29/38] 7.36.1-fb-mcp-calc-cols.4

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 54898d24bd..74faad5d8d 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.3",
+  "version": "7.36.1-fb-mcp-calc-cols.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.3",
+      "version": "7.36.1-fb-mcp-calc-cols.4",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 5a114a9552..6cfe46f911 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.3",
+  "version": "7.36.1-fb-mcp-calc-cols.4",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From a57ad1212bb346a86e1dbc8178d247e47e0a8a81 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 14 May 2026 12:47:03 -0700
Subject: [PATCH 30/38] Inline CSS.supports call

---
 .../components/src/internal/components/mcp/ChatModal.tsx  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index 30982779ce..edcafad501 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -1,12 +1,10 @@
-import React, { FC, memo, ReactNode, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { BaseModal } from '../../Modal';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 import { ChatMessage, ChatRole, ChatSegment } from './models';
 import { cancelEvent } from '../../events';
 import { useTimeout } from '../../hooks';
 
-const fieldSizingSupported = CSS.supports('field-sizing', 'content');
-
 export type RenderSegment = (segment: ChatSegment, index: number) => ReactNode | undefined;
 
 function renderSegmentDefault(segment: ChatSegment, index: number): ReactNode | undefined {
@@ -72,6 +70,8 @@ export const ChatModal: FC<ChatModalProps> = memo(props => {
         return timer.clear;
     }, [timer]);
 
+    const fieldSizingSupported = useMemo(() => CSS.supports('field-sizing', 'content'), []);
+
     // Firefox does not support the CSS property "field-sizing" which allows for the height of the textarea
     // to increase up to "max-height" based on the textarea content. Here we use a layout effect to mimic this
     // behavior in JavaScript.
@@ -86,7 +86,7 @@ export const ChatModal: FC<ChatModalProps> = memo(props => {
         const nextHeight = el.scrollHeight + parseInt(computed.borderTopWidth) + parseInt(computed.borderBottomWidth);
 
         el.style.height = `${nextHeight}px`;
-    }, [prompt]);
+    }, [fieldSizingSupported, prompt]);
 
     useEffect(() => {
         const el = historyRef.current;

From 1480e0eb76dc5fbc88fe1acfed01551355f462b4 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 14 May 2026 12:47:33 -0700
Subject: [PATCH 31/38] 7.36.1-fb-mcp-calc-cols.5

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 74faad5d8d..0b85c6938e 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.4",
+  "version": "7.36.1-fb-mcp-calc-cols.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.4",
+      "version": "7.36.1-fb-mcp-calc-cols.5",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 6cfe46f911..6822bb3fd6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.4",
+  "version": "7.36.1-fb-mcp-calc-cols.5",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 03b94d31e1a23f499936f382967c9c5735456518 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 09:36:26 -0700
Subject: [PATCH 32/38] Use Modal, expand tests

---
 .../components/src/internal/Modal.test.tsx    | 190 ++++++++++++++++++
 packages/components/src/internal/Modal.tsx    |  34 +++-
 packages/components/src/internal/app/utils.ts |   4 -
 .../CalculatedFieldOptions.test.tsx           | 158 +++++++++++++--
 .../CalculatedFieldOptions.tsx                |  32 +--
 .../ExpressionAssistantModal.test.tsx         |   1 -
 .../ExpressionAssistantModal.tsx              |   4 +-
 .../components/domainproperties/actions.ts    |   2 +-
 .../src/internal/components/mcp/ChatModal.tsx | 105 +++++-----
 9 files changed, 427 insertions(+), 103 deletions(-)
 create mode 100644 packages/components/src/internal/Modal.test.tsx

diff --git a/packages/components/src/internal/Modal.test.tsx b/packages/components/src/internal/Modal.test.tsx
new file mode 100644
index 0000000000..b31ce6d707
--- /dev/null
+++ b/packages/components/src/internal/Modal.test.tsx
@@ -0,0 +1,190 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { userEvent } from '@testing-library/user-event';
+
+import { BaseModal, Modal, ModalHeader } from './Modal';
+
+describe('Modal components', () => {
+    describe('BaseModal', () => {
+        test('renders children into a portal with default classes', () => {
+            render(
+                <BaseModal>
+                    <div className="inner-content">hello</div>
+                </BaseModal>
+            );
+
+            const wrapper = document.querySelector('.modal-wrapper');
+            expect(wrapper).not.toBeNull();
+            expect(document.querySelector('.modal-backdrop')).not.toBeNull();
+
+            const dialog = document.querySelector('.modal-dialog');
+            expect(dialog).not.toBeNull();
+            expect(dialog.classList.contains('modal-sm')).toBe(false);
+            expect(dialog.classList.contains('modal-lg')).toBe(false);
+
+            expect(document.querySelector('.modal-content .inner-content').textContent).toEqual('hello');
+        });
+
+        test('applies bsSize="sm" class', () => {
+            render(<BaseModal bsSize="sm">child</BaseModal>);
+            const dialog = document.querySelector('.modal-dialog');
+            expect(dialog.classList.contains('modal-sm')).toBe(true);
+            expect(dialog.classList.contains('modal-lg')).toBe(false);
+        });
+
+        test('applies bsSize="lg" class', () => {
+            render(<BaseModal bsSize="lg">child</BaseModal>);
+            const dialog = document.querySelector('.modal-dialog');
+            expect(dialog.classList.contains('modal-lg')).toBe(true);
+            expect(dialog.classList.contains('modal-sm')).toBe(false);
+        });
+
+        test('applies custom className', () => {
+            render(<BaseModal className="custom-class">child</BaseModal>);
+            const dialog = document.querySelector('.modal-dialog');
+            expect(dialog.classList.contains('custom-class')).toBe(true);
+        });
+
+        test('toggles "no-scroll" on document.body while mounted', () => {
+            expect(document.body.classList.contains('no-scroll')).toBe(false);
+            const { unmount } = render(<BaseModal>child</BaseModal>);
+            expect(document.body.classList.contains('no-scroll')).toBe(true);
+            unmount();
+            expect(document.body.classList.contains('no-scroll')).toBe(false);
+        });
+    });
+
+    describe('ModalHeader', () => {
+        test('renders title and no close button by default', () => {
+            render(<ModalHeader title="My Title" />);
+            const header = document.querySelector('.modal-header');
+            expect(header).not.toBeNull();
+            expect(header.querySelector('.modal-title').textContent).toEqual('My Title');
+            expect(header.querySelector('button.close')).toBeNull();
+        });
+
+        test('renders close button when onCancel is provided and invokes it on click', async () => {
+            const onCancel = jest.fn();
+            render(<ModalHeader onCancel={onCancel} title="t" />);
+            const closeBtn = document.querySelector('button.close');
+            expect(closeBtn).not.toBeNull();
+            expect(closeBtn.querySelector('.sr-only').textContent).toEqual('Close');
+            await userEvent.click(closeBtn);
+            expect(onCancel).toHaveBeenCalledTimes(1);
+        });
+
+        test('does not render the title element when title is falsy', () => {
+            render(<ModalHeader onCancel={jest.fn()} title={null} />);
+            expect(document.querySelector('.modal-title')).toBeNull();
+            // Close button should still be present
+            expect(document.querySelector('button.close')).not.toBeNull();
+        });
+
+        test('renders children inside the header', () => {
+            render(
+                <ModalHeader title="t">
+                    <span className="extra-child">extra</span>
+                </ModalHeader>
+            );
+            const header = document.querySelector('.modal-header');
+            expect(header.querySelector('.extra-child').textContent).toEqual('extra');
+        });
+    });
+
+    describe('Modal', () => {
+        test('renders children inside modal-body', () => {
+            render(
+                <Modal onCancel={jest.fn()}>
+                    <div className="body-child">body content</div>
+                </Modal>
+            );
+            const body = document.querySelector('.modal-body');
+            expect(body).not.toBeNull();
+            expect(body.querySelector('.body-child').textContent).toEqual('body content');
+        });
+
+        test('renders default ModalHeader when title or onCancel is provided and no custom header', () => {
+            render(<Modal onCancel={jest.fn()} title="Hello" />);
+            const header = document.querySelector('.modal-header');
+            expect(header).not.toBeNull();
+            expect(header.querySelector('.modal-title').textContent).toEqual('Hello');
+            expect(header.querySelector('button.close')).not.toBeNull();
+        });
+
+        test('does not render header when no title, onCancel, or custom header is given', () => {
+            render(<Modal onConfirm={jest.fn()}>body</Modal>);
+            expect(document.querySelector('.modal-header')).toBeNull();
+        });
+
+        test('renders custom header instead of default ModalHeader', () => {
+            render(
+                <Modal header={<div className="custom-header">custom</div>} onCancel={jest.fn()} title="ignored">
+                    body
+                </Modal>
+            );
+            // Default ModalHeader should not render when a custom header is supplied
+            expect(document.querySelector('.modal-header')).toBeNull();
+            expect(document.querySelector('.custom-header').textContent).toEqual('custom');
+        });
+
+        test('renders custom footer when provided and skips ModalButtons', () => {
+            render(
+                <Modal footer={<span className="custom-footer">f</span>} onCancel={jest.fn()} onConfirm={jest.fn()}>
+                    body
+                </Modal>
+            );
+            const footer = document.querySelector('.modal-footer');
+            expect(footer).not.toBeNull();
+            expect(footer.querySelector('.custom-footer').textContent).toEqual('f');
+            // ModalButtons applies the 'modal-buttons' class — should not be present
+            expect(document.querySelector('.modal-buttons')).toBeNull();
+        });
+
+        test('renders ModalButtons when no footer is provided', async () => {
+            const onCancel = jest.fn();
+            const onConfirm = jest.fn();
+            render(
+                <Modal cancelText="Nope" confirmText="Go" onCancel={onCancel} onConfirm={onConfirm}>
+                    body
+                </Modal>
+            );
+
+            const buttons = document.querySelector('.modal-footer.modal-buttons');
+            expect(buttons).not.toBeNull();
+
+            const buttonEls = buttons.querySelectorAll('button');
+            // First button is cancel, last is confirm
+            const cancelBtn = Array.from(buttonEls).find(b => b.textContent === 'Nope');
+            const confirmBtn = Array.from(buttonEls).find(b => b.textContent === 'Go');
+            expect(cancelBtn).toBeDefined();
+            expect(confirmBtn).toBeDefined();
+
+            await userEvent.click(cancelBtn);
+            await userEvent.click(confirmBtn);
+            expect(onCancel).toHaveBeenCalledTimes(1);
+            expect(onConfirm).toHaveBeenCalledTimes(1);
+        });
+
+        test('renders footerContent inside default ModalButtons', () => {
+            render(
+                <Modal footerContent={<span className="fc">fc</span>} onCancel={jest.fn()} onConfirm={jest.fn()}>
+                    body
+                </Modal>
+            );
+            const buttons = document.querySelector('.modal-footer.modal-buttons');
+            expect(buttons).not.toBeNull();
+            expect(buttons.querySelector('.fc').textContent).toEqual('fc');
+        });
+
+        test('passes bsSize and className down to BaseModal', () => {
+            render(
+                <Modal bsSize="lg" className="my-modal" onCancel={jest.fn()}>
+                    body
+                </Modal>
+            );
+            const dialog = document.querySelector('.modal-dialog');
+            expect(dialog.classList.contains('modal-lg')).toBe(true);
+            expect(dialog.classList.contains('my-modal')).toBe(true);
+        });
+    });
+});
diff --git a/packages/components/src/internal/Modal.tsx b/packages/components/src/internal/Modal.tsx
index 227a027e89..622d39341e 100644
--- a/packages/components/src/internal/Modal.tsx
+++ b/packages/components/src/internal/Modal.tsx
@@ -47,11 +47,11 @@ export const BaseModal: FC<BaseModalProps> = ({ bsSize, children, className }) =
 };
 BaseModal.displayName = 'BaseModal';
 
-interface ModalHeaderProps {
+interface ModalHeaderProps extends PropsWithChildren {
     onCancel?: () => void;
     title: ReactNode;
 }
-export const ModalHeader: FC<ModalHeaderProps> = ({ title, onCancel }) => {
+export const ModalHeader: FC<ModalHeaderProps> = ({ children, onCancel, title }) => {
     return (
         <div className="modal-header">
             {onCancel !== undefined && (
@@ -61,16 +61,30 @@ export const ModalHeader: FC<ModalHeaderProps> = ({ title, onCancel }) => {
                 </button>
             )}
             {title && <h2 className="modal-title text__wrap">{title}</h2>}
+            {children}
         </div>
     );
 };
 ModalHeader.displayName = 'ModalHeader';
 
 export interface ModalProps extends BaseModalProps, ModalButtonsProps {
-    // Note: you probably shouldn't use footer, instead use the other props to render the appropriate footer
+    /**
+     * Custom footer component. When this is supplied, the default footer interactions will not be rendered.
+     * Note: You probably should not use footer, instead use the other props to render the appropriate footer.
+     */
     footer?: ReactNode;
-    // This is partial content of the default footer rendered by the Modal. It is ignored if a "footer" is supplied.
+    /**
+     * Partial content of the default footer rendered by the Modal. It is ignored if a "footer" is supplied.
+     */
     footerContent?: ReactNode;
+    /**
+     * Custom header component. When this is supplied, the default header interactions will not be rendered.
+     * Note: You probably should not use header, instead use the other props to render the appropriate header.
+     */
+    header?: ReactNode;
+    /**
+     * Title passed to the default header (see ModalHeader). If a custom header is supplied, then this is ignored.
+     */
     title?: ReactNode;
 }
 
@@ -87,6 +101,7 @@ export const Modal: FC<ModalProps> = memo(props => {
         confirmingText,
         footer,
         footerContent,
+        header,
         isConfirming,
         onCancel,
         onCommentChange,
@@ -94,10 +109,11 @@ export const Modal: FC<ModalProps> = memo(props => {
         requiresUserComment,
         title,
     } = props;
-    const showHeader = onCancel || title;
+    const showHeader = !!(onCancel || title);
     return (
         <BaseModal bsSize={bsSize} className={className}>
-            {showHeader && <ModalHeader onCancel={onCancel} title={title} />}
+            {showHeader && !header && <ModalHeader onCancel={onCancel} title={title} />}
+            {header}
 
             <div className="modal-body">{children}</div>
 
@@ -107,12 +123,12 @@ export const Modal: FC<ModalProps> = memo(props => {
                     cancelText={cancelText}
                     canConfirm={canConfirm}
                     confirmClass={confirmClass}
-                    confirmText={confirmText}
                     confirmingText={confirmingText}
+                    confirmText={confirmText}
                     isConfirming={isConfirming}
-                    onConfirm={onConfirm}
-                    onCommentChange={onCommentChange}
                     onCancel={onCancel}
+                    onCommentChange={onCommentChange}
+                    onConfirm={onConfirm}
                     requiresUserComment={requiresUserComment}
                 >
                     {footerContent}
diff --git a/packages/components/src/internal/app/utils.ts b/packages/components/src/internal/app/utils.ts
index c96b842330..ab948a1f6f 100644
--- a/packages/components/src/internal/app/utils.ts
+++ b/packages/components/src/internal/app/utils.ts
@@ -390,10 +390,6 @@ export function isAdvancedWorkflowEnabled(moduleContext?: ModuleContext): boolea
     );
 }
 
-export function isAIAssistanceEnabled(): boolean {
-    return getServerContext().mcpReady === true;
-}
-
 export function isDataChangeCommentRequirementFeatureEnabled(moduleContext?: ModuleContext): boolean {
     return isFeatureEnabled(ProductFeature.DataChangeCommentRequirement, moduleContext);
 }
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
index e05f51d672..41e33a363d 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
@@ -1,8 +1,18 @@
 import React from 'react';
+import { List } from 'immutable';
+import { waitFor } from '@testing-library/react';
+import { userEvent } from '@testing-library/user-event';
 
 import { renderWithAppContext } from '../../test/reactTestLibraryHelpers';
+import { getTestAPIWrapper } from '../../APIWrapper';
 
-import { CalculatedFieldOptions, getColumnTypeMap, getPHIColumnNames, typeToDisplay } from './CalculatedFieldOptions';
+import {
+    CalculatedFieldOptions,
+    CalculatedFieldOptionsProps,
+    getColumnTypeMap,
+    getPHIColumnNames,
+    typeToDisplay,
+} from './CalculatedFieldOptions';
 import { DomainField, SystemField } from './models';
 import {
     DOMAIN_FIELD_PARTIALLY_LOCKED,
@@ -11,35 +21,35 @@ import {
     PHILEVEL_NOT_PHI,
     STRING_RANGE_URI,
 } from './constants';
+import { getDomainPropertiesTestAPIWrapper } from './APIWrapper';
 
 describe('CalculatedFieldOptions', () => {
+    function defaultProps(): CalculatedFieldOptionsProps {
+        return {
+            domainIndex: 0,
+            getDomainFields: jest.fn(),
+            field: DomainField.create({ rangeURI: STRING_RANGE_URI }),
+            index: 0,
+            onChange: jest.fn(),
+        };
+    }
+
     test('default properties', async () => {
-        renderWithAppContext(
-            <CalculatedFieldOptions
-                domainIndex={0}
-                field={DomainField.create({ rangeURI: STRING_RANGE_URI })}
-                getDomainFields={jest.fn()}
-                index={0}
-                onChange={jest.fn()}
-            />
-        );
+        renderWithAppContext(<CalculatedFieldOptions {...defaultProps()} />);
 
         expect(document.querySelector('.domain-field-section-heading')).toHaveTextContent('Expression');
         expect(document.querySelectorAll('.margin-bottom')).toHaveLength(0);
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
         expect(document.querySelectorAll('.domain-field-calc-footer')).toHaveLength(1);
         expect(document.querySelector('textarea')).toHaveTextContent('');
-        expect(document.querySelector('textarea').getAttribute('disabled')).toBe(null);
+        expect(document.querySelector('textarea')).not.toBeDisabled();
     });
 
     test('with existing expression', async () => {
         renderWithAppContext(
             <CalculatedFieldOptions
-                domainIndex={0}
+                {...defaultProps()}
                 field={DomainField.create({ valueExpression: '1=0', rangeURI: INT_RANGE_URI })}
-                getDomainFields={jest.fn()}
-                index={0}
-                onChange={jest.fn()}
             />
         );
 
@@ -48,24 +58,21 @@ describe('CalculatedFieldOptions', () => {
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
         expect(document.querySelectorAll('.domain-field-calc-footer')).toHaveLength(1);
         expect(document.querySelector('textarea')).toHaveTextContent('1=0');
-        expect(document.querySelector('textarea').getAttribute('disabled')).toBe(null);
+        expect(document.querySelector('textarea')).not.toBeDisabled();
     });
 
     test('disabled from lockType', async () => {
         renderWithAppContext(
             <CalculatedFieldOptions
-                domainIndex={0}
+                {...defaultProps()}
                 field={DomainField.create({ valueExpression: '1=0', lockType: DOMAIN_FIELD_PARTIALLY_LOCKED })}
-                getDomainFields={jest.fn()}
-                index={0}
-                onChange={jest.fn()}
             />
         );
 
         expect(document.querySelector('.domain-field-section-heading')).toHaveTextContent('Expression');
         expect(document.querySelectorAll('.form-control')).toHaveLength(1);
         expect(document.querySelector('textarea')).toHaveTextContent('1=0');
-        expect(document.querySelector('textarea').getAttribute('disabled')).toBe('');
+        expect(document.querySelector('textarea')).toBeDisabled();
     });
 
     test('typeToDisplay', () => {
@@ -99,7 +106,7 @@ describe('CalculatedFieldOptions', () => {
             Modified: 'DATETIME',
             ModifiedBy: 'INTEGER',
         };
-        expect(getColumnTypeMap(undefined, undefined)).toEqual({ ...defaultTypeMap });
+        expect(getColumnTypeMap()).toEqual({ ...defaultTypeMap });
         expect(getColumnTypeMap([], [])).toEqual({ ...defaultTypeMap });
         expect(
             getColumnTypeMap(
@@ -128,4 +135,111 @@ describe('CalculatedFieldOptions', () => {
             d: 'INTEGER',
         });
     });
+
+    describe('AI assistance (mcpReady)', () => {
+        const getDomainFields = () => ({ domainFields: List<DomainField>(), systemFields: [] as SystemField[] });
+
+        const renderWithAssistance = (
+            mcpReady: boolean | undefined,
+            fieldOverrides: Partial<{ propertyId: number; rangeURI: string; valueExpression: string }> = {},
+            parseResponse: Error | { error?: string; type?: string } = { type: 'INTEGER' }
+        ) => {
+            const parseCalculatedColumn = jest.fn().mockImplementation(() => {
+                if (parseResponse instanceof Error) return Promise.reject(parseResponse);
+                return Promise.resolve(parseResponse);
+            });
+            const onChange = jest.fn();
+            const result = renderWithAppContext(
+                <CalculatedFieldOptions
+                    {...defaultProps()}
+                    field={DomainField.create({ rangeURI: STRING_RANGE_URI, ...fieldOverrides })}
+                    getDomainFields={getDomainFields}
+                    onChange={onChange}
+                />,
+                {
+                    appContext: {
+                        api: getTestAPIWrapper(jest.fn, {
+                            domain: getDomainPropertiesTestAPIWrapper(jest.fn, { parseCalculatedColumn }),
+                        }),
+                    },
+                    serverContext: { mcpReady },
+                }
+            );
+
+            return { ...result, parseCalculatedColumn, onChange };
+        };
+
+        test('renders AI Assistant button and hides examples table when mcpReady is true', () => {
+            renderWithAssistance(true);
+
+            const aiButtons = Array.from(document.querySelectorAll('button')).filter(b =>
+                b.textContent?.includes('AI Assistant')
+            );
+            expect(aiButtons).toHaveLength(1);
+            expect(document.querySelector('.domain-field-calc-examples')).toBeNull();
+        });
+
+        test('renders examples table and hides AI Assistant button when mcpReady is false', () => {
+            renderWithAssistance(false);
+
+            const aiButtons = Array.from(document.querySelectorAll('button')).filter(b =>
+                b.textContent?.includes('AI Assistant')
+            );
+            expect(aiButtons).toHaveLength(0);
+            expect(document.querySelector('.domain-field-calc-examples')).not.toBeNull();
+        });
+
+        test('renders examples table and hides AI Assistant button when mcpReady is undefined', () => {
+            renderWithAssistance(undefined);
+
+            const aiButtons = Array.from(document.querySelectorAll('button')).filter(b =>
+                b.textContent?.includes('AI Assistant')
+            );
+            expect(aiButtons).toHaveLength(0);
+            expect(document.querySelector('.domain-field-calc-examples')).not.toBeNull();
+        });
+
+        test('clicking AI Assistant button opens the ExpressionAssistantModal', async () => {
+            renderWithAssistance(true);
+
+            // The modal is not open yet
+            await waitFor(() => {
+                expect(document.querySelector('.modal-title')).toBeNull();
+            });
+
+            const aiButton = Array.from(document.querySelectorAll('button')).find(b =>
+                b.textContent?.includes('AI Assistant')
+            );
+
+            await userEvent.click(aiButton!);
+            expect(document.querySelector('.modal-title')).toHaveTextContent('Expression AI Assistant');
+        });
+
+        test('renders "Get help from AI" button next to error when mcpReady is true and validation fails', async () => {
+            renderWithAssistance(true, { propertyId: 1, valueExpression: 'bogus' }, { error: 'Invalid expression' });
+
+            // Validation error should be displayed
+            await waitFor(() => {
+                expect(document.querySelector('.error')).toHaveTextContent('Invalid expression');
+            });
+
+            // "Get help from AI" button should be present alongside the error
+            const helpBtn = document.querySelector('button.validate-link-ai');
+            expect(helpBtn).not.toBeNull();
+            expect(helpBtn).toHaveTextContent('Get help from AI');
+
+            // Clicking it should open the assistant modal
+            await userEvent.click(helpBtn!);
+            expect(document.querySelector('.modal-title')).toHaveTextContent('Expression AI Assistant');
+        });
+
+        test('does not render "Get help from AI" button on error when mcpReady is false', async () => {
+            renderWithAssistance(false, { propertyId: 1, valueExpression: 'bogus' }, { error: 'Invalid expression' });
+
+            await waitFor(() => {
+                expect(document.querySelector('.error')).toHaveTextContent('Invalid expression');
+            });
+            expect(document.querySelector('button.validate-link-ai')).toBeNull();
+        });
+    });
 });
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index fc75bf4667..1b04cdf8c5 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -14,11 +14,11 @@ import { SectionHeading } from './SectionHeading';
 import { isFieldFullyLocked, isFieldPartiallyLocked } from './propertiesUtil';
 import { CALCULATED_TYPE, MULTI_CHOICE_TYPE, PropDescType } from './PropDescType';
 import { SVGIcon } from '../base/SVGIcon';
-import { isAIAssistanceEnabled } from '../../app/utils';
 import { useModalState } from '../../hooks';
 import { EXPR_ASST_METRIC_FEATURE_AREA, ExpressionAssistantModal } from './ExpressionAssistantModal';
 import { incrementClientSideMetricCount } from '../../actions';
 import { useAppContext } from '../../AppContext';
+import { useServerContext } from '../base/ServerContext';
 
 // export for jest testing
 export const typeToDisplay = (type: string): string => {
@@ -37,13 +37,17 @@ export const typeToDisplay = (type: string): string => {
 };
 
 // export for jest testing
-export const getColumnTypeMap = (domainFields: DomainField[], systemFields: SystemField[]): Record<string, string> => {
-    const colTypeMap = {};
+export const getColumnTypeMap = (
+    domainFields?: DomainField[],
+    systemFields?: SystemField[]
+): Record<string, string> => {
     // Issue 51169: add some default system fields
-    colTypeMap['Created'] = 'DATETIME';
-    colTypeMap['CreatedBy'] = 'INTEGER';
-    colTypeMap['Modified'] = 'DATETIME';
-    colTypeMap['ModifiedBy'] = 'INTEGER';
+    const colTypeMap = {
+        Created: 'DATETIME',
+        CreatedBy: 'INTEGER',
+        Modified: 'DATETIME',
+        ModifiedBy: 'INTEGER',
+    };
 
     systemFields?.forEach(df => {
         colTypeMap[df.Name] = df.DataType.toUpperCase();
@@ -75,7 +79,7 @@ const HELP_TIP_BODY = (
     </div>
 );
 
-interface Props {
+export interface CalculatedFieldOptionsProps {
     domainIndex: number;
     field: DomainField;
     getDomainFields: GetDomainFields;
@@ -83,13 +87,12 @@ interface Props {
     onChange: (fieldId: string, value: any, index?: number, expand?: boolean, skipDirtyCheck?: boolean) => void;
 }
 
-export const CalculatedFieldOptions: FC<Props> = memo(props => {
+export const CalculatedFieldOptions: FC<CalculatedFieldOptionsProps> = memo(props => {
     const { index, field, domainIndex, onChange, getDomainFields } = props;
     const [loading, setLoading] = useState<boolean>(!field.isNew());
     const [error, setError] = useState<string>(undefined);
     const [parsedType, setParsedType] = useState<string>(undefined);
     const { close, open, show } = useModalState();
-    const assistanceEnabled = isAIAssistanceEnabled();
     const isNew = useMemo(() => field.isNew(), [field]);
     const { headingId, inputId } = useMemo(
         () => ({
@@ -99,6 +102,7 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         [domainIndex, index]
     );
     const { api } = useAppContext();
+    const assistanceEnabled = useServerContext().mcpReady === true;
 
     const handleChange = useCallback<React.ChangeEventHandler<HTMLTextAreaElement>>(
         evt => {
@@ -217,9 +221,13 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
                             <div>
                                 <span className="error">{error}</span>
                                 {assistanceEnabled && (
-                                    <span className="clickable-text validate-link-ai" onClick={onValidateAssistant}>
+                                    <button
+                                        className="clickable-text validate-link-ai"
+                                        onClick={onValidateAssistant}
+                                        type="button"
+                                    >
                                         Get help from AI
-                                    </span>
+                                    </button>
                                 )}
                             </div>
                         )}
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
index 0586c32531..6e10d77709 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
@@ -377,5 +377,4 @@ describe('ExpressionAssistantModal', () => {
         expect(chatModalProps.onCancel).toBe(onCancel);
         expect(chatModalProps.title).toBe('Expression AI Assistant');
     });
-
 });
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index d39e2e7906..f91abc3d72 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -38,9 +38,9 @@ const SqlExpression: FC<SqlSnippetProps> = memo(({ onApply, readOnly, sql }) =>
                 <code className="language-sql">{sql}</code>
             </pre>
             {!readOnly && onApply && (
-                <span className="clickable-text" onClick={handleApply} role="button">
+                <button className="clickable-text" onClick={handleApply} type="button">
                     <i className="fa fa-check" /> Apply Expression
-                </span>
+                </button>
             )}
         </div>
     );
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 9aa1f1f502..b3efac29d7 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -1534,7 +1534,7 @@ export interface ExpressionAssistOptions {
     domainFields?: (DomainField | SystemField)[];
     fieldError?: string;
     fieldExpression?: string;
-    phiColumns: string[];
+    phiColumns?: string[];
     prompt: string;
     requestHandler?: RequestHandler;
 }
diff --git a/packages/components/src/internal/components/mcp/ChatModal.tsx b/packages/components/src/internal/components/mcp/ChatModal.tsx
index edcafad501..5b2cf913a4 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.tsx
@@ -1,5 +1,5 @@
 import React, { FC, memo, ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { BaseModal } from '../../Modal';
+import { Modal, ModalHeader } from '../../Modal';
 import { LoadingSpinner } from '../base/LoadingSpinner';
 import { ChatMessage, ChatRole, ChatSegment } from './models';
 import { cancelEvent } from '../../events';
@@ -131,60 +131,61 @@ export const ChatModal: FC<ChatModalProps> = memo(props => {
         [handleSend]
     );
 
-    return (
-        <BaseModal className="chat-modal">
-            <div className="modal-header">
-                <h4 className="modal-title text__wrap">{title}</h4>
-                <button className="btn btn-sm btn-default" onClick={handleCancel} type="button">
-                    End Chat
-                </button>
-            </div>
-            <div className="modal-body">
-                <div className="chat-history" ref={historyRef}>
-                    {messages.map(message => (
-                        <ChatItem key={message.id} message={message} renderSegment={renderSegment} />
-                    ))}
-                    {isPending && (
-                        <div className="chat-item assistant-response pending">
-                            <LoadingSpinner msg="Thinking..." />
-                        </div>
-                    )}
-                </div>
-            </div>
-            <div className="modal-footer">
-                <form className="form-inline" onSubmit={handleSubmit}>
-                    <div className="form-group">
-                        <div className="col-xs-12">
-                            <textarea
-                                aria-label={`${title} Prompt`}
-                                className="form-control prompt-input"
-                                maxLength={4000}
-                                name="chat-prompt"
-                                onChange={handleChange}
-                                onKeyDown={handleKeyDown}
-                                placeholder="Enter a prompt"
-                                ref={textAreaRef}
-                                rows={1}
-                                value={prompt}
-                            />
-                        </div>
+    const header = (
+        <ModalHeader title={title}>
+            <button className="btn btn-sm btn-default" onClick={handleCancel} type="button">
+                End Chat
+            </button>
+        </ModalHeader>
+    );
+
+    const footer = (
+        <>
+            <form className="form-inline" onSubmit={handleSubmit}>
+                <div className="form-group">
+                    <div className="col-xs-12">
+                        <textarea
+                            aria-label={`${title} Prompt`}
+                            className="form-control prompt-input"
+                            maxLength={4000}
+                            name="chat-prompt"
+                            onChange={handleChange}
+                            onKeyDown={handleKeyDown}
+                            placeholder="Enter a prompt"
+                            ref={textAreaRef}
+                            rows={1}
+                            value={prompt}
+                        />
                     </div>
-                    {isPending && (
-                        <button className="btn btn-default prompt-button" onClick={handleInterrupt} type="button">
-                            <i className="fa fa-stop" />
-                        </button>
-                    )}
-                    {!isPending && (
-                        <button className="btn btn-default prompt-button" disabled={!prompt.trim()} type="submit">
-                            <i className="fa fa-arrow-up" />
-                        </button>
-                    )}
-                </form>
-                <div className="chat-modal__caution">
-                    Your data and chats are private. AI can make mistakes. Double check any suggestions.
                 </div>
+                {isPending && (
+                    <button className="btn btn-default prompt-button" onClick={handleInterrupt} type="button">
+                        <i className="fa fa-stop" />
+                    </button>
+                )}
+                {!isPending && (
+                    <button className="btn btn-default prompt-button" disabled={!prompt.trim()} type="submit">
+                        <i className="fa fa-arrow-up" />
+                    </button>
+                )}
+            </form>
+            <div className="chat-modal__caution">AI can make mistakes. Double check any suggestions.</div>
+        </>
+    );
+
+    return (
+        <Modal className="chat-modal" footer={footer} header={header} title={title}>
+            <div className="chat-history" ref={historyRef}>
+                {messages.map(message => (
+                    <ChatItem key={message.id} message={message} renderSegment={renderSegment} />
+                ))}
+                {isPending && (
+                    <div className="chat-item assistant-response pending">
+                        <LoadingSpinner msg="Thinking..." />
+                    </div>
+                )}
             </div>
-        </BaseModal>
+        </Modal>
     );
 });
 ChatModal.displayName = 'ChatModal';

From c8dccc5ecf4ee0696f32885dbea1b6cb09e98815 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 09:37:54 -0700
Subject: [PATCH 33/38] lint

---
 .../components/src/internal/APIWrapper.ts     |   6 +-
 .../DomainRowExpandedOptions.tsx              | 236 +++++++++---------
 .../components/forms/BulkUpdateForm.tsx       |   8 +-
 .../src/internal/components/forms/utils.ts    |   2 +-
 .../components/mcp/ChatModal.test.tsx         |   6 +-
 5 files changed, 133 insertions(+), 125 deletions(-)

diff --git a/packages/components/src/internal/APIWrapper.ts b/packages/components/src/internal/APIWrapper.ts
index ea9d7d3029..d3734466e7 100644
--- a/packages/components/src/internal/APIWrapper.ts
+++ b/packages/components/src/internal/APIWrapper.ts
@@ -1,14 +1,14 @@
 import { AssayAPIWrapper, AssayServerAPIWrapper, getAssayTestAPIWrapper } from './components/assay/APIWrapper';
-import { SamplesAPIWrapper, SamplesServerAPIWrapper, getSamplesTestAPIWrapper } from './components/samples/APIWrapper';
+import { getSamplesTestAPIWrapper, SamplesAPIWrapper, SamplesServerAPIWrapper } from './components/samples/APIWrapper';
 import {
+    getPicklistTestAPIWrapper,
     PicklistAPIWrapper,
     PicklistServerAPIWrapper,
-    getPicklistTestAPIWrapper,
 } from './components/picklist/APIWrapper';
 import {
+    getLabelPrintingTestAPIWrapper,
     LabelPrintingAPIWrapper,
     LabelPrintingServerAPIWrapper,
-    getLabelPrintingTestAPIWrapper,
 } from './components/labelPrinting/APIWrapper';
 import {
     getSecurityTestAPIWrapper,
diff --git a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
index 63cf814d3f..0bf936adb5 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
@@ -37,20 +37,20 @@ import { CALCULATED_TYPE } from './PropDescType';
 import { FieldFilterCriteria } from './FieldFilterCriteria';
 
 interface Props {
+    allowMultiChoiceField: boolean;
     appPropertiesOnly?: boolean;
     domainContainerPath?: string;
     domainFormDisplayOptions?: IDomainFormDisplayOptions;
     domainIndex: number;
     field: DomainField;
     getDomainFields?: GetDomainFields;
+    handleDataTypeChange: (targetId: string, value: any) => void;
     index: number;
     onChange: (fieldId: string, value: any, index?: number, expand?: boolean, skipDirtyCheck?: boolean) => void;
     onMultiChange: (changes: List<IFieldChange>) => void;
     queryName?: string;
     schemaName?: string;
     showingModal: (boolean) => void;
-    handleDataTypeChange: (targetId: string, value: any) => void;
-    allowMultiChoiceField: boolean;
 }
 
 export class DomainRowExpandedOptions extends React.Component<Props> {
@@ -68,7 +68,7 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
             schemaName,
             queryName,
             handleDataTypeChange,
-            allowMultiChoiceField
+            allowMultiChoiceField,
         } = this.props;
 
         // In most cases we will use the selected data type to determine which field options to show,
@@ -79,135 +79,122 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
         }
 
         switch (dataTypeName) {
-            case 'string':
-                if (domainFormDisplayOptions && !domainFormDisplayOptions.hideTextOptions) {
-                    // Issue 39877: Max text length options should not be visible for text key field of list
-                    // Also, don't show max text length options for calculated fields
-                    if (field.isPrimaryKey || field.isCalculatedField()) {
-                        return;
-                    }
+            case 'attachment':
+            case 'fileLink':
+                // Remove when this is supported in apps. Issue 46476
+                if (appPropertiesOnly) return null;
 
-                    return (
-                        <TextFieldOptions
-                            index={index}
-                            domainIndex={domainIndex}
-                            label="Text Options"
-                            scale={field.scale}
-                            onChange={onChange}
-                            lockType={field.lockType}
-                            scannable={field.scannable}
-                            appPropertiesOnly={appPropertiesOnly}
-                            showScannableOption={domainFormDisplayOptions?.showScannableOption}
-                        />
-                    );
-                } else {
-                    return null;
-                }
-            case 'flag':
                 return (
-                    <TextFieldOptions
-                        index={index}
+                    <FileAttachmentOptions
+                        displayOption={field.format}
                         domainIndex={domainIndex}
-                        label="Flag Options"
-                        scale={field.scale}
-                        onChange={onChange}
-                        lockType={field.lockType}
-                    />
-                );
-            case 'multiLine':
-                return (
-                    <TextFieldOptions
                         index={index}
-                        domainIndex={domainIndex}
-                        label="Multi-line Text Field Options"
-                        scale={field.scale}
-                        onChange={onChange}
+                        label={dataTypeName === 'fileLink' ? 'File' : 'Attachment'}
                         lockType={field.lockType}
+                        onChange={onChange}
                     />
                 );
             case 'boolean':
                 return (
                     <BooleanFieldOptions
-                        index={index}
                         domainIndex={domainIndex}
-                        label="Boolean Field Options"
                         format={field.format}
-                        onChange={onChange}
+                        index={index}
+                        label="Boolean Field Options"
                         lockType={field.lockType}
+                        onChange={onChange}
                     />
                 );
-            case 'dateTime':
             case 'date':
+            case 'dateTime':
             case 'time':
                 return (
                     <DateTimeFieldOptions
-                        index={index}
                         domainIndex={domainIndex}
-                        label="Date and Time Options"
                         format={field.format}
-                        onChange={onChange}
+                        index={index}
+                        label="Date and Time Options"
                         lockType={field.lockType}
+                        onChange={onChange}
                         type={dataTypeName}
                     />
                 );
-            case 'int':
+            case 'decimal':
+            case 'double':
                 return (
                     <NumericFieldOptions
-                        index={index}
+                        defaultScale={field.defaultScale}
                         domainIndex={domainIndex}
-                        label="Integer Options"
                         format={field.format}
-                        defaultScale={field.defaultScale}
-                        onChange={onChange}
+                        index={index}
+                        label="Decimal Options"
                         lockType={field.lockType}
-                        scannable={field.scannable}
-                        appPropertiesOnly={appPropertiesOnly}
-                        showScannableOption={
-                            domainFormDisplayOptions?.showScannableOption && !field.isCalculatedField()
-                        }
+                        onChange={onChange}
+                        // Issue #44567: Hide scannable option due to matching issues with floating point representation.
+                        showScannableOption={false}
                     />
                 );
-            case 'double':
-            case 'decimal':
+            case 'int':
                 return (
                     <NumericFieldOptions
-                        index={index}
+                        appPropertiesOnly={appPropertiesOnly}
+                        defaultScale={field.defaultScale}
                         domainIndex={domainIndex}
-                        label="Decimal Options"
                         format={field.format}
-                        defaultScale={field.defaultScale}
-                        onChange={onChange}
+                        index={index}
+                        label="Integer Options"
                         lockType={field.lockType}
-                        // Issue #44567: Hide scannable option due to matching issues with floating point representation.
-                        showScannableOption={false}
+                        onChange={onChange}
+                        scannable={field.scannable}
+                        showScannableOption={
+                            domainFormDisplayOptions?.showScannableOption && !field.isCalculatedField()
+                        }
                     />
                 );
             case 'lookup':
                 return (
                     <LookupFieldOptions
-                        index={index}
                         domainIndex={domainIndex}
                         field={field}
+                        index={index}
                         label="Lookup Definition Options"
+                        lockType={field.lockType}
                         lookupContainer={field.lookupContainer ?? domainContainerPath}
                         onChange={onChange}
                         onMultiChange={onMultiChange}
-                        lockType={field.lockType}
                     />
                 );
-            case 'sample':
+            case 'multiChoice':
+            case 'textChoice':
+                // don't show Text Choice options for query metadata editor
+                if (domainFormDisplayOptions?.hideValidators) return null;
+
                 return (
-                    <SampleFieldOptions
-                        index={index}
-                        field={field}
+                    <TextChoiceOptions
+                        allowMultiChoice={allowMultiChoiceField}
                         domainIndex={domainIndex}
-                        label="Sample Options"
-                        value={field.lookupQueryValue}
-                        original={field.original}
-                        container={field.lookupContainer}
+                        field={field}
+                        handleDataTypeChange={handleDataTypeChange}
+                        index={index}
+                        key={index + '-' + field?.propertyId} // drag-drop to reorder column result in wrong options displayed
+                        label="Text Choice Options"
+                        lockedForDomain={domainFormDisplayOptions.textChoiceLockedForDomain}
+                        lockedSqlFragment={domainFormDisplayOptions.textChoiceLockedSqlFragment}
+                        lockType={field.lockType}
                         onChange={onChange}
-                        onMultiChange={onMultiChange}
+                        queryName={queryName}
+                        schemaName={schemaName}
+                    />
+                );
+            case 'multiLine':
+                return (
+                    <TextFieldOptions
+                        domainIndex={domainIndex}
+                        index={index}
+                        label="Multi-line Text Field Options"
                         lockType={field.lockType}
+                        onChange={onChange}
+                        scale={field.scale}
                     />
                 );
             case 'ontologyLookup':
@@ -216,51 +203,64 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
                 return (
                     <OntologyLookupOptions
                         domainContainerPath={domainContainerPath}
-                        index={index}
-                        domainIndex={domainIndex}
-                        label="Ontology Lookup Options"
                         domainFields={domainFields}
+                        domainIndex={domainIndex}
                         field={field}
+                        index={index}
+                        label="Ontology Lookup Options"
+                        lockType={field.lockType}
                         onChange={onChange}
                         onMultiChange={onMultiChange}
-                        lockType={field.lockType}
                     />
                 );
-            case 'textChoice':
-            case 'multiChoice':
-                // don't show Text Choice options for query metadata editor
-                if (domainFormDisplayOptions?.hideValidators) return null;
-
+            case 'sample':
                 return (
-                    <TextChoiceOptions
+                    <SampleFieldOptions
+                        container={field.lookupContainer}
                         domainIndex={domainIndex}
-                        key={index + '-' + field?.propertyId} // drag-drop to reorder column result in wrong options displayed
-                        index={index}
                         field={field}
-                        label="Text Choice Options"
+                        index={index}
+                        label="Sample Options"
                         lockType={field.lockType}
                         onChange={onChange}
-                        queryName={queryName}
-                        schemaName={schemaName}
-                        lockedForDomain={domainFormDisplayOptions.textChoiceLockedForDomain}
-                        lockedSqlFragment={domainFormDisplayOptions.textChoiceLockedSqlFragment}
-                        handleDataTypeChange={handleDataTypeChange}
-                        allowMultiChoice={allowMultiChoiceField}
+                        onMultiChange={onMultiChange}
+                        original={field.original}
+                        value={field.lookupQueryValue}
                     />
                 );
-            case 'fileLink':
-            case 'attachment':
-                // Remove when this is supported in apps. Issue 46476
-                if (appPropertiesOnly) return null;
+            case 'string':
+                if (domainFormDisplayOptions && !domainFormDisplayOptions.hideTextOptions) {
+                    // Issue 39877: Max text length options should not be visible for text key field of list
+                    // Also, don't show max text length options for calculated fields
+                    if (field.isPrimaryKey || field.isCalculatedField()) {
+                        return;
+                    }
 
+                    return (
+                        <TextFieldOptions
+                            appPropertiesOnly={appPropertiesOnly}
+                            domainIndex={domainIndex}
+                            index={index}
+                            label="Text Options"
+                            lockType={field.lockType}
+                            onChange={onChange}
+                            scale={field.scale}
+                            scannable={field.scannable}
+                            showScannableOption={domainFormDisplayOptions?.showScannableOption}
+                        />
+                    );
+                } else {
+                    return null;
+                }
+            case 'flag':
                 return (
-                    <FileAttachmentOptions
-                        index={index}
+                    <TextFieldOptions
                         domainIndex={domainIndex}
-                        label={dataTypeName === 'fileLink' ? 'File' : 'Attachment'}
-                        displayOption={field.format}
-                        onChange={onChange}
+                        index={index}
+                        label="Flag Options"
                         lockType={field.lockType}
+                        onChange={onChange}
+                        scale={field.scale}
                     />
                 );
         }
@@ -289,16 +289,16 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
                     {domainFormDisplayOptions?.derivationDataScopeConfig?.show && !field.isCalculatedField() && (
                         <div className="col-xs-12">
                             <DerivationDataScopeFieldOptions
-                                index={index}
-                                domainIndex={domainIndex}
                                 config={domainFormDisplayOptions?.derivationDataScopeConfig}
-                                value={field.derivationDataScope}
-                                label={domainFormDisplayOptions?.derivationDataScopeConfig?.sectionTitle}
-                                onChange={onChange}
-                                lockType={field.lockType}
+                                domainIndex={domainIndex}
+                                fieldDataType={field.dataType}
+                                index={index}
                                 isExistingField={!field.isNew()}
                                 isRequiredField={field.required}
-                                fieldDataType={field.dataType}
+                                label={domainFormDisplayOptions?.derivationDataScopeConfig?.sectionTitle}
+                                lockType={field.lockType}
+                                onChange={onChange}
+                                value={field.derivationDataScope}
                             />
                         </div>
                     )}
@@ -316,24 +316,24 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
                     <div className="col-xs-12">{this.typeDependentOptions()}</div>
                     <div className="col-xs-12">
                         <NameAndLinkingOptions
-                            index={index}
+                            appPropertiesOnly={appPropertiesOnly}
+                            domainFormDisplayOptions={domainFormDisplayOptions}
                             domainIndex={domainIndex}
                             field={field}
+                            index={index}
                             onChange={onChange}
                             onMultiChange={onMultiChange}
-                            appPropertiesOnly={appPropertiesOnly}
-                            domainFormDisplayOptions={domainFormDisplayOptions}
                         />
                     </div>
                     {!isFieldFullyLocked(field.lockType) && (
                         <div className="col-xs-12">
                             <ConditionalFormattingAndValidation
-                                index={index}
+                                domainFormDisplayOptions={domainFormDisplayOptions}
                                 domainIndex={domainIndex}
                                 field={field}
+                                index={index}
                                 onChange={onChange}
                                 showingModal={showingModal}
-                                domainFormDisplayOptions={domainFormDisplayOptions}
                             />
                         </div>
                     )}
diff --git a/packages/components/src/internal/components/forms/BulkUpdateForm.tsx b/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
index f791aea047..e9337b36d3 100644
--- a/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
+++ b/packages/components/src/internal/components/forms/BulkUpdateForm.tsx
@@ -67,7 +67,9 @@ export const SelectionWarning: FC<SelectionWarningProps> = props => {
     }
 
     if (missingCount > 0) {
-        messages.push(`Cannot edit ${missingCount} of the selected ${nounPlural}, ${pronoun(missingCount, 'they')} may have been deleted.`);
+        messages.push(
+            `Cannot edit ${missingCount} of the selected ${nounPlural}, ${pronoun(missingCount, 'they')} may have been deleted.`
+        );
     }
 
     if (messages.length === 0) return null;
@@ -312,7 +314,9 @@ export class BulkUpdateForm extends PureComponent<BulkUpdateFormProps, State> {
         } = this.props;
         const fileFields = queryInfo.columns.valueArray.filter(col => col.isFileInput).map(col => col.name);
         const { fieldValues, fieldsInConflict } =
-            isLoadingDataForSelection || !dataForSelection ? { fieldValues: undefined, fieldsInConflict: [] } : getCommonDataValues(dataForSelection, fileFields);
+            isLoadingDataForSelection || !dataForSelection
+                ? { fieldValues: undefined, fieldsInConflict: [] }
+                : getCommonDataValues(dataForSelection, fileFields);
 
         // if all selectedIds are from the same containerPath, use that for the lookups via QueryFormInputs > QuerySelect,
         // if selections are from multiple containerPaths, disable the lookup and file field inputs
diff --git a/packages/components/src/internal/components/forms/utils.ts b/packages/components/src/internal/components/forms/utils.ts
index cdbfc58ee3..fa83765fa9 100644
--- a/packages/components/src/internal/components/forms/utils.ts
+++ b/packages/components/src/internal/components/forms/utils.ts
@@ -153,7 +153,7 @@ interface FieldValue {
 type FieldArray = FieldValue[];
 type FieldMap = Map<string, any>;
 type FieldList = List<FieldMap>;
-type Field = FieldList | FieldArray | FieldMap | FieldValue;
+type Field = FieldArray | FieldList | FieldMap | FieldValue;
 
 const isFieldList = (value: any): value is FieldList => List.isList(value);
 
diff --git a/packages/components/src/internal/components/mcp/ChatModal.test.tsx b/packages/components/src/internal/components/mcp/ChatModal.test.tsx
index b18db56d61..c9ac51ee6b 100644
--- a/packages/components/src/internal/components/mcp/ChatModal.test.tsx
+++ b/packages/components/src/internal/components/mcp/ChatModal.test.tsx
@@ -98,7 +98,11 @@ describe('ChatModal', () => {
         test('custom renderSegment overrides default rendering when defined', () => {
             // Arrange
             const renderSegment: RenderSegment = (segment, index) =>
-                segment.type === 'text' ? <span key={index} data-testid="custom">CUSTOM:{segment.text}</span> : undefined;
+                segment.type === 'text' ? (
+                    <span data-testid="custom" key={index}>
+                        CUSTOM:{segment.text}
+                    </span>
+                ) : undefined;
             const messages = [
                 makeMessage({
                     id: 'a1',

From d7f39994b332b4d57363e7e6584e3abd3b9f5265 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 09:38:34 -0700
Subject: [PATCH 34/38] 7.36.1-fb-mcp-calc-cols.6

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 0b85c6938e..f3cd10e858 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.5",
+  "version": "7.36.1-fb-mcp-calc-cols.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.5",
+      "version": "7.36.1-fb-mcp-calc-cols.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 6822bb3fd6..0557199e15 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.5",
+  "version": "7.36.1-fb-mcp-calc-cols.6",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 7fda3874260e4a99d5c1f7d005bf11e7e0af0d14 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 15:57:11 -0700
Subject: [PATCH 35/38] Prepare release notes

---
 packages/components/releaseNotes/components.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 47a6a1c642..980662d135 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,14 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version 7.37.0
+*Released*: 15 May 2026
+- Calculated Column Assistant
+- Add `ChatModal` component for prompt/conversation interaction
+- Add `ExpressionAssistantModal` for specific implementation of expression assistant modal
+- Add `query-expressionAssistantAgent.api` endpoint to `APIWrapper`
+- Move `query-parseCalculatedColumn.api` endpoint wrapper to `APIWrapper`
+
 ### version 7.36.0
 *Released*: 13 May 2026
 - Update heading tags in various page elements for better accessibility

From 2852cb6aff98d08950615a4c9b08a87b7829b38e Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 17:32:47 -0700
Subject: [PATCH 36/38] resolveErrorMessage

---
 .../domainproperties/ExpressionAssistantModal.test.tsx     | 7 +++++--
 .../domainproperties/ExpressionAssistantModal.tsx          | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
index 6e10d77709..35a26e3661 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.test.tsx
@@ -231,7 +231,10 @@ describe('ExpressionAssistantModal', () => {
 
         test('thrown non-abort error appends a generic failure message', async () => {
             // Arrange - error with truthy status simulates a non-abort failure
-            const expressionAssistant = jest.fn().mockRejectedValue(Object.assign(new Error('nope'), { status: 500 }));
+            const expectedErrorMsg = 'Something went awry!';
+            const expressionAssistant = jest
+                .fn()
+                .mockRejectedValue(Object.assign(new Error(expectedErrorMsg), { status: 500 }));
             renderWithAppContext(<ExpressionAssistantModal {...defaultProps()} />, makeApiContext(expressionAssistant));
 
             // Act
@@ -242,7 +245,7 @@ describe('ExpressionAssistantModal', () => {
             // Assert - appended assistant message uses the generic failure text and not the raw exception
             await waitFor(() => {
                 const m = chatModalProps.messages as ChatMessage[];
-                expect(m[m.length - 1].error).toBe('Request failed. Please try again.');
+                expect(m[m.length - 1].error).toBe(expectedErrorMsg);
             });
             expect(chatModalProps.isPending).toBe(false);
             expect(incrementMetric).not.toHaveBeenCalled();
diff --git a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
index f91abc3d72..a32dde317e 100644
--- a/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
+++ b/packages/components/src/internal/components/domainproperties/ExpressionAssistantModal.tsx
@@ -8,6 +8,7 @@ import { useRequestHandler } from '../../util/RequestHandler';
 import { incrementClientSideMetricCount } from '../../actions';
 import { getColumnTypeMap, getPHIColumnNames } from './CalculatedFieldOptions';
 import { ExpressionAssistOptions } from './actions';
+import { resolveErrorMessage } from '../../util/messaging';
 
 export const EXPR_ASST_METRIC_FEATURE_AREA = 'expressionAssistant';
 const CHANGE_INTRO =
@@ -143,7 +144,10 @@ function useExpressionAssistance(
             } catch (e) {
                 aborted = !e.status;
                 if (!aborted) {
-                    pushMessage({ error: 'Request failed. Please try again.', role: ChatRole.assistant });
+                    pushMessage({
+                        error: resolveErrorMessage(e) ?? 'Request failed. Please try again.',
+                        role: ChatRole.assistant,
+                    });
                 }
             } finally {
                 if (!aborted) {

From 59ccf68f02718ddab5616029f37d56e211cc0584 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 17:33:45 -0700
Subject: [PATCH 37/38] 7.37.0

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index f3cd10e858..0ee6856198 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.6",
+  "version": "7.37.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.36.1-fb-mcp-calc-cols.6",
+      "version": "7.37.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 0557199e15..7581b8197c 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.36.1-fb-mcp-calc-cols.6",
+  "version": "7.37.0",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 527ae7edd07417ec9527e972bd2fcf51936ff188 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 15 May 2026 17:35:36 -0700
Subject: [PATCH 38/38] Bump @labkey/api

---
 packages/components/package-lock.json | 8 ++++----
 packages/components/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 0ee6856198..9f846b2f8b 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -10,7 +10,7 @@
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.51.3-fb-mcp-calc-cols.0",
+        "@labkey/api": "1.51.3",
         "@testing-library/dom": "~10.4.1",
         "@testing-library/jest-dom": "~6.9.1",
         "@testing-library/react": "~16.3.2",
@@ -3774,9 +3774,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.51.3-fb-mcp-calc-cols.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.3-fb-mcp-calc-cols.0.tgz",
-      "integrity": "sha512-irA1mdns6EADwHYumFkniwN8Bmi2+XkPvF8p3tqLXc4A9VoSMbAPa4PeIPw5Mv1wEFT8wZ/yw6dlyn04bRbmqg==",
+      "version": "1.51.3",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.51.3.tgz",
+      "integrity": "sha512-rs0idz4TLQuDatYBnLHFTL8ljpvCaCVynRA1KukTWD8yoZOGnMipX4m6+2CmoUaatZPFbiEIYvEqGU8WKLWrpg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 7581b8197c..64d6ad0a61 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -53,7 +53,7 @@
   "homepage": "https://github.com/LabKey/labkey-ui-components#readme",
   "dependencies": {
     "@hello-pangea/dnd": "18.0.1",
-    "@labkey/api": "1.51.3-fb-mcp-calc-cols.0",
+    "@labkey/api": "1.51.3",
     "@testing-library/dom": "~10.4.1",
     "@testing-library/jest-dom": "~6.9.1",
     "@testing-library/react": "~16.3.2",