plugin-agent-orchestrator 1.0.28 → 1.0.32

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

@@ -1,145 +1,141 @@
-import React, { useState } from 'react';
-import { Modal, Input, Button, Alert, Typography, Space, Spin } from 'antd';
-import { Upload } from '@nocobase/client';
-import { useApp } from '@nocobase/client-v2';
-import { useT } from '../locale';
-import { parseJsonText } from '../utils/jsonFields';
-
-const { TextArea } = Input;
-
-interface SkillTestPanelProps {
-  skill: any;
-  onClose: () => void;
-}
-
-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,
-        )
-      : '{}',
-  );
-  const [running, setRunning] = useState(false);
-  const [result, setResult] = useState<any>(null);
-  const [error, setError] = useState('');
-
-  const handleRun = async () => {
-    setRunning(true);
-    setResult(null);
-    setError('');
-
-    let parsedInput;
-    try {
-      parsedInput = JSON.parse(input);
-    } catch {
-      setError(t('Invalid JSON input'));
-      setRunning(false);
-      return;
-    }
-
-    try {
-      const { data } = await api.request({
-        url: 'skillHub:test',
-        method: 'POST',
-        data: { skillId: skill.id, input: parsedInput },
-      });
-      const responseData = data?.data?.data || data?.data || data;
-      setResult(responseData);
-    } catch (err: any) {
-      setError(err?.response?.data?.errors?.[0]?.message || err.message || t('Execution failed'));
-    } finally {
-      setRunning(false);
-    }
-  };
-
-  return (
-    <Modal
-      open
-      title={`${t('Test Skill')}: ${skill.title}`}
-      onCancel={onClose}
-      footer={[
-        <Button key="close" onClick={onClose}>
-          {t('Close')}
-        </Button>,
-        <Button key="run" type="primary" onClick={handleRun} loading={running}>
-          {t('Run')}
-        </Button>,
-      ]}
-      width={640}
-      destroyOnClose
-    >
-      <Space direction="vertical" style={{ width: '100%' }} size="middle">
-        <div>
-          <Typography.Text strong>{t('Input (JSON)')}</Typography.Text>
-          <TextArea
-            rows={6}
-            value={input}
-            onChange={(e) => setInput(e.target.value)}
-            style={{ fontFamily: 'monospace', fontSize: 13, marginTop: 4 }}
-          />
-        </div>
-
-        {running && <Spin tip={t('Running skill on worker...')} />}
-
-        {error && <Alert type="error" message={error} showIcon />}
-
-        {result && (
-          <>
-            <Alert
-              type={result.status === 'succeeded' ? 'success' : 'error'}
-              message={result.status === 'succeeded' ? t('Succeeded') : t('Failed')}
-              description={`Duration: ${result.durationMs || 0}ms`}
-              showIcon
-            />
-
-            {result.stdout && (
-              <div>
-                <Typography.Text strong>stdout:</Typography.Text>
-                <pre style={{ background: '#f5f5f5', padding: 8, maxHeight: 200, overflow: 'auto', fontSize: 12 }}>
-                  {result.stdout}
-                </pre>
-              </div>
-            )}
-
-            {result.stderr && (
-              <div>
-                <Typography.Text strong type="danger">stderr:</Typography.Text>
-                <pre style={{ background: '#fff2f0', padding: 8, maxHeight: 200, overflow: 'auto', fontSize: 12 }}>
-                  {result.stderr}
-                </pre>
-              </div>
-            )}
-
-            {result.files?.length > 0 && (
-              <div>
-                <Typography.Text strong>{t('Output Files')}:</Typography.Text>
-                <div style={{ marginTop: 8 }}>
-                  <Upload.ReadPretty 
-                    value={result.files.map((f: any, i: number) => ({
-                      id: `test-${f.name}-${i}`,
-                      title: f.name,
-                      filename: f.name,
-                      extname: f.name.includes('.') ? `.${f.name.split('.').pop()}` : '',
-                      url: f.downloadUrl,
-                      status: 'done'
-                    }))} 
-                    multiple={true} 
-                    showFileName={true} 
-                  />
-                </div>
-              </div>
-            )}
-          </>
-        )}
-      </Space>
-    </Modal>
-  );
-};
+import React, { useState } from 'react';
+import { Modal, Input, Button, Alert, Typography, Space, Spin } from 'antd';
+import { Upload } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
+import { useT } from '../locale';
+import { parseJsonText } from '../utils/jsonFields';
+
+const { TextArea } = Input;
+
+interface SkillTestPanelProps {
+  skill: any;
+  onClose: () => void;
+}
+
+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)
+      : '{}',
+  );
+  const [running, setRunning] = useState(false);
+  const [result, setResult] = useState<any>(null);
+  const [error, setError] = useState('');
+
+  const handleRun = async () => {
+    setRunning(true);
+    setResult(null);
+    setError('');
+
+    let parsedInput;
+    try {
+      parsedInput = JSON.parse(input);
+    } catch {
+      setError(t('Invalid JSON input'));
+      setRunning(false);
+      return;
+    }
+
+    try {
+      const { data } = await api.request({
+        url: 'skillHub:test',
+        method: 'POST',
+        data: { skillId: skill.id, input: parsedInput },
+      });
+      const responseData = data?.data?.data || data?.data || data;
+      setResult(responseData);
+    } catch (err: any) {
+      setError(err?.response?.data?.errors?.[0]?.message || err.message || t('Execution failed'));
+    } finally {
+      setRunning(false);
+    }
+  };
+
+  return (
+    <Modal
+      open
+      title={`${t('Test Skill')}: ${skill.title}`}
+      onCancel={onClose}
+      footer={[
+        <Button key="close" onClick={onClose}>
+          {t('Close')}
+        </Button>,
+        <Button key="run" type="primary" onClick={handleRun} loading={running}>
+          {t('Run')}
+        </Button>,
+      ]}
+      width={640}
+      destroyOnClose
+    >
+      <Space direction="vertical" style={{ width: '100%' }} size="middle">
+        <div>
+          <Typography.Text strong>{t('Input (JSON)')}</Typography.Text>
+          <TextArea
+            rows={6}
+            value={input}
+            onChange={(e) => setInput(e.target.value)}
+            style={{ fontFamily: 'monospace', fontSize: 13, marginTop: 4 }}
+          />
+        </div>
+
+        {running && <Spin tip={t('Running skill on worker...')} />}
+
+        {error && <Alert type="error" message={error} showIcon />}
+
+        {result && (
+          <>
+            <Alert
+              type={result.status === 'succeeded' ? 'success' : 'error'}
+              message={result.status === 'succeeded' ? t('Succeeded') : t('Failed')}
+              description={`Duration: ${result.durationMs || 0}ms`}
+              showIcon
+            />
+
+            {result.stdout && (
+              <div>
+                <Typography.Text strong>stdout:</Typography.Text>
+                <pre style={{ background: '#f5f5f5', padding: 8, maxHeight: 200, overflow: 'auto', fontSize: 12 }}>
+                  {result.stdout}
+                </pre>
+              </div>
+            )}
+
+            {result.stderr && (
+              <div>
+                <Typography.Text strong type="danger">
+                  stderr:
+                </Typography.Text>
+                <pre style={{ background: '#fff2f0', padding: 8, maxHeight: 200, overflow: 'auto', fontSize: 12 }}>
+                  {result.stderr}
+                </pre>
+              </div>
+            )}
+
+            {result.files?.length > 0 && (
+              <div>
+                <Typography.Text strong>{t('Output Files')}:</Typography.Text>
+                <div style={{ marginTop: 8 }}>
+                  <Upload.ReadPretty
+                    value={result.files.map((f: any, i: number) => ({
+                      id: `test-${f.name}-${i}`,
+                      title: f.name,
+                      filename: f.name,
+                      extname: f.name.includes('.') ? `.${f.name.split('.').pop()}` : '',
+                      url: f.downloadUrl,
+                      status: 'done',
+                    }))}
+                    multiple={true}
+                    showFileName={true}
+                  />
+                </div>
+              </div>
+            )}
+          </>
+        )}
+      </Space>
+    </Modal>
+  );
+};

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

