diff --git a/frontend/src/components/expert/ExpertChatInput.vue b/frontend/src/components/expert/ExpertChatInput.vue
index 2ab245f22a..2cf248c9d5 100644
--- a/frontend/src/components/expert/ExpertChatInput.vue
+++ b/frontend/src/components/expert/ExpertChatInput.vue
@@ -1,5 +1,9 @@
 <template>
-    <div class="ff-expert-input">
+    <div ref="resizeTarget" class="ff-expert-input" :style="{height: heightStyle}">
+        <resize-bar
+            direction="horizontal"
+            @mousedown="startResize"
+        />
         <!-- Action buttons row -->
         <div class="action-buttons">
             <button
@@ -12,44 +16,65 @@
             </button>
             <div class="right-buttons">
                 <capabilities-selector v-if="isOperatorAgent" />
-                <button
-                    v-if="isGenerating && !isSessionExpired"
-                    type="button"
-                    class="btn-stop"
-                    @click="handleStop"
-                >
-                    Stop
-                </button>
-                <button
-                    v-else-if="!isSessionExpired"
-                    type="button"
-                    class="btn-send"
-                    :disabled="!canSend"
-                    @click="handleSend"
-                >
-                    Send
-                </button>
             </div>
         </div>
+        <div class="input-wrapper" :class="{ 'focused': isTextareaFocused }">
+            <!-- Textarea -->
+            <textarea
+                ref="textarea"
+                v-model="inputText"
+                class="chat-input"
+                :placeholder="placeholderText"
+                :disabled="isInputDisabled"
+                @keydown="handleKeydown"
+                @focus="isTextareaFocused = true"
+                @blur="isTextareaFocused = false"
+            />
 
-        <!-- Textarea -->
-        <textarea
-            ref="textarea"
-            v-model="inputText"
-            class="chat-input"
-            :placeholder="placeholderText"
-            :disabled="isInputDisabled"
-            @keydown="handleKeydown"
-        />
+            <div class="actions">
+                <div class="left">
+                    <include-selection-button v-if="hasUserSelection && !isOperatorAgent" />
+                </div>
+
+                <div class="right">
+                    <button
+                        v-if="isGenerating && !isSessionExpired"
+                        type="button"
+                        class="btn-stop"
+                        @click="handleStop"
+                    >
+                        Stop
+                    </button>
+                    <button
+                        v-else-if="!isSessionExpired"
+                        type="button"
+                        class="btn-send"
+                        :disabled="!canSend"
+                        @click="handleSend"
+                    >
+                        Send
+                    </button>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+
+import { useResizingHelper } from '../../composables/ResizingHelper.js'
+
+import ResizeBar from '../../pages/instance/Editor/components/drawer/ResizeBar.vue'
+
 import CapabilitiesSelector from './components/CapabilitiesSelector.vue'
