plugin-agent-orchestrator 1.0.28 → 1.0.32

package/src/client/plugin.tsx

@@ -2,7 +2,6 @@ import { Plugin } from '@nocobase/client';
 import { OrchestratorSettings } from './OrchestratorSettings';
 import { InteractionSchemasProvider } from './skill-hub/tools/InteractionSchemasProvider';
 import { registerSkillLoopCards } from './skill-hub/tools/registerSkillLoopCards';
-import { registerOrchestratorCards } from './tools/registerOrchestratorCards';
 
 export class PluginAgentOrchestratorClient extends Plugin {
   async load() {
@@ -26,7 +25,6 @@ export class PluginAgentOrchestratorClient extends Plugin {
   }
 
   private async registerSkillUiCards() {
-    await registerOrchestratorCards((this as any).app);
     await registerSkillLoopCards((this as any).app);
   }
 }

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

@@ -1,202 +1,200 @@
-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 { 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',
-  running: 'processing',
-  succeeded: 'success',
-  failed: 'error',
-  canceled: 'warning',
-  timeout: 'error',
-};
-
-export const ExecutionHistory: React.FC = () => {
-  const api = useApp().apiClient;
-  const t = useT();
-  const [executions, setExecutions] = useState<any[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [page, setPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  const pageSize = 20;
-
-  const fetchExecutions = useCallback(async () => {
-    setLoading(true);
-    try {
-      const { data } = await api.request({
-        url: 'skillExecutions:list',
-        params: {
-          page,
-          pageSize,
-          sort: ['-createdAt'],
-          appends: ['skill', 'triggeredBy'],
-        },
-      });
-      const rawData = data?.data?.data ?? data?.data ?? [];
-      setExecutions(Array.isArray(rawData) ? rawData : []);
-      setTotal(data?.meta?.count || 0);
-    } catch {
-      // ignore
-    } finally {
-      setLoading(false);
-    }
-  }, [api, page]);
-
-  useEffect(() => {
-    fetchExecutions();
-  }, [fetchExecutions]);
-
-  const handleDelete = async (id: number) => {
-    try {
-      await api.request({
-        url: `skillExecutions:destroy`,
-        method: 'POST',
-        params: {
-          filterByTk: id
-        }
-      });
-      message.success(t('Deleted successfully'));
-      fetchExecutions();
-    } catch (err: any) {
-      message.error(err?.response?.data?.errors?.[0]?.message || t('Delete failed'));
-    }
-  };
-
-  const columns = [
-    {
-      title: 'ID',
-      dataIndex: 'id',
-      key: 'id',
-      width: 80,
-    },
-    {
-      title: t('Skill'),
-      dataIndex: ['skill', 'title'],
-      key: 'skill',
-      width: 180,
-    },
-    {
-      title: t('Status'),
-      dataIndex: 'status',
-      key: 'status',
-      width: 120,
-      render: (status: string) => (
-        <Tag color={STATUS_COLORS[status] || 'default'}>{status}</Tag>
-      ),
-    },
-    {
-      title: t('Duration'),
-      dataIndex: 'durationMs',
-      key: 'duration',
-      width: 100,
-      render: (ms: number) => (ms ? `${(ms / 1000).toFixed(1)}s` : '-'),
-    },
-    {
-      title: t('Files'),
-      dataIndex: 'outputFiles',
-      key: 'files',
-      width: 250,
-      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,
-          filename: f.name,
-          extname: f.name.includes('.') ? `.${f.name.split('.').pop()}` : '',
-          url: `/api/skillHub:download?execId=${record.id}&filename=${encodeURIComponent(f.name)}`,
-          status: 'done'
-        }));
-        return <Upload.ReadPretty value={formattedFiles} multiple={true} showFileName={true} />;
-      },
-    },
-    {
-      title: t('Triggered By'),
-      dataIndex: ['triggeredBy', 'nickname'],
-      key: 'triggeredBy',
-      width: 120,
-      render: (v: string) => v || '-',
-    },
-    {
-      title: t('Created At'),
-      dataIndex: 'createdAt',
-      key: 'createdAt',
-      width: 180,
-      render: (v: string) => (v ? new Date(v).toLocaleString() : '-'),
-    },
-    {
-      title: t('Output'),
-      key: 'output',
-      width: 200,
-      render: (_: any, record: any) => (
-        <Space direction="vertical" size={0}>
-          {record.stdout && (
-            <Tooltip title={record.stdout}>
-              <Typography.Text style={{ fontSize: 12, maxWidth: 200 }} ellipsis>
-                {record.stdout}
-              </Typography.Text>
-            </Tooltip>
-          )}
-          {record.stderr && (
-            <Tooltip title={record.stderr}>
-              <Typography.Text type="danger" style={{ fontSize: 12, maxWidth: 200 }} ellipsis>
-                {record.stderr}
-              </Typography.Text>
-            </Tooltip>
-          )}
-        </Space>
-      ),
-    },
-    {
-      title: t('Actions'),
-      key: 'actions',
-      width: 80,
-      fixed: 'right' as const,
-      render: (_: any, record: any) => (
-        <Space size="middle">
-          <Popconfirm
-            title={t('Are you sure to delete this execution history and its files?')}
-            onConfirm={() => handleDelete(record.id)}
-            okText={t('Yes')}
-            cancelText={t('No')}
-          >
-            <Button type="text" danger icon={<DeleteOutlined />} size="small" />
-          </Popconfirm>
-        </Space>
-      ),
-    },
-  ];
-
-  return (
-    <Card
-      title={t('Execution History')}
-      extra={
-        <Space>
-          <Button icon={<ReloadOutlined />} onClick={fetchExecutions} loading={loading}>
-            {t('Refresh')}
-          </Button>
-        </Space>
-      }
-    >
-      <Table
-        dataSource={executions}
-        columns={columns}
-        rowKey="id"
-        loading={loading}
-        size="middle"
-        pagination={{
-          current: page,
-          pageSize,
-          total,
-          onChange: setPage,
-          showTotal: (t) => `Total: ${t}`,
-        }}
-        scroll={{ x: 1200 }}
-      />
-    </Card>
-  );
-};
+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 { 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',
+  running: 'processing',
+  succeeded: 'success',
+  failed: 'error',
+  canceled: 'warning',
+  timeout: 'error',
+};
+
+export const ExecutionHistory: React.FC = () => {
+  const api = useApp().apiClient;
+  const t = useT();
+  const [executions, setExecutions] = useState<any[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [page, setPage] = useState(1);
+  const [total, setTotal] = useState(0);
+  const pageSize = 20;
+
+  const fetchExecutions = useCallback(async () => {
+    setLoading(true);
+    try {
+      const { data } = await api.request({
+        url: 'skillExecutions:list',
+        params: {
+          page,
+          pageSize,
+          sort: ['-createdAt'],
+          appends: ['skill', 'triggeredBy'],
+        },
+      });
+      const rawData = data?.data?.data ?? data?.data ?? [];
+      setExecutions(Array.isArray(rawData) ? rawData : []);
+      setTotal(data?.meta?.count || 0);
+    } catch {
+      // ignore
+    } finally {
+      setLoading(false);
+    }
+  }, [api, page]);
+
+  useEffect(() => {
+    fetchExecutions();
+  }, [fetchExecutions]);
+
+  const handleDelete = async (id: number) => {
+    try {
+      await api.request({
+        url: `skillExecutions:destroy`,
+        method: 'POST',
+        params: {
+          filterByTk: id,
+        },
+      });
+      message.success(t('Deleted successfully'));
+      fetchExecutions();
+    } catch (err: any) {
+      message.error(err?.response?.data?.errors?.[0]?.message || t('Delete failed'));
+    }
+  };
+
+  const columns = [
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      width: 80,
+    },
+    {
+      title: t('Skill'),
+      dataIndex: ['skill', 'title'],
+      key: 'skill',
+      width: 180,
+    },
+    {
+      title: t('Status'),
+      dataIndex: 'status',
+      key: 'status',
+      width: 120,
+      render: (status: string) => <Tag color={STATUS_COLORS[status] || 'default'}>{status}</Tag>,
+    },
+    {
+      title: t('Duration'),
+      dataIndex: 'durationMs',
+      key: 'duration',
+      width: 100,
+      render: (ms: number) => (ms ? `${(ms / 1000).toFixed(1)}s` : '-'),
+    },
+    {
+      title: t('Files'),
+      dataIndex: 'outputFiles',
+      key: 'files',
+      width: 250,
+      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,
+          filename: f.name,
+          extname: f.name.includes('.') ? `.${f.name.split('.').pop()}` : '',
+          url: `/api/skillHub:download?execId=${record.id}&filename=${encodeURIComponent(f.name)}`,
+          status: 'done',
+        }));
+        return <Upload.ReadPretty value={formattedFiles} multiple={true} showFileName={true} />;
+      },
+    },
+    {
+      title: t('Triggered By'),
+      dataIndex: ['triggeredBy', 'nickname'],
+      key: 'triggeredBy',
+      width: 120,
+      render: (v: string) => v || '-',
+    },
+    {
+      title: t('Created At'),
+      dataIndex: 'createdAt',
+      key: 'createdAt',
+      width: 180,
+      render: (v: string) => (v ? new Date(v).toLocaleString() : '-'),
+    },
+    {
+      title: t('Output'),
+      key: 'output',
+      width: 200,
+      render: (_: any, record: any) => (
+        <Space direction="vertical" size={0}>
+          {record.stdout && (
+            <Tooltip title={record.stdout}>
+              <Typography.Text style={{ fontSize: 12, maxWidth: 200 }} ellipsis>
+                {record.stdout}
+              </Typography.Text>
+            </Tooltip>
+          )}
+          {record.stderr && (
+            <Tooltip title={record.stderr}>
+              <Typography.Text type="danger" style={{ fontSize: 12, maxWidth: 200 }} ellipsis>
+                {record.stderr}
+              </Typography.Text>
+            </Tooltip>
+          )}
+        </Space>
+      ),
+    },
+    {
+      title: t('Actions'),
+      key: 'actions',
+      width: 80,
+      fixed: 'right' as const,
+      render: (_: any, record: any) => (
+        <Space size="middle">
+          <Popconfirm
+            title={t('Are you sure to delete this execution history and its files?')}
+            onConfirm={() => handleDelete(record.id)}
+            okText={t('Yes')}
+            cancelText={t('No')}
+          >
+            <Button type="text" danger icon={<DeleteOutlined />} size="small" />
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <Card
+      title={t('Execution History')}
+      extra={
+        <Space>
+          <Button icon={<ReloadOutlined />} onClick={fetchExecutions} loading={loading}>
+            {t('Refresh')}
+          </Button>
+        </Space>
+      }
+    >
+      <Table
+        dataSource={executions}
+        columns={columns}
+        rowKey="id"
+        loading={loading}
+        size="middle"
+        pagination={{
+          current: page,
+          pageSize,
+          total,
+          onChange: setPage,
+          showTotal: (t) => `Total: ${t}`,
+        }}
+        scroll={{ x: 1200 }}
+      />
+    </Card>
+  );
+};

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

