@nocobase/ai 2.1.0-alpha.13 → 2.1.0-alpha.14

package/lib/ai-employee-manager/index.js

@@ -109,7 +109,8 @@ const _DefaultAIEmployeeManager = class _DefaultAIEmployeeManager {
             knowledgeBase: DEFAULT_KNOWLEDGE_BASE,
             knowledgeBasePrompt: DEFAULT_KNOWLEDGE_BASE_PROMPT,
             enabled: true,
-            builtIn: true
+            builtIn: true,
+            sort: employee.sort
           },
           { transaction }
         );
@@ -132,7 +133,8 @@ const _DefaultAIEmployeeManager = class _DefaultAIEmployeeManager {
         skillSettings: {
           skills: [...employee.skills],
           tools: [...mergedTools]
-        }
+        },
+        sort: employee.sort
       };
       await existed.update(values, { transaction });
     });

package/lib/ai-employee-manager/types.d.ts

@@ -34,6 +34,7 @@ export type AIEmployeeOptions = {
     bio?: string;
     greeting?: string;
     systemPrompt?: string | null;
+    sort?: number;
 };
 export type AIEmployeeEntry = Omit<AIEmployeeOptions, 'skills' | 'tools' | 'systemPrompt'> & {
     about?: string;

package/lib/loader/employee.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(employee_exports);
 var import_utils = require("@nocobase/utils");
 var import_scanner = require("./scanner");
 var import_fs = require("fs");
+var import_promises = require("fs/promises");
 var import_types = require("./types");
 var import_path = __toESM(require("path"));
 const _AIEmployeeLoader = class _AIEmployeeLoader extends import_types.LoadAndRegister {
@@ -67,18 +68,19 @@ const _AIEmployeeLoader = class _AIEmployeeLoader extends import_types.LoadAndRe
     }
     const grouped = /* @__PURE__ */ new Map();
     for (const fd of this.files) {
-      const employeeRoot = getEmployeeRoot(fd.path);
+      const employeeRoot = getEmployeeRoot(fd);
       const group = grouped.get(employeeRoot) ?? [];
       group.push(fd);
       grouped.set(employeeRoot, group);
     }
     const descriptors = await Promise.all(
       Array.from(grouped.entries()).map(async ([employeeRoot, fds]) => {
-        var _a, _b;
-        const file = selectEmployeeDefinitionFile(fds, employeeRoot, this.log);
+        var _a, _b, _c;
+        const file = fds.find((fd) => fd.extname === ".ts" || fd.extname === ".js");
         if (!file || !(0, import_fs.existsSync)(file.path)) {
           return null;
         }
+        const promptFile = fds.find((fd) => fd.basename === "prompt.md");
         const name = import_path.default.basename(employeeRoot);
         try {
           const imported = await (0, import_utils.importModule)(file.path);
@@ -89,6 +91,17 @@ const _AIEmployeeLoader = class _AIEmployeeLoader extends import_types.LoadAndRe
             return null;
           }
           const { skills = [], tools = [] } = employeeOptions;
+          if (promptFile && (0, import_fs.existsSync)(promptFile.path)) {
+            try {
+              employeeOptions.systemPrompt = await (0, import_promises.readFile)(promptFile.path, "utf-8");
+            } catch (e) {
+              (_b = this.log) == null ? void 0 : _b.error(
+                `ai employee [${name}] load fail: error occur when reading prompt.md at ${promptFile.path}`,
+                e
+              );
+              return null;
+            }
+          }
           return {
             name,
             employeeRoot,
@@ -100,7 +113,7 @@ const _AIEmployeeLoader = class _AIEmployeeLoader extends import_types.LoadAndRe
             }
           };
         } catch (e) {
-          (_b = this.log) == null ? void 0 : _b.error(`ai employee [${name}] load fail: error occur when import ${file.path}`, e);
+          (_c = this.log) == null ? void 0 : _c.error(`ai employee [${name}] load fail: error occur when import ${file.path}`, e);
           return null;
         }
       })
@@ -119,25 +132,13 @@ const _AIEmployeeLoader = class _AIEmployeeLoader extends import_types.LoadAndRe
 };
 __name(_AIEmployeeLoader, "AIEmployeeLoader");
 let AIEmployeeLoader = _AIEmployeeLoader;
