From f5b84384cf2093dce970318d202f555fd65ecb21 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Fri, 30 Jan 2026 15:49:30 +0800
Subject: [PATCH] feat: support search tool  after @

---
 .../workflow/block-selector/tool-picker.tsx   | 48 ++++++++++++-------
 .../plugins/tool-block/tool-picker-block.tsx  | 17 +++++--
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/web/app/components/workflow/block-selector/tool-picker.tsx b/web/app/components/workflow/block-selector/tool-picker.tsx
index 1d702e9931..1f6dca104f 100644
--- a/web/app/components/workflow/block-selector/tool-picker.tsx
+++ b/web/app/components/workflow/block-selector/tool-picker.tsx
@@ -54,6 +54,9 @@ type Props = {
   preventFocusLoss?: boolean
   hideFeaturedTool?: boolean
   hideSelectedInfo?: boolean
+  searchText?: string
+  onSearchTextChange?: (value: string) => void
+  hideSearchBox?: boolean
 }
 
 const ToolPicker: FC<Props> = ({
@@ -73,9 +76,20 @@ const ToolPicker: FC<Props> = ({
   preventFocusLoss = false,
   hideFeaturedTool = false,
   hideSelectedInfo = false,
+  searchText: controlledSearchText,
+  onSearchTextChange,
+  hideSearchBox = false,
 }) => {
   const { t } = useTranslation()
   const [searchText, setSearchText] = useState('')
+  const isSearchControlled = controlledSearchText !== undefined
+  const effectiveSearchText = isSearchControlled ? controlledSearchText : searchText
+  const handleSearchTextChange = (value: string) => {
+    if (isSearchControlled)
+      onSearchTextChange?.(value)
+    else
+      setSearchText(value)
+  }
   const [tags, setTags] = useState<string[]>([])
 
   const { enable_marketplace } = useGlobalPublicStore(s => s.systemFeatures)
@@ -190,26 +204,28 @@ const ToolPicker: FC<Props> = ({
             e.preventDefault()
           }}
         >
-          <div
-            className="p-2 pb-1"
-          >
-            <SearchBox
-              search={searchText}
-              onSearchChange={setSearchText}
-              tags={tags}
-              onTagsChange={setTags}
-              placeholder={t('searchTools', { ns: 'plugin' })!}
-              supportAddCustomTool={supportAddCustomTool}
-              onAddedCustomTool={handleAddedCustomTool}
-              onShowAddCustomCollectionModal={showEditCustomCollectionModal}
-              inputClassName="grow"
-            />
-          </div>
+          {!hideSearchBox && (
+            <div
+              className="p-2 pb-1"
+            >
+              <SearchBox
+                search={effectiveSearchText}
+                onSearchChange={handleSearchTextChange}
+                tags={tags}
+                onTagsChange={setTags}
+                placeholder={t('searchTools', { ns: 'plugin' })!}
+                supportAddCustomTool={supportAddCustomTool}
+                onAddedCustomTool={handleAddedCustomTool}
+                onShowAddCustomCollectionModal={showEditCustomCollectionModal}
+                inputClassName="grow"
+              />
+            </div>
+          )}
           <AllTools
             className="mt-1"
             toolContentClassName="max-w-[100%]"
             tags={tags}
-            searchText={searchText}
+            searchText={effectiveSearchText}
             onSelect={handleSelect as OnSelectBlock}
             onSelectMultiple={handleSelectMultiple}
             buildInTools={builtinToolList || []}
diff --git a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-picker-block.tsx b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-picker-block.tsx
index 1784503c97..a82c938104 100644
--- a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-picker-block.tsx
+++ b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-picker-block.tsx
@@ -8,7 +8,7 @@ import {
   $insertNodes,
 } from 'lexical'
 import * as React from 'react'
-import { useCallback, useMemo } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import ReactDOM from 'react-dom'
 import { v4 as uuid } from 'uuid'
 import { useBasicTypeaheadTriggerMatch } from '@/app/components/base/prompt-editor/hooks'
@@ -35,11 +35,12 @@ const ToolPickerBlock = ({ scope = 'all' }: ToolPickerBlockProps) => {
   const [editor] = useLexicalComposerContext()
   const checkForTriggerMatch = useBasicTypeaheadTriggerMatch('@', {
     minLength: 0,
-    maxLength: 0,
+    maxLength: 75,
   })
   const storeApi = useWorkflowStore()
   const toolBlockContext = useToolBlockContext()
   const isUsingExternalMetadata = Boolean(toolBlockContext?.onMetadataChange)
+  const [queryString, setQueryString] = useState('')
 
   const options = useMemo(() => [new ToolPickerMenuOption()], [])
 
@@ -132,7 +133,10 @@ const ToolPickerBlock = ({ scope = 'all' }: ToolPickerBlockProps) => {
     if (!anchorElementRef.current)
       return null
 
-    const closeMenu = () => selectOptionAndCleanUp(options[0])
+    const closeMenu = () => {
+      setQueryString('')
+      selectOptionAndCleanUp(options[0])
+    }
 
     return ReactDOM.createPortal(
       <ToolPicker
@@ -156,19 +160,22 @@ const ToolPickerBlock = ({ scope = 'all' }: ToolPickerBlockProps) => {
           insertTools(tools)
           closeMenu()
         }}
+        searchText={queryString}
+        onSearchTextChange={setQueryString}
+        hideSearchBox
         scope={scope}
         hideFeaturedTool
         preventFocusLoss
       />,
       anchorElementRef.current,
     )
-  }, [insertTools, options, scope])
+  }, [insertTools, options, queryString, scope])
 
   return (
     <LexicalTypeaheadMenuPlugin
       options={options}
       onSelectOption={() => { }}
-      onQueryChange={() => { }}
+      onQueryChange={matchingString => setQueryString(matchingString || '')}
       menuRenderFn={renderMenu}
       triggerFn={checkForTriggerMatch}
       anchorClassName="z-[999999] translate-y-[calc(-100%-3px)]"