@@ -1,55 +1,51 @@
-import React from 'react';
-import { Progress, Typography } from 'antd';
-import { LoadingOutlined, CheckCircleOutlined } from '@ant-design/icons';
-
-interface ExecutionProgressProps {
-  execId: string;
-  skillName: string;
-  percent: number;
-  log: string;
-}
-
-/**
- * Progress component rendered inside chat UI when receiving
- * SSE custom event: {action: "skillProgress", body: {...}}
- *
- * Usage in chat message renderer:
- * ```
- * if (event.action === 'skillProgress') {
- *   return <ExecutionProgress {...event.body} />;
- * }
- * ```
- */
-export const ExecutionProgress: React.FC<ExecutionProgressProps> = ({
-  skillName,
-  percent,
-  log,
-}) => {
-  const isDone = percent >= 100;
-
-  return (
-    <div style={{ padding: '8px 12px', background: '#fafafa', borderRadius: 6, margin: '4px 0' }}>
-      <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 4 }}>
-        {isDone ? (
-          <CheckCircleOutlined style={{ color: '#52c41a' }} />
-        ) : (
-          <LoadingOutlined style={{ color: '#1890ff' }} />
-        )}
-        <Typography.Text strong style={{ fontSize: 13 }}>
-          {skillName}
-        </Typography.Text>
-      </div>
-      <Progress
-        percent={percent}
-        size="small"
-        status={isDone ? 'success' : 'active'}
-        strokeColor={isDone ? '#52c41a' : '#1890ff'}
-      />
-      {log && (
-        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-          {log}
-        </Typography.Text>
-      )}
-    </div>
-  );
-};
+import React from 'react';
+import { Progress, Typography } from 'antd';
+import { LoadingOutlined, CheckCircleOutlined } from '@ant-design/icons';
+
+interface ExecutionProgressProps {
+  execId: string;
+  skillName: string;
+  percent: number;
+  log: string;
+}
+
+/**
+ * Progress component rendered inside chat UI when receiving
+ * SSE custom event: {action: "skillProgress", body: {...}}
+ *
+ * Usage in chat message renderer:
+ * ```
+ * if (event.action === 'skillProgress') {
+ *   return <ExecutionProgress {...event.body} />;
+ * }
+ * ```
+ */
+export const ExecutionProgress: React.FC<ExecutionProgressProps> = ({ skillName, percent, log }) => {
+  const isDone = percent >= 100;
+
+  return (
+    <div style={{ padding: '8px 12px', background: '#fafafa', borderRadius: 6, margin: '4px 0' }}>
+      <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 4 }}>
+        {isDone ? (
+          <CheckCircleOutlined style={{ color: '#52c41a' }} />
+        ) : (
+          <LoadingOutlined style={{ color: '#1890ff' }} />
+        )}
+        <Typography.Text strong style={{ fontSize: 13 }}>
+          {skillName}
+        </Typography.Text>
+      </div>
+      <Progress
+        percent={percent}
+        size="small"
+        status={isDone ? 'success' : 'active'}
+        strokeColor={isDone ? '#52c41a' : '#1890ff'}
+      />
+      {log && (
+        <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+          {log}
+        </Typography.Text>
+      )}
+    </div>
+  );
+};