Merge branch 'main' into feat/rag-pipeline

web/Dockerfile

@@ -6,7 +6,7 @@ LABEL maintainer="takatost@gmail.com"
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 RUN apk add --no-cache tzdata
-RUN npm install -g pnpm@10.8.0
+RUN npm install -g pnpm@10.11.1
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 

web/app/components/base/chat/chat/hooks.ts

@@ -366,8 +366,9 @@ export const useChat = (
             if (!newResponseItem)
               return
 
+            const isUseAgentThought = newResponseItem.agent_thoughts?.length > 0
             updateChatTreeNode(responseItem.id, {
-              content: newResponseItem.answer,
+              content: isUseAgentThought ? '' : newResponseItem.answer,
               log: [
                 ...newResponseItem.message,
                 ...(newResponseItem.message[newResponseItem.message.length - 1].role !== 'assistant'

web/app/components/base/icons/src/public/llm/OpenaiTeal.json

@@ -33,5 +33,5 @@
 			}
 		]
 	},
-	"name": "OpenaiTale"
+	"name": "OpenaiTeal"
 }

web/app/components/base/icons/src/public/llm/OpenaiTeal.tsx

@@ -2,7 +2,7 @@
 // DON NOT EDIT IT MANUALLY
 
 import * as React from 'react'
-import data from './OpenaiTale.json'
+import data from './OpenaiTeal.json'
 import IconBase from '@/app/components/base/icons/IconBase'
 import type { IconData } from '@/app/components/base/icons/IconBase'
 
@@ -15,6 +15,6 @@ const Icon = (
   },
 ) => <IconBase {...props} ref={ref} data={data as IconData} />
 
-Icon.displayName = 'OpenaiTale'
+Icon.displayName = 'OpenaiTeal'
 
 export default Icon

web/app/components/base/icons/src/public/llm/index.ts

@@ -28,9 +28,9 @@ export { default as Microsoft } from './Microsoft'
 export { default as OpenaiBlack } from './OpenaiBlack'
 export { default as OpenaiBlue } from './OpenaiBlue'
 export { default as OpenaiGreen } from './OpenaiGreen'
+export { default as OpenaiTeal } from './OpenaiTeal'
 export { default as OpenaiText } from './OpenaiText'
 export { default as OpenaiTransparent } from './OpenaiTransparent'
-export { default as OpenaiTale } from './OpenaiTale'
 export { default as OpenaiViolet } from './OpenaiViolet'
 export { default as OpenaiYellow } from './OpenaiYellow'
 export { default as OpenllmText } from './OpenllmText'

web/app/components/base/radio/component/radio/index.tsx

