plugin-agent-orchestrator 1.0.22 → 1.0.25

package/src/client/skill-hub/index.tsx

@@ -1,51 +1,58 @@
-import { Plugin } from '@nocobase/client';
-import { SkillManager } from './components/SkillManager';
-import { ExecutionHistory } from './components/ExecutionHistory';
-import { SkillMetrics } from './components/SkillMetrics';
-import { LoopSettings } from './components/LoopSettings';
-import { InteractionSchemasProvider } from './tools/InteractionSchemasProvider';
-import { registerSkillLoopCards } from './tools/registerSkillLoopCards';
-
-export class PluginSkillHubClient extends Plugin {
-  async load() {
-    (this as any).app.use(InteractionSchemasProvider);
-
-    (this as any).app.pluginSettingsManager.add('skill-hub', {
-      title: (this as any).t('Skill Hub'),
-      icon: 'CodeOutlined',
-    });
-
-    (this as any).app.pluginSettingsManager.add('skill-hub.definitions', {
-      title: (this as any).t('Skill Definitions'),
-      Component: SkillManager,
-      aclSnippet: 'pm.skill-hub',
-    });
-
-    (this as any).app.pluginSettingsManager.add('skill-hub.loop-settings', {
-      title: (this as any).t('Skill Review Settings'),
-      Component: LoopSettings,
-      aclSnippet: 'pm.skill-hub',
-    });
-
-    (this as any).app.pluginSettingsManager.add('skill-hub.executions', {
-      title: (this as any).t('Execution History'),
-      Component: ExecutionHistory,
-      aclSnippet: 'pm.skill-hub',
-    });
-
-    (this as any).app.pluginSettingsManager.add('skill-hub.metrics', {
-      title: (this as any).t('Dashboard Metrics'),
-      Component: SkillMetrics,
-      aclSnippet: 'pm.skill-hub',
-    });
-
-    await this.registerSkillUiCards();
-  }
-
-  private async registerSkillUiCards() {
-    await registerSkillLoopCards((this as any).app);
-  }
-}
-
-export { SkillManager, ExecutionHistory, SkillMetrics, LoopSettings };
-export default PluginSkillHubClient;
+import { Plugin } from '@nocobase/client';
+import { SkillManager } from './components/SkillManager';
+import { ExecutionHistory } from './components/ExecutionHistory';
+import { SkillMetrics } from './components/SkillMetrics';
+import { LoopSettings } from './components/LoopSettings';
+import { InteractionSchemasProvider } from './tools/InteractionSchemasProvider';
+import { registerSkillLoopCards } from './tools/registerSkillLoopCards';
+
+export class PluginSkillHubClient extends Plugin {
+  async load() {
+    (this as any).app.use(InteractionSchemasProvider);
+
+    (this as any).app.pluginSettingsManager.add('skill-hub', {
+      title: (this as any).t('Skill Hub'),
+      icon: 'CodeOutlined',
+    });
+
+    (this as any).app.pluginSettingsManager.add('skill-hub.definitions', {
+      title: (this as any).t('Skill Definitions'),
+      Component: SkillManager,
+      aclSnippet: 'pm.skill-hub',
+    });
+
+    (this as any).app.pluginSettingsManager.add('skill-hub.loop-settings', {
+      title: (this as any).t('Skill Review Settings'),
+      Component: LoopSettings,
+      aclSnippet: 'pm.skill-hub',
+    });
+
+    (this as any).app.pluginSettingsManager.add('skill-hub.executions', {
+      title: (this as any).t('Execution History'),
+      Component: ExecutionHistory,
+      aclSnippet: 'pm.skill-hub',
+    });
+
+    (this as any).app.pluginSettingsManager.add('skill-hub.metrics', {
+      title: (this as any).t('Dashboard Metrics'),
+      Component: SkillMetrics,
+      aclSnippet: 'pm.skill-hub',
+    });
+
+    (this as any).app.eventBus?.addEventListener?.('auth:tokenChanged', (event: Event) => {
+      const token = (event as CustomEvent<{ token?: string | null }>).detail?.token;
+      if (token) {
+        this.registerSkillUiCards();
+      }
+    });
+
+    await this.registerSkillUiCards();
+  }
+
+  private async registerSkillUiCards() {
+    await registerSkillLoopCards((this as any).app);
+  }
+}
+
+export { SkillManager, ExecutionHistory, SkillMetrics, LoopSettings };
+export default PluginSkillHubClient;

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,99 +1,132 @@
-import React, { createContext, useContext, useEffect, useState } from 'react';
-import { useAPIClient } from '@nocobase/client';
-import { parseJsonText } from '../utils/jsonFields';
-import { InteractionSchema } from './loopTemplates';
-
-const Ctx = createContext<Map<string, InteractionSchema>>(new Map());
-
-export const useInteractionSchemas = () => useContext(Ctx);
-
-const sanitize = (name: string) =>
-  name
-    .toLowerCase()
-    .replace(/[^a-z0-9_]/g, '_')
-    .replace(/_+/g, '_')
-    .replace(/^_|_$/g, '');
-
-export const InteractionSchemasProvider: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
-  const api = useAPIClient();
-  const [map, setMap] = useState<Map<string, InteractionSchema>>(new Map());
-  const [version, setVersion] = useState(0);
-
-  useEffect(() => {
-    const refresh = () => setVersion((current) => current + 1);
-    window.addEventListener('skill-hub-loop-settings-changed', refresh);
-    return () => window.removeEventListener('skill-hub-loop-settings-changed', refresh);
-  }, []);
-
-  useEffect(() => {
-    let cancelled = false;
-    const extractList = (data: any) => {
-      const value = data?.data?.data ?? data?.data ?? data ?? [];
-      return Array.isArray(value) ? value : [];
-    };
-    const schemaFromLoopConfig = (config: any): InteractionSchema | null => {
-      const schema = parseJsonText<InteractionSchema | null>(config.schema, null);
-      if (schema) {
-        return config.prompt && !schema.prompt ? { ...schema, prompt: config.prompt } : schema;
-      }
-      if (config.prompt) {
-        return {
-          type: 'confirm',
-          prompt: config.prompt,
-        };
-      }
-      return null;
-    };
-
-    Promise.all([
-      api.request({
-        url: 'skillDefinitions:list',
-        params: {
-          filter: { enabled: true },
-          fields: ['id', 'name', 'autoCall', 'interactionSchema'],
-          pageSize: 500,
-        },
-      }),
-      api.request({
-        url: 'skillLoopConfigs:list',
-        params: {
-          filter: { enabled: true },
-          fields: ['skillId', 'enabled', 'schema', 'prompt', 'templateKey'],
-          pageSize: 500,
-        },
-      }).catch(() => ({ data: [] })),
-    ])
-      .then(([skillsResponse, loopConfigsResponse]) => {
-        if (cancelled) return;
-        const next = new Map<string, InteractionSchema>();
-        const skills = extractList(skillsResponse.data);
-        const loopConfigs = extractList(loopConfigsResponse.data);
-        const skillsById = new Map(skills.map((skill: any) => [String(skill.id), skill]));
-
-        for (const s of skills) {
-          if (s.autoCall) continue;
-          const schema = parseJsonText<InteractionSchema | null>(s.interactionSchema, null);
-          if (!schema) continue;
-          next.set(sanitize(s.name), schema);
-        }
-
-        for (const config of loopConfigs) {
-          const skill = skillsById.get(String(config.skillId));
-          if (!skill?.name) continue;
-          const schema = schemaFromLoopConfig(config);
-          if (!schema) continue;
-          next.set(sanitize(skill.name), schema);
-        }
-
-        setMap(next);
-      })
-      .catch(() => {
-        // silently ignore — user may lack permission to list definitions
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [api, version]);
-
-  return <Ctx.Provider value={map}>{children}</Ctx.Provider>;
-};
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { useApp } from '@nocobase/client-v2';
+import { parseJsonText } from '../utils/jsonFields';
+import { InteractionSchema } from './loopTemplates';
+
+const Ctx = createContext<Map<string, InteractionSchema>>(new Map());
+
+export const useInteractionSchemas = () => useContext(Ctx);
+
+type ApiClientWithAuth = ReturnType<typeof useApp>['apiClient'] & {
+  auth?: {
+    getToken?: () => string | null | undefined;
+    token?: string | null;
+  };
+  app?: {
+    eventBus?: {
+      addEventListener?: (type: string, listener: EventListenerOrEventListenerObject) => void;
+      removeEventListener?: (type: string, listener: EventListenerOrEventListenerObject) => void;
+    };
+  };
+};
+
+const sanitize = (name: string) =>
+  name
+    .toLowerCase()
+    .replace(/[^a-z0-9_]/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_|_$/g, '');
+
+export const InteractionSchemasProvider: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
+  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);
+
+  useEffect(() => {
+    const refresh = () => setVersion((current) => current + 1);
+    const refreshAfterSignIn = (event: Event) => {
+      const token = (event as CustomEvent<{ token?: string | null }>).detail?.token;
+      if (token) {
+        refresh();
+      }
+    };
+    window.addEventListener('skill-hub-loop-settings-changed', refresh);
+    api.app?.eventBus?.addEventListener?.('auth:tokenChanged', refreshAfterSignIn);
+    return () => {
+      window.removeEventListener('skill-hub-loop-settings-changed', refresh);
+      api.app?.eventBus?.removeEventListener?.('auth:tokenChanged', refreshAfterSignIn);
+    };
+  }, [api]);
+
+  useEffect(() => {
+    let cancelled = false;
+    if (!authToken) {
+      return () => {
+        cancelled = true;
+      };
+    }
+    const extractList = (data: any) => {
+      const value = data?.data?.data ?? data?.data ?? data ?? [];
+      return Array.isArray(value) ? value : [];
+    };
+    const schemaFromLoopConfig = (config: any): InteractionSchema | null => {
+      const schema = parseJsonText<InteractionSchema | null>(config.schema, null);
+      if (schema) {
+        return config.prompt && !schema.prompt ? { ...schema, prompt: config.prompt } : schema;
+      }
+      if (config.prompt) {
+        return {
+          type: 'confirm',
+          prompt: config.prompt,
+        };
+      }
+      return null;
+    };
+
+    Promise.all([
+      api.request({
+        url: 'skillDefinitions:list',
+        skipNotify: true,
+        params: {
+          filter: { enabled: true },
+          fields: ['id', 'name', 'autoCall', 'interactionSchema'],
+          pageSize: 500,
+        },
+      }),
+      api
+        .request({
+          url: 'skillLoopConfigs:list',
+          skipNotify: true,
+          params: {
+            filter: { enabled: true },
+            fields: ['skillId', 'enabled', 'schema', 'prompt', 'templateKey'],
+            pageSize: 500,
+          },
+        })
+        .catch(() => ({ data: [] })),
+    ])
+      .then(([skillsResponse, loopConfigsResponse]) => {
+        if (cancelled) return;
+        const next = new Map<string, InteractionSchema>();
+        const skills = extractList(skillsResponse.data);
+        const loopConfigs = extractList(loopConfigsResponse.data);
+        const skillsById = new Map(skills.map((skill: any) => [String(skill.id), skill]));
+
+        for (const s of skills) {
+          if (s.autoCall) continue;
+          const schema = parseJsonText<InteractionSchema | null>(s.interactionSchema, null);
+          if (!schema) continue;
+          next.set(sanitize(s.name), schema);
+        }
+
+        for (const config of loopConfigs) {
+          const skill = skillsById.get(String(config.skillId));
+          if (!skill?.name) continue;
+          const schema = schemaFromLoopConfig(config);
+          if (!schema) continue;
+          next.set(sanitize(skill.name), schema);
+        }
+
+        setMap(next);
+      })
+      .catch(() => {
+        // silently ignore — user may lack permission to list definitions
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [api, authToken, version]);
+
+  return <Ctx.Provider value={map}>{children}</Ctx.Provider>;
+};

package/src/client/skill-hub/tools/registerSkillLoopCards.ts

@@ -1,58 +1,71 @@
-import { SkillHubCard } from './SkillHubCard';
-import { parseJsonText } from '../utils/jsonFields';
-
-const sanitize = (name: string) =>
-  name
-    .toLowerCase()
-    .replace(/[^a-z0-9_]/g, '_')
-    .replace(/_+/g, '_')
-    .replace(/^_|_$/g, '');
-
-const extractList = (data: any) => {
-  const value = data?.data?.data ?? data?.data ?? data ?? [];
-  return Array.isArray(value) ? value : [];
-};
-
-export async function registerSkillLoopCards(app: any) {
-  const toolsManager = app.aiManager?.toolsManager;
-  if (!toolsManager) return;
-
-  try {
-    const skillsResponse = await app.apiClient.request({
-      url: 'skillDefinitions:list',
-      params: {
-        filter: { enabled: true },
-        fields: ['id', 'name', 'autoCall', 'interactionSchema'],
-        pageSize: 500,
-      },
-    });
-
-    let loopSkillIds = new Set<string>();
-    try {
-      const loopConfigsResponse = await app.apiClient.request({
-        url: 'skillLoopConfigs:list',
-        params: {
-          filter: { enabled: true },
-          fields: ['skillId'],
-          pageSize: 500,
-        },
-      });
-      loopSkillIds = new Set(extractList(loopConfigsResponse.data).map((config: any) => String(config.skillId)));
-      if (loopSkillIds.size > 0) {
-        toolsManager.registerTools('skill_hub_execute', { ui: { card: SkillHubCard } });
-      }
-    } catch {
-      // Older deployments may not have the collection before migration/sync.
-    }
-
-    const skills = extractList(skillsResponse.data);
-    for (const skill of skills) {
-      const hasLoopConfig = loopSkillIds.has(String(skill.id));
-      const hasLegacySchema = !skill.autoCall && !!parseJsonText(skill.interactionSchema, null);
-      if (!hasLoopConfig && !hasLegacySchema) continue;
-      toolsManager.registerTools(`skill_hub_${sanitize(skill.name)}`, { ui: { card: SkillHubCard } });
-    }
-  } catch {
-    // user without ACL or backend unavailable - skip silently
-  }
-}
+import { SkillHubCard } from './SkillHubCard';
+import { parseJsonText } from '../utils/jsonFields';
+
+const sanitize = (name: string) =>
+  name
+    .toLowerCase()
+    .replace(/[^a-z0-9_]/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_|_$/g, '');
+
+const extractList = (data: any) => {
+  const value = data?.data?.data ?? data?.data ?? data ?? [];
+  return Array.isArray(value) ? value : [];
+};
+
+const getAuthToken = (app: any) => app?.apiClient?.auth?.getToken?.() || app?.apiClient?.auth?.token || '';
+
+const registerSkillHubCard = (toolsManager: any, name: string) => {
+  try {
+    toolsManager.registerTools(name, { ui: { card: SkillHubCard } });
+  } catch (err: unknown) {
+    if (!(err instanceof Error) || !err.message.includes('override existing keys')) {
+      throw err;
+    }
+  }
+};
+
+export async function registerSkillLoopCards(app: any) {
+  const toolsManager = app.aiManager?.toolsManager;
+  if (!toolsManager) return;
+  registerSkillHubCard(toolsManager, 'skill_hub_execute');
+  if (!getAuthToken(app)) return;
+
+  try {
+    const skillsResponse = await app.apiClient.request({
+      url: 'skillDefinitions:list',
+      skipNotify: true,
+      params: {
+        filter: { enabled: true },
+        fields: ['id', 'name', 'autoCall', 'interactionSchema'],
+        pageSize: 500,
+      },
+    });
+
+    let loopSkillIds = new Set<string>();
+    try {
+      const loopConfigsResponse = await app.apiClient.request({
+        url: 'skillLoopConfigs:list',
+        skipNotify: true,
+        params: {
+          filter: { enabled: true },
+          fields: ['skillId'],
+          pageSize: 500,
+        },
+      });
+      loopSkillIds = new Set(extractList(loopConfigsResponse.data).map((config: any) => String(config.skillId)));
+    } catch {
+      // Older deployments may not have the collection before migration/sync.
+    }
+
+    const skills = extractList(skillsResponse.data);
+    for (const skill of skills) {
+      const hasLoopConfig = loopSkillIds.has(String(skill.id));
+      const hasLegacySchema = !skill.autoCall && !!parseJsonText(skill.interactionSchema, null);
+      if (!hasLoopConfig && !hasLegacySchema) continue;
+      registerSkillHubCard(toolsManager, `skill_hub_${sanitize(skill.name)}`);
+    }
+  } catch {
+    // user without ACL or backend unavailable - skip silently
+  }
+}

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);

package/src/client/tools/registerOrchestratorCards.ts

@@ -1,7 +1,17 @@
-import { PlanApprovalCard } from './PlanApprovalCard';
-
-export async function registerOrchestratorCards(app: any) {
-  const toolsManager = app.aiManager?.toolsManager;
-  if (!toolsManager) return;
-  toolsManager.registerTools('orchestrator_execute_plan', { ui: { card: PlanApprovalCard } });
-}
+import { PlanApprovalCard } from './PlanApprovalCard';
+
+const registerToolCard = (toolsManager: any, name: string) => {
+  try {
+    toolsManager.registerTools(name, { ui: { card: PlanApprovalCard } });
+  } catch (err: unknown) {
+    if (!(err instanceof Error) || !err.message.includes('override existing keys')) {
+      throw err;
+    }
+  }
+};
+
+export async function registerOrchestratorCards(app: any) {
+  const toolsManager = app.aiManager?.toolsManager;
+  if (!toolsManager) return;
+  registerToolCard(toolsManager, 'orchestrator_execute_plan');
+}

package/src/client-v2/components/AIEmployeeSelect.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { Select } from 'antd';
+import { useAIEmployees } from './AIEmployeesContext';
+
+/**
+ * Reusable Select component for AI Employees.
+ * Uses shared AIEmployeesContext instead of making its own API call.
+ */
+export const AIEmployeeSelect: React.FC<{
+  value?: string;
+  onChange?: (value: string) => void;
+  exclude?: string; // username to exclude (prevent self-reference)
+  placeholder?: string;
+}> = ({ value, onChange, exclude, placeholder = 'Select AI Employee...' }) => {
+  const { employees, loading } = useAIEmployees();
+
+  const options = React.useMemo(() => {
+    return employees
+      .filter((emp) => !exclude || emp.username !== exclude)
+      .map((emp) => ({
+        label: emp.nickname,
+        value: emp.username,
+        description: emp.about,
+      }));
+  }, [employees, exclude]);
+
+  return (
+    <Select
+      loading={loading}
+      options={options}
+      value={value}
+      onChange={onChange}
+      placeholder={placeholder}
+      showSearch
+      filterOption={(input, option) =>
+        (option?.label ?? '').toString().toLowerCase().includes(input.toLowerCase()) ||
+        (option?.value ?? '').toString().toLowerCase().includes(input.toLowerCase())
+      }
+      optionRender={(option) => (
+        <div>
+          <div style={{ fontWeight: 500 }}>{option.label}</div>
+          {option.data.description && <div style={{ fontSize: 12, color: '#888' }}>{option.data.description}</div>}
+        </div>
+      )}
+    />
+  );
+};