-function getEmployeeRoot(filePath) {
-  if (isIndexFile(filePath)) {
-    return import_path.default.dirname(filePath);
+function getEmployeeRoot(fd) {
+  if (fd.basename === "index.ts" || fd.basename === "index.js" || fd.basename === "prompt.md") {
+    return import_path.default.dirname(fd.path);
   }
-  const { dir, name } = import_path.default.parse(filePath);
-  return import_path.default.join(dir, name);
+  return fd.path;
 }
 __name(getEmployeeRoot, "getEmployeeRoot");
-function selectEmployeeDefinitionFile(files, employeeRoot, log) {
-  const direct = files.find((fd) => !isIndexFile(fd.path));
-  const nested = files.find((fd) => isIndexFile(fd.path));
-  if (direct && nested) {
-    log == null ? void 0 : log.warn(
-      `ai employee [${import_path.default.basename(employeeRoot)}] duplicate definition found, use ${direct.path} instead of ${nested.path}`
-    );
-  }
-  return direct ?? nested;
-}
-__name(selectEmployeeDefinitionFile, "selectEmployeeDefinitionFile");
 async function discoverSkills(employeeRoot) {
   const skillsDir = import_path.default.join(employeeRoot, "skills");
   if (!(0, import_fs.existsSync)(skillsDir)) {
@@ -171,11 +172,6 @@ async function discoverTools(employeeRoot) {
   );
 }
 __name(discoverTools, "discoverTools");
-function isIndexFile(filePath) {
-  const basename = import_path.default.basename(filePath);
-  return basename === "index.ts" || basename === "index.js";
-}
-__name(isIndexFile, "isIndexFile");
 function uniq(values) {
   return [...new Set(values)];
 }

package/lib/mcp-manager/index.js

@@ -142,7 +142,7 @@ const _DefaultMCPManager = class _DefaultMCPManager {
               description: tool.description || `MCP tool: ${tool.name} from ${serverName}`,
               schema: tool.schema
             },
-            invoke: /* @__PURE__ */ __name(async (_ctx, args, _id) => {
+            invoke: /* @__PURE__ */ __name(async (_ctx, args) => {
               try {
                 const result = await tool.invoke(args);
                 return result;

package/lib/mcp-tools-manager.d.ts

@@ -10,15 +10,34 @@ export type McpTool = {
     name: string;
     description: string;
     inputSchema?: any;
+    resourceName?: string;
+    actionName?: string;
+    path?: string;
+    method?: string;
     call: (args: Record<string, any>, context?: McpToolCallContext) => Promise<any>;
 };
 export type McpToolCallContext = {
     token?: string;
     headers?: Record<string, string | string[] | undefined>;
 };
+export type McpToolResultPostProcessorContext = {
+    tool: McpTool;
+    args: Record<string, any>;
+    callContext?: McpToolCallContext;
+    response?: {
+        statusCode?: number;
+        headers?: Record<string, any>;
+        body?: any;
+    };
+};
+export type McpToolResultPostProcessor = (result: any, context: McpToolResultPostProcessorContext) => any | Promise<any>;
 export declare class McpToolsManager {
     private tools;
+    private resultPostProcessors;
+    private getActionKey;
     registerTools(tools: McpTool[]): void;
+    registerToolResultPostProcessor(resourceName: string, actionName: string, processor: McpToolResultPostProcessor): void;
+    postProcessToolResult(tool: McpTool, result: any, context: Omit<McpToolResultPostProcessorContext, 'tool'>): Promise<any>;
     listTools(): McpTool[];
     getTool(name: string): McpTool;
 }

package/lib/mcp-tools-manager.js

@@ -33,11 +33,35 @@ module.exports = __toCommonJS(mcp_tools_manager_exports);
 var import_utils = require("@nocobase/utils");
 const _McpToolsManager = class _McpToolsManager {
   tools = new import_utils.Registry();
+  resultPostProcessors = /* @__PURE__ */ new Map();
+  getActionKey(resourceName, actionName) {
+    return `${resourceName}:${actionName}`;
+  }
   registerTools(tools) {
     for (const tool of tools) {
       this.tools.register(tool.name, tool);
     }
   }
+  registerToolResultPostProcessor(resourceName, actionName, processor) {
+    const key = this.getActionKey(resourceName, actionName);
+    const processors = this.resultPostProcessors.get(key) || [];
+    processors.push(processor);
+    this.resultPostProcessors.set(key, processors);
+  }
+  async postProcessToolResult(tool, result, context) {
+    if (!tool.resourceName || !tool.actionName) {
+      return result;
+    }
+    const processors = this.resultPostProcessors.get(this.getActionKey(tool.resourceName, tool.actionName)) || [];
+    let current = result;
+    for (const processor of processors) {
+      current = await processor(current, {
+        ...context,
+        tool
+      });
+    }
+    return current;
+  }
   listTools() {
     return [...this.tools.getValues()];
   }

package/lib/tools-manager/types.d.ts

@@ -30,7 +30,11 @@ export type ToolsOptions = {
         description: string;
         schema?: any;
     };
-    invoke: (ctx: Context, args: any, id: string) => Promise<any>;
+    invoke: (ctx: Context, args: any, runtime: ToolsRuntime) => Promise<any>;
+};
+export type ToolsRuntime = {
+    toolCallId: string;
+    writer: (chunk: any) => void;
 };
 export type ToolsEntry = ToolsOptions;
 export type Scope = 'SPECIFIED' | 'GENERAL' | 'CUSTOM';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/ai",
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.14",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -17,10 +17,10 @@
     "@langchain/mcp-adapters": "^1.1.3",
     "@langchain/ollama": "^1.2.2",
     "@langchain/openai": "^1.2.7",
-    "@nocobase/data-source-manager": "2.1.0-alpha.13",
-    "@nocobase/logger": "2.1.0-alpha.13",
-    "@nocobase/resourcer": "2.1.0-alpha.13",
-    "@nocobase/utils": "2.1.0-alpha.13",
+    "@nocobase/data-source-manager": "2.1.0-alpha.14",
+    "@nocobase/logger": "2.1.0-alpha.14",
+    "@nocobase/resourcer": "2.1.0-alpha.14",
+    "@nocobase/utils": "2.1.0-alpha.14",
     "fast-glob": "^3.3.2",
     "flexsearch": "^0.8.2",
     "gray-matter": "^4.0.3",
@@ -35,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/ai"
   },
-  "gitHead": "2807a8948412d9c235115a31a81a66f7c82dd173"
+  "gitHead": "d8735b541de0ff9557bba704de49c799b4962672"
 }

package/src/__tests__/ai-employees.test.ts

@@ -13,6 +13,7 @@ import path from 'path';
 import { AIManager } from '../ai-manager';
 import { AIEmployeeManager, AIEmployeeEntry } from '../ai-employee-manager';
 
+const normalizeEOL = (value: string) => value.replace(/\r\n?/g, '\n');
 const normalizeTools = (entry: AIEmployeeEntry) =>
   [...(entry.skillSettings?.tools ?? [])].sort((a, b) => a.name.localeCompare(b.name));
 const normalizeSkills = (entry: AIEmployeeEntry) => [...(entry.skillSettings?.skills ?? [])].sort();
@@ -39,6 +40,7 @@ describe('AI employee loader test cases', () => {
           '**/ai-employees/*/index.ts',
           '**/ai-employees/*.js',
           '**/ai-employees/*/index.js',
+          '**/ai-employees/*/prompt.md',
           '!**/ai-employees/**/*.d.ts',
         ],
       },
@@ -67,6 +69,7 @@ describe('AI employee loader test cases', () => {
     expect(employee).toBeDefined();
     expect(employee.username).toBe('index-employee');
     expect(employee.nickname).toBe('Index Employee');
+    expect(normalizeEOL(employee.defaultPrompt)).toBe('Prompt from markdown file.\n');
     expect(normalizeTools(employee)).toEqual([]);
     expect(normalizeSkills(employee)).toEqual([]);
   });

package/src/__tests__/resource/ai/ai-employees/index-employee/prompt.md

@@ -0,0 +1 @@
+Prompt from markdown file.

package/src/__tests__/resource/ai/ai-employees/with-tools/tools/discoveredTool.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'discovered tool',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/ai-employees/with-tools-merge/tools/discoveredTool.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'discovered tool in merge employee',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/skills/data-modeling/tools/read.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'read document',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/skills/data-modeling/tools/search/index.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'search document',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/skills/document/tools/read.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'read document',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/skills/document/tools/search/index.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'search document',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/desc/index.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'tools with description.md',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/group/group1.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'hallow group1',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/group/group2.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'hallow group2',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/group/group3/index.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'hallow group3',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/hallow/index.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'hallow tools',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/__tests__/resource/ai/tools/print.ts

@@ -17,7 +17,7 @@ export default defineTools({
     description: 'print tools',
     schema: null,
   },
-  invoke: async (ctx: Context, args: any, id: string) => {
+  invoke: async (ctx: Context, args: any) => {
     return { status: 'success' };
   },
 });

package/src/ai-employee-manager/index.ts

@@ -96,6 +96,7 @@ export class DefaultAIEmployeeManager implements AIEmployeeManager {
             knowledgeBasePrompt: DEFAULT_KNOWLEDGE_BASE_PROMPT,
             enabled: true,
             builtIn: true,
+            sort: employee.sort,
           },
           { transaction },
         );
@@ -117,6 +118,7 @@ export class DefaultAIEmployeeManager implements AIEmployeeManager {
           skills: [...employee.skills],
           tools: [...mergedTools],
         },
+        sort: employee.sort,
       };
       await existed.update(values, { transaction });
     });

package/src/ai-employee-manager/types.ts

@@ -38,6 +38,7 @@ export type AIEmployeeOptions = {
   bio?: string;
   greeting?: string;
   systemPrompt?: string | null;
+  sort?: number;
 };
 
 export type AIEmployeeEntry = Omit<AIEmployeeOptions, 'skills' | 'tools' | 'systemPrompt'> & {

package/src/loader/employee.ts

@@ -10,6 +10,7 @@
 import { importModule } from '@nocobase/utils';
 import { DirectoryScanner, DirectoryScannerOptions, FileDescriptor } from './scanner';
 import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
 import { AIManager } from '../ai-manager';
 import { LoadAndRegister } from './types';
 import { Logger } from '@nocobase/logger';
@@ -45,7 +46,7 @@ export class AIEmployeeLoader extends LoadAndRegister<AIEmployeeLoaderOptions> {
 
     const grouped = new Map<string, FileDescriptor[]>();
     for (const fd of this.files) {
-      const employeeRoot = getEmployeeRoot(fd.path);
+      const employeeRoot = getEmployeeRoot(fd);
       const group = grouped.get(employeeRoot) ?? [];
       group.push(fd);
       grouped.set(employeeRoot, group);
@@ -53,10 +54,12 @@ export class AIEmployeeLoader extends LoadAndRegister<AIEmployeeLoaderOptions> {
 
     const descriptors = await Promise.all(
       Array.from(grouped.entries()).map(async ([employeeRoot, fds]) => {
-        const file = selectEmployeeDefinitionFile(fds, employeeRoot, this.log);
+        const file = fds.find((fd) => fd.extname === '.ts' || fd.extname === '.js');
         if (!file || !existsSync(file.path)) {
           return null;
         }
+        const promptFile = fds.find((fd) => fd.basename === 'prompt.md');
+
         const name = path.basename(employeeRoot);
         try {
           const imported = await importModule(file.path);
@@ -67,6 +70,19 @@ export class AIEmployeeLoader extends LoadAndRegister<AIEmployeeLoaderOptions> {
             return null;
           }
           const { skills = [], tools = [] } = employeeOptions;
+
+          if (promptFile && existsSync(promptFile.path)) {
+            try {
+              employeeOptions.systemPrompt = await readFile(promptFile.path, 'utf-8');
+            } catch (e) {
+              this.log?.error(
+                `ai employee [${name}] load fail: error occur when reading prompt.md at ${promptFile.path}`,
+                e,
+              );
+              return null;
+            }
+          }
+
           return {
             name,
             employeeRoot,
@@ -105,25 +121,11 @@ export type AIEmployeeDescriptor = {
   options: AIEmployeeOptions;
 };
 
-function getEmployeeRoot(filePath: string) {
-  if (isIndexFile(filePath)) {
-    return path.dirname(filePath);
-  }
-  const { dir, name } = path.parse(filePath);
-  return path.join(dir, name);
-}
-
-function selectEmployeeDefinitionFile(files: FileDescriptor[], employeeRoot: string, log?: Logger) {
-  const direct = files.find((fd) => !isIndexFile(fd.path));
-  const nested = files.find((fd) => isIndexFile(fd.path));
-  if (direct && nested) {
-    log?.warn(
-      `ai employee [${path.basename(employeeRoot)}] duplicate definition found, use ${direct.path} instead of ${
-        nested.path
-      }`,
-    );
+function getEmployeeRoot(fd: FileDescriptor) {
+  if (fd.basename === 'index.ts' || fd.basename === 'index.js' || fd.basename === 'prompt.md') {
+    return path.dirname(fd.path);
   }
-  return direct ?? nested;
+  return fd.path;
 }
 
 async function discoverSkills(employeeRoot: string): Promise<string[]> {
@@ -161,11 +163,6 @@ async function discoverTools(employeeRoot: string): Promise<AIEmployeeToolSettin
   );
 }
 
-function isIndexFile(filePath: string) {
-  const basename = path.basename(filePath);
-  return basename === 'index.ts' || basename === 'index.js';
-}
-
 function uniq<T>(values: T[]) {
   return [...new Set(values)];
 }

package/src/mcp-manager/index.ts

@@ -139,7 +139,7 @@ export class DefaultMCPManager implements MCPManager {
               description: tool.description || `MCP tool: ${tool.name} from ${serverName}`,
               schema: tool.schema,
             },
-            invoke: async (_ctx: Context, args: any, _id: string) => {
+            invoke: async (_ctx: Context, args: any) => {
               try {
                 const result = await tool.invoke(args);
                 return result;

package/src/mcp-tools-manager.ts

@@ -13,6 +13,10 @@ export type McpTool = {
   name: string;
   description: string;
   inputSchema?: any;
+  resourceName?: string;
+  actionName?: string;
+  path?: string;
+  method?: string;
   call: (args: Record<string, any>, context?: McpToolCallContext) => Promise<any>;
 };
 
@@ -21,8 +25,29 @@ export type McpToolCallContext = {
   headers?: Record<string, string | string[] | undefined>;
 };
 
+export type McpToolResultPostProcessorContext = {
+  tool: McpTool;
+  args: Record<string, any>;
+  callContext?: McpToolCallContext;
+  response?: {
+    statusCode?: number;
+    headers?: Record<string, any>;
+    body?: any;
+  };
+};
+
+export type McpToolResultPostProcessor = (
+  result: any,
+  context: McpToolResultPostProcessorContext,
+) => any | Promise<any>;
+
 export class McpToolsManager {
   private tools = new Registry<McpTool>();
+  private resultPostProcessors = new Map<string, McpToolResultPostProcessor[]>();
+
+  private getActionKey(resourceName: string, actionName: string) {
+    return `${resourceName}:${actionName}`;
+  }
 
   registerTools(tools: McpTool[]) {
     for (const tool of tools) {
@@ -30,6 +55,31 @@ export class McpToolsManager {
     }
   }
 
+  registerToolResultPostProcessor(resourceName: string, actionName: string, processor: McpToolResultPostProcessor) {
+    const key = this.getActionKey(resourceName, actionName);
+    const processors = this.resultPostProcessors.get(key) || [];
+    processors.push(processor);
+    this.resultPostProcessors.set(key, processors);
+  }
+
+  async postProcessToolResult(tool: McpTool, result: any, context: Omit<McpToolResultPostProcessorContext, 'tool'>) {
+    if (!tool.resourceName || !tool.actionName) {
+      return result;
+    }
+
+    const processors = this.resultPostProcessors.get(this.getActionKey(tool.resourceName, tool.actionName)) || [];
+    let current = result;
+
+    for (const processor of processors) {
+      current = await processor(current, {
+        ...context,
+        tool,
+      });
+    }
+
+    return current;
+  }
+
   listTools() {
     return [...this.tools.getValues()];
   }

package/src/tools-manager/types.ts

@@ -34,7 +34,12 @@ export type ToolsOptions = {
     description: string;
     schema?: any;
   };
-  invoke: (ctx: Context, args: any, id: string) => Promise<any>;
+  invoke: (ctx: Context, args: any, runtime: ToolsRuntime) => Promise<any>;
+};
+
+export type ToolsRuntime = {
+  toolCallId: string;
+  writer: (chunk: any) => void;
 };
 
 export type ToolsEntry = ToolsOptions;