@@ -37,14 +37,15 @@ export default function Radio({
   const isChecked = groupContext ? groupContext.value === value : checked
   const divClassName = `
     flex items-center py-1 relative
-    px-7 cursor-pointer hover:bg-gray-200 rounded
+    px-7 cursor-pointer text-text-secondary rounded
+    bg-components-option-card-option-bg hover:bg-components-option-card-option-bg-hover hover:shadow-xs
   `
 
   return (
     <div className={cn(
       s.label,
       disabled ? s.disabled : '',
-      isChecked ? 'bg-white shadow' : '',
+      isChecked ? 'bg-components-option-card-option-bg-hover shadow-xs' : '',
       divClassName,
       className)}
     onClick={() => handleChange(value)}

web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx

@@ -5,7 +5,7 @@ import type {
 } from '../declarations'
 import { useLanguage } from '../hooks'
 import { Group } from '@/app/components/base/icons/src/vender/other'
-import { OpenaiBlue, OpenaiTale, OpenaiViolet, OpenaiYellow } from '@/app/components/base/icons/src/public/llm'
+import { OpenaiBlue, OpenaiTeal, OpenaiViolet, OpenaiYellow } from '@/app/components/base/icons/src/public/llm'
 import cn from '@/utils/classnames'
 import { renderI18nObject } from '@/i18n'
 
@@ -25,7 +25,7 @@ const ModelIcon: FC<ModelIconProps> = ({
   if (provider?.provider && ['openai', 'langgenius/openai/openai'].includes(provider.provider) && modelName?.startsWith('o'))
     return <div className='flex items-center justify-center'><OpenaiYellow className={cn('h-5 w-5', className)} /></div>
   if (provider?.provider && ['openai', 'langgenius/openai/openai'].includes(provider.provider) && modelName?.includes('gpt-4.1'))
-    return <div className='flex items-center justify-center'><OpenaiTale className={cn('h-5 w-5', className)} /></div>
+    return <div className='flex items-center justify-center'><OpenaiTeal className={cn('h-5 w-5', className)} /></div>
   if (provider?.provider && ['openai', 'langgenius/openai/openai'].includes(provider.provider) && modelName?.includes('gpt-4o'))
     return <div className='flex items-center justify-center'><OpenaiBlue className={cn('h-5 w-5', className)} /></div>
   if (provider?.provider && ['openai', 'langgenius/openai/openai'].includes(provider.provider) && modelName?.startsWith('gpt-4'))

web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx

@@ -83,7 +83,12 @@ const InstallByDSLList: FC<Props> = ({
 
   useEffect(() => {
     if (!isFetchingMarketplaceDataById && infoGetById?.data.plugins) {
-      const payloads = infoGetById?.data.plugins
+      const sortedList = allPlugins.filter(d => d.type === 'marketplace').map((d) => {
+        const p = d as GitHubItemAndMarketPlaceDependency
+        const id = p.value.marketplace_plugin_unique_identifier?.split(':')[0]
+        return infoGetById.data.plugins.find(item => item.plugin_id === id)!
+      })
+      const payloads = sortedList
       const failedIndex: number[] = []
       const nextPlugins = produce(pluginsRef.current, (draft) => {
         marketPlaceInDSLIndex.forEach((index, i) => {

web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx

@@ -148,7 +148,7 @@ const CodeEditor: FC<Props> = ({
       {isShowVarPicker && (
         <div
           ref={popupRef}
-          className='w-[228px] space-y-1 rounded-lg border border-gray-200 bg-white p-1 shadow-lg'
+          className='w-[228px] space-y-1 rounded-lg border border-components-panel-border bg-components-panel-bg p-1 shadow-lg'
           style={{
             position: 'fixed',
             top: popupPosition.y,

web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx

@@ -43,7 +43,7 @@ const VarReferencePicker: FC<Props> = ({
         offset={4}
       >
         <PortalToFollowElemTrigger onClick={() => setOpen(!open)} className='w-[120px] cursor-pointer'>
-          <div className='flex h-8 items-center justify-between rounded-lg border-0 bg-components-button-secondary-bg px-2.5 text-[13px] text-text-primary'>
+          <div className='flex h-8 items-center justify-between rounded-lg border-0 bg-components-input-bg-normal px-2.5 text-[13px] text-text-primary'>
             <div className='w-0 grow truncate capitalize' title={value}>{value}</div>
             <RiArrowDownSLine className='h-3.5 w-3.5 shrink-0 text-text-secondary' />
           </div>

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-number.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import ConditionValueMethod from './condition-value-method'
 import type { ConditionValueMethodProps } from './condition-value-method'
 import ConditionVariableSelector from './condition-variable-selector'
-import ConditionCommonVariableSelector from './condition-common-variable-selector.tsx'
+import ConditionCommonVariableSelector from './condition-common-variable-selector'
 import type {
   Node,
   NodeOutPutVar,

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-string.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'
 import ConditionValueMethod from './condition-value-method'
 import type { ConditionValueMethodProps } from './condition-value-method'
 import ConditionVariableSelector from './condition-variable-selector'
-import ConditionCommonVariableSelector from './condition-common-variable-selector.tsx'
+import ConditionCommonVariableSelector from './condition-common-variable-selector'
 import type {
   Node,
   NodeOutPutVar,