@flowfuse/nr-assistant 0.6.1-f938e50-202512021006.0 → 0.6.1-fd37d56-202512091447.0

package/README.md

@@ -1,9 +1,10 @@
-# FlowFuse Node-RED Assistant
+# FlowFuse Node-RED Expert Plugin
 
-A Node-RED plugin to assist FlowFuse users.
+A plugin to bring AI assistance to your Node-RED flow building.
 
+This plugin is preinstalled in Node-RED instances hosted and managed by the FlowFuse platform.
 
-**This plugin can only be used within FlowFuse-managed Node-RED instances.**
+It can also be installed locally for use outside of FlowFuse - but does require a FlowFuse Cloud user account.
 
 FlowFuse is the Industrial application platform for building and operating custom industrial solutions that digitalize processes and operations. It integrates seamlessly into both IT and OT environments, leveraging Node-RED to enable teams to connect, collect, transform, and visualize data from industrial systems. Companies use FlowFuse to manage, scale, and secure their Node-RED-based applications across industrial environments.
 
@@ -36,7 +37,6 @@ This plugin is designed to assist users of the FlowFuse platform by providing to
 
 
 ### Inline Code Completions
-NOTE: This feature will be limited to pro and enterprise tiers.
 
 #### functions
 ![flowfuse-assistant-inline-function-completions](https://github.com/user-attachments/assets/487b07be-861b-48d1-88c7-22c9cebffefa)
@@ -57,29 +57,6 @@ npm install @flowfuse/nr-assistant
 
 Client-side portion of the plugin is in `index.html`. The server side code is in `index.js`
 
-
-## NOTES:
-
-* Requires the settings.js file to contain the following:
-
-```json
-{
-    "flowforge": {
-        "assistant": {
-            "enabled": true,
-            "url": "https://", // URL of the AI service
-            "token": "", // API token for the AI service
-            "requestTimeout": 60000 // Timeout value for the AI service request
-        }
-    }
-}
-```
-
-These values are automatically set when running within the FlowFuse platform via the `nr-launcher` component.
-
-The `url` and `token` are for an AI service hosted by FlowFuse; it is not publicly available for use outside of the FlowFuse platform.
-
-
 ## Limitations
 
 ### Function Builder

package/completions.html

@@ -91,7 +91,7 @@
                 debug('prediction', typeSearchSuggestions)
                 return typeSearchSuggestions || []
             },