@@ -1,16 +1,16 @@
-import { useApp } from '@nocobase/client-v2';
-import { useCallback } from 'react';
-export const namespace = 'plugin-agent-orchestrator';
-
-export function useT() {
-  const app = useApp();
-  return useCallback(
-    (str: string, options?: any): string =>
-      app.i18n.t(str, { ns: [namespace, 'client'], ...options }) as unknown as string,
-    [app.i18n]
-  );
-}
-
-export function tStr(key: string) {
-  return `{{t(${JSON.stringify(key)}, { ns: ['${namespace}', 'client'], nsMode: 'fallback' })}}`;
-}
+import { useApp } from '@nocobase/client-v2';
+import { useCallback } from 'react';
+export const namespace = 'plugin-agent-orchestrator';
+
+export function useT() {
+  const app = useApp();
+  return useCallback(
+    (str: string, options?: any): string =>
+      app.i18n.t(str, { ns: [namespace, 'client'], ...options }) as unknown as string,
+    [app.i18n],
+  );
+}
+
+export function tStr(key: string) {
+  return `{{t(${JSON.stringify(key)}, { ns: ['${namespace}', 'client'], nsMode: 'fallback' })}}`;
+}

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

@@ -1,109 +1,104 @@
-import React from 'react';
-import { Form, Input, Select, Radio, InputNumber, Button, Space, Card, Typography } from 'antd';
-import { ToolsUIProperties } from '@nocobase/client';
-import { useInteractionSchemas } from './InteractionSchemasProvider';
-
-export const SkillHubCard: React.FC<ToolsUIProperties> = ({ toolCall, decisions }) => {
-  const schemas = useInteractionSchemas();
-  const [form] = Form.useForm();
-
-  const sanitize = (name: string) =>
-    name
-      .toLowerCase()
-      .replace(/[^a-z0-9_]/g, '_')
-      .replace(/_+/g, '_')
-      .replace(/^_|_$/g, '');
-  const isGenericExecutor = toolCall.name === 'skill_hub_execute';
-  const rawArgs = (toolCall.args as Record<string, any>) || {};
-  const skillKey = isGenericExecutor ? sanitize(rawArgs.skillName || '') : toolCall.name.replace(/^skill_hub_/, '');
-  const schema = schemas.get(skillKey);
-
-  const interrupted = toolCall.invokeStatus === 'init' || toolCall.invokeStatus === 'interrupted';
-  if (!interrupted) {
-    return null;
-  }
-
-  if (!schema) {
-    return (
-      <Card size="small" style={{ marginTop: 8 }}>
-        <Typography.Paragraph style={{ marginBottom: 12 }}>
-          Review this Skill Hub tool call before execution.
-        </Typography.Paragraph>
-        <Space>
-          <Button type="primary" onClick={() => decisions.approve()}>
-            Run
-          </Button>
-          <Button onClick={() => decisions.reject('user_cancel')}>Cancel</Button>
-        </Space>
-      </Card>
-    );
-  }
-
-  const onSubmit = async () => {
-    const values = await form.validateFields();
-    const args = isGenericExecutor
-      ? {
-          ...rawArgs,
-          input: schema.type === 'select' ? values : { ...(rawArgs.input || {}), ...values },
-        }
-      : schema.type === 'select'
-        ? values
-        : { ...rawArgs, ...values };
-    await decisions.edit(args);
-  };
-
-  const renderField = (key: string, f: any) => {
-    if (f?.enum) {
-      return <Select options={f.enum.map((v: any) => ({ value: v, label: String(v) }))} />;
-    }
-    if (f?.type === 'number' || f?.type === 'integer') {
-      return <InputNumber style={{ width: '100%' }} />;
-    }
-    return <Input />;
-  };
-
-  return (
-    <Card size="small" style={{ marginTop: 8 }}>
-      <Typography.Paragraph style={{ marginBottom: 12 }}>{schema.prompt}</Typography.Paragraph>
-
-      {schema.type !== 'confirm' && (
-        <Form
-          form={form}
-          layout="vertical"
-          initialValues={(isGenericExecutor ? rawArgs.input : rawArgs) || {}}
-          style={{ marginBottom: 8 }}
-        >
-          {schema.type === 'select' && (
-            <Form.Item name="choice" rules={[{ required: true }]}>
-              <Radio.Group>
-                {(schema.options ?? []).map((o) => (
-                  <Radio key={String(o.value)} value={o.value}>
-                    {o.label}
-                  </Radio>
-                ))}
-              </Radio.Group>
-            </Form.Item>
-          )}
-          {schema.type === 'form' &&
-            Object.entries(schema.fields ?? {}).map(([key, f]) => (
-              <Form.Item
-                key={key}
-                name={key}
-                label={f.title || key}
-                rules={[{ required: !!f.required }]}
-              >
-                {renderField(key, f)}
-              </Form.Item>
-            ))}
-        </Form>
-      )}
-
-      <Space>
-        <Button type="primary" onClick={schema.type === 'confirm' ? () => decisions.approve() : onSubmit}>
-          Run
-        </Button>
-        <Button onClick={() => decisions.reject('user_cancel')}>Cancel</Button>
-      </Space>
-    </Card>
-  );
-};
+import React from 'react';
+import { Form, Input, Select, Radio, InputNumber, Button, Space, Card, Typography } from 'antd';
+import { ToolsUIProperties } from '@nocobase/client';
+import { useInteractionSchemas } from './InteractionSchemasProvider';
+
+export const SkillHubCard: React.FC<ToolsUIProperties> = ({ toolCall, decisions }) => {
+  const schemas = useInteractionSchemas();
+  const [form] = Form.useForm();
+
+  const sanitize = (name: string) =>
+    name
+      .toLowerCase()
+      .replace(/[^a-z0-9_]/g, '_')
+      .replace(/_+/g, '_')
+      .replace(/^_|_$/g, '');
+  const isGenericExecutor = toolCall.name === 'skill_hub_execute';
+  const rawArgs = (toolCall.args as Record<string, any>) || {};
+  const skillKey = isGenericExecutor ? sanitize(rawArgs.skillName || '') : toolCall.name.replace(/^skill_hub_/, '');
+  const schema = schemas.get(skillKey);
+
+  const interrupted = toolCall.invokeStatus === 'init' || toolCall.invokeStatus === 'interrupted';
+  if (!interrupted) {
+    return null;
+  }
+
+  if (!schema) {
+    return (
+      <Card size="small" style={{ marginTop: 8 }}>
+        <Typography.Paragraph style={{ marginBottom: 12 }}>
+          Review this Skill Hub tool call before execution.
+        </Typography.Paragraph>
+        <Space>
+          <Button type="primary" onClick={() => decisions.approve()}>
+            Run
+          </Button>
+          <Button onClick={() => decisions.reject('user_cancel')}>Cancel</Button>
+        </Space>
+      </Card>
+    );
+  }
+
+  const onSubmit = async () => {
+    const values = await form.validateFields();
+    const args = isGenericExecutor
+      ? {
+          ...rawArgs,
+          input: schema.type === 'select' ? values : { ...(rawArgs.input || {}), ...values },
+        }
+      : schema.type === 'select'
+        ? values
+        : { ...rawArgs, ...values };
+    await decisions.edit(args);
+  };
+
+  const renderField = (key: string, f: any) => {
+    if (f?.enum) {
+      return <Select options={f.enum.map((v: any) => ({ value: v, label: String(v) }))} />;
+    }
+    if (f?.type === 'number' || f?.type === 'integer') {
+      return <InputNumber style={{ width: '100%' }} />;
+    }
+    return <Input />;
+  };
+
+  return (
+    <Card size="small" style={{ marginTop: 8 }}>
+      <Typography.Paragraph style={{ marginBottom: 12 }}>{schema.prompt}</Typography.Paragraph>
+
+      {schema.type !== 'confirm' && (
+        <Form
+          form={form}
+          layout="vertical"
+          initialValues={(isGenericExecutor ? rawArgs.input : rawArgs) || {}}
+          style={{ marginBottom: 8 }}
+        >
+          {schema.type === 'select' && (
+            <Form.Item name="choice" rules={[{ required: true }]}>
+              <Radio.Group>
+                {(schema.options ?? []).map((o) => (
+                  <Radio key={String(o.value)} value={o.value}>
+                    {o.label}
+                  </Radio>
+                ))}
+              </Radio.Group>
+            </Form.Item>
+          )}
+          {schema.type === 'form' &&
+            Object.entries(schema.fields ?? {}).map(([key, f]) => (
+              <Form.Item key={key} name={key} label={f.title || key} rules={[{ required: !!f.required }]}>
+                {renderField(key, f)}
+              </Form.Item>
+            ))}
+        </Form>
+      )}
+
+      <Space>
+        <Button type="primary" onClick={schema.type === 'confirm' ? () => decisions.approve() : onSubmit}>
+          Run
+        </Button>
+        <Button onClick={() => decisions.reject('user_cancel')}>Cancel</Button>
+      </Space>
+    </Card>
+  );
+};

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

