From cf0551433d945b7bbe8f1d46fb001e71f7ca90cb Mon Sep 17 00:00:00 2001
From: buua436 <sz_buua@foxmail.com>
Date: Mon, 9 Nov 2026 14:34:29 +0800
Subject: [PATCH] fix: correct agent tool, schema, and save handling (#22089)

---
 .../schema-editor/types/array-editor.test.tsx | 37 ++++++++++++++
 .../schema-editor/types/array-editor.tsx      | 14 +++--
 .../gobal-variable-sheet/hooks/use-form.tsx   |  2 +-
 .../agent/gobal-variable-sheet/index.tsx      |  2 +-
 .../use-agent-tool-initial-values.test.ts     | 32 ++++++++++++
 .../hooks/use-agent-tool-initial-values.ts    |  3 +-
 .../agent/hooks/use-run-preflight.test.ts     | 29 +++++++++++
 web/src/pages/agent/hooks/use-save-graph.ts   | 51 ++++++++++++-------
 web/src/pages/agent/index.tsx                 |  8 +--
 9 files changed, 147 insertions(+), 31 deletions(-)
 create mode 100644 web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.test.tsx

diff --git a/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.test.tsx b/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.test.tsx
new file mode 100644
index 0000000000..f3c705cf23
--- /dev/null
+++ b/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.test.tsx
@@ -0,0 +1,37 @@
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
+import ArrayEditor from './array-editor';
+
+jest.mock('../type-editor', () => ({
+  __esModule: true,
+  default: () => null,
+}));
+
+describe('ArrayEditor', () => {
+  it('writes the latest uniqueItems switch value to the schema', async () => {
+    const onChange = jest.fn();
+
+    render(
+      <ArrayEditor
+        schema={{ type: 'array', items: { type: 'string' } } as any}
+        validationNode={undefined}
+        onChange={onChange}
+      />,
+    );
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('switch'));
+    });
+
+    await waitFor(() => {
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({ uniqueItems: true }),
+      );
+    });
+  });
+});
diff --git a/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.tsx b/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.tsx
index b50a2add3e..908f9ffb2f 100644
--- a/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.tsx
+++ b/web/src/components/jsonjoy-builder/components/schema-editor/types/array-editor.tsx
@@ -43,13 +43,13 @@ const ArrayEditor: React.FC<TypeEditorProps> = ({
   );
 
   // Handle validation settings change
-  const handleValidationChange = () => {
+  const handleValidationChange = (nextUniqueItems = uniqueItems) => {
     const validationProps: ObjectJSONSchema = {
       type: 'array',
       ...(isBooleanSchema(schema) ? {} : schema),
       minItems: minItems,
       maxItems: maxItems,
-      uniqueItems: uniqueItems || undefined,
+      uniqueItems: nextUniqueItems || undefined,
     };
 
     // Keep the items schema
@@ -68,6 +68,10 @@ const ArrayEditor: React.FC<TypeEditorProps> = ({
     onChange(propsToKeep as ObjectJSONSchema);
   };
 
+  const handleValidationBlur = () => {
+    handleValidationChange();
+  };
+
   // Handle item schema changes
   const handleItemSchemaChange = (updatedItemSchema: ObjectJSONSchema) => {
     const updatedSchema: ObjectJSONSchema = {
@@ -125,7 +129,7 @@ const ArrayEditor: React.FC<TypeEditorProps> = ({
               setMinItems(value);
               // Don't update immediately to avoid too many rerenders
             }}
-            onBlur={handleValidationChange}
+            onBlur={handleValidationBlur}
             placeholder={t.arrayMinimumPlaceholder}
             className={cn('h-8', !!minMaxError && 'border-destructive')}
           />
@@ -150,7 +154,7 @@ const ArrayEditor: React.FC<TypeEditorProps> = ({
               setMaxItems(value);
               // Don't update immediately to avoid too many rerenders
             }}
-            onBlur={handleValidationChange}
+            onBlur={handleValidationBlur}
             placeholder={t.arrayMaximumPlaceholder}
             className={cn('h-8', !!minMaxError && 'border-destructive')}
           />
@@ -170,7 +174,7 @@ const ArrayEditor: React.FC<TypeEditorProps> = ({
           checked={uniqueItems}
           onCheckedChange={(checked) => {
             setUniqueItems(checked);
-            setTimeout(handleValidationChange, 0);
+            handleValidationChange(checked);
           }}
         />
         <Label htmlFor={uniqueItemsId} className="cursor-pointer">
diff --git a/web/src/pages/agent/gobal-variable-sheet/hooks/use-form.tsx b/web/src/pages/agent/gobal-variable-sheet/hooks/use-form.tsx
index 685e3cd87a..24f01ef7bd 100644
--- a/web/src/pages/agent/gobal-variable-sheet/hooks/use-form.tsx
+++ b/web/src/pages/agent/gobal-variable-sheet/hooks/use-form.tsx
@@ -34,7 +34,7 @@ export const useHandleForm = () => {
         globalVariables: param,
       });
 
-      if (res.code === 0) {
+      if (res?.code === 0) {
         refetch();
       }
     },
diff --git a/web/src/pages/agent/gobal-variable-sheet/index.tsx b/web/src/pages/agent/gobal-variable-sheet/index.tsx
index 1c86357af7..945ec8f868 100644
--- a/web/src/pages/agent/gobal-variable-sheet/index.tsx
+++ b/web/src/pages/agent/gobal-variable-sheet/index.tsx
@@ -54,7 +54,7 @@ export const GlobalParamSheet = (props: IGlobalParamModalProps) => {
     const res = await saveGraph(undefined, {
       globalVariables: param,
     });
-    if (res.code === 0) {
+    if (res?.code === 0) {
       refetch();
     }
   };
diff --git a/web/src/pages/agent/hooks/use-agent-tool-initial-values.test.ts b/web/src/pages/agent/hooks/use-agent-tool-initial-values.test.ts
index 02a0422d6b..850dfe4dc6 100644
--- a/web/src/pages/agent/hooks/use-agent-tool-initial-values.test.ts
+++ b/web/src/pages/agent/hooks/use-agent-tool-initial-values.test.ts
@@ -1,5 +1,13 @@
+import { renderHook } from '@testing-library/react';
+import { Operator } from '../constant';
+import { useInitializeOperatorParams } from './use-add-node';
+import { useAgentToolInitialValues } from './use-agent-tool-initial-values';
 import { getQueritAgentInitialValues } from './querit-agent-initial-values';
 
+jest.mock('./use-add-node', () => ({
+  useInitializeOperatorParams: jest.fn(),
+}));
+
 describe('getQueritAgentInitialValues', () => {
   it('creates Querit Agent params without runtime query or outputs', () => {
     expect(
@@ -30,3 +38,27 @@ describe('getQueritAgentInitialValues', () => {
     });
   });
 });
+
+describe('useAgentToolInitialValues', () => {
+  it('does not reuse canvas defaults for a Tavily Search agent tool', () => {
+    jest.mocked(useInitializeOperatorParams).mockReturnValue({
+      initialFormValuesMap: {
+        [Operator.TavilySearch]: {
+          api_key: 'canvas-api-key',
+          search_depth: 'advanced',
+          max_results: 10,
+        },
+        [Operator.TavilyExtract]: {
+          api_key: 'canvas-api-key',
+          extract_depth: 'advanced',
+        },
+      },
+    } as any);
+
+    const { result } = renderHook(() => useAgentToolInitialValues());
+
+    expect(
+      result.current.initializeAgentToolValues(Operator.TavilySearch),
+    ).toEqual({ api_key: '' });
+  });
+});
diff --git a/web/src/pages/agent/hooks/use-agent-tool-initial-values.ts b/web/src/pages/agent/hooks/use-agent-tool-initial-values.ts
index f25d8330a1..8cd7af5f70 100644
--- a/web/src/pages/agent/hooks/use-agent-tool-initial-values.ts
+++ b/web/src/pages/agent/hooks/use-agent-tool-initial-values.ts
@@ -17,7 +17,8 @@ export function useAgentToolInitialValues() {
             ...omit(initialValues, 'query'),
             description: '',
           };
-        case (Operator.TavilySearch, Operator.TavilyExtract):
+        case Operator.TavilySearch:
+        case Operator.TavilyExtract:
           return {
             api_key: '',
           };
diff --git a/web/src/pages/agent/hooks/use-run-preflight.test.ts b/web/src/pages/agent/hooks/use-run-preflight.test.ts
index c2867453be..d705e3bf92 100644
--- a/web/src/pages/agent/hooks/use-run-preflight.test.ts
+++ b/web/src/pages/agent/hooks/use-run-preflight.test.ts
@@ -144,6 +144,35 @@ describe('Run preflight', () => {
     expect(message.error).not.toHaveBeenCalled();
   });
 
+  it('reports DSL build exceptions and resolves the save promise', async () => {
+    mockBuildDslData.mockImplementationOnce(() => {
+      throw new Error('Unable to build agent DSL');
+    });
+    const { result } = renderHook(() => useSaveGraph());
+    let saveResult: unknown;
+
+    await act(async () => {
+      saveResult = await result.current.saveGraph();
+    });
+
+    expect(saveResult).toBeUndefined();
+    expect(message.error).toHaveBeenCalledWith('Unable to build agent DSL');
+    expect(mockSaveAgent).not.toHaveBeenCalled();
+  });
+
+  it('reports rejected agent save requests and resolves the save promise', async () => {
+    mockSaveAgent.mockRejectedValueOnce(new Error('Unable to save agent'));
+    const { result } = renderHook(() => useSaveGraph());
+    let saveResult: unknown;
+
+    await act(async () => {
+      saveResult = await result.current.saveGraph();
+    });
+
+    expect(saveResult).toBeUndefined();
+    expect(message.error).toHaveBeenCalledWith('Unable to save agent');
+  });
+
   it('validates explicit nextNodes before opening chat', async () => {
     useGraphStore.setState({
       nodes: [node('Message', { content: ['hello'] })],
diff --git a/web/src/pages/agent/hooks/use-save-graph.ts b/web/src/pages/agent/hooks/use-save-graph.ts
index 31f0700201..00077adb0c 100644
--- a/web/src/pages/agent/hooks/use-save-graph.ts
+++ b/web/src/pages/agent/hooks/use-save-graph.ts
@@ -46,27 +46,40 @@ export const useSaveGraph = (
         return;
       }
 
-      const params: Record<string, any> = {
-        id,
-        title: data.title,
-        dsl: buildDslData(currentNodes, otherParam),
-      };
+      try {
+        const params: Record<string, any> = {
+          id,
+          title: data.title,
+          dsl: buildDslData(currentNodes, otherParam),
+        };
 
-      if (release) {
-        params.release = 'true';
-      }
-      // Both the debounced auto-save and the explicit Save button pass
-      // autosave:true so the backend refreshes only the live draft and never
-      // mints a new version. Only publishing (release) writes a version row,
-      // optionally carrying an alias into user_canvas_version.
-      if (autosave) {
-        params.autosave = true;
-      }
-      if (alias) {
-        params.alias = alias;
-      }
+        if (release) {
+          params.release = 'true';
+        }
+        // Both the debounced auto-save and the explicit Save button pass
+        // autosave:true so the backend refreshes only the live draft and never
+        // mints a new version. Only publishing (release) writes a version row,
+        // optionally carrying an alias into user_canvas_version.
+        if (autosave) {
+          params.autosave = true;
+        }
+        if (alias) {
+          params.alias = alias;
+        }
 
-      return saveAgent(params);
+        const result = await saveAgent(params);
+        if (result?.code !== undefined && result.code !== 0) {
+          message.error(result.message || i18n.t('message.requestError'));
+        }
+        return result;
+      } catch (error) {
+        message.error(
+          error instanceof Error && error.message
+            ? error.message
+            : i18n.t('message.requestError'),
+        );
+        return undefined;
+      }
     },
     [id, data.title, buildDslData, saveAgent],
   );
diff --git a/web/src/pages/agent/index.tsx b/web/src/pages/agent/index.tsx
index 895735e768..34fe5d8e92 100644
--- a/web/src/pages/agent/index.tsx
+++ b/web/src/pages/agent/index.tsx
@@ -120,12 +120,12 @@ export default function Agent() {
   const { saveGraph, loading } = useSaveGraph();
   // Manual Save is a draft save, same as auto-save: it refreshes the live
   // canvas without minting a user_canvas_version row. Publishing does that.
-  const handleSave = useCallback(() => {
-    saveGraph(undefined, undefined, undefined, true);
+  const handleSave = useCallback(async () => {
+    await saveGraph(undefined, undefined, undefined, true);
   }, [saveGraph]);
   const handlePublish = useCallback(
-    (alias?: string) => {
-      saveGraph(undefined, undefined, true, undefined, alias);
+    async (alias?: string) => {
+      await saveGraph(undefined, undefined, true, undefined, alias);
     },
     [saveGraph],
   );