Merge branch 'main' into 6669-wrong-url-and-favicon

Author: Steve-Mcl

.github/workflows/branch-deploy.yaml

@@ -40,7 +40,7 @@ on:
       - 'docs/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.number }}
+  group: ${{ github.workflow }}-${{ github.event.number || inputs.pr_number }}
   cancel-in-progress: false
 
 env:
@@ -89,7 +89,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       inputs.driver_k8s_branch != 'main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: driver-k8s
       publish_package: true
@@ -106,7 +106,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       inputs.nr_project_nodes_branch != 'main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: nr-project-nodes
       publish_package: true
@@ -123,7 +123,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       inputs.nr_file_nodes_branch != 'main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: nr-file-nodes
       publish_package: true
@@ -140,7 +140,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       inputs.nr_assistant_branch != 'main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: nr-assistant
       publish_package: true
@@ -157,7 +157,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       inputs.nr_tables_nodes_branch != 'main'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: nr-tables-nodes
       publish_package: true
@@ -179,7 +179,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       (always() && inputs.nr_launcher_branch != 'main') || needs.publish_nr_project_nodes.result == 'success' || needs.publish_nr_file_nodes.result == 'success' || needs.publish_nr_assistant.result == 'success' || needs.publish_nr_tables_nodes.result == 'success'
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: flowfuse-nr-launcher
       publish_package: true
@@ -203,7 +203,7 @@ jobs:
       needs.validate-user.outputs.is_org_member == 'true' &&
       github.event_name == 'workflow_dispatch' &&
       (always() && needs.publish_nr_launcher.result == 'success')
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.47.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.48.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile
@@ -247,7 +247,7 @@ jobs:
 
       - name: Configure AWS credentials for ECR interaction
         id: aws-config
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
         with:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ env.AWS_ECR_PUSH_ROLE }}
           role-session-name: GithubActionsRoleSession
@@ -386,7 +386,7 @@ jobs:
 
       - name: Configure AWS credentials for ECR interaction
         id: aws-config
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
         with:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ env.AWS_ECR_PUSH_ROLE }}
           role-session-name: GithubActionsRoleSession
@@ -406,7 +406,7 @@ jobs:
           docker push ${{ steps.aws-config.outputs.aws-account-id }}.dkr.ecr.eu-west-1.amazonaws.com/flowforge/${{ env.tagged_image }}-${{ env.timestamp }}
 
       - name: Configure AWS credentials for EKS interaction
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
         with:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ env.AWS_EKS_DEPLOY_ROLE }}
           role-session-name: GithubActionsRoleSessio
@@ -617,7 +617,7 @@ jobs:
       id-token: write
     steps:
       - name: Configure AWS credentials for EKS interaction
-        uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
         with:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ env.AWS_EKS_DEPLOY_ROLE }}
           role-session-name: GithubActionsRoleSession

.github/workflows/publish.yml

@@ -97,7 +97,7 @@ jobs:
     if: |
       needs.check-tests-status.outputs.tests_status == 'success' && github.ref == 'refs/heads/main'
     needs: check-tests-status
-    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.47.0'
+    uses: 'flowfuse/github-actions-workflows/.github/workflows/publish_node_package.yml@v0.48.0'
     with:
       package_name: flowfuse
       build_package: true

.github/workflows/release-publish.yml

@@ -18,6 +18,6 @@ jobs:
       - run: npm ci
       - run: npm run build
       # - run: npm run test
-      - uses: JS-DevTools/npm-publish@4ce4bd0f334d5316473155078da1955d42148494 # v4.1.4
+      - uses: JS-DevTools/npm-publish@0fd2f4369c5d6bcfcde6091a7c527d810b9b5c3f # v4.1.5
         with:
           token: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/tests.yml

@@ -140,7 +140,7 @@ jobs:
       - name: Install Dependencies
         run: npm ci
       - name: Run UI E2E (Cypress) Tests - OS
-        uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
+        uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
         with:
           install: false
           config-file: config/cypress-os.config.js
@@ -180,7 +180,7 @@ jobs:
       - name: Install Dependencies
         run: npm ci
       - name: Run UI E2E (Cypress) Tests - EE
-        uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
+        uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
         with:
             install: false
             config-file: config/cypress-ee.config.js

frontend/src/components/ResizeBar.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="resize-bar" :class="{horizontal: isHorizontal}" />
+    <div class="resize-bar" :class="{horizontal: isHorizontal, resizing: isResizing}" />
 </template>
 
 <script>