@@ -1,52 +1,52 @@
-export type InteractionSchema = {
-  type: 'form' | 'select' | 'confirm';
-  prompt: string;
-  options?: { label: string; value: string | number }[];
-  fields?: Record<string, { type?: string; title?: string; required?: boolean; enum?: any[] }>;
-};
-
-export type LoopTemplate = {
-  key: string;
-  title: string;
-  description: string;
-  schema: InteractionSchema;
-};
-
-export const LOOP_TEMPLATES: LoopTemplate[] = [
-  {
-    key: 'confirm',
-    title: 'Confirm before run',
-    description: 'Ask the user to approve or cancel the skill call.',
-    schema: {
-      type: 'confirm',
-      prompt: 'Review this skill call before execution.',
-    },
-  },
-  {
-    key: 'review-input',
-    title: 'Review editable input',
-    description: 'Show selected input fields so the user can edit them before running.',
-    schema: {
-      type: 'form',
-      prompt: 'Review and edit the skill input before execution.',
-      fields: {},
-    },
-  },
-  {
-    key: 'choose-option',
-    title: 'Choose one option',
-    description: 'Ask the user to choose one option before running.',
-    schema: {
-      type: 'select',
-      prompt: 'Choose how to run this skill.',
-      options: [
-        { label: 'Default', value: 'default' },
-        { label: 'Careful', value: 'careful' },
-      ],
-    },
-  },
-];
-
-export function getLoopTemplate(key?: string) {
-  return LOOP_TEMPLATES.find((template) => template.key === key) || LOOP_TEMPLATES[0];
-}
+export type InteractionSchema = {
+  type: 'form' | 'select' | 'confirm';
+  prompt: string;
+  options?: { label: string; value: string | number }[];
+  fields?: Record<string, { type?: string; title?: string; required?: boolean; enum?: any[] }>;
+};
+
+export type LoopTemplate = {
+  key: string;
+  title: string;
+  description: string;
+  schema: InteractionSchema;
+};
+
+export const LOOP_TEMPLATES: LoopTemplate[] = [
+  {
+    key: 'confirm',
+    title: 'Confirm before run',
+    description: 'Ask the user to approve or cancel the skill call.',
+    schema: {
+      type: 'confirm',
+      prompt: 'Review this skill call before execution.',
+    },
+  },
+  {
+    key: 'review-input',
+    title: 'Review editable input',
+    description: 'Show selected input fields so the user can edit them before running.',
+    schema: {
+      type: 'form',
+      prompt: 'Review and edit the skill input before execution.',
+      fields: {},
+    },
+  },
+  {
+    key: 'choose-option',
+    title: 'Choose one option',
+    description: 'Ask the user to choose one option before running.',
+    schema: {
+      type: 'select',
+      prompt: 'Choose how to run this skill.',
+      options: [
+        { label: 'Default', value: 'default' },
+        { label: 'Careful', value: 'careful' },
+      ],
+    },
+  },
+];
+
+export function getLoopTemplate(key?: string) {
+  return LOOP_TEMPLATES.find((template) => template.key === key) || LOOP_TEMPLATES[0];
+}