Merge branch 'feat/support-agent-sandbox' of https://github.com/langgenius/dify into feat/support-agent-sandbox

2026-05-04 01:18:05 +08:00 · 2026-01-20 14:01:43 +08:00
parent 2650ceb0a6 c5fc3cc08e
commit 3b72b45319
7 changed files with 102 additions and 6 deletions
--- a/web/app/components/base/chat/chat/hooks.ts
+++ b/web/app/components/base/chat/chat/hooks.ts
@ -343,7 +343,8 @@ export const useChat = (
          tool_elapsed_time,
        }: any) => {
          if (!isAgentMode) {
-            responseItem.content = responseItem.content + message
+            if (chunk_type === 'text')
+              responseItem.content = responseItem.content + message
          }
          else {
            const lastThought = responseItem.agent_thoughts?.[responseItem.agent_thoughts?.length - 1]
--- a/web/app/components/base/icons/src/vender/line/general/AssembleVariablesAlt.json
+++ b/web/app/components/base/icons/src/vender/line/general/AssembleVariablesAlt.json
@ -0,0 +1,26 @@
+{
+  "icon": {
+    "type": "element",
+    "isRootNode": true,
+    "name": "svg",
+    "attributes": {
+      "width": "12",
+      "height": "12",
+      "viewBox": "0 0 12 12",
+      "fill": "none",
+      "xmlns": "http://www.w3.org/2000/svg"
+    },
+    "children": [
+      {
+        "type": "element",
+        "name": "path",
+        "attributes": {
+          "d": "M5.14286 5.14286V3.42857L8 5.71429L5.14286 8V6.28571H0V5.14286H5.14286ZM0.83303 7.42857H2.04658C2.72474 9.10389 4.36721 10.28571 6.28571 10.28571C8.81049 10.28571 10.85717 8.23903 10.85717 5.71429C10.85717 3.18956 8.81049 1.14285 6.28571 1.14285C4.36721 1.14285 2.72474 2.32467 2.04658 4H0.83303C1.56118 1.68165 3.72706 0 6.28571 0C9.4416 0 12 2.55837 12 5.71429C12 8.87014 9.4416 11.42854 6.28571 11.42854C3.72706 11.42854 1.56118 9.74691 0.83303 7.42857Z",
+          "fill": "currentColor"
+        },
+        "children": []
+      }
+    ]
+  },
+  "name": "AssembleVariablesAlt"
+}
--- a/web/app/components/base/icons/src/vender/line/general/AssembleVariablesAlt.tsx
+++ b/web/app/components/base/icons/src/vender/line/general/AssembleVariablesAlt.tsx
@ -0,0 +1,20 @@
+// GENERATE BY script
+// DON NOT EDIT IT MANUALLY
+
+import type { IconData } from '@/app/components/base/icons/IconBase'
+import * as React from 'react'
+import IconBase from '@/app/components/base/icons/IconBase'
+import data from './AssembleVariablesAlt.json'
+
+const Icon = (
+  {
+    ref,
+    ...props
+  }: React.SVGProps<SVGSVGElement> & {
+    ref?: React.RefObject<React.RefObject<HTMLOrSVGElement>>
+  },
+) => <IconBase {...props} ref={ref} data={data as IconData} />
+
+Icon.displayName = 'AssembleVariablesAlt'
+
+export default Icon
--- a/web/app/components/base/icons/src/vender/line/general/index.ts
+++ b/web/app/components/base/icons/src/vender/line/general/index.ts
@ -1,4 +1,5 @@
 export { default as AssembleVariables } from './AssembleVariables'
+export { default as AssembleVariablesAlt } from './AssembleVariablesAlt'
 export { default as AtSign } from './AtSign'
 export { default as Bookmark } from './Bookmark'
 export { default as Check } from './Check'
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
@ -67,6 +67,7 @@ type VariableReferenceFieldsProps = {
  currentTool?: Tool | Event
  currentProvider?: ToolWithProvider | TriggerWithProvider
  isFilterFileVar?: boolean
+  toolNodeId?: string
 }

 const VariableReferenceFields: FC<VariableReferenceFieldsProps> = ({
--- a/web/app/components/workflow/panel/debug-and-preview/hooks.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/hooks.ts
@ -286,7 +286,8 @@ export const useChat = (
          tool_error,
          tool_elapsed_time,
        }: any) => {
-          responseItem.content = responseItem.content + message
+          if (chunk_type === 'text')
+            responseItem.content = responseItem.content + message

          if (chunk_type === 'tool_call') {
            if (!responseItem.toolCalls)
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@ -511,7 +511,7 @@
  },
  "app/components/app/create-app-modal/index.tsx": {
    "react-hooks-extra/no-direct-set-state-in-use-effect": {
-      "count": 1
+      "count": 2
    },
    "ts/no-explicit-any": {
      "count": 1
@ -2394,6 +2394,16 @@
      "count": 24
    }
  },
+  "app/components/plugins/plugin-detail-panel/tool-selector/sections/tool-authorization-section.tsx": {
+    "ts/no-explicit-any": {
+      "count": 1
+    }
+  },
+  "app/components/plugins/plugin-detail-panel/tool-selector/sections/tool-settings-section.tsx": {
+    "ts/no-explicit-any": {
+      "count": 4
+    }
+  },
  "app/components/plugins/plugin-detail-panel/tool-selector/tool-credentials-form.tsx": {
    "ts/no-explicit-any": {
      "count": 3
@ -2886,6 +2896,11 @@
      "count": 2
    }
  },
+  "app/components/workflow/custom-group-node/custom-group-node.tsx": {
+    "unused-imports/no-unused-vars": {
+      "count": 1
+    }
+  },
  "app/components/workflow/header/run-mode.tsx": {
    "no-console": {
      "count": 1
@ -3034,8 +3049,11 @@
    }
  },
  "app/components/workflow/nodes/_base/components/form-input-item.tsx": {
+    "style/indent": {
+      "count": 19
+    },
    "ts/no-explicit-any": {
-      "count": 33
+      "count": 34
    }
  },
  "app/components/workflow/nodes/_base/components/input-support-select-var.tsx": {
@ -3254,6 +3272,11 @@
      "count": 5
    }
  },
+  "app/components/workflow/nodes/command/default.ts": {
+    "ts/no-explicit-any": {
+      "count": 1
+    }
+  },
  "app/components/workflow/nodes/components.ts": {
    "ts/no-explicit-any": {
      "count": 2
@ -3487,6 +3510,16 @@
      "count": 1
    }
  },
+  "app/components/workflow/nodes/llm/panel.tsx": {
+    "unused-imports/no-unused-imports": {
+      "count": 1
+    }
+  },
+  "app/components/workflow/nodes/llm/types.ts": {
+    "ts/no-explicit-any": {
+      "count": 3
+    }
+  },
  "app/components/workflow/nodes/llm/use-config.ts": {
    "react-hooks-extra/no-direct-set-state-in-use-effect": {
      "count": 2
@ -3962,6 +3995,11 @@
      "count": 4
    }
  },
+  "app/components/workflow/skill/editor/code-file-editor.tsx": {
+    "ts/no-explicit-any": {
+      "count": 2
+    }
+  },
  "app/components/workflow/store/workflow/debug/inspect-vars-slice.ts": {
    "ts/no-explicit-any": {
      "count": 2
@ -4003,6 +4041,9 @@
  "app/components/workflow/utils/node.ts": {
    "regexp/no-super-linear-backtracking": {
      "count": 1
+    },
+    "ts/no-empty-object-type": {
+      "count": 1
    }
  },
  "app/components/workflow/utils/tool.ts": {
@ -4012,7 +4053,7 @@
  },
  "app/components/workflow/utils/workflow-init.ts": {
    "ts/no-explicit-any": {
-      "count": 12
+      "count": 13
    }
  },
  "app/components/workflow/utils/workflow.ts": {
@ -4159,6 +4200,11 @@
      "count": 1
    }
  },
+  "eslint-suppressions.json": {
+    "style/eol-last": {
+      "count": 1
+    }
+  },
  "hooks/use-async-window-open.spec.ts": {
    "ts/no-explicit-any": {
      "count": 6
@ -4449,7 +4495,7 @@
  },
  "types/workflow.ts": {
    "ts/no-explicit-any": {
-      "count": 15
+      "count": 18
    }
  },
  "utils/clipboard.ts": {