Merge branch 'main' into feature/audit-telemetry-gdpr-deletion

Author: yau-wd

packages/agentflow/src/infrastructure/api/hooks/useAsyncOptions.test.tsx

@@ -7,9 +7,11 @@ import { useAsyncOptions } from './useAsyncOptions'
 const mockGetChatModels = jest.fn()
 const mockGetAllTools = jest.fn()
 const mockGetCredentialsByName = jest.fn()
+const mockGetAllChatflows = jest.fn()
 
 // Stable API objects — same reference on every render so they don't re-trigger the effect
 const mockApiContext = {
+    chatflowsApi: { getAllChatflows: mockGetAllChatflows },
     chatModelsApi: { getChatModels: mockGetChatModels },
     toolsApi: { getAllTools: mockGetAllTools },
     credentialsApi: { getAllCredentials: jest.fn(), getCredentialsByName: mockGetCredentialsByName },
@@ -94,6 +96,26 @@ describe('useAsyncOptions', () => {
         expect(result.current.options[0]).toEqual({ label: 'OpenAI Key', name: 'c1' })
     })
 
+    it('listFlows: populates options with label/name/description mapped from chatflows', async () => {
+        mockGetAllChatflows.mockResolvedValue([
+            { id: 'cf-1', name: 'Support Bot', type: 'CHATFLOW' },
+            { id: 'cf-2', name: 'Sales Agent', type: 'AGENTFLOW' },
+            { id: 'cf-3', name: 'Multi Agent', type: 'MULTIAGENT' }
+        ])
+
+        const { result } = renderHook(() => useAsyncOptions({ loadMethod: 'listFlows' }))
+
+        await waitFor(() => expect(result.current.loading).toBe(false))
+
+        expect(mockGetAllChatflows).toHaveBeenCalledTimes(1)
+        expect(result.current.options).toEqual([
+            { name: 'cf-1', label: 'Support Bot', description: 'Chatflow' },
+            { name: 'cf-2', label: 'Sales Agent', description: 'Agentflow V2' },
+            { name: 'cf-3', label: 'Multi Agent', description: 'Agentflow V1' }
+        ])
+        expect(result.current.error).toBeNull()
+    })
+
     it('API error: sets error message, loading false', async () => {
         mockGetChatModels.mockRejectedValue(new Error('Network failure'))
 

packages/agentflow/src/infrastructure/api/hooks/useAsyncOptions.ts

@@ -25,7 +25,8 @@ interface UseAsyncOptionsResult {
  * Fetches async option lists from the API using the loadMethodRegistry.
  */
 export function useAsyncOptions({ loadMethod, credentialNames, params }: UseAsyncOptionsParams): UseAsyncOptionsResult {
-    const { chatModelsApi, toolsApi, credentialsApi, storesApi, embeddingsApi, runtimeStateApi, nodesApi, apiBaseUrl } = useApiContext()
+    const { chatflowsApi, chatModelsApi, toolsApi, credentialsApi, storesApi, embeddingsApi, runtimeStateApi, nodesApi, apiBaseUrl } =
+        useApiContext()
 
     const [options, setOptions] = useState<OptionItem[]>([])
     const [loading, setLoading] = useState(true)
@@ -65,6 +66,7 @@ export function useAsyncOptions({ loadMethod, credentialNames, params }: UseAsyn
                 } else if (loadMethod) {
                     const fn = getLoadMethod(loadMethod)
                     const apis: ApiServices = {
+                        chatflowsApi,
                         chatModelsApi,
                         toolsApi,
                         credentialsApi,
@@ -102,6 +104,7 @@ export function useAsyncOptions({ loadMethod, credentialNames, params }: UseAsyn
         credentialNamesKey,
         paramsKey,
         fetchCounter,
+        chatflowsApi,
         chatModelsApi,
         toolsApi,
         credentialsApi,

packages/agentflow/src/infrastructure/api/loadMethodRegistry.test.ts

@@ -2,6 +2,15 @@ import type { ApiServices } from './loadMethodRegistry'
 import { getLoadMethod, loadMethodRegistry } from './loadMethodRegistry'
 
 const mockApis: ApiServices = {
+    chatflowsApi: {
+        getAllChatflows: jest.fn(),
+        getChatflow: jest.fn(),
+        createChatflow: jest.fn(),
+        updateChatflow: jest.fn(),
+        deleteChatflow: jest.fn(),
+        generateAgentflow: jest.fn(),
+        getChatModels: jest.fn()
+    },
     chatModelsApi: {
         getChatModels: jest.fn()
     },
@@ -159,6 +168,39 @@ describe('loadMethodRegistry', () => {
         })
     })
 
+    describe('listFlows', () => {
+        it('should call chatflowsApi.getAllChatflows() and map to label/name/description', async () => {
+            const mockChatflows = [
+                { id: 'cf-1', name: 'My Chatflow', type: 'CHATFLOW' },
+                { id: 'cf-2', name: 'My Agentflow', type: 'AGENTFLOW' },
+                { id: 'cf-3', name: 'My Multi', type: 'MULTIAGENT' }
+            ]
+            ;(mockApis.chatflowsApi.getAllChatflows as jest.Mock).mockResolvedValue(mockChatflows)
+
+            const result = await loadMethodRegistry['listFlows'](mockApis)
+            expect(mockApis.chatflowsApi.getAllChatflows).toHaveBeenCalled()
+            expect(result).toEqual([
+                { label: 'My Chatflow', name: 'cf-1', description: 'Chatflow' },
+                { label: 'My Agentflow', name: 'cf-2', description: 'Agentflow V2' },
+                { label: 'My Multi', name: 'cf-3', description: 'Agentflow V1' }
+            ])
+        })
+
+        it('should return empty array when there are no chatflows', async () => {
+            ;(mockApis.chatflowsApi.getAllChatflows as jest.Mock).mockResolvedValue([])
+
+            const result = await loadMethodRegistry['listFlows'](mockApis)
+            expect(result).toEqual([])
+        })
+
+        it('should fall back to "Chatflow" description for unknown type', async () => {
+            ;(mockApis.chatflowsApi.getAllChatflows as jest.Mock).mockResolvedValue([{ id: 'cf-1', name: 'Unknown', type: 'UNKNOWN' }])
+
+            const result = await loadMethodRegistry['listFlows'](mockApis)
+            expect(result).toEqual([{ label: 'Unknown', name: 'cf-1', description: 'Chatflow' }])
+        })
+    })
+
     describe('listCredentials', () => {
         it('should call credentialsApi.getCredentialsByName() with params.name', async () => {
             const mockCredentials = [{ id: '1', name: 'My Key', credentialName: 'openAIApi' }]

packages/agentflow/src/infrastructure/api/loadMethodRegistry.ts

@@ -1,3 +1,4 @@
+import type { ChatflowsApi } from './chatflows'
 import type { CredentialsApi } from './credentials'
 import type { EmbeddingsApi } from './embeddings'
 import type { ChatModelsApi } from './models'
@@ -7,6 +8,7 @@ import type { StoresApi } from './stores'
 import type { ToolsApi } from './tools'
 
 export interface ApiServices {
+    chatflowsApi: ChatflowsApi
     chatModelsApi: ChatModelsApi
     toolsApi: ToolsApi
     credentialsApi: CredentialsApi
@@ -31,13 +33,20 @@ export interface ApiServices {
  * - `listVectorStores` — fetches vector stores via `POST /node-load-method/agentAgentflow`
  * - `listEmbeddings` — fetches embedding models via `POST /node-load-method/agentAgentflow`
  * - `listRuntimeStateKeys` — fetches runtime state keys via `POST /node-load-method/agentAgentflow`
+ * - `listFlows` — fetches all chatflows/agentflows via `GET /chatflows`; returns `{ label: name, name: id, description: type }`
  * - `listCredentials` — fetches credentials filtered by `params.name` via `GET /credentials?credentialName=<name>`
  * - `listActions` — fetches available actions for a node (e.g. Composio, MCP tools) via `POST /node-load-method/{nodeName}`;
  *   requires `params.nodeName` and accepts optional `params.inputs` forwarded as `currentNode.inputs`
  * - `listTables` — fetches available tables for a node (e.g. AWSDynamoDBKVStorage) via `POST /node-load-method/{nodeName}`;
  *   requires `params.nodeName` and accepts optional `params.inputs` forwarded as `currentNode.inputs`
  *
  */
+function getChatflowTypeLabel(type: string | undefined): string {
+    if (type === 'AGENTFLOW') return 'Agentflow V2'
+    if (type === 'MULTIAGENT') return 'Agentflow V1'
+    return 'Chatflow'
+}
+
 export const loadMethodRegistry: Record<string, (_apis: ApiServices, _params?: Record<string, unknown>) => Promise<unknown>> = {
     listModels: (apis, params) => {
         const nodeName = params?.nodeName as string | undefined
@@ -53,6 +62,14 @@ export const loadMethodRegistry: Record<string, (_apis: ApiServices, _params?: R
     listVectorStores: (apis) => apis.storesApi.getVectorStores(),
     listEmbeddings: (apis) => apis.embeddingsApi.getEmbeddings(),
     listRuntimeStateKeys: (apis) => apis.runtimeStateApi.getRuntimeStateKeys(),
+    listFlows: async (apis) => {
+        const chatflows = await apis.chatflowsApi.getAllChatflows()
+        return chatflows.map((cf) => ({
+            label: cf.name,
+            name: cf.id,
+            description: getChatflowTypeLabel(cf.type)
+        }))
+    },
     listCredentials: (apis, params) => {
         const name = params?.name
         if (typeof name !== 'string') {

packages/components/package.json

@@ -99,7 +99,7 @@
         "@opentelemetry/sdk-trace-base": "1.27.0",
         "@opentelemetry/semantic-conventions": "1.27.0",
         "@pinecone-database/pinecone": "4.0.0",
-        "@qdrant/js-client-rest": "^1.9.0",
+        "@qdrant/js-client-rest": "^1.17.0",
         "@stripe/agent-toolkit": "^0.1.20",
         "@supabase/supabase-js": "^2.29.0",
         "@types/js-yaml": "^4.0.5",