+import IncludeSelectionButton from './components/IncludeSelectionButton.vue'
 
 export default {
     name: 'ExpertChatInput',
     components: {
+        ResizeBar,
+        IncludeSelectionButton,
         CapabilitiesSelector
     },
     props: {
@@ -79,12 +104,24 @@ export default {
         }
     },
     emits: ['send', 'stop', 'start-over'],
+    setup () {
+        const { startResize, heightStyle, bindResizer } = useResizingHelper()
+
+        return {
+            startResize,
+            bindResizer,
+            heightStyle
+        }
+    },
     data () {
         return {
-            inputText: ''
+            inputText: '',
+            includeSelection: true,
+            isTextareaFocused: false
         }
     },
     computed: {
+        ...mapGetters('product/assistant', ['hasUserSelection']),
         isInputDisabled () {
             if (this.isSessionExpired) return true
             if (this.isGenerating) return true
@@ -103,6 +140,15 @@ export default {
                 : 'Tell us what you need help with'
         }
     },
+    mounted () {
+        this.bindResizer({
+            component: this.$refs.resizeTarget,
+            mobileBreakpoint: 640, // match your app breakpoint
+            maxHeightRatio: 0.9, // whatever you want the cap to be
+            minHeight: 120, // optional: stop it collapsing to 0
+            maxViewportMarginY: 80 // optional: keep some space
+        })
+    },
     methods: {
         handleSend () {
             if (!this.canSend) return
@@ -142,13 +188,16 @@ export default {
     border-top: 1px solid #E5E7EB; // border-gray-200
     background: white;
     flex-shrink: 0; // Prevent input area from shrinking
+    position: relative;
+    min-height: 15vh;
+    max-height: 40vh;
 }
 
 .action-buttons {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin-bottom: 1rem; // pb-4
+    margin-bottom: 0.5rem;
 }
 
 .right-buttons {
@@ -174,6 +223,8 @@ button {
     background-color: white;
     color: inherit;
     border-color: #C7D2FE; // indigo-300
+    padding: 0.25rem 0.50rem;
+    border-radius: 5px;
 
     &:hover:not(:disabled) {
         background-color: #F9FAFB; // gray-50
@@ -184,6 +235,8 @@ button {
     background-color: $ff-indigo-600;
     color: white;
     border-color: $ff-indigo-600;
+    border-radius: 5px;
+    padding: 0.25rem 0.50rem;
 
     &:hover:not(:disabled) {
         background-color: $ff-indigo-700;
@@ -197,6 +250,8 @@ button {
     display: flex;
     align-items: center;
     gap: 0.5rem;
+    border-radius: 5px;
+    padding: 0.25rem 0.50rem;
 
     &::before {
         content: '';
@@ -211,33 +266,63 @@ button {
     }
 }
 
-.chat-input {
-    width: 100%;
-    height: 6rem; // h-24
-    padding: 1rem; // p-4
+.input-wrapper {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 10vh;
     border: 2px solid #D1D5DB; // border-2 border-gray-300
     border-radius: 0.5rem; // rounded-lg
-    font-size: 0.875rem; // text-sm
-    line-height: 1.5;
-    color: #111827; // text-gray-900
-    resize: none;
-    outline: none;
-    font-family: inherit;
-    background: white;
+    transition: border-color 0.2s ease;
 
-    &:focus {
-        border-color: $ff-indigo-500; // focus:border-indigo-500
-        outline: none;
+    &.focused {
+        border-color: $ff-indigo-500;
     }
 
-    &:disabled {
-        cursor: not-allowed;
-        background-color: #F9FAFB; // bg-gray-50
-        color: #6B7280; // text-gray-500
+    .chat-input {
+        flex: 1;
+        width: 100%;
+        padding: 1rem; // p-4
+        box-sizing: border-box;
+        overflow-y: auto;
+        border: none;
+        outline: none;
+        font-size: 0.875rem; // text-sm
+        line-height: 1.5;
+        color: #111827; // text-gray-900
+        resize: none;
+        font-family: inherit;
+        background: white;
+
+        &:focus {
+            outline: none;
+        }
+
+        &:disabled {
+            cursor: not-allowed;
+            background-color: #F9FAFB; // bg-gray-50
+            color: #6B7280; // text-gray-500
+        }
+
+        &::placeholder {
+            color: #9CA3AF; // placeholder gray
+        }
     }
 
-    &::placeholder {
-        color: #9CA3AF; // placeholder gray
+    .actions {
+        padding: .5rem;
+        display: flex;
+        justify-content: space-between;
+
+        .left {
+            display: flex;
+            justify-content: flex-start;
+        }
+
+        .right {
+            display: flex;
+            justify-content: flex-end;
+        }
     }
 }
 </style>
diff --git a/frontend/src/components/expert/ExpertChatMessage.vue b/frontend/src/components/expert/ExpertChatMessage.vue
index d56bfc977b..ecd2354a05 100644
--- a/frontend/src/components/expert/ExpertChatMessage.vue
+++ b/frontend/src/components/expert/ExpertChatMessage.vue
@@ -53,7 +53,19 @@ export default {
                 return this.sanitize(this.message.content)
             }
             // Convert markdown to HTML
-            const html = marked(this.message.content || '', {
+            const content = []
+            content.push(this.message.content || '')
+            if (this.message.resources?.issues?.length > 0) {
+                content.push('\n\n')
+                content.push('**Issues:**')
+                content.push(this.message.resources.issues.map(issue => `\n- ${this.sanitize(issue)}`).join(''))
+            }
+            if (this.message.resources?.suggestions?.length > 0) {
+                content.push('\n\n')
+                content.push('**Suggestions:**')
+                content.push(this.message.resources.suggestions.map(suggestion => `\n- ${this.sanitize(suggestion)}`).join(''))
+            }
+            const html = marked(content.join('\n'), {
                 breaks: true,
                 gfm: true
             })
@@ -65,6 +77,18 @@ export default {
                     utm_campaign: 'expert-chat'
                 }
             })
+        },
+        issues () {
+            return this.resources.issues
+        },
+        suggestions () {
+            return this.resources.suggestions
+        },
+        hasIssues () {
+            return (this.resources.issues && this.resources.issues.length > 0)
+        },
+        hasSuggestions () {
+            return (this.resources.suggestions && this.resources.suggestions.length > 0)
         }
     }
 }
@@ -149,6 +173,7 @@ export default {
     :deep(ul), :deep(ol) {
         margin: 0.5rem 0;
         padding-left: 1.5rem;
+        list-style: square;
     }
 
     :deep(li) {
diff --git a/frontend/src/components/expert/components/CapabilitiesSelector.vue b/frontend/src/components/expert/components/CapabilitiesSelector.vue
index 2918aa46b1..c49dcf3802 100644
--- a/frontend/src/components/expert/components/CapabilitiesSelector.vue
+++ b/frontend/src/components/expert/components/CapabilitiesSelector.vue
@@ -165,9 +165,9 @@ export default {
         }
 
         button.ff-button {
-            padding: 0.5rem 0.75rem;
             border: 1px solid #c7d2fe; // indigo-300 to match other buttons
-            border-radius: 9999px; // pill shape
+            border-radius: 5px;
+            padding: 0.25rem 0.50rem;
             background: $ff-white;
             color: #1f2937; // gray-800, explicit dark text
             font-size: 0.875rem;
@@ -201,7 +201,6 @@ export default {
                 background: $ff-indigo-600;
                 border-color: $ff-indigo-600;
                 color: $ff-white;
-                border-radius: 9999px; // keep pill shape when open
 
                 .icon {
                     svg {
diff --git a/frontend/src/composables/ResizingHelper.js b/frontend/src/composables/ResizingHelper.js
new file mode 100644
index 0000000000..6af165f34c
--- /dev/null
+++ b/frontend/src/composables/ResizingHelper.js
@@ -0,0 +1,121 @@
+import { computed, ref } from 'vue'
+
+export function useResizingHelper () {
+    const viewportWidth = ref(window.innerWidth)
+    const viewportHeight = ref(window.innerHeight)
+
+    const MIN_WIDTH = ref(0)
+    const MIN_HEIGHT = ref(0)
+    const MAX_VIEWPORT_MARGIN_X = ref(0)
+    const MAX_VIEWPORT_MARGIN_Y = ref(0)
+
+    const MOBILE_BREAKPOINT = ref(0)
+    const MAX_WIDTH_RATIO = ref(1)
+    const MAX_HEIGHT_RATIO = ref(1)
+
+    let resizing = false
+    let startX = 0
+    let startY = 0
+    let startWidth = 0
+    let startHeight = 0
+
+    const width = ref(0)
+    const height = ref(0)
+
+    function startResize (e) {
+        resizing = true
+        startX = e.clientX
+        startY = e.clientY
+
+        startWidth = width.value
+        startHeight = height.value
+
+        document.addEventListener('mousemove', resize)
+        document.addEventListener('mouseup', stopResize)
+    }
+
+    function stopResize () {
+        resizing = false
+        document.removeEventListener('mousemove', resize)
+        document.removeEventListener('mouseup', stopResize)
+    }
+
+    function resize (e) {
+        if (resizing) {
+            const widthChange = e.clientX - startX
+            const heightChange = e.clientY - startY
+
+            const newWidth = startWidth + widthChange
+            const newHeight = startHeight - heightChange
+
+            width.value = Math.min(
+                Math.max(MIN_WIDTH.value, newWidth),
+                viewportWidth.value - MAX_VIEWPORT_MARGIN_X.value
+            )
+            height.value = Math.min(
+                Math.max(MIN_HEIGHT.value, newHeight),
+                viewportHeight.value - MAX_VIEWPORT_MARGIN_Y.value
+            )
+        }
+    }
+
+    function bindResizer ({
+        component = null,
+        initialWidth = 0,
+        initialHeight = 0,
+        minWidth,
+        minHeight,
+        maxViewportMarginX,
+        maxViewportMarginY,
+        mobileBreakpoint,
+        maxWidthRatio,
+        maxHeightRatio
+    } = {}) {
+        let componentWidth = initialWidth
+        let componentHeight = initialHeight
+
+        if (component) {
+            const element = component.$el || component
+
+            if (element && element.getBoundingClientRect) {
+                const rect = element.getBoundingClientRect()
+                componentWidth = initialWidth || rect.width
+                componentHeight = initialHeight || rect.height
+            }
+        }
+
+        height.value = componentHeight
+        width.value = componentWidth
+
+        MIN_WIDTH.value = minWidth
+        MIN_HEIGHT.value = minHeight
+        MAX_VIEWPORT_MARGIN_X.value = maxViewportMarginX
+        MAX_VIEWPORT_MARGIN_Y.value = maxViewportMarginY
+
+        MOBILE_BREAKPOINT.value = mobileBreakpoint ?? 0
+        MAX_WIDTH_RATIO.value = maxWidthRatio ?? 1
+        MAX_HEIGHT_RATIO.value = maxHeightRatio ?? 1
+    }
+
+    const heightStyle = computed(() => {
+        if (viewportHeight.value < MOBILE_BREAKPOINT.value) {
+            return `${Math.min(height.value, viewportHeight.value)}px`
+        }
+        return `${Math.min(height.value, viewportHeight.value * MAX_HEIGHT_RATIO.value)}px`
+    })
+
+    const widthStyle = computed(() => {
+        if (viewportWidth.value < MOBILE_BREAKPOINT.value) {
+            return `${Math.min(width.value, viewportWidth.value)}px`
+        }
+        return `${Math.min(width.value, viewportWidth.value * MAX_WIDTH_RATIO.value)}px`
+    })
+
+    return {
+        heightStyle,
+        widthStyle,
+        startResize,
+        stopResize,
+        bindResizer
+    }
+}
diff --git a/frontend/src/pages/instance/Editor/components/drawer/ResizeBar.vue b/frontend/src/pages/instance/Editor/components/drawer/ResizeBar.vue
index a4650600a3..064107714e 100644
--- a/frontend/src/pages/instance/Editor/components/drawer/ResizeBar.vue
+++ b/frontend/src/pages/instance/Editor/components/drawer/ResizeBar.vue
@@ -1,43 +1,67 @@
 <template>
-    <div class="resize-bar" />
+    <div class="resize-bar" :class="{horizontal: isHorizontal}" />
 </template>
 
 <script>
 export default {
-    name: 'ResizeBar'
+    name: 'ResizeBar',
+    props: {
+        direction: {
+            type: String,
+            default: 'vertical' // vertical || horizontal
+        }
+    },
+    computed: {
+        isHorizontal () {
+            return this.direction === 'horizontal'
+        }
+    }
 }
 </script>
 
 <style scoped lang="scss">
 .resize-bar {
-  position: absolute;
-  right: 0;
-  top: 0;
-  width: 6px;
-  height: 100%;
-  border-right: 1px solid $ff-grey-400;
-  background: transparent;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 15;
-
-  &::before {
-    content: '...';
-    position: relative;
-    left: 3px;
-    writing-mode: vertical-rl;
-    line-height: 0.5;
-    letter-spacing: 4px;
-    color: $ff-grey-500;
-  }
-
-  &:hover {
-    cursor: ew-resize;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 6px;
+    height: 100%;
+    border-right: 1px solid $ff-grey-400;
+    background: transparent;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 15;
 
     &::before {
-      color: $ff-grey-700;
+        content: '...';
+        position: relative;
+        left: 3px;
+        writing-mode: vertical-rl;
+        line-height: 0.5;
+        letter-spacing: 4px;
+        color: $ff-grey-500;
+    }
+
+    &:hover {
+        cursor: ew-resize;
+
+        &::before {
+            color: $ff-grey-700;
+        }
+    }
+
+    &.horizontal {
+        width: 100%;
+        height: 6px;
+
+        &::before {
+            writing-mode: horizontal-tb;
+        }
+
+        &:hover {
+            cursor: ns-resize;
+        }
     }
-  }
 }
 </style>
diff --git a/frontend/src/store/modules/context/index.js b/frontend/src/store/modules/context/index.js
index c48ceb7465..4fd17294c0 100644
--- a/frontend/src/store/modules/context/index.js
+++ b/frontend/src/store/modules/context/index.js
@@ -14,6 +14,8 @@ const getters = {
         // Return safe defaults when route is not yet initialized
         if (!state.route) {
             return {
+                assistantVersion: rootState.product.assistant.version,
+                assistantFeatures: rootState.product.assistant.assistantFeatures,
                 userId: rootState.account?.user?.id || null,
                 teamId: rootState.account?.team?.id || null,
                 teamSlug: rootState.account?.team?.slug || null,
@@ -21,8 +23,10 @@ const getters = {
                 deviceId: null,
                 applicationId: null,
                 isTrialAccount: rootGetters['account/isTrialAccount'] || false,
+                nodeRedVersion: rootState.product.assistant.nodeRedVersion,
                 pageName: null,
                 rawRoute: {},
+                selectedNodes: null,
                 scope: 'ff-app'
             }
         }
@@ -43,8 +47,14 @@ const getters = {
                 : 'ff-app'
 
         const { matched, redirectedFrom, ...rawRoute } = state.route ?? {}
+        let selectedNodes = null
 
+        if (scope === 'immersive' && rootGetters['product/expert/isFfAgent'] && rootState.product.assistant.selectedNodes.length > 0) {
+            selectedNodes = rootState.product.assistant.selectedNodes
+        }
         return {
+            assistantVersion: rootState.product.assistant.version,
+            assistantFeatures: rootState.product.assistant.assistantFeatures,
             userId: rootState.account?.user?.id || null,
             teamId: rootState.account?.team?.id || null,
             teamSlug: rootState.account?.team?.slug || null,
@@ -53,7 +63,9 @@ const getters = {
             applicationId: applicationId ?? null,
             isTrialAccount: rootGetters['account/isTrialAccount'] || false,
             pageName: state.route.name,
+            nodeRedVersion: rootState.product.assistant.nodeRedVersion,
             rawRoute,
+            selectedNodes,
             scope
         }
     }
diff --git a/frontend/src/store/modules/product/assistant/index.js b/frontend/src/store/modules/product/assistant/index.js
index 2563855123..65df4244cf 100644
--- a/frontend/src/store/modules/product/assistant/index.js
+++ b/frontend/src/store/modules/product/assistant/index.js
@@ -1,16 +1,79 @@
 import messagingService from '../../../../services/messaging.service.js'
 
-const initialState = () => ({
-    version: null,
-    supportedActions: {},
-    palette: {},
-    scope: {
-        target: 'nr-assistant',
-        scope: 'flowfuse-expert',
-        source: 'flowfuse-expert'
-    },
-    selectedNodes: []
-})
+const eventsRegistry = {
+    'editor:open': {
+        nodeRedEvent: 'editor:open', // this is the Node-RED event
+        propertyBag: 'editorState',
+        propertyName: 'editorOpen',
+        propertyValue: true
+    },
+    'editor:close': {
+        nodeRedEvent: 'testing stuff matey',
+        propertyBag: 'editorState',
+        propertyName: 'editorOpen',
+        propertyValue: false
+    },
+    'search:open': {
+        nodeRedEvent: 'search:open',
+        propertyBag: 'editorState',
+        propertyName: 'searchOpen',
+        propertyValue: true
+    },
+    'search:close': {
+        nodeRedEvent: 'search:close',
+        propertyBag: 'editorState',
+        propertyName: 'searchOpen',
+        propertyValue: false
+    },
+    'actionList:open': {
+        nodeRedEvent: 'actionList:open',
+        propertyBag: 'editorState',
+        propertyName: 'actionListOpen',
+        propertyValue: true
+    },
+    'actionList:close': {
+        nodeRedEvent: 'actionList:close',
+        propertyBag: 'editorState',
+        propertyName: 'actionListOpen',
+        propertyValue: false
+    },
+    'type-search:open': {
+        nodeRedEvent: 'type-search:open',
+        propertyBag: 'editorState',
+        propertyName: 'typeSearchOpen',
+        propertyValue: true
+    },
+    'type-search:close': {
+        nodeRedEvent: 'type-search:close',
+        propertyBag: 'editorState',
+        propertyName: 'typeSearchOpen',
+        propertyValue: false
+    }
+}
+
+const initialState = () => {
+    const initialEditorState = {}
+    Object.values(eventsRegistry).forEach(eventDetails => {
+        if (eventDetails.propertyBag === 'editorState') {
+            initialEditorState[eventDetails.propertyName] = false // default to false
+        }
+    })
+
+    return {
+        version: null,
+        supportedActions: {},
+        assistantFeatures: {},
+        palette: {},
+        scope: {
+            target: 'nr-assistant',
+            scope: 'flowfuse-expert',
+            source: 'flowfuse-expert'
+        },
+        nodeRedVersion: null,
+        selectedNodes: [],
+        editorState: { ...initialEditorState }
+    }
+}
 
 const meta = {
     persistence: {}
@@ -21,6 +84,9 @@ const state = initialState()
 const getters = {
     immersiveInstance: (state, getters, rootState) => {
         return rootState.context.instance
+    },
+    hasUserSelection: (state) => {
+        return state.selectedNodes.length
     }
 }
 
@@ -32,11 +98,29 @@ const mutations = {
         state.supportedActions = supportedActions
     },
     SET_PALETTE (state, palette) {
-        state.palette = palette ?? []
+        state.palette = palette ?? {}
     },
     SET_SELECTED_NODES (state, selection) {
         state.selectedNodes = selection
     },
+    SET_FEATURES (state, features) {
+        state.assistantFeatures = features
+    },
+    SET_NODE_RED_VERSION (state, version) {
+        state.nodeRedVersion = version
+    },
+    SET_REGISTERED_EVENT_PROPERTY (state, { registeredEvent, data }) {
+        const propertyBag = registeredEvent.propertyBag
+        if (!propertyBag || !Object.prototype.hasOwnProperty.call(state, propertyBag)) {
+            return
+        }
+        const propertyName = registeredEvent.propertyName
+        const propertyValue = registeredEvent.propertyValue || false
+        if (!propertyName) {
+            return
+        }
+        state[propertyBag][propertyName] = propertyValue
+    },
     RESET (state) {
         const newState = initialState()
         Object.keys(newState).forEach(key => {
@@ -55,15 +139,25 @@ const actions = {
         case payload.data.type === 'assistant-ready':
             commit('SET_VERSION', payload.data.version)
             commit('SET_PALETTE', payload.data.palette)
+            commit('SET_FEATURES', payload.data.features)
+            commit('SET_NODE_RED_VERSION', payload.data.nodeRedVersion)
             dispatch('requestSupportedActions')
             dispatch('requestSelectedNodes')
+            dispatch('registerEventListeners')
             return await dispatch('requestPalette')
+        case typeof eventsRegistry[payload.data.type] === 'object':
+            return dispatch('setRegisteredEventProperty', {
+                registeredEvent: eventsRegistry[payload.data.type],
+                data: payload.data
+            })
         case payload.data.type === 'get-assistant-version':
             return dispatch('setVersion', payload.data.version)
         case payload.data.type === 'get-supported-actions':
             return dispatch('setSupportedActions', payload.data.supportedActions)
         case payload.data.type === 'set-palette':
             return dispatch('setPalette', payload.data.palette)
+        case payload.data.type === 'set-assistant-features':
+            return dispatch('setFeatures', payload.data.features)
         case payload.data.type === 'set-selection':
             return dispatch('setSelectedNodes', payload.data.selection)
         default:
@@ -82,12 +176,24 @@ const actions = {
     requestSelectedNodes: async ({ dispatch }) => {
         return dispatch('sendMessage', { type: 'get-selection' })
     },
+    registerEventListeners: async ({ dispatch }) => {
+        return dispatch('sendMessage', {
+            type: 'register-event-listeners',
+            params: eventsRegistry
+        })
+    },
+    setRegisteredEventProperty: ({ commit }, { registeredEvent, data }) => {
+        commit('SET_REGISTERED_EVENT_PROPERTY', { registeredEvent, data })
+    },
     setVersion: ({ commit }, version) => {
         commit('SET_VERSION', version)
     },
     setSupportedActions: ({ commit }, supportedActions) => {
         commit('SET_SUPPORTED_ACTIONS', supportedActions)
     },
+    setFeatures: ({ commit }, features) => {
+        commit('SET_FEATURES', features)
+    },
     setPalette: ({ commit }, palette) => {
         commit('SET_PALETTE', palette)
     },
diff --git a/frontend/src/store/modules/product/expert/index.js b/frontend/src/store/modules/product/expert/index.js
index 8be3d4d512..2d5bb98a61 100644
--- a/frontend/src/store/modules/product/expert/index.js
+++ b/frontend/src/store/modules/product/expert/index.js
@@ -447,6 +447,15 @@ const actions = {
                         content: item.title || 'Resources',
                         timestamp: Date.now()
                     })
+                } else if (item.kind === 'chat' && ((Array.isArray(item.issues) && item.issues.length > 0) || (Array.isArray(item.suggestions) && item.suggestions.length > 0))) {
+                    // Add chat message with issues and suggestions
+                    commit('ADD_MESSAGE', {
+                        type: 'ai',
+                        kind: 'chat',
+                        resources: item,
+                        content: item.content || 'Response',
+                        timestamp: Date.now()
+                    })
                 } else if (item.kind === 'chat') {
                     // Add chat message with streaming effect
                     await dispatch('streamMessage', item.content)