diff --git a/frontend/src/components/expert/Expert.vue b/frontend/src/components/expert/Expert.vue
index 523b4fb083..dc3a3838d2 100644
--- a/frontend/src/components/expert/Expert.vue
+++ b/frontend/src/components/expert/Expert.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script>
-import { mapState } from 'pinia'
-import { mapActions, mapGetters, mapState as mapVuexState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
+import { mapGetters, mapActions as mapVuexActions, mapState as mapVuexState } from 'vuex'
 
 import ExpertChatInput from './components/ExpertChatInput.vue'
 import ExpertMessages from './components/ExpertMessages.vue'
@@ -32,6 +32,7 @@ import ExpertModeSwitcher from './components/ExpertModeSwitcher.vue'
 import InfoBanner from './components/InfoBanner.vue'
 import UpdateBanner from './components/UpdateBanner.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
 
 export default {
@@ -148,12 +149,11 @@ export default {
         this.resetSessionTimer()
     },
     methods: {
-        ...mapActions('product/expert', [
-            'handleQuery',
-            'handleMessageResponse',
+        ...mapVuexActions('product/expert', [
             'setAbortController',
             'resetSessionTimer'
         ]),
+        ...mapActions(useProductAssistantStore, ['reset']),
         handleStopGeneration () {
             if (this.abortController) {
                 this.abortController.abort()
diff --git a/frontend/src/components/expert/components/ExpertChatInput.vue b/frontend/src/components/expert/components/ExpertChatInput.vue
index 34771a04f8..b8ff516491 100644
--- a/frontend/src/components/expert/components/ExpertChatInput.vue
+++ b/frontend/src/components/expert/components/ExpertChatInput.vue
@@ -62,7 +62,8 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions, mapState } from 'pinia'
+import { mapGetters, mapActions as mapVuexActions } from 'vuex'
 
 import { useResizingHelper } from '../../../composables/ResizingHelper.js'
 
@@ -71,6 +72,7 @@ import ResizeBar from '../../ResizeBar.vue'
 import CapabilitiesSelector from './CapabilitiesSelector.vue'
 import ContextSelector from './context-selection/index.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
 
 export default {
@@ -110,7 +112,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('product/assistant', [
+        ...mapState(useProductAssistantStore, [
             'immersiveInstance',
             'immersiveDevice'
         ]),
@@ -155,8 +157,8 @@ export default {
         })
     },
     methods: {
-        ...mapActions('product/assistant', ['resetContextSelection']),
-        ...mapActions('product/expert', ['startOver', 'handleQuery', 'handleMessageResponse']),
+        ...mapActions(useProductAssistantStore, ['resetContextSelection']),
+        ...mapVuexActions('product/expert', ['startOver', 'handleQuery', 'handleMessageResponse']),
         async handleSend () {
             if (!this.canSend) return
 
diff --git a/frontend/src/components/expert/components/UpdateBanner.vue b/frontend/src/components/expert/components/UpdateBanner.vue
index 2ad8632398..1d0ed36082 100644
--- a/frontend/src/components/expert/components/UpdateBanner.vue
+++ b/frontend/src/components/expert/components/UpdateBanner.vue
@@ -26,8 +26,10 @@
 </template>
 
 <script>
+import { mapActions, mapState } from 'pinia'
 import SemVer from 'semver'
-import { mapActions, mapGetters, mapState } from 'vuex'
+
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
 
 const assistantVerWithAvailableUpdatesSupport = '0.11.0' // Minimum version of assistant package that supports update available detection
 const nrVerWithAvailableUpdatesSupport = '4.1.6' // Minimum Node-RED version that provides available updates to editorState
@@ -35,8 +37,7 @@ const nrVerWithAvailableUpdatesSupport = '4.1.6' // Minimum Node-RED version tha
 export default {
     name: 'UpdateBanner',
     computed: {
-        ...mapState('product/assistant', ['palette', 'editorState', 'version', 'nodeRedVersion', 'supportedActions']),
-        ...mapGetters('product/assistant', ['isFeaturePaletteEnabled', 'isEditorRunning']),
+        ...mapState(useProductAssistantStore, ['palette', 'editorState', 'version', 'nodeRedVersion', 'supportedActions', 'isEditorRunning']),
         assistantLoaded () {
             // If one of version, nodeRedVersion or palette are present, we know it is loaded
             return !!(this.version || this.nodeRedVersion || this.palette)
@@ -116,7 +117,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['manageNodePackage', 'installNodePackage']),
+        ...mapActions(useProductAssistantStore, ['manageNodePackage', 'installNodePackage']),
         onButtonClick () {
             if (typeof this.assistantState?.buttonAction === 'function') {
                 this.assistantState.buttonAction()
diff --git a/frontend/src/components/expert/components/chips/ContextChip.vue b/frontend/src/components/expert/components/chips/ContextChip.vue
index f7f1ad4817..9114276bc2 100644
--- a/frontend/src/components/expert/components/chips/ContextChip.vue
+++ b/frontend/src/components/expert/components/chips/ContextChip.vue
@@ -8,12 +8,14 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import { pluralize } from '../../../../composables/strings/String.js'
 
 import DefaultChip from './DefaultChip.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'ContextChip',
     components: {
@@ -27,7 +29,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('product/assistant', ['getSelectedContext']),
+        ...mapState(useProductAssistantStore, ['getSelectedContext']),
         selectedContext () {
             return this.getSelectedContext
         },
@@ -39,7 +41,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['setSelectedContext']),
+        ...mapActions(useProductAssistantStore, ['setSelectedContext']),
         pluralize,
         toggleSelection () {
             const currentSelection = this.selectedContext.filter(c => c.name !== this.contextItem.name)
diff --git a/frontend/src/components/expert/components/chips/DebugChip.vue b/frontend/src/components/expert/components/chips/DebugChip.vue
index ca3fb7a8c9..dafb03a443 100644
--- a/frontend/src/components/expert/components/chips/DebugChip.vue
+++ b/frontend/src/components/expert/components/chips/DebugChip.vue
@@ -12,12 +12,14 @@
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import { pluralize } from '../../../../composables/strings/String.js'
 
 import DefaultChip from './DefaultChip.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'DebugChip',
     components: {
@@ -32,7 +34,7 @@ export default {
     },
     emits: ['update:modelValue'],
     computed: {
-        ...mapState('product/assistant', ['debugLog']),
+        ...mapState(useProductAssistantStore, ['debugLog']),
         selectedCounter () {
             return this.debugLog.length
         },
@@ -75,7 +77,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['resetDebugLogContext']),
+        ...mapActions(useProductAssistantStore, ['resetDebugLogContext']),
         pluralize,
         toggleSelection () {
             this.$emit('update:modelValue', !this.modelValue)
diff --git a/frontend/src/components/expert/components/chips/SelectionChip.vue b/frontend/src/components/expert/components/chips/SelectionChip.vue
index bcc01f9633..1079853248 100644
--- a/frontend/src/components/expert/components/chips/SelectionChip.vue
+++ b/frontend/src/components/expert/components/chips/SelectionChip.vue
@@ -12,12 +12,14 @@
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import { pluralize } from '../../../../composables/strings/String.js'
 
 import DefaultChip from './DefaultChip.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'SelectionChip',
     components: {
@@ -32,7 +34,7 @@ export default {
     },
     emits: ['update:modelValue'],
     computed: {
-        ...mapState('product/assistant', ['selectedNodes']),
+        ...mapState(useProductAssistantStore, ['selectedNodes']),
         filteredSelectedNodes () {
             return this.selectedNodes.filter(n => !['global-config'].includes(n.type))
         },
@@ -51,7 +53,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['setSelectedNodes']),
+        ...mapActions(useProductAssistantStore, ['setSelectedNodes']),
         pluralize,
         toggleSelection () {
             this.$emit('update:modelValue', !this.modelValue)
diff --git a/frontend/src/components/expert/components/context-selection/ContextSelectorButton.vue b/frontend/src/components/expert/components/context-selection/ContextSelectorButton.vue
index 9654cd3ac2..d0673a18ce 100644
--- a/frontend/src/components/expert/components/context-selection/ContextSelectorButton.vue
+++ b/frontend/src/components/expert/components/context-selection/ContextSelectorButton.vue
@@ -26,12 +26,12 @@
 <script>
 
 import { CubeIcon, DocumentIcon, PaperClipIcon, ViewListIcon } from '@heroicons/vue/outline'
-import { mapActions } from 'vuex'
-
-import { mapGetters } from 'vuex/dist/vuex.cjs.js'
+import { mapActions, mapState } from 'pinia'
 
 import { pluralize } from '../../../../composables/strings/String.js'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'ContextSelectorButton',
     components: {
@@ -43,7 +43,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('product/assistant', ['availableContextOptions', 'getSelectedContext']),
+        ...mapState(useProductAssistantStore, ['availableContextOptions', 'getSelectedContext']),
         hasContextOptions () {
             return this.contextOptions?.length > 0
         },
@@ -74,10 +74,10 @@ export default {
     },
     methods: {
         pluralize,
-        ...mapActions('product/assistant', ['setSelectedContext']),
+        ...mapActions(useProductAssistantStore, ['setSelectedContext']),
         selectItem (option) {
             if (option.onSelectAction) {
-                this.$store.dispatch(`product/assistant/${option.onSelectAction}`)
+                useProductAssistantStore()[option.onSelectAction]()
             } else {
                 const cleanOption = (option) => ({
                     value: option.value,
diff --git a/frontend/src/components/expert/components/context-selection/index.vue b/frontend/src/components/expert/components/context-selection/index.vue
index 97fc9c4935..c7fbb0c46c 100644
--- a/frontend/src/components/expert/components/context-selection/index.vue
+++ b/frontend/src/components/expert/components/context-selection/index.vue
@@ -10,6 +10,7 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
 import { mapGetters } from 'vuex'
 
 import ContextChip from '../chips/ContextChip.vue'
@@ -18,6 +19,8 @@ import SelectionChip from '../chips/SelectionChip.vue'
 
 import ContextSelectorButton from './ContextSelectorButton.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'ContextSelector',
     components: {
@@ -27,7 +30,7 @@ export default {
         ContextSelectorButton
     },
     computed: {
-        ...mapGetters('product/assistant', ['getSelectedContext', 'hasDebugLogsSelected', 'hasUserSelection']),
+        ...mapState(useProductAssistantStore, ['getSelectedContext', 'hasDebugLogsSelected', 'hasUserSelection']),
         ...mapGetters('product/expert', ['isOperatorAgent']),
         selectedContext () {
             // for insights mode, return empty array
diff --git a/frontend/src/components/expert/components/messages/components/AnswerWrapper.vue b/frontend/src/components/expert/components/messages/components/AnswerWrapper.vue
index 9d78783ce2..3ab016bdb7 100644
--- a/frontend/src/components/expert/components/messages/components/AnswerWrapper.vue
+++ b/frontend/src/components/expert/components/messages/components/AnswerWrapper.vue
@@ -71,7 +71,8 @@
 
 <script>
 
-import { mapActions, mapState } from 'vuex'
+import { mapState } from 'pinia'
+import { mapActions as mapVuexActions, mapState as mapVuexState } from 'vuex'
 
 import useTimerHelper from '../../../../../composables/TimerHelper.js'
 
@@ -86,6 +87,8 @@ import ResourcesList from './resources/ResourcesList.vue'
 import RichContent from './resources/RichContent.vue'
 import SuggestionsList from './resources/SuggestionsList.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'AnswerWrapper',
     components: {
@@ -122,8 +125,8 @@ export default {
         }
     },
     computed: {
-        ...mapState('product/assistant', ['supportedActions']),
-        ...mapState('product/expert', ['agentMode']),
+        ...mapState(useProductAssistantStore, ['supportedActions']),
+        ...mapVuexState('product/expert', ['agentMode']),
         hasGuideHeader () {
             // chat answers contain generic titles, they don't need to be displayed
             return !!(this.answer.title && !this.isChatAnswer)
@@ -247,7 +250,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/expert', ['updateAnswerStreamedState', 'updateMessageStreamedState']),
+        ...mapVuexActions('product/expert', ['updateAnswerStreamedState', 'updateMessageStreamedState']),
         buildStreamingOrder () {
             // order matters
             // this is where the decision of the streaming order of components is decided
@@ -303,7 +306,7 @@ export default {
                     params[paramName] = value
                 }
             }
-            this.$store.dispatch('product/assistant/invokeAction', { action, params })
+            useProductAssistantStore().invokeAction({ action, params })
         }
     }
 }
diff --git a/frontend/src/components/expert/components/messages/components/resource-cards/FlowResourceCard.vue b/frontend/src/components/expert/components/messages/components/resource-cards/FlowResourceCard.vue
index b6ec104ee2..a775af9f66 100644
--- a/frontend/src/components/expert/components/messages/components/resource-cards/FlowResourceCard.vue
+++ b/frontend/src/components/expert/components/messages/components/resource-cards/FlowResourceCard.vue
@@ -47,12 +47,15 @@
 
 <script>
 import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/vue/solid'
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions } from 'pinia'
+import { mapGetters } from 'vuex'
 
 import TextCopier from '../../../../../TextCopier.vue'
 import FlowViewer from '../../../../../flow-viewer/FlowViewer.vue'
 import StreamableContent from '../resources/StreamableContent.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'StandardResourceCard',
     components: { StreamableContent, TextCopier, FlowViewer, ChevronUpIcon, ChevronDownIcon },
@@ -93,7 +96,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['sendFlowsToImport']),
+        ...mapActions(useProductAssistantStore, ['sendFlowsToImport']),
         importFlows () {
             this.sendFlowsToImport(this.flowsJson)
             // TODO: hide the ff-expert panel after importing. Ideally after a "success" message is received from the assistant
diff --git a/frontend/src/components/expert/components/messages/components/resource-cards/PackageResourceCard.vue b/frontend/src/components/expert/components/messages/components/resource-cards/PackageResourceCard.vue
index 9db676454f..c07fb40b26 100644
--- a/frontend/src/components/expert/components/messages/components/resource-cards/PackageResourceCard.vue
+++ b/frontend/src/components/expert/components/messages/components/resource-cards/PackageResourceCard.vue
@@ -41,11 +41,15 @@
 </template>
 
 <script>
+
+import { mapActions, mapState } from 'pinia'
 import { computed } from 'vue'
-import { mapActions, mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
 
 import StreamableContent from '../resources/StreamableContent.vue'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'PackageResourceCard',
     components: { StreamableContent },
@@ -88,6 +92,7 @@ export default {
     },
     computed: {
         ...mapGetters('product/expert', ['canManagePalette']),
+        ...mapState(useProductAssistantStore, ['palette']),
         packageFaviconUrl () {
             const url = this.nodePackage.metadata?.streamable?.source || this.nodePackage.url.streamable
             try {
@@ -105,7 +110,7 @@ export default {
         isPackageInstalled () {
             const pkg = this.nodePackage
 
-            return !!this.$store.state.product.assistant?.palette?.[pkg.id.streamable]
+            return !!this.palette?.[pkg.id.streamable]
         },
         urlWithUTMTracking () {
             const url = this.packageUrl
@@ -131,7 +136,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('product/assistant', ['installNodePackage', 'manageNodePackage']),
+        ...mapActions(useProductAssistantStore, ['installNodePackage', 'manageNodePackage']),
         handleImageError (event) {
             // Hide broken image icon
             event.target.style.display = 'none'
diff --git a/frontend/src/components/expert/components/messages/components/resources/StreamableContent.vue b/frontend/src/components/expert/components/messages/components/resources/StreamableContent.vue
index 216b3edf87..1dd23fa7f8 100644
--- a/frontend/src/components/expert/components/messages/components/resources/StreamableContent.vue
+++ b/frontend/src/components/expert/components/messages/components/resources/StreamableContent.vue
@@ -10,11 +10,13 @@
 
 <script>
 import { marked } from 'marked'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import useStreamingWords from '@/composables/strings/StreamingWords.js'
 import { sanitize } from '@/composables/strings/String.js'
 
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 export default {
     name: 'StreamableContent',
     props: {
@@ -73,7 +75,7 @@ export default {
         return { stream, streamedText: text, isStreaming, sanitize }
     },
     computed: {
-        ...mapState('product/assistant', ['supportedActions']),
+        ...mapState(useProductAssistantStore, ['supportedActions']),
         rawText () {
             const rawText = this.modelValue ? this.modelValue.streamable : this.string
 
diff --git a/frontend/src/components/immersive-editor/HostedInstanceEditorWrapper.vue b/frontend/src/components/immersive-editor/HostedInstanceEditorWrapper.vue
index 95f3ced59a..8d3b251526 100644
--- a/frontend/src/components/immersive-editor/HostedInstanceEditorWrapper.vue
+++ b/frontend/src/components/immersive-editor/HostedInstanceEditorWrapper.vue
@@ -23,9 +23,12 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import { mapActions } from 'pinia'
 
 import LoadingScreenWrapper from './LoadingScreenWrapper.vue'
+
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 const States = {
     STOPPED: 'stopped',
     LOADING: 'loading',
@@ -97,7 +100,7 @@ export default {
         this.resetAssistant()
     },
     methods: {
-        ...mapActions('product/assistant', {
+        ...mapActions(useProductAssistantStore, {
             resetAssistant: 'reset'
         }),
         // todo this event listener should be moved in the messaging.service.js
diff --git a/frontend/src/services/messaging.service.js b/frontend/src/services/messaging.service.js
index b026d6f843..3a1c9f837b 100644
--- a/frontend/src/services/messaging.service.js
+++ b/frontend/src/services/messaging.service.js
@@ -1,3 +1,5 @@
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
 const DATA_SOURCE_FLOWFUSE_WEBSITE = 'flowfuse-website'
 const DATA_SOURCE_ASSISTANT = 'nr-assistant'
 const DATA_TARGET_ASSISTANT = 'flowfuse-expert'
@@ -109,7 +111,7 @@ class MessagingService {
     }
 
     async handleAssistantMessage (event) {
-        await this.$store.dispatch('product/assistant/handleMessage', event)
+        await useProductAssistantStore().handleMessage(event)
     }
 
     sendReadyMessage () {
diff --git a/frontend/src/store/modules/account/index.js b/frontend/src/store/modules/account/index.js
index 12c63a46d3..1ce72effe7 100644
--- a/frontend/src/store/modules/account/index.js
+++ b/frontend/src/store/modules/account/index.js
@@ -10,6 +10,7 @@ import router from '../../../routes.js'
 import product from '../../../services/product.js'
 
 import { useContextStore } from '@/stores/context.js'
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
 import { useUxDialogStore } from '@/stores/ux-dialog.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
 import { useUxNavigationStore } from '@/stores/ux-navigation.js'
@@ -526,7 +527,7 @@ const actions = {
                     useContextStore().$reset()
                     // Task 6:  useProductTablesStore().$reset()
                     // Task 7:  useProductBrokersStore().$reset()
-                    // Task 8:  useProductAssistantStore().$reset()
+                    useProductAssistantStore().$reset()
                     // Task 9:  useProductExpertFfAgentStore().$reset()
                     // Task 10: useProductExpertOperatorAgentStore().$reset()
                     // Task 11: useProductExpertStore().$reset()
diff --git a/frontend/src/store/modules/product/assistant/index.js b/frontend/src/store/modules/product/assistant/index.js
deleted file mode 100644
index b05f32947d..0000000000
--- a/frontend/src/store/modules/product/assistant/index.js
+++ /dev/null
@@ -1,556 +0,0 @@
-import SemVer from 'semver'
-
-import messagingService from '../../../../services/messaging.service.js'
-
-import { useContextStore } from '@/stores/context.js'
-
-const MAX_DEBUG_LOG_ENTRIES = 100 // maximum number of debug log entries to keep
-
-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
-    },
-    'registry:updates-available': {
-        nodeRedEvent: 'registry:updates-available',
-        propertyBag: 'editorState',
-        propertyName: 'updatesAvailable',
-        propertyValue: null,
-        useEventData: true // use event data to set this property
-    },
-    'flows:loaded': {
-        nodeRedEvent: 'flows:loaded',
-        propertyBag: 'editorState',
-        propertyName: 'flowsLoaded',
-        propertyValue: true
-    },
-    'runtime-state': {
-        nodeRedEvent: 'runtime-state',
-        propertyBag: 'editorState',
-        propertyName: 'runtimeState',
-        propertyValue: null,
-        useEventData: true
-    }
-}
-
-/**
- * @typedef {Object} ContextOption
- * @prop {string} value - the value of the context option, e.g. 'palette'
- * @prop {string} name - the name of the context option, e.g. 'Palette' - this is what is shown in the selected context chip
- * @prop {string} label - the label of the context option, e.g. 'Add Palette to context' - this is what is shown in the dropdown menu when selecting context options
- * @prop {string} menuIcon - the name of the icon to show in the dropdown menu when selecting context options, e.g. 'CubeIcon'
- * @prop {boolean|undefined} [showAsChip] - whether to show this context option as a chip when selected. Defaults to true. If false, the context option will not be shown as a chip when selected, but will still be included in the context list as an option.
- * @prop {string|undefined} [onSelectAction] - an optional action to invoke when this context option is selected.
- */
-
-// Flags that can be used in the assistant to indicate support for features this side in the expert.
-// This will prevent the assistant from offering options that aren't supported
-// e.g. inhibit showing the "Add debug to context" buttons
-// NOTE: Some flags may not be used (since they have no visible effect on NR)
-// NOTE: These flags may one day be set based on user level or team settings, but for now we will just set them to true since we support all features in the expert.
-const supportedFeatures = {
-    debugLogContext: { enabled: true }, // allows the expert to include debug log entries in the expert context
-    flowImport: { enabled: true }, // flag to let assistant know flows can be offered to import onto the workspace
-    flowSelection: { enabled: true }, // allows user to select nodes on workspace and have that selection sent to the expert context
-    paletteManagement: { enabled: true } // allows the expert to send commands to show the palette manager
-}
-
-/**
- * @type {Array<ContextOption>} ALL_CONTEXT_OPTIONS - a list of all available context options. This is used to populate the dropdown menu when selecting context options in the chat ui.
- */
-const ALL_CONTEXT_OPTIONS = [
-    {
-        value: 'palette',
-        name: 'Palette',
-        label: 'Add Palette to context',
-        menuIcon: 'CubeIcon',
-        showAsChip: true
-    },
-    {
-        value: 'visible-debug-logs',
-        name: 'Debug Logs',
-        label: 'Add Debug Logs (all visible)',
-        menuIcon: 'ViewListIcon',
-        showAsChip: false,
-        onSelectAction: 'requestDebugLogContextVisibleEntries'
-    },
-    {
-        value: 'visible-debug-errors',
-        name: 'Error Logs',
-        label: 'Add Debug Logs (errors only)',
-        menuIcon: 'ViewListIcon',
-        showAsChip: false,
-        onSelectAction: 'requestDebugLogContextVisibleErrorEntries'
-    }
-]
-
-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: [],
-        selectedContext: [...ALL_CONTEXT_OPTIONS].filter(option => !option.onSelectAction), // don't add items with onSelectAction (they are handled differently)
-        debugLog: [],
-        editorState: { ...initialEditorState }
-    }
-}
-
-const meta = {
-    persistence: {}
-}
-
-const state = initialState()
-
-const getters = {
-    immersiveInstance: () => {
-        return useContextStore().instance
-    },
-    immersiveDevice: () => {
-        return useContextStore().device
-    },
-    hasUserSelection: (state) => {
-        return state.selectedNodes.length
-    },
-    hasContextSelection: (state) => {
-        return state.selectedContext.length
-    },
-    hasDebugLogsSelected: (state, getters) => {
-        return getters.debugLog?.length > 0
-    },
-    isFeaturePaletteEnabled: (state) => {
-        if (!supportedFeatures.paletteManagement?.enabled) {
-            // disabled locally in the expert, so no need to check assistant features or node-red version
-            return false
-        }
-        if (state.assistantFeatures?.commands?.['get-palette']?.enabled === false) {
-            return false
-        }
-        // introduced in nr-assistant 0.11.0 were actual support flags
-        if (state.assistantFeatures?.paletteManagement?.enabled === false) {
-            return false
-        }
-        return true
-    },
-    isFeatureDebugLogContextEnabled: (state) => {
-        if (!supportedFeatures.debugLogContext?.enabled) {
-            // disabled locally in the expert, so no need to check assistant features or node-red version
-            return false
-        }
-        if (!state.assistantFeatures?.debugLogContext?.enabled || !supportedFeatures.debugLogContext?.enabled) {
-            return false
-        }
-        if (!state.nodeRedVersion || !SemVer.valid(state.nodeRedVersion) || SemVer.lt(state.nodeRedVersion, '4.1.6')) {
-            // while nr-assistant 0.11.0 with debug log context support can be installed on NR 4.1.5 and below, the feature requires new functionality in Node-RED 4.1.6
-            return false
-        }
-        return true
-    },
-    /**
-     * Returns the list of context options that are currently available based on the assistant features, filtering out
-     * options that are not available. This is used to populate the dropdown menu when selecting context options in the chat ui.
-     */
-    availableContextOptions: (state, getters) => {
-        const options = ALL_CONTEXT_OPTIONS.filter(option => {
-            switch (true) {
-            case option.value === 'visible-debug-logs':
-            case option.value === 'visible-debug-errors':
-                return getters.isFeatureDebugLogContextEnabled
-            case option.value === 'palette':
-                return getters.isFeaturePaletteEnabled
-            }
-            return true
-        })
-        return options
-    },
-    getSelectedContext: (state, getters) => {
-        const availableOptions = {}
-        getters.availableContextOptions.forEach(option => {
-            availableOptions[option.value] = option
-        })
-        return state.selectedContext.filter(c => availableOptions[c.value])
-    },
-    paletteContribOnly: (state, getters) => {
-        if (getters.isFeaturePaletteEnabled === false) {
-            return null
-        }
-        const palette = { ...(state.palette || {}) }
-        delete palette['node-red']
-        return palette
-    },
-    debugLog: (state, getters) => {
-        if (getters.isFeatureDebugLogContextEnabled === false) {
-            return null
-        }
-        return state.debugLog || []
-    },
-    allowedInboundOrigins: (state, getters) => {
-        const allowedOrigins = [window.origin]
-
-        if (getters.immersiveInstance?.url) {
-            allowedOrigins.push(getters.immersiveInstance.url)
-        }
-
-        if (getters.immersiveDevice?.editor?.url) {
-            // todo this might not be needed because it's just the path to the editor tunnel, not an actual origin
-            //   and the only origin we might receive messages is the current window origin
-            allowedOrigins.push(getters.immersiveDevice.editor.url)
-        }
-
-        return allowedOrigins
-    },
-    isEditorRunning: (state) => {
-        // NOTE: this is achieved via dynamic event registration for 'flows:loaded' and 'runtime-state' events,
-        // which requires nr-assistant version 0.10.1 or later.
-        return state.editorState?.flowsLoaded || state.editorState?.runtimeState?.state === 'start'
-    }
-}
-
-const mutations = {
-    SET_VERSION (state, version) {
-        state.version = version
-    },
-    SET_SUPPORTED_ACTIONS (state, supportedActions) {
-        state.supportedActions = supportedActions
-    },
-    SET_PALETTE (state, palette) {
-        state.palette = palette ?? {}
-    },
-    SET_SELECTED_NODES (state, selection) {
-        state.selectedNodes = selection
-    },
-    SET_SELECTED_CONTEXT (state, context) {
-        state.selectedContext = context || []
-    },
-    ADD_DEBUG_LOG_CONTEXT (state, debugLog) {
-        if (!debugLog) {
-            return
-        }
-        const entries = (Array.isArray(debugLog) ? debugLog : [debugLog]).filter(Boolean)
-        if (entries.length === 0) {
-            return
-        }
-
-        // so long as the uuid of the entry is not already present, add it.
-        entries.forEach(e => {
-            if (!state.debugLog.some(logEntry => logEntry.uuid === e.uuid)) {
-                state.debugLog.push(e) // push will add to the end of the array, which is the most recent entries at the end
-            }
-        })
-        // remove any excess entries beyond the max, keeping the most recent ones
-        if (state.debugLog.length > MAX_DEBUG_LOG_ENTRIES) {
-            state.debugLog.splice(0, state.debugLog.length - MAX_DEBUG_LOG_ENTRIES) // splice will remove the oldest entries at the start of the array
-        }
-    },
-    REMOVE_DEBUG_LOG_CONTEXT (state, debugLog) {
-        if (!debugLog) {
-            return
-        }
-        const entries = (Array.isArray(debugLog) ? debugLog : [debugLog]).filter(Boolean)
-        if (entries.length === 0) {
-            return
-        }
-        // for each entry, get the uuid and find the matching log entry & remove it
-        entries.forEach(e => {
-            const index = state.debugLog.findIndex(logEntry => logEntry.uuid === e.uuid)
-            if (index !== -1) {
-                state.debugLog.splice(index, 1)
-            }
-        })
-    },
-    RESET_DEBUG_LOG_CONTEXT (state) {
-        state.debugLog = []
-    },
-    SET_FEATURES (state, features) {
-        state.assistantFeatures = features
-    },
-    SET_NODE_RED_VERSION (state, version) {
-        state.nodeRedVersion = version
-    },
-    SET_REGISTERED_EVENT_PROPERTY (state, { registeredEvent, eventData }) {
-        const propertyBag = registeredEvent.propertyBag
-        if (!propertyBag || !Object.prototype.hasOwnProperty.call(state, propertyBag)) {
-            return
-        }
-        const propertyName = registeredEvent.propertyName
-        if (!propertyName) {
-            return
-        }
-        let propertyValue
-        if (registeredEvent.useEventData === true) {
-            propertyValue = eventData
-        } else {
-            propertyValue = registeredEvent.propertyValue
-        }
-        state[propertyBag][propertyName] = propertyValue
-    },
-    RESET (state) {
-        const newState = initialState()
-        Object.keys(newState).forEach(key => {
-            state[key] = newState[key]
-        })
-    }
-}
-
-const actions = {
-    async handleMessage ({ commit, getters, dispatch }, payload) {
-        if (!getters.allowedInboundOrigins.includes(payload.origin)) {
-            console.warn('Received message from unknown origin. Ignoring.')
-            return
-        }
-
-        switch (true) {
-        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)
-            commit('SET_REGISTERED_EVENT_PROPERTY', {
-                registeredEvent: eventsRegistry['registry:updates-available'],
-                eventData: payload.data.nodeRedUpdatesAvailable
-            })
-            dispatch('requestSupportedActions')
-            dispatch('requestSelectedNodes')
-            dispatch('registerEventListeners')
-            dispatch('requestPalette')
-            return await dispatch('confirmExpertReady')
-        case typeof eventsRegistry[payload.data.type] === 'object':
-            return dispatch('setRegisteredEventProperty', {
-                registeredEvent: eventsRegistry[payload.data.type],
-                eventData: payload.data.eventData
-            })
-        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)
-        // case payload.data.type === 'debug-log-entry':
-        case payload.data.type === 'debug-log-context-add':
-            return dispatch('addDebugLogContext', payload.data.debugLog)
-        case payload.data.type === 'debug-log-context-remove':
-            return dispatch('removeDebugLogContext', payload.data.debugLog)
-        case payload.data.type === 'debug-log-context-clear':
-            return dispatch('resetDebugLogContext')
-        default:
-            // do nothing
-        }
-    },
-    confirmExpertReady: async ({ getters, dispatch }) => {
-        return dispatch('sendMessage', {
-            type: 'expert-ready',
-            params: { supportedFeatures }
-        })
-    },
-    /**
-     * Sends the list of registered debug log entries to the assistant, to sync
-     * the state of debug log context between Node-RED and the expert.
-     */
-    sendDebugLogRegister: async ({ dispatch, state }) => {
-        // get a list of uuids from state.debugLog and send them to assistant
-        const register = state.debugLog.map(entry => entry.uuid)
-        return dispatch('sendMessage', {
-            type: 'debug-log-context-registered',
-            params: { register }
-        })
-    },
-    /**
-     * Requests the debug log entries that are currently visible in the debug sidebar.
-     * NOTE: This first clears the current debug log context in state so that incoming entries replace the current context instead of adding to it.
-     */
-    requestDebugLogContextVisibleEntries: async ({ dispatch, commit }) => {
-        commit('RESET_DEBUG_LOG_CONTEXT')
-        return dispatch('sendMessage', {
-            type: 'debug-log-context-get-entries',
-            params: { visibleOnly: true, fatal: true, error: true, warn: true, info: true, debug: true, trace: false }
-        })
-    },
-    /**
-     * Requests the debug log entries that are currently visible in the debug sidebar, but only errors and fatals.
-     * NOTE: This first clears the current debug log context in state so that incoming entries replace the current context instead of adding to it.
-     */
-    requestDebugLogContextVisibleErrorEntries: async ({ dispatch, commit }) => {
-        commit('RESET_DEBUG_LOG_CONTEXT')
-        return dispatch('sendMessage', {
-            type: 'debug-log-context-get-entries',
-            params: { visibleOnly: true, fatal: true, error: true, warn: false, info: false, debug: false, trace: false }
-        })
-    },
-    requestVersion: async ({ dispatch }) => {
-        return dispatch('sendMessage', 'get-assistant-version')
-    },
-    requestSupportedActions: async ({ dispatch }) => {
-        return dispatch('sendMessage', { type: 'get-supported-actions' })
-    },
-    requestPalette: async ({ dispatch }) => {
-        return dispatch('sendMessage', { type: 'get-palette' })
-    },
-    requestSelectedNodes: async ({ dispatch }) => {
-        return dispatch('sendMessage', { type: 'get-selection' })
-    },
-    registerEventListeners: async ({ dispatch }) => {
-        return dispatch('sendMessage', {
-            type: 'register-event-listeners',
-            params: eventsRegistry
-        })
-    },
-    setRegisteredEventProperty: ({ commit }, { registeredEvent, eventData }) => {
-        commit('SET_REGISTERED_EVENT_PROPERTY', { registeredEvent, eventData })
-    },
-    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)
-    },
-    setSelectedNodes: async ({ commit }, selection) => {
-        commit('SET_SELECTED_NODES', selection)
-    },
-    setSelectedContext: async ({ commit }, context) => {
-        commit('SET_SELECTED_CONTEXT', context)
-    },
-    addDebugLogContext: async ({ commit, dispatch }, debugLog) => {
-        commit('ADD_DEBUG_LOG_CONTEXT', debugLog)
-        dispatch('sendDebugLogRegister') // sync node-red state with expert state after adding new entries
-    },
-    removeDebugLogContext: async ({ commit, dispatch }, debugLog) => {
-        commit('REMOVE_DEBUG_LOG_CONTEXT', debugLog)
-        dispatch('sendDebugLogRegister') // sync node-red state with expert state after removing entries
-    },
-    resetDebugLogContext: async ({ commit, dispatch }) => {
-        commit('RESET_DEBUG_LOG_CONTEXT')
-        dispatch('sendDebugLogRegister') // sync node-red state with expert state after clearing entries
-    },
-    reset: ({ commit }) => {
-        commit('RESET')
-    },
-    resetContextSelection: ({ commit, getters }) => {
-        const defaultContext = getters.availableContextOptions
-        commit('SET_SELECTED_CONTEXT', defaultContext)
-    },
-    invokeAction: async ({ dispatch }, { action, params }) => {
-        return dispatch('sendMessage', {
-            type: 'invoke-action',
-            action,
-            params
-        })
-    },
-    sendFlowsToImport: async ({ dispatch }, flowsJson) => {
-        return dispatch('sendMessage', {
-            type: 'invoke-action',
-            action: 'custom:import-flow',
-            params: {
-                flow: flowsJson // parameters to go with the action
-            }
-        })
-    },
-    installNodePackage: async ({ dispatch }, packageName) => {
-        return dispatch('sendMessage', {
-            type: 'invoke-action',
-            action: 'core:manage-palette',
-            params: {
-                view: 'install',
-                filter: packageName
-            }
-        })
-    },
-    manageNodePackage: async ({ dispatch }, packageName) => {
-        return dispatch('sendMessage', {
-            type: 'invoke-action',
-            action: 'core:manage-palette',
-            params: {
-                view: 'nodes',
-                filter: packageName
-            }
-        })
-    },
-    sendMessage ({ getters }, payload) {
-        const service = messagingService()
-        return service.sendMessage({
-            message: {
-                ...payload,
-                ...state.scope // includes target, source, scope
-            },
-            target: window.frames['immersive-editor-iframe'],
-            targetOrigin: getters.immersiveInstance?.url
-        })
-    }
-}
-
-export default {
-    namespaced: true,
-    state,
-    initialState,
-    getters,
-    mutations,
-    actions,
-    meta
-}
diff --git a/frontend/src/store/modules/product/expert/index.js b/frontend/src/store/modules/product/expert/index.js
index 20cbe95267..7664f623ca 100644
--- a/frontend/src/store/modules/product/expert/index.js
+++ b/frontend/src/store/modules/product/expert/index.js
@@ -13,6 +13,7 @@ import FFAgent from './ff-agent/index.js'
 import OperatorAgent from './operator-agent/index.js'
 
 import { useContextStore } from '@/stores/context.js'
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
 
 const initialState = () => ({
     shouldWakeUpAssistant: false,
@@ -40,11 +41,11 @@ const getters = {
     isFfAgent: (state) => state.agentMode === FF_AGENT,
     isOperatorAgent: (state) => state.agentMode === OPERATOR_AGENT,
     hasSelectedCapabilities: (state) => state[OPERATOR_AGENT].selectedCapabilities?.length > 0,
-    canImportFlows: (state, getters, rootState, rootGetters) => {
-        return !!rootGetters['product/assistant/immersiveInstance'] && !!rootState.product.assistant.supportedActions['custom:import-flow']
+    canImportFlows: () => {
+        return !!useProductAssistantStore().immersiveInstance && !!useProductAssistantStore().supportedActions['custom:import-flow']
     },
-    canManagePalette: (state, getters, rootState, rootGetters) => {
-        return !!rootGetters['product/assistant/immersiveInstance'] && !!rootState.product.assistant.supportedActions['core:manage-palette']
+    canManagePalette: () => {
+        return !!useProductAssistantStore().immersiveInstance && !!useProductAssistantStore().supportedActions['core:manage-palette']
     }
 }
 
diff --git a/frontend/src/store/modules/product/index.js b/frontend/src/store/modules/product/index.js
index 1e4621270e..27c97530d7 100644
--- a/frontend/src/store/modules/product/index.js
+++ b/frontend/src/store/modules/product/index.js
@@ -1,6 +1,5 @@
 import brokerApi from '../../../api/broker.js'
 
-import assistant from './assistant/index.js'
 import expert from './expert/index.js'
 import tables from './tables/index.js'
 
@@ -213,7 +212,7 @@ const actions = {
 
 export default {
     namespaced: true,
-    modules: { assistant, tables, expert },
+    modules: { tables, expert },
     state,
     initialState: initialState(),
     getters,
diff --git a/frontend/src/stores/context.js b/frontend/src/stores/context.js
index 9f57adf5c8..2079481094 100644
--- a/frontend/src/stores/context.js
+++ b/frontend/src/stores/context.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 
 import { useAccountBridge } from './_account_bridge.js' // bridge — remove after all deps migrated
+import { useProductAssistantStore } from './product-assistant.js'
 
 export const useContextStore = defineStore('context', {
     state: () => ({
@@ -40,12 +41,14 @@ export const useContextStore = defineStore('context', {
                 }
             }
 
+            const assistant = useProductAssistantStore()
+
             if (!state.route) {
                 // Use the account bridge for account-related fields
                 const account = useAccountBridge()
                 return {
-                    assistantVersion: rootState.product.assistant.version,
-                    assistantFeatures: rootState.product.assistant.assistantFeatures,
+                    assistantVersion: assistant.version,
+                    assistantFeatures: assistant.assistantFeatures,
                     palette: null,
                     debugLog: null,
                     userId: rootState.account?.user?.id || null,
@@ -55,7 +58,7 @@ export const useContextStore = defineStore('context', {
                     deviceId: null,
                     applicationId: null,
                     isTrialAccount: account.featuresCheck?.isTrialAccount || false,
-                    nodeRedVersion: rootState.product.assistant.nodeRedVersion,
+                    nodeRedVersion: assistant.nodeRedVersion,
                     pageName: null,
                     rawRoute: {},
                     selectedNodes: null,
@@ -84,21 +87,21 @@ export const useContextStore = defineStore('context', {
             if (
                 scope === 'immersive' &&
                 rootGetters['product/expert/isFfAgent'] &&
-                rootState.product.assistant.selectedNodes.length > 0
+                assistant.selectedNodes.length > 0
             ) {
-                selectedNodes = rootState.product.assistant.selectedNodes
+                selectedNodes = assistant.selectedNodes
             }
 
             let palette = null
-            if (rootState.product.assistant.selectedContext?.some(e => e.value === 'palette')) {
-                palette = rootGetters['product/assistant/paletteContribOnly']
+            if (assistant.selectedContext?.some(e => e.value === 'palette')) {
+                palette = assistant.paletteContribOnly
             }
 
             return {
-                assistantVersion: rootState.product.assistant.version,
-                assistantFeatures: rootState.product.assistant.assistantFeatures,
+                assistantVersion: assistant.version,
+                assistantFeatures: assistant.assistantFeatures,
                 palette,
-                debugLog: rootGetters['product/assistant/debugLog'],
+                debugLog: assistant.debugLog,
                 userId: rootState.account?.user?.id || null,
                 teamId: rootState.account?.team?.id || null,
                 teamSlug: rootState.account?.team?.slug || null,
@@ -107,7 +110,7 @@ export const useContextStore = defineStore('context', {
                 applicationId: applicationId ?? null,
                 isTrialAccount: rootGetters['account/isTrialAccount'] || false,
                 pageName: state.route.name,
-                nodeRedVersion: rootState.product.assistant.nodeRedVersion,
+                nodeRedVersion: assistant.nodeRedVersion,
                 rawRoute,
                 selectedNodes,
                 scope
diff --git a/frontend/src/stores/index.js b/frontend/src/stores/index.js
index d0bf846144..3a8096bec8 100644
--- a/frontend/src/stores/index.js
+++ b/frontend/src/stores/index.js
@@ -1,5 +1,6 @@
 // Barrel export — add store exports here as each task is merged
 export { useContextStore } from './context.js'
+export { useProductAssistantStore } from './product-assistant.js'
 export { useUxDrawersStore } from './ux-drawers.js'
 export { useUxNavigationStore } from './ux-navigation.js'
 export { useUxStore } from './ux.js'
diff --git a/frontend/src/stores/product-assistant.js b/frontend/src/stores/product-assistant.js
new file mode 100644
index 0000000000..f6c0ea1ab6
--- /dev/null
+++ b/frontend/src/stores/product-assistant.js
@@ -0,0 +1,486 @@
+import { defineStore } from 'pinia'
+import SemVer from 'semver'
+
+import messagingService from '@/services/messaging.service.js'
+import { useContextStore } from '@/stores/context.js'
+
+const MAX_DEBUG_LOG_ENTRIES = 100 // maximum number of debug log entries to keep
+
+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
+    },
+    'registry:updates-available': {
+        nodeRedEvent: 'registry:updates-available',
+        propertyBag: 'editorState',
+        propertyName: 'updatesAvailable',
+        propertyValue: null,
+        useEventData: true // use event data to set this property
+    },
+    'flows:loaded': {
+        nodeRedEvent: 'flows:loaded',
+        propertyBag: 'editorState',
+        propertyName: 'flowsLoaded',
+        propertyValue: true
+    },
+    'runtime-state': {
+        nodeRedEvent: 'runtime-state',
+        propertyBag: 'editorState',
+        propertyName: 'runtimeState',
+        propertyValue: null,
+        useEventData: true
+    }
+}
+
+/**
+ * @typedef {Object} ContextOption
+ * @prop {string} value - the value of the context option, e.g. 'palette'
+ * @prop {string} name - the name of the context option, e.g. 'Palette' - this is what is shown in the selected context chip
+ * @prop {string} label - the label of the context option, e.g. 'Add Palette to context' - this is what is shown in the dropdown menu when selecting context options
+ * @prop {string} menuIcon - the name of the icon to show in the dropdown menu when selecting context options, e.g. 'CubeIcon'
+ * @prop {boolean|undefined} [showAsChip] - whether to show this context option as a chip when selected. Defaults to true. If false, the context option will not be shown as a chip when selected, but will still be included in the context list as an option.
+ * @prop {string|undefined} [onSelectAction] - an optional action to invoke when this context option is selected.
+ */
+
+// Flags that can be used in the assistant to indicate support for features this side in the expert.
+// This will prevent the assistant from offering options that aren't supported
+// e.g. inhibit showing the "Add debug to context" buttons
+// NOTE: Some flags may not be used (since they have no visible effect on NR)
+// NOTE: These flags may one day be set based on user level or team settings, but for now we will just set them to true since we support all features in the expert.
+const supportedFeatures = {
+    debugLogContext: { enabled: true }, // allows the expert to include debug log entries in the expert context
+    flowImport: { enabled: true }, // flag to let assistant know flows can be offered to import onto the workspace
+    flowSelection: { enabled: true }, // allows user to select nodes on workspace and have that selection sent to the expert context
+    paletteManagement: { enabled: true } // allows the expert to send commands to show the palette manager
+}
+
+/**
+ * @type {Array<ContextOption>} ALL_CONTEXT_OPTIONS - a list of all available context options. This is used to populate the dropdown menu when selecting context options in the chat ui.
+ */
+const ALL_CONTEXT_OPTIONS = [
+    {
+        value: 'palette',
+        name: 'Palette',
+        label: 'Add Palette to context',
+        menuIcon: 'CubeIcon',
+        showAsChip: true
+    },
+    {
+        value: 'visible-debug-logs',
+        name: 'Debug Logs',
+        label: 'Add Debug Logs (all visible)',
+        menuIcon: 'ViewListIcon',
+        showAsChip: false,
+        onSelectAction: 'requestDebugLogContextVisibleEntries'
+    },
+    {
+        value: 'visible-debug-errors',
+        name: 'Error Logs',
+        label: 'Add Debug Logs (errors only)',
+        menuIcon: 'ViewListIcon',
+        showAsChip: false,
+        onSelectAction: 'requestDebugLogContextVisibleErrorEntries'
+    }
+]
+
+function buildInitialEditorState () {
+    const editorState = {}
+    Object.values(eventsRegistry).forEach(eventDetails => {
+        if (eventDetails.propertyBag === 'editorState') {
+            editorState[eventDetails.propertyName] = false
+        }
+    })
+    return editorState
+}
+
+export const useProductAssistantStore = defineStore('product-assistant', {
+    state: () => ({
+        version: null,
+        supportedActions: {},
+        assistantFeatures: {},
+        palette: {},
+        scope: {
+            target: 'nr-assistant',
+            scope: 'flowfuse-expert',
+            source: 'flowfuse-expert'
+        },
+        nodeRedVersion: null,
+        selectedNodes: [],
+        // don't add items with onSelectAction — they are handled differently
+        selectedContext: [...ALL_CONTEXT_OPTIONS].filter(option => !option.onSelectAction),
+        // NOTE: state is named debugLogEntries to avoid a name conflict with the
+        // debugLog getter which gates the feature flag. Use this.debugLogEntries
+        // internally; external consumers should read this.debugLog (the getter).
+        debugLogEntries: [],
+        editorState: { ...buildInitialEditorState() }
+    }),
+    getters: {
+        immersiveInstance: () => useContextStore().instance,
+        immersiveDevice: () => useContextStore().device,
+        hasUserSelection: (state) => state.selectedNodes.length > 0,
+        hasContextSelection: (state) => state.selectedContext.length > 0,
+        hasDebugLogsSelected () {
+            return this.debugLog?.length > 0
+        },
+        isFeaturePaletteEnabled: (state) => {
+            if (!supportedFeatures.paletteManagement?.enabled) {
+                return false
+            }
+            if (state.assistantFeatures?.commands?.['get-palette']?.enabled === false) {
+                return false
+            }
+            // introduced in nr-assistant 0.11.0 were actual support flags
+            if (state.assistantFeatures?.paletteManagement?.enabled === false) {
+                return false
+            }
+            return true
+        },
+        isFeatureDebugLogContextEnabled: (state) => {
+            if (!supportedFeatures.debugLogContext?.enabled) {
+                return false
+            }
+            if (!state.assistantFeatures?.debugLogContext?.enabled || !supportedFeatures.debugLogContext?.enabled) {
+                return false
+            }
+            if (!state.nodeRedVersion || !SemVer.valid(state.nodeRedVersion) || SemVer.lt(state.nodeRedVersion, '4.1.6')) {
+                // while nr-assistant 0.11.0 with debug log context support can be installed on NR 4.1.5 and below,
+                // the feature requires new functionality in Node-RED 4.1.6
+                return false
+            }
+            return true
+        },
+        /**
+         * Returns the list of context options that are currently available based on the assistant features, filtering out
+         * options that are not available. This is used to populate the dropdown menu when selecting context options in the chat ui.
+         */
+        availableContextOptions () {
+            return ALL_CONTEXT_OPTIONS.filter(option => {
+                switch (true) {
+                case option.value === 'visible-debug-logs':
+                case option.value === 'visible-debug-errors':
+                    return this.isFeatureDebugLogContextEnabled
+                case option.value === 'palette':
+                    return this.isFeaturePaletteEnabled
+                }
+                return true
+            })
+        },
+        getSelectedContext (state) {
+            const availableOptions = {}
+            this.availableContextOptions.forEach(option => {
+                availableOptions[option.value] = option
+            })
+            return state.selectedContext.filter(c => availableOptions[c.value])
+        },
+        paletteContribOnly (state) {
+            if (this.isFeaturePaletteEnabled === false) {
+                return null
+            }
+            const palette = { ...(state.palette || {}) }
+            delete palette['node-red']
+            return palette
+        },
+        /**
+         * Returns the debug log entries, or null if the feature is disabled.
+         * NOTE: Named debugLog (not debugLogEntries) to match the Vuex getter name used by consumers.
+         */
+        debugLog (state) {
+            if (this.isFeatureDebugLogContextEnabled === false) {
+                return null
+            }
+            return state.debugLogEntries || []
+        },
+        allowedInboundOrigins () {
+            const allowedOrigins = [window.origin]
+            const instance = useContextStore().instance
+            const device = useContextStore().device
+            if (instance?.url) allowedOrigins.push(instance.url)
+            if (device?.editor?.url) {
+                // todo this might not be needed because it's just the path to the editor tunnel, not an actual origin
+                //   and the only origin we might receive messages is the current window origin
+                allowedOrigins.push(device.editor.url)
+            }
+            return allowedOrigins
+        },
+        isEditorRunning: (state) => {
+            // NOTE: this is achieved via dynamic event registration for 'flows:loaded' and 'runtime-state' events,
+            // which requires nr-assistant version 0.10.1 or later.
+            return state.editorState?.flowsLoaded || state.editorState?.runtimeState?.state === 'start'
+        }
+    },
+    actions: {
+        async handleMessage (payload) {
+            if (!this.allowedInboundOrigins.includes(payload.origin)) {
+                console.warn('Received message from unknown origin. Ignoring.')
+                return
+            }
+
+            switch (true) {
+            case payload.data.type === 'assistant-ready':
+                this.version = payload.data.version
+                this.palette = payload.data.palette ?? {}
+                this.assistantFeatures = payload.data.features
+                this.nodeRedVersion = payload.data.nodeRedVersion
+                this.setRegisteredEventProperty({
+                    registeredEvent: eventsRegistry['registry:updates-available'],
+                    eventData: payload.data.nodeRedUpdatesAvailable
+                })
+                this.requestSupportedActions()
+                this.requestSelectedNodes()
+                this.registerEventListeners()
+                this.requestPalette()
+                return await this.confirmExpertReady()
+            case typeof eventsRegistry[payload.data.type] === 'object':
+                return this.setRegisteredEventProperty({
+                    registeredEvent: eventsRegistry[payload.data.type],
+                    eventData: payload.data.eventData
+                })
+            case payload.data.type === 'get-assistant-version':
+                return this.setVersion(payload.data.version)
+            case payload.data.type === 'get-supported-actions':
+                return this.setSupportedActions(payload.data.supportedActions)
+            case payload.data.type === 'set-palette':
+                return this.setPalette(payload.data.palette)
+            case payload.data.type === 'set-assistant-features':
+                return this.setFeatures(payload.data.features)
+            case payload.data.type === 'set-selection':
+                return this.setSelectedNodes(payload.data.selection)
+            // case payload.data.type === 'debug-log-entry':
+            case payload.data.type === 'debug-log-context-add':
+                return this.addDebugLogContext(payload.data.debugLog)
+            case payload.data.type === 'debug-log-context-remove':
+                return this.removeDebugLogContext(payload.data.debugLog)
+            case payload.data.type === 'debug-log-context-clear':
+                return this.resetDebugLogContext()
+            default:
+                // do nothing
+            }
+        },
+        async confirmExpertReady () {
+            return this.sendMessage({
+                type: 'expert-ready',
+                params: { supportedFeatures }
+            })
+        },
+        /**
+         * Sends the list of registered debug log entries to the assistant, to sync
+         * the state of debug log context between Node-RED and the expert.
+         */
+        async sendDebugLogRegister () {
+            const register = this.debugLogEntries.map(entry => entry.uuid)
+            return this.sendMessage({
+                type: 'debug-log-context-registered',
+                params: { register }
+            })
+        },
+        /**
+         * Requests the debug log entries that are currently visible in the debug sidebar.
+         * NOTE: This first clears the current debug log context in state so that incoming entries replace the current context instead of adding to it.
+         */
+        async requestDebugLogContextVisibleEntries () {
+            this.debugLogEntries = []
+            return this.sendMessage({
+                type: 'debug-log-context-get-entries',
+                params: { visibleOnly: true, fatal: true, error: true, warn: true, info: true, debug: true, trace: false }
+            })
+        },
+        /**
+         * Requests the debug log entries that are currently visible in the debug sidebar, but only errors and fatals.
+         * NOTE: This first clears the current debug log context in state so that incoming entries replace the current context instead of adding to it.
+         */
+        async requestDebugLogContextVisibleErrorEntries () {
+            this.debugLogEntries = []
+            return this.sendMessage({
+                type: 'debug-log-context-get-entries',
+                params: { visibleOnly: true, fatal: true, error: true, warn: false, info: false, debug: false, trace: false }
+            })
+        },
+        async requestVersion () {
+            return this.sendMessage('get-assistant-version')
+        },
+        async requestSupportedActions () {
+            return this.sendMessage({ type: 'get-supported-actions' })
+        },
+        async requestPalette () {
+            return this.sendMessage({ type: 'get-palette' })
+        },
+        async requestSelectedNodes () {
+            return this.sendMessage({ type: 'get-selection' })
+        },
+        async registerEventListeners () {
+            return this.sendMessage({
+                type: 'register-event-listeners',
+                params: eventsRegistry
+            })
+        },
+        setRegisteredEventProperty ({ registeredEvent, eventData }) {
+            const propertyBag = registeredEvent.propertyBag
+            if (!propertyBag || !Object.prototype.hasOwnProperty.call(this, propertyBag)) {
+                return
+            }
+            const propertyName = registeredEvent.propertyName
+            if (!propertyName) {
+                return
+            }
+            const propertyValue = registeredEvent.useEventData === true ? eventData : registeredEvent.propertyValue
+            this[propertyBag][propertyName] = propertyValue
+        },
+        setVersion (version) {
+            this.version = version
+        },
+        setSupportedActions (supportedActions) {
+            this.supportedActions = supportedActions
+        },
+        setFeatures (features) {
+            this.assistantFeatures = features
+        },
+        setPalette (palette) {
+            this.palette = palette ?? {}
+        },
+        async setSelectedNodes (selection) {
+            this.selectedNodes = selection
+        },
+        async setSelectedContext (context) {
+            this.selectedContext = context || []
+        },
+        async addDebugLogContext (debugLog) {
+            if (!debugLog) {
+                return
+            }
+            const entries = (Array.isArray(debugLog) ? debugLog : [debugLog]).filter(Boolean)
+            if (entries.length === 0) {
+                return
+            }
+            // so long as the uuid of the entry is not already present, add it.
+            entries.forEach(e => {
+                if (!this.debugLogEntries.some(logEntry => logEntry.uuid === e.uuid)) {
+                    this.debugLogEntries.push(e) // push will add to the end of the array, which is the most recent entries at the end
+                }
+            })
+            // remove any excess entries beyond the max, keeping the most recent ones
+            if (this.debugLogEntries.length > MAX_DEBUG_LOG_ENTRIES) {
+                this.debugLogEntries.splice(0, this.debugLogEntries.length - MAX_DEBUG_LOG_ENTRIES) // splice will remove the oldest entries at the start of the array
+            }
+            this.sendDebugLogRegister() // sync node-red state with expert state after adding new entries
+        },
+        async removeDebugLogContext (debugLog) {
+            if (!debugLog) {
+                return
+            }
+            const entries = (Array.isArray(debugLog) ? debugLog : [debugLog]).filter(Boolean)
+            if (entries.length === 0) {
+                return
+            }
+            // for each entry, get the uuid and find the matching log entry & remove it
+            entries.forEach(e => {
+                const index = this.debugLogEntries.findIndex(logEntry => logEntry.uuid === e.uuid)
+                if (index !== -1) {
+                    this.debugLogEntries.splice(index, 1)
+                }
+            })
+            this.sendDebugLogRegister() // sync node-red state with expert state after removing entries
+        },
+        async resetDebugLogContext () {
+            this.debugLogEntries = []
+            this.sendDebugLogRegister() // sync node-red state with expert state after clearing entries
+        },
+        reset () {
+            this.$reset()
+        },
+        resetContextSelection () {
+            this.selectedContext = this.availableContextOptions
+        },
+        async invokeAction ({ action, params }) {
+            return this.sendMessage({
+                type: 'invoke-action',
+                action,
+                params
+            })
+        },
+        async sendFlowsToImport (flowsJson) {
+            return this.sendMessage({
+                type: 'invoke-action',
+                action: 'custom:import-flow',
+                params: {
+                    flow: flowsJson // parameters to go with the action
+                }
+            })
+        },
+        async installNodePackage (packageName) {
+            return this.sendMessage({
+                type: 'invoke-action',
+                action: 'core:manage-palette',
+                params: {
+                    view: 'install',
+                    filter: packageName
+                }
+            })
+        },
+        async manageNodePackage (packageName) {
+            return this.sendMessage({
+                type: 'invoke-action',
+                action: 'core:manage-palette',
+                params: {
+                    view: 'nodes',
+                    filter: packageName
+                }
+            })
+        },
+        sendMessage (payload) {
+            const service = messagingService()
+            return service.sendMessage({
+                message: {
+                    ...payload,
+                    ...this.scope
+                },
+                target: window.frames['immersive-editor-iframe'],
+                targetOrigin: this.immersiveInstance?.url
+            })
+        }
+    }
+})
diff --git a/test/unit/frontend/stores/product-assistant.spec.js b/test/unit/frontend/stores/product-assistant.spec.js
new file mode 100644
index 0000000000..21cd24e3f6
--- /dev/null
+++ b/test/unit/frontend/stores/product-assistant.spec.js
@@ -0,0 +1,398 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useContextStore } from '@/stores/context.js'
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+
+vi.mock('@/services/messaging.service.js', () => ({
+    default: () => ({
+        sendMessage: vi.fn().mockResolvedValue(undefined)
+    })
+}))
+
+describe('product-assistant store', () => {
+    beforeEach(() => {
+        setActivePinia(createPinia())
+    })
+
+    describe('initial state', () => {
+        it('initializes with null version', () => {
+            const store = useProductAssistantStore()
+            expect(store.version).toBeNull()
+        })
+
+        it('initializes nodeRedVersion as null', () => {
+            const store = useProductAssistantStore()
+            expect(store.nodeRedVersion).toBeNull()
+        })
+
+        it('initializes selectedNodes as empty array', () => {
+            const store = useProductAssistantStore()
+            expect(store.selectedNodes).toEqual([])
+        })
+
+        it('initializes supportedActions as empty object', () => {
+            const store = useProductAssistantStore()
+            expect(store.supportedActions).toEqual({})
+        })
+
+        it('initializes palette as empty object', () => {
+            const store = useProductAssistantStore()
+            expect(store.palette).toEqual({})
+        })
+
+        it('initializes debugLogEntries as empty array', () => {
+            const store = useProductAssistantStore()
+            expect(store.debugLogEntries).toEqual([])
+        })
+
+        it('initializes selectedContext with palette option (no onSelectAction items)', () => {
+            const store = useProductAssistantStore()
+            expect(store.selectedContext.every(opt => !opt.onSelectAction)).toBe(true)
+        })
+
+        it('initializes editorState with all boolean properties false', () => {
+            const store = useProductAssistantStore()
+            expect(store.editorState.editorOpen).toBe(false)
+            expect(store.editorState.searchOpen).toBe(false)
+            expect(store.editorState.flowsLoaded).toBe(false)
+        })
+    })
+
+    describe('getters', () => {
+        describe('immersiveInstance', () => {
+            it('returns null when context store has no instance', () => {
+                const store = useProductAssistantStore()
+                expect(store.immersiveInstance).toBeNull()
+            })
+
+            it('returns the instance from the context store', () => {
+                const contextStore = useContextStore()
+                const store = useProductAssistantStore()
+                const mockInstance = { id: 'inst-1', url: 'http://localhost:1880' }
+                contextStore.setInstance(mockInstance)
+                expect(store.immersiveInstance).toEqual(mockInstance)
+            })
+        })
+
+        describe('immersiveDevice', () => {
+            it('returns null when context store has no device', () => {
+                const store = useProductAssistantStore()
+                expect(store.immersiveDevice).toBeNull()
+            })
+
+            it('returns the device from the context store', () => {
+                const contextStore = useContextStore()
+                const store = useProductAssistantStore()
+                const mockDevice = { id: 'dev-1', editor: { url: 'http://device.local' } }
+                contextStore.setDevice(mockDevice)
+                expect(store.immersiveDevice).toEqual(mockDevice)
+            })
+        })
+
+        describe('hasUserSelection', () => {
+            it('returns false when selectedNodes is empty', () => {
+                const store = useProductAssistantStore()
+                expect(store.hasUserSelection).toBe(false)
+            })
+
+            it('returns true when selectedNodes has entries', () => {
+                const store = useProductAssistantStore()
+                store.selectedNodes = [{ id: 'node-1' }]
+                expect(store.hasUserSelection).toBe(true)
+            })
+        })
+
+        describe('isFeaturePaletteEnabled', () => {
+            it('returns true by default', () => {
+                const store = useProductAssistantStore()
+                expect(store.isFeaturePaletteEnabled).toBe(true)
+            })
+
+            it('returns false when assistantFeatures disables get-palette command', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { commands: { 'get-palette': { enabled: false } } }
+                expect(store.isFeaturePaletteEnabled).toBe(false)
+            })
+
+            it('returns false when assistantFeatures disables paletteManagement', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { paletteManagement: { enabled: false } }
+                expect(store.isFeaturePaletteEnabled).toBe(false)
+            })
+        })
+
+        describe('isFeatureDebugLogContextEnabled', () => {
+            it('returns false when assistantFeatures has no debugLogContext', () => {
+                const store = useProductAssistantStore()
+                expect(store.isFeatureDebugLogContextEnabled).toBe(false)
+            })
+
+            it('returns false when nodeRedVersion is below 4.1.6', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { debugLogContext: { enabled: true } }
+                store.nodeRedVersion = '4.1.5'
+                expect(store.isFeatureDebugLogContextEnabled).toBe(false)
+            })
+
+            it('returns true when debugLogContext enabled and nodeRedVersion >= 4.1.6', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { debugLogContext: { enabled: true } }
+                store.nodeRedVersion = '4.1.6'
+                expect(store.isFeatureDebugLogContextEnabled).toBe(true)
+            })
+        })
+
+        describe('debugLog', () => {
+            it('returns null when debug log context feature is disabled', () => {
+                const store = useProductAssistantStore()
+                // feature disabled by default (no assistantFeatures set)
+                expect(store.debugLog).toBeNull()
+            })
+
+            it('returns entries when feature is enabled', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { debugLogContext: { enabled: true } }
+                store.nodeRedVersion = '4.1.6'
+                store.debugLogEntries = [{ uuid: 'a', msg: 'test' }]
+                expect(store.debugLog).toEqual([{ uuid: 'a', msg: 'test' }])
+            })
+        })
+
+        describe('paletteContribOnly', () => {
+            it('returns palette without node-red key', () => {
+                const store = useProductAssistantStore()
+                store.palette = { 'node-red': { version: '4.0.0' }, 'my-package': { version: '1.0.0' } }
+                expect(store.paletteContribOnly).not.toHaveProperty('node-red')
+                expect(store.paletteContribOnly).toHaveProperty('my-package')
+            })
+
+            it('returns null when palette feature is disabled', () => {
+                const store = useProductAssistantStore()
+                store.assistantFeatures = { paletteManagement: { enabled: false } }
+                expect(store.paletteContribOnly).toBeNull()
+            })
+        })
+
+        describe('allowedInboundOrigins', () => {
+            it('always includes window.origin', () => {
+                const store = useProductAssistantStore()
+                expect(store.allowedInboundOrigins).toContain(window.origin)
+            })
+
+            it('includes instance url when instance is set', () => {
+                const contextStore = useContextStore()
+                const store = useProductAssistantStore()
+                contextStore.setInstance({ id: 'inst-1', url: 'http://node-red.local' })
+                expect(store.allowedInboundOrigins).toContain('http://node-red.local')
+            })
+
+            it('includes device editor url when device is set', () => {
+                const contextStore = useContextStore()
+                const store = useProductAssistantStore()
+                contextStore.setDevice({ id: 'dev-1', editor: { url: 'http://device.local' } })
+                expect(store.allowedInboundOrigins).toContain('http://device.local')
+            })
+        })
+
+        describe('isEditorRunning', () => {
+            it('returns false by default', () => {
+                const store = useProductAssistantStore()
+                expect(store.isEditorRunning).toBe(false)
+            })
+
+            it('returns true when flowsLoaded is true', () => {
+                const store = useProductAssistantStore()
+                store.editorState.flowsLoaded = true
+                expect(store.isEditorRunning).toBe(true)
+            })
+
+            it('returns true when runtimeState is start', () => {
+                const store = useProductAssistantStore()
+                store.editorState.runtimeState = { state: 'start' }
+                expect(store.isEditorRunning).toBe(true)
+            })
+        })
+    })
+
+    describe('actions', () => {
+        describe('setVersion', () => {
+            it('sets the version', () => {
+                const store = useProductAssistantStore()
+                store.setVersion('1.2.3')
+                expect(store.version).toBe('1.2.3')
+            })
+        })
+
+        describe('setSupportedActions', () => {
+            it('sets supportedActions', () => {
+                const store = useProductAssistantStore()
+                store.setSupportedActions({ 'custom:import-flow': true })
+                expect(store.supportedActions).toEqual({ 'custom:import-flow': true })
+            })
+        })
+
+        describe('setFeatures', () => {
+            it('sets assistantFeatures', () => {
+                const store = useProductAssistantStore()
+                store.setFeatures({ paletteManagement: { enabled: true } })
+                expect(store.assistantFeatures).toEqual({ paletteManagement: { enabled: true } })
+            })
+        })
+
+        describe('setPalette', () => {
+            it('sets palette', () => {
+                const store = useProductAssistantStore()
+                store.setPalette({ 'my-node': { version: '1.0.0' } })
+                expect(store.palette).toEqual({ 'my-node': { version: '1.0.0' } })
+            })
+
+            it('defaults to empty object when null is passed', () => {
+                const store = useProductAssistantStore()
+                store.setPalette(null)
+                expect(store.palette).toEqual({})
+            })
+        })
+
+        describe('setSelectedNodes', () => {
+            it('sets selectedNodes', async () => {
+                const store = useProductAssistantStore()
+                await store.setSelectedNodes([{ id: 'n1' }])
+                expect(store.selectedNodes).toEqual([{ id: 'n1' }])
+            })
+        })
+
+        describe('setSelectedContext', () => {
+            it('sets selectedContext', async () => {
+                const store = useProductAssistantStore()
+                await store.setSelectedContext([{ value: 'palette' }])
+                expect(store.selectedContext).toEqual([{ value: 'palette' }])
+            })
+
+            it('defaults to empty array when null is passed', async () => {
+                const store = useProductAssistantStore()
+                await store.setSelectedContext(null)
+                expect(store.selectedContext).toEqual([])
+            })
+        })
+
+        describe('addDebugLogContext', () => {
+            it('adds a log entry', async () => {
+                const store = useProductAssistantStore()
+                await store.addDebugLogContext({ uuid: 'a', msg: 'hello' })
+                expect(store.debugLogEntries).toHaveLength(1)
+                expect(store.debugLogEntries[0].uuid).toBe('a')
+            })
+
+            it('does not add duplicate uuids', async () => {
+                const store = useProductAssistantStore()
+                await store.addDebugLogContext({ uuid: 'a', msg: 'hello' })
+                await store.addDebugLogContext({ uuid: 'a', msg: 'hello again' })
+                expect(store.debugLogEntries).toHaveLength(1)
+            })
+
+            it('accepts an array of entries', async () => {
+                const store = useProductAssistantStore()
+                await store.addDebugLogContext([{ uuid: 'a' }, { uuid: 'b' }])
+                expect(store.debugLogEntries).toHaveLength(2)
+            })
+
+            it('does nothing when passed null', async () => {
+                const store = useProductAssistantStore()
+                await store.addDebugLogContext(null)
+                expect(store.debugLogEntries).toHaveLength(0)
+            })
+
+            it('caps entries at 100', async () => {
+                const store = useProductAssistantStore()
+                const entries = Array.from({ length: 105 }, (_, i) => ({ uuid: `entry-${i}` }))
+                await store.addDebugLogContext(entries)
+                expect(store.debugLogEntries).toHaveLength(100)
+                // oldest entries are removed — entry-0 through entry-4 should be gone
+                expect(store.debugLogEntries[0].uuid).toBe('entry-5')
+            })
+        })
+
+        describe('removeDebugLogContext', () => {
+            it('removes an entry by uuid', async () => {
+                const store = useProductAssistantStore()
+                store.debugLogEntries = [{ uuid: 'a' }, { uuid: 'b' }]
+                await store.removeDebugLogContext({ uuid: 'a' })
+                expect(store.debugLogEntries).toEqual([{ uuid: 'b' }])
+            })
+
+            it('does nothing when uuid not found', async () => {
+                const store = useProductAssistantStore()
+                store.debugLogEntries = [{ uuid: 'a' }]
+                await store.removeDebugLogContext({ uuid: 'z' })
+                expect(store.debugLogEntries).toHaveLength(1)
+            })
+
+            it('does nothing when passed null', async () => {
+                const store = useProductAssistantStore()
+                store.debugLogEntries = [{ uuid: 'a' }]
+                await store.removeDebugLogContext(null)
+                expect(store.debugLogEntries).toHaveLength(1)
+            })
+        })
+
+        describe('resetDebugLogContext', () => {
+            it('clears all debug log entries', async () => {
+                const store = useProductAssistantStore()
+                store.debugLogEntries = [{ uuid: 'a' }, { uuid: 'b' }]
+                await store.resetDebugLogContext()
+                expect(store.debugLogEntries).toEqual([])
+            })
+        })
+
+        describe('reset', () => {
+            it('resets state back to initial values', () => {
+                const store = useProductAssistantStore()
+                store.version = '2.0.0'
+                store.nodeRedVersion = '4.1.6'
+                store.selectedNodes = [{ id: 'n1' }]
+                store.reset()
+                expect(store.version).toBeNull()
+                expect(store.nodeRedVersion).toBeNull()
+                expect(store.selectedNodes).toEqual([])
+            })
+        })
+
+        describe('setRegisteredEventProperty', () => {
+            it('sets a boolean editorState property', () => {
+                const store = useProductAssistantStore()
+                store.setRegisteredEventProperty({
+                    registeredEvent: {
+                        propertyBag: 'editorState',
+                        propertyName: 'editorOpen',
+                        propertyValue: true
+                    },
+                    eventData: null
+                })
+                expect(store.editorState.editorOpen).toBe(true)
+            })
+
+            it('uses eventData when useEventData is true', () => {
+                const store = useProductAssistantStore()
+                store.setRegisteredEventProperty({
+                    registeredEvent: {
+                        propertyBag: 'editorState',
+                        propertyName: 'runtimeState',
+                        propertyValue: null,
+                        useEventData: true
+                    },
+                    eventData: { state: 'start' }
+                })
+                expect(store.editorState.runtimeState).toEqual({ state: 'start' })
+            })
+
+            it('does nothing when propertyBag does not exist on store', () => {
+                const store = useProductAssistantStore()
+                expect(() => store.setRegisteredEventProperty({
+                    registeredEvent: { propertyBag: 'nonExistent', propertyName: 'foo', propertyValue: true },
+                    eventData: null
+                })).not.toThrow()
+            })
+        })
+    })
+})