-            name: 'Node-RED Assistant Completions',
+            name: 'Node-RED Expert Completions',
             icon: 'font-awesome/fa-magic',
             onadd: async function () {
                 if (!window.FFAssistantUtils) {

package/index.html

@@ -50,7 +50,6 @@
         let initialisedInterlock = false
         let mcpReadyInterlock = false
         let assistantInitialised = false
-        let mcpReady = false
         debug('Loading Node-RED Assistant Plugin...')
         const plugin = {
             type: 'assistant',
@@ -62,20 +61,18 @@
                 }
                 RED.comms.subscribe('nr-assistant/#', (topic, msg) => {
                     debug('comms', topic, msg)
-                    if (topic === 'nr-assistant/initialise' && !initialisedInterlock) {
-                        initialisedInterlock = true
+                    if (topic === 'nr-assistant/initialise') {
+                        assistantOptions.standalone = !!msg?.standalone
                         assistantOptions.enabled = !!msg?.enabled
                         assistantOptions.requestTimeout = msg?.requestTimeout || AI_TIMEOUT
                         assistantOptions.tablesEnabled = msg?.tablesEnabled === true
                         assistantOptions.inlineCompletionsEnabled = msg?.inlineCompletionsEnabled === true
                         initAssistant(msg)
-                        RED.actions.add('flowfuse-nr-assistant:function-builder', showFunctionBuilderPrompt, { label: '@flowfuse/nr-assistant/flowfuse-nr-assistant:function-builder.action.label' })
-                        setMenuShortcutKey('ff-assistant-function-builder', 'red-ui-workspace', 'ctrl-alt-f', 'flowfuse-nr-assistant:function-builder')
                     }
-                    if (topic === 'nr-assistant/mcp/ready' && !mcpReadyInterlock) {
-                        mcpReadyInterlock = true
-                        mcpReady = !!msg?.enabled && assistantOptions.enabled
-                        if (mcpReady) {
+                    if (topic === 'nr-assistant/mcp/ready') {
+                        if (!mcpReadyInterlock && !!msg?.enabled) {
+                            mcpReadyInterlock = true
+                            // Complete first time setup
                             debug('assistant MCP initialised')
                             RED.actions.add('flowfuse-nr-assistant:explain-flows', explainSelectedNodes, { label: '@flowfuse/nr-assistant/flowfuse-nr-assistant:explain-flows.action.label' })
                             const menuEntry = {
@@ -89,6 +86,12 @@
                             }
                             RED.menu.addItem('red-ui-header-button-ff-ai', menuEntry)
                             setMenuShortcutKey('ff-assistant-explain-flows', 'red-ui-workspace', 'ctrl-alt-e', 'flowfuse-nr-assistant:explain-flows')
+                        } else if (mcpReadyInterlock) {
+                            if (msg?.enabled) {
+                                RED.menu.setVisible('ff-assistant-explain-flows', true)
+                            } else {
+                                RED.menu.setVisible('ff-assistant-explain-flows', false)
+                            }
                         }
                     }
                 })
@@ -96,21 +99,117 @@
         }
         RED.plugins.registerPlugin('flowfuse-nr-assistant', plugin)
 
+        function createAssistantMenu () {
+            const toolbarMenuButton = $('<li><a id="red-ui-header-button-ff-ai" class="button" href="#"></a></li>')
+            const toolbarMenuButtonAnchor = toolbarMenuButton.find('a')
+            const deployButtonLi = $('#red-ui-header-button-deploy').closest('li')
+            if (deployButtonLi.length) {
+                deployButtonLi.before(toolbarMenuButton) // add the button before the deploy button
+            } else {
+                toolbarMenuButton.prependTo('.red-ui-header-toolbar') // add the button leftmost of the toolbar
+            }
+            RED.popover.tooltip(toolbarMenuButtonAnchor, plugin._('name'))
+
+            /* NOTE: For the menu entries icons' property...
+               If `.icon` is a URL (e.g. resource/xxx/icon.svg), the RED.menu API will add it as an <img> tag.
+               That makes it impossible to set the fill colour of the SVG PATH via a CSS var.
+               So, by not specifying an icon URL, an <i> tag with the class set to <icon> will be created by the API
+               This permits us to use CSS classes (defined below) that can set the icon and affect the fill colour
+            */
+            debug('Building FlowFuse Expert menu')
+
+            const ffAssistantMenu = [
+                { id: 'ff-assistant-title', label: plugin._('name'), visible: true }, // header
+                null // separator
+            ]
+            RED.menu.init({ id: 'red-ui-header-button-ff-ai', options: ffAssistantMenu })
+        }
+        function showLoginPrompt () {
+            $.ajax({
+                contentType: 'application/json',
+                url: 'nr-assistant/auth/start',
+                method: 'POST',
+                data: JSON.stringify({
+                    editorURL: window.location.origin + window.location.pathname
+                })
+            }).then(data => {
+                if (data && data.path && data.state) {
+                    const handleAuthCallback = function (evt) {
+                        debug('handleAuthCallback', evt)
+                        try {
+                            const message = JSON.parse(evt.data)
+                            if (message.code === 'flowfuse-auth-complete') {
+                                showNotification('Connected to FlowFuse', { type: 'success' })
+                                if (message.state === data.state) {
+                                    RED.menu.setVisible('ff-assistant-login', false)
+                                    RED.menu.setVisible('ff-assistant-function-builder', true)
+                                }
+                            } else if (message.code === 'flowfuse-auth-error') {
+                                showNotification('Failed to connect to FlowFuse', { type: 'error' })
+                                console.warn('Failed to connect to FlowFuse:', message.error)
+                            }
+                        } catch (err) {}
+                        window.removeEventListener('message', handleAuthCallback, false)
+                    }
+                    window.open(document.location.toString().replace(/[?#].*$/, '') + data.path, 'FlowFuseNodeREDPluginAuthWindow', 'menubar=no,location=no,toolbar=no,chrome,height=650,width=500')
+                    window.addEventListener('message', handleAuthCallback, false)
+                } else if (data && data.error) {
+                    RED.notify(`Failed to connect to server: ${data.error}`, { type: 'error' })
+                }
+            })
+        }
         function initAssistant (options) {
-            if (assistantInitialised) {
-                return
+            debug('initialising...', assistantOptions)
+            if (!initialisedInterlock) {
+                // Initialiise common UI elements
+                initialisedInterlock = true
+                createAssistantMenu()
+                if (assistantOptions.standalone) {
+                    RED.menu.addItem('red-ui-header-button-ff-ai', {
+                        id: 'ff-assistant-login',
+                        label: `<span>${plugin._('login.menu.label')}</span>`,
+                        onselect: showLoginPrompt,
+                        visible: !assistantOptions.enabled
+                    })
+                }
+                RED.menu.addItem('red-ui-header-button-ff-ai', {
+                    id: 'ff-assistant-function-builder',
+                    icon: 'ff-assistant-menu-icon function',
+                    label: `<span>${plugin._('function-builder.menu.label')}</span>`,
+                    sublabel: plugin._('function-builder.menu.description'),
+                    onselect: 'flowfuse-nr-assistant:function-builder',
+                    shortcutSpan: $('<span class="red-ui-popover-key"></span>'),
+                    visible: assistantOptions.enabled
+                })
             }
-            debug('initialising...')
+
             if (!assistantOptions.enabled) {
+                if (assistantOptions.standalone) {
+                    RED.menu.setVisible('ff-assistant-login', true)
+                }
+                RED.menu.setVisible('ff-assistant-function-builder', false)
                 console.warn(plugin._('errors.assistant-not-enabled'))
                 return
+            } else {
+                if (assistantOptions.standalone) {
+                    RED.menu.setVisible('ff-assistant-login', false)
+                }
+                RED.menu.setVisible('ff-assistant-function-builder', true)
+            }
+
+            if (!assistantInitialised) {
+                registerMonacoExtensions()
+                RED.actions.add('flowfuse-nr-assistant:function-builder', showFunctionBuilderPrompt, { label: '@flowfuse/nr-assistant/flowfuse-nr-assistant:function-builder.action.label' })
+                setMenuShortcutKey('ff-assistant-function-builder', 'red-ui-workspace', 'ctrl-alt-f', 'flowfuse-nr-assistant:function-builder')
+                assistantInitialised = true
             }
+        }
 
+        function registerMonacoExtensions () {
             if (!window.monaco) {
                 console.warn('Monaco editor not found. Unable to register code lens provider. Consider using the Monaco editor for a better experience.')
                 return
             }
-
             const funcCommandId = 'nr-assistant-fn-inline'
             const jsonCommandId = 'nr-assistant-json-inline'
             const cssCommandId = 'nr-assistant-css-inline'
@@ -121,6 +220,9 @@
 
             monaco.languages.registerCodeLensProvider('javascript', {
                 provideCodeLenses: function (model, token) {
+                    if (!assistantOptions.enabled) {
+                        return
+                    }
                     const thisEditor = getMonacoEditorForModel(model)
                     if (!thisEditor) {
                         return
@@ -168,8 +270,8 @@
                     }
                     codeLens.command = {
                         id: codeLens.id,
-                        title: 'Ask the FlowFuse Assistant 🪄',
-                        tooltip: 'Click to ask FlowFuse Assistant for help writing code',
+                        title: 'Ask the FlowFuse Expert 🪄',
+                        tooltip: 'Click to ask FlowFuse Expert for help writing code',
                         arguments: [model, codeLens, token]
                     }
                     return codeLens
@@ -178,6 +280,9 @@
 
             monaco.languages.registerCodeLensProvider('json', {
                 provideCodeLenses: function (model, token) {
+                    if (!assistantOptions.enabled) {
+                        return
+                    }
                     const thisEditor = getMonacoEditorForModel(model)
                     if (!thisEditor) {
                         return
@@ -203,8 +308,8 @@
                     }
                     codeLens.command = {
                         id: codeLens.id,
-                        title: 'Ask the FlowFuse Assistant 🪄',
-                        tooltip: 'Click to ask FlowFuse Assistant for help with JSON',
+                        title: 'Ask the FlowFuse Expert 🪄',
+                        tooltip: 'Click to ask FlowFuse Expert for help with JSON',
                         arguments: [model, codeLens, token]
                     }
                     return codeLens
@@ -213,6 +318,9 @@
 
             monaco.languages.registerCodeLensProvider('css', {
                 provideCodeLenses: function (model, token) {
+                    if (!assistantOptions.enabled) {
+                        return
+                    }
                     debug('CSS CodeLens provider called', model, token)
                     const thisEditor = getMonacoEditorForModel(model)
                     const node = RED.view.selection()?.nodes?.[0]
@@ -242,8 +350,8 @@
                     }
                     codeLens.command = {
                         id: codeLens.id,
-                        title: 'Ask the FlowFuse Assistant 🪄',
-                        tooltip: 'Click to ask FlowFuse Assistant for help with CSS',
+                        title: 'Ask the FlowFuse Expert 🪄',
+                        tooltip: 'Click to ask FlowFuse Expert for help with CSS',
                         arguments: [model, codeLens, token]
                     }
                     return codeLens
@@ -252,6 +360,9 @@
 
             monaco.languages.registerCodeLensProvider('html', {
                 provideCodeLenses: function (model, token) {
+                    if (!assistantOptions.enabled) {
+                        return
+                    }
                     debug('HTML CodeLens provider called', model, token)
                     const thisEditor = getMonacoEditorForModel(model)
                     if (!thisEditor) {
@@ -284,8 +395,8 @@
                     }
                     codeLens.command = {
                         id: codeLens.id,
-                        title: 'Ask the FlowFuse Assistant 🪄',
-                        tooltip: 'Click to ask FlowFuse Assistant for help with VUE or HTML',
+                        title: 'Ask the FlowFuse Expert 🪄',
+                        tooltip: 'Click to ask FlowFuse Expert for help with VUE or HTML',
                         arguments: [model, codeLens, token]
                     }
                     return codeLens
@@ -294,6 +405,9 @@
 
             assistantOptions.tablesEnabled && monaco.languages.registerCodeLensProvider('sql', {
                 provideCodeLenses: function (model, token) {
+                    if (!assistantOptions.enabled) {
+                        return
+                    }
                     debug('SQL CodeLens provider called', model, token)
                     const thisEditor = getMonacoEditorForModel(model)
                     if (!thisEditor) {
@@ -326,8 +440,8 @@
                     }
                     codeLens.command = {
                         id: codeLens.id,
-                        title: 'Ask the FlowFuse Assistant 🪄',
-                        tooltip: 'Click to ask FlowFuse Assistant for help with PostgreSQL',
+                        title: 'Ask the FlowFuse Expert 🪄',
+                        tooltip: 'Click to ask FlowFuse Expert for help with PostgreSQL',
                         arguments: [model, codeLens, token]
                     }
                     return codeLens
@@ -365,8 +479,8 @@
                     }
                     /** @type {PromptUIOptions} */
                     const uiOptions = {
-                        title: 'FlowFuse Assistant : Function Code',
-                        explanation: 'The FlowFuse Assistant can help you write JavaScript code.',
+                        title: 'FlowFuse Expert : Function Code',
+                        explanation: 'The FlowFuse Expert can help you write JavaScript code.',
                         description: 'Enter a short description of what you want it to do.'
                     }
                     doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
@@ -451,8 +565,8 @@
                     }
                     /** @type {PromptUIOptions} */
                     const uiOptions = {
-                        title: 'FlowFuse Assistant : JSON',
-                        explanation: 'The FlowFuse Assistant can help you write JSON.',
+                        title: 'FlowFuse Expert : JSON',
+                        explanation: 'The FlowFuse Expert can help you write JSON.',
                         description: 'Enter a short description of what you want it to do.'
                     }
                     doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
@@ -513,8 +627,8 @@
                     }
                     /** @type {PromptUIOptions} */
                     const uiOptions = {
-                        title: 'FlowFuse Assistant : CSS',
-                        explanation: 'The FlowFuse Assistant can help you write CSS.',
+                        title: 'FlowFuse Expert : CSS',
+                        explanation: 'The FlowFuse Expert can help you write CSS.',
                         description: 'Enter a short description of what you want it to do.'
                     }
                     doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
@@ -575,8 +689,8 @@
                     }
                     /** @type {PromptUIOptions} */
                     const uiOptions = {
-                        title: 'FlowFuse Assistant : Dashboard 2 UI Template',
-                        explanation: 'The FlowFuse Assistant can help you write HTML, VUE and JavaScript.',
+                        title: 'FlowFuse Expert : Dashboard 2 UI Template',
+                        explanation: 'The FlowFuse Expert can help you write HTML, VUE and JavaScript.',
                         description: 'Enter a short description of what you want it to do.'
                     }
                     doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
@@ -638,8 +752,8 @@
                     }
                     /** @type {PromptUIOptions} */
                     const uiOptions = {
-                        title: 'FlowFuse Assistant : FlowFuse Query',
-                        explanation: 'The FlowFuse Assistant can help you write SQL queries.',
+                        title: 'FlowFuse Expert : FlowFuse Query',
+                        explanation: 'The FlowFuse Expert can help you write SQL queries.',
                         description: 'Enter a short description of what you want it to do.'
                     }
                     doPrompt(node, thisEditor, promptOptions, uiOptions, (error, response) => {
@@ -946,7 +1060,9 @@
                         provideInlineCompletions: (model, position, context, token) =>
                             new Promise((resolve) => {
                                 debug('provideInlineCompletions: handling inline completion for languageId ' + languageId, position, context, token)
-
+                                if (!assistantOptions.enabled) {
+                                    return
+                                }
                                 // prep - get the editor and node, exit if not found or not supported
                                 const { editor, node } = getEditorAndNode(model)
                                 if (!editor || !node) { return }
@@ -1025,41 +1141,7 @@
                 }
                 supportedInlineCompletions.forEach(options => registerAIInlineCompletions(options))
             }
-
-            const toolbarMenuButton = $('<li><a id="red-ui-header-button-ff-ai" class="button" href="#"></a></li>')
-            const toolbarMenuButtonAnchor = toolbarMenuButton.find('a')
-            const deployButtonLi = $('#red-ui-header-button-deploy').closest('li')
-            if (deployButtonLi.length) {
-                deployButtonLi.before(toolbarMenuButton) // add the button before the deploy button
-            } else {
-                toolbarMenuButton.prependTo('.red-ui-header-toolbar') // add the button leftmost of the toolbar
-            }
-            RED.popover.tooltip(toolbarMenuButtonAnchor, plugin._('name'))
-
-            /* NOTE: For the menu entries icons' property...
-               If `.icon` is a URL (e.g. resource/xxx/icon.svg), the RED.menu API will add it as an <img> tag.
-               That makes it impossible to set the fill colour of the SVG PATH via a CSS var.
-               So, by not specifying an icon URL, an <i> tag with the class set to <icon> will be created by the API
-               This permits us to use CSS classes (defined below) that can set the icon and affect the fill colour
-            */
-            debug('Building FlowFuse Assistant menu')
-            const ffAssistantMenu = [
-                { id: 'ff-assistant-title', label: plugin._('name'), visible: true }, // header
-                null, // separator
-                {
-                    id: 'ff-assistant-function-builder',
-                    icon: 'ff-assistant-menu-icon function',
-                    label: `<span>${plugin._('function-builder.menu.label')}</span>`,
-                    sublabel: plugin._('function-builder.menu.description'),
-                    onselect: 'flowfuse-nr-assistant:function-builder',
-                    shortcutSpan: $('<span class="red-ui-popover-key"></span>'),
-                    visible: true
-                }
-            ]
-            RED.menu.init({ id: 'red-ui-header-button-ff-ai', options: ffAssistantMenu })
-            assistantInitialised = true
         }
-
         const previousPrompts = {}
 
         /**
@@ -1151,7 +1233,7 @@
 
         function getUserInput ({ title, explanation, description, placeholder, defaultInput } = {
             title: plugin._('name'),
-            explanation: 'The FlowFuse Assistant can help you create things.',
+            explanation: 'The FlowFuse Expert can help you create things.',
             description: 'Enter a short description explaining what you want it to do.',
             placeholder: '',
             defaultInput: ''
@@ -1200,7 +1282,7 @@
                     },
                     buttons: [
                         {
-                            text: 'Ask the FlowFuse Assistant 🪄',
+                            text: 'Ask the FlowFuse Expert 🪄',
                             // class: 'primary',
                             click: function () {
                                 const prompt = dialog.find('#ff-nr-ai-dialog-input-editor').val()
@@ -1225,7 +1307,7 @@
             }
             getUserInput({
                 defaultInput: previousFunctionBuilderPrompt,
-                title: title || 'FlowFuse Assistant : Create A Function Node',
+                title: title || 'FlowFuse Expert : Create A Function Node',
                 explanation: plugin._('function-builder.dialog-input.explanation'),
                 description: plugin._('function-builder.dialog-input.description')
             }).then((prompt) => {
@@ -1421,7 +1503,7 @@
                         const options = {
                             buttons: [{
                                 text: plugin._('explain-flows.dialog-result.close-button'),
-                                icon: 'ui-icon-close',
+                                // icon: 'ui-icon-close',
                                 class: 'primary',
                                 click: function () {
                                     $(dlg).dialog('close')
@@ -1435,7 +1517,7 @@
                                 options.buttons.unshift(
                                     {
                                         text: plugin._('explain-flows.dialog-result.copy-button'),
-                                        icon: 'ui-icon-copy',
+                                        // icon: 'ui-icon-copy',
                                         click: function () {
                                             navigator.clipboard.writeText(text).then(() => {
                                                 showNotification('Copied to clipboard', { type: 'success' })
@@ -1452,7 +1534,7 @@
                                 options.buttons.unshift(
                                     {
                                         text: plugin._('explain-flows.dialog-result.comment-node-button'),
-                                        icon: 'ui-icon-comment',
+                                        // icon: 'ui-icon-comment',
                                         // class: 'primary',
                                         click: function () {
                                             const commentNode = {
@@ -1502,8 +1584,8 @@
             }
             getUserInput({
                 defaultInput: previousFlowBuilderPrompt,
-                title: title || 'FlowFuse Assistant : Flow Builder',
-                explanation: 'The FlowFuse Assistant can help you create a new flow.',
+                title: title || 'FlowFuse Expert : Flow Builder',
+                explanation: 'The FlowFuse Expert can help you create a new flow.',
                 description: 'Enter a short description of what you want the flow to do.'
             }).then((prompt) => {
                 /** @type {JQueryXHR} */
@@ -1589,7 +1671,7 @@
         }
 
         /**
-         * Shows a busy notification with a cancel button
+         * Shows a notification
          * @param {string} message - The message to display in the notification
          * @param {object} [options] - The options to pass to the notification
          * @param {'error'|'warning'|'success'|'compact'} [options.type] - The type of notification to display
@@ -1663,25 +1745,25 @@
                     const minutes = Math.floor(seconds / 60)
                     const remainingSeconds = seconds % 60
                     if (minutes > 0) {
-                        RED.notify(`Sorry, the FlowFuse Assistant is busy. Please try again in ${minutes} minute${minutes > 1 ? 's' : ''}.`, 'warning')
+                        RED.notify(`Sorry, the FlowFuse Expert is busy. Please try again in ${minutes} minute${minutes > 1 ? 's' : ''}.`, 'warning')
                     } else {
-                        RED.notify(`Sorry, the FlowFuse Assistant is busy. Please try again in ${remainingSeconds} second${remainingSeconds > 1 ? 's' : ''}.`, 'warning')
+                        RED.notify(`Sorry, the FlowFuse Expert is busy. Please try again in ${remainingSeconds} second${remainingSeconds > 1 ? 's' : ''}.`, 'warning')
                     }
                     return
                 }
-                RED.notify('Sorry, the FlowFuse Assistant is busy. Please try again later.', 'warning')
+                RED.notify('Sorry, the FlowFuse Expert is busy. Please try again later.', 'warning')
                 return
             }
             if (jqXHR.status === 404) {
-                RED.notify('Sorry, the FlowFuse Assistant is not available at the moment', 'warning')
+                RED.notify('Sorry, the FlowFuse Expert is not available at the moment', 'warning')
                 return
             }
             if (jqXHR.status === 401) {
-                RED.notify('Sorry, you are not authorised to use the FlowFuse Assistant', 'warning')
+                RED.notify('Sorry, you are not authorised to use the FlowFuse Expert', 'warning')
                 return
             }
             if (jqXHR.status >= 400 && jqXHR.status < 500) {
-                let message = 'Sorry, the FlowFuse Assistant cannot help with this request'
+                let message = 'Sorry, the FlowFuse Expert cannot help with this request'
                 if (jqXHR.responseJSON?.body?.code === 'assistant_service_denied' && jqXHR.responseJSON?.body?.error) {
                     message = jqXHR.responseJSON.body.error
                 }
@@ -1907,7 +1989,7 @@
     #red-ui-header ul#red-ui-header-button-ff-ai-submenu.red-ui-menu-dropdown {
         width: 300px !important; /* make the submenu wider to prevent wrapping elements */
     }
-    #red-ui-header ul.red-ui-menu-dropdown li a {
+    #red-ui-header #red-ui-header-button-ff-ai+ul.red-ui-menu-dropdown li a {
         padding: 8px 16px;
     }
 

package/index.js

@@ -1,22 +1,30 @@
 module.exports = (RED) => {
     const assistant = require('./lib/assistant.js')
-
+    const settings = require('./lib/settings.js')
+    const auth = require('./lib/auth/index.js')
     RED.plugins.registerPlugin('flowfuse-nr-assistant', {
         type: 'assistant',
-        name: 'Node-RED Assistant Plugin',
+        name: 'Node-RED Expert Plugin',
         icon: 'font-awesome/fa-magic',
         settings: {
             '*': { exportable: true }
         },
-        onadd: function () {
-            const assistantSettings = require('./lib/settings.js').getSettings(RED)
-            if (!assistant.isInitialized && !assistant.isLoading) {
-                assistant.init(RED, assistantSettings).then(() => {
-                    // All good, the assistant is initialized.
-                    // Any info messages made during initialization are logged in the assistant module
-                }).catch((error) => {
-                    RED.log.error('Failed to initialize FlowFuse Assistant Plugin:', error)
-                })
+        onadd: async function () {
+            try {
+                await auth.init(RED)
+                const assistantSettings = await settings.getSettings(RED)
+                if (!assistant.isInitialized && !assistant.isLoading) {
+                    assistant.init(RED, assistantSettings).then(() => {
+                        // All good, the assistant is initialized.
+                        // Any info messages made during initialization are logged in the assistant module
+                    }).catch((error) => {
+                        console.error(error)
+                        RED.log.error('Failed to initialize FlowFuse Expert Plugin:', error)
+                    })
+                }
+            } catch (error) {
+                console.error(error)
+                RED.log.error('Failed to initialize FlowFuse Expert Plugin:', error)
             }
         }
     })