@@ -9,6 +9,10 @@ export default {
         direction: {
             type: String,
             default: 'vertical' // vertical || horizontal
+        },
+        isResizing: {
+            type: Boolean,
+            default: false
         }
     },
     computed: {

frontend/src/components/TextCopier.vue

@@ -1,11 +1,11 @@
 <template>
     <span class="ff-text-copier">
-        <span v-if="showText" @click="copyPath">
+        <span v-if="showText" @click.stop="copyPath">
             <slot name="default">
                 <span class="text">{{ text }}</span>
             </slot>
         </span>
-        <button v-if="hasText" class="ff-icon-button" @click="copyPath">
+        <button v-if="hasText" class="ff-icon-button" @click.stop="copyPath">
             <DuplicateIcon v-if="!copied" class="ff-icon" />
             <CheckIcon v-else class="ff-icon ff-icon-check" />
         </button>
@@ -114,15 +114,15 @@ export default {
     border-radius: 4px;
     cursor: pointer;
     transition: all 0.2s ease;
-    color: $ff-grey-600;
+    color: $ff-color--action;
 
     &:hover {
-      color: $ff-indigo-600;
-      background-color: $ff-indigo-50;
+      color: $ff-white;
+      background-color: $ff-color--highlight;
     }
 
     &:active {
-      background-color: $ff-indigo-100;
+      background-color: $ff-color--highlight;
     }
 
     .ff-icon {

frontend/src/components/expert/ExpertChatInput.vue

@@ -1,6 +1,7 @@
 <template>
     <div ref="resizeTarget" class="ff-expert-input" :style="{height: heightStyle}">
         <resize-bar
+            :is-resizing="isInputResizing"
             direction="horizontal"
             @mousedown="startResize"
         />
@@ -33,7 +34,11 @@
 
             <div class="actions">
                 <div class="left">
-                    <include-selection-button v-if="hasUserSelection && !isOperatorAgent" />
+                    <context-selector v-if="!isOperatorAgent" />
+                    <div class="context-items-container" @wheel="horizontalScrolling">
+                        <include-context-item v-for="(context, index) in selectedContext" :key="index" :contextItem="context" />
+                        <include-selection-button v-if="hasUserSelection && !isOperatorAgent" />
+                    </div>
                 </div>
 
                 <div class="right">
@@ -61,21 +66,25 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 
 import { useResizingHelper } from '../../composables/ResizingHelper.js'
 
 import ResizeBar from '../ResizeBar.vue'
 
 import CapabilitiesSelector from './components/CapabilitiesSelector.vue'
+import ContextSelector from './components/ContextSelector.vue'
+import IncludeContextItem from './components/IncludeContextItem.vue'
 import IncludeSelectionButton from './components/IncludeSelectionButton.vue'
 
 export default {
     name: 'ExpertChatInput',
     components: {
-        ResizeBar,
+        CapabilitiesSelector,
+        ContextSelector,
+        IncludeContextItem,
         IncludeSelectionButton,
-        CapabilitiesSelector
+        ResizeBar
     },
     props: {
         isGenerating: {
@@ -105,12 +114,13 @@ export default {
     },
     emits: ['send', 'stop', 'start-over'],
     setup () {
-        const { startResize, heightStyle, bindResizer } = useResizingHelper()
+        const { startResize, heightStyle, bindResizer, isResizing: isInputResizing } = useResizingHelper()
 
         return {
             startResize,
             bindResizer,
-            heightStyle
+            heightStyle,
+            isInputResizing
         }
     },
     data () {
@@ -121,7 +131,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('product/assistant', ['hasUserSelection']),
+        ...mapGetters('product/assistant', ['hasUserSelection', 'getSelectedContext']),
         isInputDisabled () {
             if (this.isSessionExpired) return true
             if (this.isGenerating) return true
@@ -138,6 +148,13 @@ export default {
             return this.isOperatorAgent
                 ? 'Tell us what you want to know about'
                 : 'Tell us what you need help with'
+        },
+        selectedContext () {
+            // for insights mode, return empty array
+            if (this.isOperatorAgent) {
+                return []
+            }
+            return this.getSelectedContext
         }
     },
     mounted () {
@@ -150,6 +167,7 @@ export default {
         })
     },
     methods: {
+        ...mapActions('product/assistant', ['resetContextSelection']),
         handleSend () {
             if (!this.canSend) return
 
@@ -166,6 +184,10 @@ export default {
         handleStartOver () {
             this.$emit('start-over')
             this.inputText = ''
+            // When in support mode, reset/restore assistant context selection (opt-out by default)
+            if (!this.isOperatorAgent) {
+                this.resetContextSelection()
+            }
         },
         handleKeydown (event) {
             // Enter without Shift = send message
@@ -174,6 +196,12 @@ export default {
                 this.handleSend()
             }
             // Shift+Enter = new line (default behavior)
+        },
+        horizontalScrolling (event) {
+            const target = event.currentTarget
+            if (event.deltaY === 0) return
+            event.preventDefault()
+            target.scrollLeft += event.deltaY / 2
         }
     }
 }
@@ -313,10 +341,22 @@ button {
         padding: .5rem;
         display: flex;
         justify-content: space-between;
+        gap: 0.75rem;
 
         .left {
             display: flex;
             justify-content: flex-start;
+
+            // scroll for overflow of selected chips
+            overflow: auto;
+            flex: 1;
+            .context-items-container {
+                flex: 1;
+                overflow-x: auto;
+                scrollbar-width: none;
+                display: flex;
+                gap: 0.5rem;
+            }
         }
 
         .right {

frontend/src/components/expert/components/CapabilitiesSelector.vue

@@ -10,7 +10,7 @@
             :value-key="['instance', 'mcpServerUrl']"
             placeholder="Resources"
             open-above
-            :min-options-width="280"
+            :options-min-width="280"
             align-right
         >
             <template #options="{ options }">