plugin-agent-orchestrator 1.0.23 → 1.0.26

package/dist/externalVersion.js

@@ -11,8 +11,9 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.1.6",
+  "ahooks": "3.7.8",
   "@nocobase/client-v2": "2.1.6",
+  "@nocobase/client": "2.1.6",
   "@nocobase/server": "2.1.6",
   "@nocobase/database": "2.1.6",
   "@langchain/langgraph": "0.2.74",

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "代理协调器",
   "displayName.vi-VN": "Điều phối Agent",
   "description": "Hierarchical Multi-Agent orchestration for NocoBase AI Employees. Enables Leader agents to delegate tasks to Sub-Agent employees without modifying core plugin-ai.",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "license": "Apache-2.0",
   "main": "dist/server/index.js",
   "keywords": [

package/src/client/AIEmployeesContext.tsx

@@ -1,5 +1,6 @@
 import React, { createContext, useContext } from 'react';
-import { useRequest } from '@nocobase/client';
+import { useRequest } from 'ahooks';
+import { useApp } from '@nocobase/client-v2';
 
 interface AIEmployeeInfo {
   username: string;
@@ -74,10 +75,13 @@ function extractToolNames(skillSettings: any) {
  * delegate_<leader>_to_<sub> tool to its skillSettings.tools.
  */
 export const AIEmployeesProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const { data, loading, refresh } = useRequest({
-    url: 'aiEmployees:list',
-    params: { pageSize: 200 },
-  });
+  const api = useApp().apiClient;
+  const { data, loading, refresh } = useRequest(() =>
+    api.request({
+      url: 'aiEmployees:list',
+      params: { pageSize: 200 },
+    }),
+  );
 
   const value = React.useMemo(() => {
     const rawEmployees = (data as any)?.data || [];

package/src/client/AgentRunsTab.tsx

@@ -30,7 +30,8 @@ import {
   ReloadOutlined,
   StopOutlined,
 } from '@ant-design/icons';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useRequest } from 'ahooks';
+import { useApp } from '@nocobase/client-v2';
 import { useAIEmployees } from './AIEmployeesContext';
 import { parseJsonText } from './skill-hub/utils/jsonFields';
 
@@ -174,7 +175,7 @@ function TextBlock({ value, rows = 10 }: { value: any; rows?: number }) {
 }
 
 export const AgentRunsTab: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const { employees, employeeMap } = useAIEmployees();
   const [filters, setFilters] = useState<FilterState>({});
   const [page, setPage] = useState(1);
@@ -197,10 +198,11 @@ export const AgentRunsTab: React.FC = () => {
   }, [filters, page, pageSize]);
 
   const { data, loading, refresh } = useRequest(
-    {
-      url: 'agentLoops:list',
-      params: requestParams,
-    },
+    () =>
+      api.request({
+        url: 'agentLoops:list',
+        params: requestParams,
+      }),
     {
       refreshDeps: [requestParams],
     },

package/src/client/HarnessProfilesTab.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { Button, Card, Drawer, Form, Input, Popconfirm, Space, Switch, Table, Tag, Typography, message } from 'antd';
 import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useRequest } from 'ahooks';
+import { useApp } from '@nocobase/client-v2';
 
 const { Text } = Typography;
 
@@ -12,18 +13,20 @@ const parseSettings = (value: string) => {
 };
 
 export const HarnessProfilesTab: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [open, setOpen] = React.useState(false);
   const [editingRecord, setEditingRecord] = React.useState<any>(null);
   const [form] = Form.useForm();
 
-  const { data, loading, refresh } = useRequest({
-    url: 'agentHarnessProfiles:list',
-    params: {
-      sort: ['tag'],
-      pageSize: 100,
-    },
-  });
+  const { data, loading, refresh } = useRequest(() =>
+    api.request({
+      url: 'agentHarnessProfiles:list',
+      params: {
+        sort: ['tag'],
+        pageSize: 100,
+      },
+    }),
+  );
 
   const rows = React.useMemo(() => {
     const raw = (data as any)?.data;

package/src/client/RulesTab.tsx

@@ -25,7 +25,8 @@ import {
   WarningOutlined,
   ThunderboltOutlined,
 } from '@ant-design/icons';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useRequest } from 'ahooks';
+import { useApp } from '@nocobase/client-v2';
 import { AIEmployeeSelect } from './AIEmployeeSelect';
 import { useAIEmployees } from './AIEmployeesContext';
 
@@ -104,30 +105,36 @@ const normalizeSkillSettingsForTools = (skillSettings: any) => {
 };
 
 export const RulesTab: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [visible, setVisible] = useState(false);
   const [editingRecord, setEditingRecord] = useState<any>(null);
   const [form] = Form.useForm();
 
-  const { data, loading, refresh } = useRequest({
-    url: 'orchestratorConfig:list',
-    params: {
-      sort: ['-createdAt'],
-    },
-  });
-
-  const { data: llmServicesData, loading: llmLoading } = useRequest({
-    url: 'ai:listAllEnabledModels',
-  });
-
-  const { data: harnessProfilesData, loading: harnessLoading } = useRequest({
-    url: 'agentHarnessProfiles:list',
-    params: {
-      filter: { enabled: true },
-      sort: ['tag'],
-      pageSize: 100,
-    },
-  });
+  const { data, loading, refresh } = useRequest(() =>
+    api.request({
+      url: 'orchestratorConfig:list',
+      params: {
+        sort: ['-createdAt'],
+      },
+    }),
+  );
+
+  const { data: llmServicesData, loading: llmLoading } = useRequest(() =>
+    api.request({
+      url: 'ai:listAllEnabledModels',
+    }),
+  );
+
+  const { data: harnessProfilesData, loading: harnessLoading } = useRequest(() =>
+    api.request({
+      url: 'agentHarnessProfiles:list',
+      params: {
+        filter: { enabled: true },
+        sort: ['tag'],
+        pageSize: 100,
+      },
+    }),
+  );
 
   const llmServices = React.useMemo(() => {
     const raw = (llmServicesData as any)?.data ?? llmServicesData;

package/src/client/TracingTab.tsx

@@ -18,7 +18,8 @@ import {
   Form,
 } from 'antd';
 import { EyeOutlined, CheckCircleOutlined, CloseCircleOutlined, ReloadOutlined } from '@ant-design/icons';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useRequest } from 'ahooks';
+import { useApp } from '@nocobase/client-v2';
 import { useAIEmployees } from './AIEmployeesContext';
 
 const { Text, Paragraph } = Typography;
@@ -32,7 +33,7 @@ type FilterState = {
 };
 
 export const TracingTab: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [selectedLog, setSelectedLog] = useState<any>(null);
   const [detailLoading, setDetailLoading] = useState(false);
 
@@ -61,10 +62,11 @@ export const TracingTab: React.FC = () => {
   }, [page, pageSize, filters]);
 
   const { data, loading, refresh } = useRequest(
-    {
-      url: 'orchestratorTracing:list',
-      params: requestParams,
-    },
+    () =>
+      api.request({
+        url: 'orchestratorTracing:list',
+        params: requestParams,
+      }),
     {
       refreshDeps: [requestParams],
     },

package/src/client/skill-hub/components/ExecutionHistory.tsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Card, Table, Tag, Button, Typography, Space, Tooltip, Popconfirm, message } from 'antd';
 import { ReloadOutlined, DownloadOutlined, DeleteOutlined } from '@ant-design/icons';
-import { useAPIClient, Upload } from '@nocobase/client';
-import { useT } from '../locale';
-import { parseJsonText } from '../utils/jsonFields';
+import { Upload } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
+import { useT } from '../locale';
+import { parseJsonText } from '../utils/jsonFields';
 
 const STATUS_COLORS: Record<string, string> = {
   pending: 'default',
@@ -15,7 +16,7 @@ const STATUS_COLORS: Record<string, string> = {
 };
 
 export const ExecutionHistory: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const t = useT();
   const [executions, setExecutions] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
@@ -96,12 +97,12 @@ export const ExecutionHistory: React.FC = () => {
     },
     {
       title: t('Files'),
-      dataIndex: 'outputFiles',
+      dataIndex: 'outputFiles',
       key: 'files',
       width: 250,
-      render: (files: any[], record: any) => {
-        files = parseJsonText(files, []);
-        if (!Array.isArray(files) || !files.length) return '-';
+      render: (files: any[], record: any) => {
+        files = parseJsonText(files, []);
+        if (!Array.isArray(files) || !files.length) return '-';
         const formattedFiles = files.map((f, i) => ({
           id: `${record.id}-${f.name}-${i}`,
           title: f.name,

package/src/client/skill-hub/components/GitSkillImport.tsx

@@ -25,7 +25,7 @@ import {
   DatabaseOutlined,
   SearchOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from '../locale';
 
 const { Text } = Typography;
@@ -39,7 +39,7 @@ interface GitSkillImportProps {
 export const GitSkillImport: React.FC<GitSkillImportProps> = ({ open, onClose }) => {
   const t = useT();
   const { token } = useToken();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
 
   const [step, setStep] = useState(0);
 

package/src/client/skill-hub/components/LoopSettings.tsx

@@ -16,7 +16,7 @@ import {
   Typography,
 } from 'antd';
 import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons';
-import { useAPIClient, useApp } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from '../locale';
 import { formatJsonText, parseJsonText, stringifyJsonText } from '../utils/jsonFields';
 import { getLoopTemplate, LOOP_TEMPLATES } from '../tools/loopTemplates';
@@ -30,8 +30,8 @@ const extractList = (data: any) => {
 };
 
 export const LoopSettings: React.FC = () => {
-  const api = useAPIClient();
   const app = useApp();
+  const api = app.apiClient;
   const t = useT();
   const [form] = Form.useForm();
   const [skills, setSkills] = useState<any[]>([]);

package/src/client/skill-hub/components/SkillEditor.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Modal, Form, Input, Select, InputNumber, Switch, message, Upload, Radio, Button, Space, theme } from 'antd';
 import { InboxOutlined, CloseOutlined, SaveOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from '../locale';
 import { formatJsonText, stringifyJsonText, parseJsonText } from '../utils/jsonFields';
 
@@ -14,7 +14,7 @@ interface SkillEditorProps {
 }
 
 export const SkillEditor: React.FC<SkillEditorProps> = ({ skill, onClose }) => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const t = useT();
   const { token } = useToken();
   const [form] = Form.useForm();

package/src/client/skill-hub/components/SkillManager.tsx

@@ -17,7 +17,7 @@ import {
   Tooltip,
 } from 'antd';
 import { PlusOutlined, EditOutlined, DeleteOutlined, PlayCircleOutlined, BranchesOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from '../locale';
 import { SkillEditor } from './SkillEditor';
 import { SkillTestPanel } from './SkillTestPanel';
@@ -26,7 +26,7 @@ import { GitSkillImport } from './GitSkillImport';
 const { TextArea } = Input;
 
 export const SkillManager: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const t = useT();
   const [skills, setSkills] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);

package/src/client/skill-hub/components/SkillMetrics.tsx

@@ -1,13 +1,13 @@
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { Card, Table, Typography, Space, Row, Col, Statistic, Progress } from 'antd';
 import { SyncOutlined, CheckCircleOutlined, CloseCircleOutlined, ClockCircleOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from '../locale';
 
 const { Title, Text } = Typography;
 
 export const SkillMetrics: React.FC = () => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const t = useT();
   const [executions, setExecutions] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);

package/src/client/skill-hub/components/SkillTestPanel.tsx

@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
 import { Modal, Input, Button, Alert, Typography, Space, Spin } from 'antd';
-import { useAPIClient, Upload } from '@nocobase/client';
-import { useT } from '../locale';
-import { parseJsonText } from '../utils/jsonFields';
+import { Upload } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
+import { useT } from '../locale';
+import { parseJsonText } from '../utils/jsonFields';
 
 const { TextArea } = Input;
 
@@ -11,16 +12,16 @@ interface SkillTestPanelProps {
   onClose: () => void;
 }
 
-export const SkillTestPanel: React.FC<SkillTestPanelProps> = ({ skill, onClose }) => {
-  const api = useAPIClient();
-  const t = useT();
-  const inputSchema = parseJsonText(skill.inputSchema, null);
-  const [input, setInput] = useState(
-    inputSchema?.properties
-      ? JSON.stringify(
-          Object.fromEntries(
-            Object.keys(inputSchema.properties).map((k) => [k, '']),
-          ),
+export const SkillTestPanel: React.FC<SkillTestPanelProps> = ({ skill, onClose }) => {
+  const api = useApp().apiClient;
+  const t = useT();
+  const inputSchema = parseJsonText(skill.inputSchema, null);
+  const [input, setInput] = useState(
+    inputSchema?.properties
+      ? JSON.stringify(
+          Object.fromEntries(
+            Object.keys(inputSchema.properties).map((k) => [k, '']),
+          ),
           null,
           2,
         )

package/src/client/skill-hub/locale.ts

@@ -1,4 +1,4 @@
-import { useApp } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useCallback } from 'react';
 export const namespace = 'plugin-agent-orchestrator';
 

package/src/client/skill-hub/tools/InteractionSchemasProvider.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, useEffect, useState } from 'react';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { parseJsonText } from '../utils/jsonFields';
 import { InteractionSchema } from './loopTemplates';
 
@@ -7,7 +7,7 @@ const Ctx = createContext<Map<string, InteractionSchema>>(new Map());
 
 export const useInteractionSchemas = () => useContext(Ctx);
 
-type ApiClientWithAuth = ReturnType<typeof useAPIClient> & {
+type ApiClientWithAuth = ReturnType<typeof useApp>['apiClient'] & {
   auth?: {
     getToken?: () => string | null | undefined;
     token?: string | null;
@@ -28,7 +28,7 @@ const sanitize = (name: string) =>
     .replace(/^_|_$/g, '');
 
 export const InteractionSchemasProvider: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
-  const api = useAPIClient() as ApiClientWithAuth;
+  const api = useApp().apiClient as ApiClientWithAuth;
   const authToken = api.auth?.getToken?.() || api.auth?.token || '';
   const [map, setMap] = useState<Map<string, InteractionSchema>>(new Map());
   const [version, setVersion] = useState(0);

package/src/client/tools/PlanApprovalCard.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Alert, Button, Card, Input, List, Space, Tag, Typography, message } from 'antd';
-import { ToolsUIProperties, useAPIClient } from '@nocobase/client';
+import { ToolsUIProperties } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 
 const { Paragraph, Text } = Typography;
 
@@ -18,7 +19,7 @@ const summarizeArgsPlan = (plan: any[]) =>
   }));
 
 export const PlanApprovalCard: React.FC<ToolsUIProperties> = ({ toolCall, decisions }) => {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const rawArgs = (toolCall.args as Record<string, any>) || {};
   const runId = rawArgs.runId;
   const [detail, setDetail] = React.useState<any>(null);