@ai-setting/roy-agent-core 1.5.40 → 1.5.42

package/dist/shared/@ai-setting/{roy-agent-core-2x07feb7.js → roy-agent-core-e9fdm13a.js}

@@ -522,7 +522,6 @@ ${content}`;
   sendLarkMessage(options) {
     return new Promise((resolve, reject) => {
       const { chatId, messageId, content } = options;
-      const contentJson = JSON.stringify({ text: content });
       let args;
       if (messageId) {
         args = [
@@ -530,8 +529,8 @@ ${content}`;
           "+messages-reply",
           "--message-id",
           messageId,
-          "--text",
-          contentJson,
+          "--markdown",
+          content,
           "--as",
           "bot"
         ];
@@ -541,8 +540,8 @@ ${content}`;
           "+messages-send",
           "--chat-id",
           chatId,
-          "--text",
-          contentJson
+          "--markdown",
+          content
         ];
       }
       const proc = spawn("lark-cli", args, {
@@ -596,35 +595,38 @@ ${content}`;
     }
   }
   formatTaskCreated(task) {
-    const lines = [
-      `**标题**: ${task.title || "无标题"}`
-    ];
+    const lines = [];
+    if (task.title) {
+      lines.push(`- **标题**: ${task.title}`);
+    }
     if (task.description) {
-      lines.push(`**描述**: ${task.description.substring(0, 100)}${task.description.length > 100 ? "..." : ""}`);
+      const desc = task.description.substring(0, 100) + (task.description.length > 100 ? "..." : "");
+      lines.push(`- **描述**: ${desc}`);
     }
     if (task.priority) {
-      lines.push(`**优先级**: ${task.priority}`);
+      lines.push(`- **优先级**: ${task.priority}`);
     }
     return lines.join(`
 `);
   }
   formatTaskUpdate(task, changes) {
-    const lines = [
-      `**标题**: ${task.title || "无标题"}`,
-      `**ID**: ${task.id}`
-    ];
+    const lines = [];
+    if (task.title) {
+      lines.push(`- **标题**: ${task.title}`);
+    }
+    lines.push(`- **ID**: ${task.id}`);
     if (changes?.status) {
-      lines.push(`**状态**: ${changes.status}`);
+      lines.push(`- **状态**: ${changes.status}`);
     }
     if (changes?.progress !== undefined) {
-      lines.push(`**进度**: ${changes.progress}%`);
+      lines.push(`- **进度**: ${changes.progress}%`);
     }
     if (changes?.current_status) {
-      lines.push(`**当前状态**: ${changes.current_status}`);
+      lines.push(`- **当前状态**: ${changes.current_status}`);
     }
     const changeKeys = Object.keys(changes || {}).filter((k) => !["status", "progress", "current_status"].includes(k));
     if (changeKeys.length > 0) {
-      lines.push(`**变更**: ${changeKeys.join(", ")}`);
+      lines.push(`- **变更**: ${changeKeys.join(", ")}`);
     }
     return lines.join(`
 `);

package/dist/shared/@ai-setting/{roy-agent-core-c8f2hync.js → roy-agent-core-ek6gk3wk.js}

@@ -2,6 +2,9 @@ import {
   AskUserError,
   init_workflow_hil
 } from "./roy-agent-core-e25xkv53.js";
+import {
+  AgentRegistry
+} from "./roy-agent-core-7t05apnp.js";
 import {
   ContextError
 } from "./roy-agent-core-ctdhjv68.js";
@@ -166,6 +169,7 @@ class AgentComponent extends BaseComponent {
   configWatcher;
   messageConverter = new SessionMessageConverter;
   _constructorConfig;
+  registry;
   runCounter = 0;
   constructor(options = {}) {
     super();
@@ -185,6 +189,7 @@ class AgentComponent extends BaseComponent {
     }
     this.configComponent = options.configComponent;
     await this.registerConfig(options);
+    await this.initRegistry(options.configComponent);
     this.setStatus("running");
   }
   async registerConfig(options) {
@@ -271,6 +276,63 @@ class AgentComponent extends BaseComponent {
       newValue: event.newValue
     });
   }
+  async initRegistry(configComponent) {
+    try {
+      this.registry = new AgentRegistry({
+        configComponent,
+        resolvePromptComponent: () => this.env?.getComponent?.("prompt") ?? null
+      });
+      const loadedCount = await this.registry.load();
+      logger.info(`[AgentComponent] Loaded ${loadedCount} agents from config directory`);
+      for (const agentDef of this.registry.list()) {
+        if (!this.agents.has(agentDef.name)) {
+          const systemPrompt = await this.registry.getSystemPrompt(agentDef.name);
+          this.registerAgent(agentDef.name, {
+            type: agentDef.type,
+            systemPrompt,
+            allowedTools: agentDef.allowedTools,
+            deniedTools: agentDef.deniedTools,
+            model: agentDef.model,
+            maxIterations: agentDef.maxIterations
+          });
+          logger.debug(`[AgentComponent] Registered agent from config: ${agentDef.name}`);
+        }
+      }
+    } catch (error) {
+      logger.warn(`[AgentComponent] Failed to initialize AgentRegistry: ${error}`);
+    }
+  }
+  async syncRegistryAgentsFromConfig() {
+    if (!this.registry) {
+      return;
+    }
+    for (const agentDef of this.registry.list()) {
+      const systemPrompt = await this.registry.getSystemPrompt(agentDef.name);
+      const existing = this.agents.get(agentDef.name);
+      if (existing) {
+        existing.config.systemPrompt = systemPrompt;
+      } else {
+        this.registerAgent(agentDef.name, {
+          type: agentDef.type,
+          systemPrompt,
+          allowedTools: agentDef.allowedTools,
+          deniedTools: agentDef.deniedTools,
+          model: agentDef.model,
+          maxIterations: agentDef.maxIterations
+        });
+      }
+      logger.debug(`[AgentComponent] Synced registry agent: ${agentDef.name}`);
+    }
+  }
+  getRegistry() {
+    return this.registry;
+  }
+  getAgentFromRegistry(name) {
+    return this.registry?.get(name);
+  }
+  listAgentsFromRegistry() {
+    return this.registry?.list() ?? [];
+  }
   async onStop() {
     logger.info("[AgentComponent] Stopping and cleaning up resources...");
     for (const [name, agent] of this.agents) {

package/dist/shared/@ai-setting/{roy-agent-core-frx4p6d1.js → roy-agent-core-nj8yerg9.js}

@@ -1048,6 +1048,14 @@ class ConfigComponent extends BaseComponent {
     }
     this.sourceUnwatchFns.clear();
   }
+  shutdown() {
+    this.unwatchAll();
+    this.persistQueue.clear();
+  }
+  async onStop() {
+    this.shutdown();
+    await super.onStop();
+  }
   getSources() {
     return [...this.sources];
   }

package/dist/shared/@ai-setting/{roy-agent-core-728h32vx.js → roy-agent-core-psvwzdhj.js}

@@ -1,7 +1,7 @@
 import {
   TaskTagPlugin,
   createLarkCliTaskNotifyHook
-} from "./roy-agent-core-2x07feb7.js";
+} from "./roy-agent-core-e9fdm13a.js";
 import {
   envKeyToConfigKey
 } from "./roy-agent-core-qxhq8ven.js";

package/dist/shared/@ai-setting/{roy-agent-core-ycg9rk6z.js → roy-agent-core-xkb264a8.js}

@@ -318,10 +318,25 @@ class McpLoader {
       return;
     try {
       await entry.client.close();
-      this.clients.delete(name);
-      logger2.info(`[McpLoader] Disconnected from ${name}`);
     } catch (error) {
-      logger2.warn(`[McpLoader] Error disconnecting from ${name}`, { error });
+      logger2.warn(`[McpLoader] Error closing client for ${name}`, { error });
+    }
+    await this.closeTransport(entry.transport, name);
+    this.clients.delete(name);
+    logger2.info(`[McpLoader] Disconnected from ${name}`);
+  }
+  async closeTransport(transport, name) {
+    try {
+      const transportAny = transport;
+      if (typeof transportAny.close === "function") {
+        await transportAny.close();
+      }
+      const child = transportAny._process ?? transportAny.process;
+      if (child?.pid && !child.killed) {
+        child.kill?.("SIGTERM");
+      }
+    } catch (error) {
+      logger2.warn(`[McpLoader] Error closing transport for ${name}`, { error });
     }
   }
   async disconnectAll() {

package/dist/shared/@ai-setting/{roy-agent-core-v53rfk99.js → roy-agent-core-xz22rmak.js}

@@ -1,3 +1,6 @@
+import {
+  DEFAULT_SUBAGENT_PROMPT
+} from "./roy-agent-core-7t05apnp.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-92z6t4he.js";
@@ -12,6 +15,54 @@ import {
 // src/env/task/delegate/delegate-tool.ts
 init_logger();
 import { z } from "zod";
+
+// src/env/task/delegate/subagent-resolver.ts
+function isKnownSubagentType(subagentType, registry) {
+  if (getSubAgentSpec(subagentType)) {
+    return true;
+  }
+  return registry?.hasAgent(subagentType) ?? false;
+}
+async function resolveSubAgentConfig(subagentType, options = {}) {
+  const getBuiltIn = options.getBuiltIn ?? getSubAgentSpec;
+  const builtIn = getBuiltIn(subagentType);
+  const agentDef = options.registry?.get(subagentType);
+  if (!builtIn && !agentDef) {
+    return;
+  }
+  if (agentDef) {
+    return resolveFromRegistry(subagentType, agentDef, builtIn, options.registry);
+  }
+  return {
+    subagentType,
+    description: builtIn.description,
+    basePrompt: builtIn.promptOverride || DEFAULT_SUBAGENT_PROMPT,
+    allowedTools: builtIn.allowedTools,
+    deniedTools: builtIn.deniedTools ?? ["delegate_task", "stop_task"],
+    fromRegistry: false
+  };
+}
+async function resolveFromRegistry(subagentType, agentDef, builtIn, registry) {
+  const resolvedPrompt = registry ? await registry.getSystemPrompt(subagentType) : agentDef.systemPrompt;
+  return {
+    subagentType,
+    description: agentDef.description || builtIn?.description || "Custom agent",
+    basePrompt: resolvedPrompt || builtIn?.promptOverride || DEFAULT_SUBAGENT_PROMPT,
+    allowedTools: agentDef.allowedTools ?? builtIn?.allowedTools,
+    deniedTools: agentDef.deniedTools ?? builtIn?.deniedTools ?? ["delegate_task", "stop_task"],
+    fromRegistry: true
+  };
+}
+function listKnownSubagentDescriptions(registry) {
+  const builtInLines = builtInSubAgents.map((agent) => `- ${agent.id}: ${agent.description}`);
+  const registryAgents = registry?.listAgentsByType("sub") ?? [];
+  const customLines = registryAgents.filter((agent) => !builtInSubAgents.some((builtIn) => builtIn.id === agent.name)).map((agent) => `- ${agent.name}: ${agent.description || "Custom agent"}`);
+  const lines = [...builtInLines, ...customLines];
+  return lines.join(`
+`);
+}
+
+// src/env/task/delegate/delegate-tool.ts
 var logger = createLogger("task:delegate");
 var BackgroundTaskEventTypes = {
   STARTED: "task.background.started",
@@ -99,10 +150,6 @@ var builtInSubAgents = [
 function getSubAgentSpec(id) {
   return builtInSubAgents.find((agent) => agent.id === id);
 }
-function getSubAgentToolDescription() {
-  return builtInSubAgents.map((agent) => `- ${agent.id}: ${agent.description}`).join(`
-`);
-}
 function ensureSubAgentRegistered(agentComponent, subagentType, basePrompt, subAgent, deniedTools) {
   let agentInstance = agentComponent.getAgent(subagentType);
   if (!agentInstance) {
@@ -341,24 +388,20 @@ class BackgroundTaskManager {
     }
   }
   async executeWithAbort(subSession, prompt, timeoutMs, signal) {
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        reject(new Error(`Task execution timeout after ${timeoutMs}ms`));
-      }, timeoutMs);
-      signal?.addEventListener("abort", () => {
-        clearTimeout(timer);
-        reject(new Error("Task execution stopped"));
-      });
-      const metadata = subSession.info?.metadata || {};
-      const taskId = metadata.task_id;
-      const taskDescription = metadata.task_description || "";
-      const sessionId = subSession.id;
-      const subagentType = metadata.subagent_type || "general";
-      const subAgent = getSubAgentSpec(subagentType);
-      let basePrompt = subAgent?.promptOverride || `You are a subagent. Complete this task: {task_description}`;
-      const deniedTools = subAgent?.deniedTools || [];
-      let fullPrompt = basePrompt.replace(/{task_description}/g, taskDescription || "N/A");
-      fullPrompt += `
+    const metadata = subSession.info?.metadata || {};
+    const taskId = metadata.task_id;
+    const taskDescription = metadata.task_description || "";
+    const sessionId = subSession.id;
+    const subagentType = metadata.subagent_type || "general";
+    const agentComponent = this.env?.getComponent?.("agent");
+    const registry = agentComponent?.getRegistry?.();
+    const resolved = await resolveSubAgentConfig(subagentType, { registry });
+    const subAgent = getSubAgentSpec(subagentType);
+    const basePrompt = resolved?.basePrompt || subAgent?.promptOverride || `You are a subagent. Complete this task: {task_description}`;
+    const deniedTools = resolved?.deniedTools || subAgent?.deniedTools || [];
+    const allowedTools = resolved?.allowedTools || subAgent?.allowedTools;
+    let fullPrompt = basePrompt.replace(/{task_description}/g, taskDescription || "N/A");
+    fullPrompt += `
 
 ---
 
@@ -377,18 +420,31 @@ ${prompt}
 - 使用可用工具完成任务
 - 返回清晰的任务执行结果摘要
 - 适时调用 task_operation_create 记录进展`;
-      const agentComponent = this.env?.getComponent?.("agent");
-      if (!agentComponent) {
+    if (!agentComponent) {
+      throw new Error("AgentComponent not found");
+    }
+    const subAgentForRegister = subAgent ? { ...subAgent, allowedTools } : allowedTools ? {
+      id: subagentType,
+      name: subagentType,
+      mode: "subagent",
+      description: resolved?.description || "Custom agent",
+      allowedTools,
+      deniedTools
+    } : undefined;
+    ensureSubAgentRegistered(agentComponent, subagentType, basePrompt, subAgentForRegister, deniedTools);
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        reject(new Error(`Task execution timeout after ${timeoutMs}ms`));
+      }, timeoutMs);
+      signal?.addEventListener("abort", () => {
         clearTimeout(timer);
-        reject(new Error("AgentComponent not found"));
-        return;
-      }
-      ensureSubAgentRegistered(agentComponent, subagentType, basePrompt, subAgent, deniedTools);
+        reject(new Error("Task execution stopped"));
+      });
       this.env.handle_query?.(fullPrompt, {
         sessionId,
         deniedTools: deniedTools.length > 0 ? deniedTools : undefined,
         agentType: subagentType
-      }).then((result) => {
+      })?.then((result) => {
         clearTimeout(timer);
         resolve(result);
       }).catch((error) => {
@@ -450,7 +506,7 @@ function createDelegateTool(taskComponent) {
     description: `Launch a new sub-agent to handle complex, multistep tasks autonomously.
 
 Available agent types:
-${getSubAgentToolDescription()}
+${listKnownSubagentDescriptions()}
 
 When using the delegate_task tool, you must specify a subagent_type parameter to select which agent type to use.
 
@@ -477,8 +533,9 @@ When using the delegate_task tool, you must specify a subagent_type parameter to
       const { description, prompt, subagent_type = "general", background = false, timeout, cleanup, task_id, reason } = params;
       const parentSessionId = ctx.session_id || "default";
       logger.info(`[delegate_task] Called: description=${description}, subagent_type=${subagent_type}, background=${background}, task_id=${task_id}`);
-      const subAgent = getSubAgentSpec(subagent_type);
-      if (!subAgent) {
+      const agentComponent = taskComponent.env?.getComponent?.("agent");
+      const registry = agentComponent?.getRegistry?.();
+      if (!isKnownSubagentType(subagent_type, registry)) {
         return {
           success: false,
           output: "",
@@ -558,9 +615,13 @@ async function handleSyncTask(taskComponent, parentSessionId, description, promp
         metadata: { execution_time_ms: Date.now() - startTime }
       };
     }
+    const agentComponent = taskComponent.env?.getComponent?.("agent");
+    const registry = agentComponent?.getRegistry?.();
+    const resolved = await resolveSubAgentConfig(subagentType, { registry });
     const subAgent = getSubAgentSpec(subagentType);
-    let basePrompt = subAgent?.promptOverride || `You are a subagent. Complete this task: {task_description}`;
-    const deniedTools = subAgent?.deniedTools || [];
+    let basePrompt = resolved?.basePrompt || subAgent?.promptOverride || `You are a subagent. Complete this task: {task_description}`;
+    const deniedTools = resolved?.deniedTools || subAgent?.deniedTools || [];
+    const allowedTools = resolved?.allowedTools || subAgent?.allowedTools;
     let fullPrompt = basePrompt.replace(/{task_description}/g, description || "N/A");
     fullPrompt += `
 
@@ -581,7 +642,6 @@ ${prompt}
 - 使用可用工具完成任务
 - 返回清晰的任务执行结果摘要
 - 适时调用 task_operation_create 记录进展`;
-    const agentComponent = taskComponent.env?.getComponent?.("agent");
     if (!agentComponent) {
       return {
         success: false,
@@ -590,7 +650,15 @@ ${prompt}
         metadata: { execution_time_ms: Date.now() - startTime }
       };
     }
-    ensureSubAgentRegistered(agentComponent, subagentType, basePrompt, subAgent, deniedTools);
+    const subAgentForRegister = subAgent ? { ...subAgent, allowedTools } : allowedTools ? {
+      id: subagentType,
+      name: subagentType,
+      mode: "subagent",
+      description: resolved?.description || "Custom agent",
+      allowedTools,
+      deniedTools
+    } : undefined;
+    ensureSubAgentRegistered(agentComponent, subagentType, basePrompt, subAgentForRegister, deniedTools);
     const timeoutMs = timeout || DEFAULT_TIMEOUT;
     let result;
     try {