plugin-agent-orchestrator 1.0.22 → 1.0.25

package/dist/externalVersion.js

@@ -11,12 +11,14 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.0.60",
-  "@nocobase/server": "2.0.60",
-  "@nocobase/database": "2.0.60",
+  "ahooks": "3.7.8",
+  "@nocobase/client-v2": "2.1.6",
+  "@nocobase/client": "2.1.6",
+  "@nocobase/server": "2.1.6",
+  "@nocobase/database": "2.1.6",
   "@langchain/langgraph": "0.2.74",
   "@langchain/core": "0.3.80",
-  "@nocobase/actions": "2.0.60",
-  "@nocobase/plugin-ai": "2.0.60",
-  "@nocobase/ai": "2.0.60"
+  "@nocobase/ai": "2.1.6",
+  "@nocobase/actions": "2.1.6",
+  "@nocobase/plugin-ai": "2.1.6"
 };

package/dist/locale/en-US.json

@@ -1,6 +1,13 @@
 {
   "Agent Orchestrator": "Agent Orchestrator",
   "Orchestration Rules": "Orchestration Rules",
+  "Execution Tracing": "Execution Tracing",
+  "Agent Runs": "Agent Runs",
+  "Harness Profiles": "Harness Profiles",
+  "Skill Hub Definitions": "Skill Hub Definitions",
+  "Execution History": "Execution History",
+  "Skill Review Settings": "Skill Review Settings",
+  "Metrics": "Metrics",
   "Swarm Tracing": "Swarm Tracing",
   "Leader (Orchestrator)": "Leader (Orchestrator)",
   "Sub-Agent": "Sub-Agent",

package/dist/locale/vi-VN.json

@@ -1,6 +1,13 @@
 {
   "Agent Orchestrator": "Điều phối Agent",
   "Orchestration Rules": "Quy tắc điều phối",
+  "Execution Tracing": "Truy vết thực thi",
+  "Agent Runs": "Lượt chạy Agent",
+  "Harness Profiles": "Hồ sơ Harness",
+  "Skill Hub Definitions": "Định nghĩa Skill Hub",
+  "Execution History": "Lịch sử thực thi",
+  "Skill Review Settings": "Cài đặt duyệt Skill",
+  "Metrics": "Số liệu",
   "Swarm Tracing": "Truy vết Swarm",
   "Leader (Orchestrator)": "Leader (Điều phối viên)",
   "Sub-Agent": "Agent con",

package/dist/locale/zh-CN.json

@@ -0,0 +1,27 @@
+{
+  "Agent Orchestrator": "智能体编排",
+  "Orchestration Rules": "编排规则",
+  "Execution Tracing": "执行追踪",
+  "Agent Runs": "智能体运行",
+  "Harness Profiles": "Harness 配置",
+  "Skill Hub Definitions": "技能中心定义",
+  "Execution History": "执行历史",
+  "Skill Review Settings": "技能审核设置",
+  "Metrics": "指标",
+  "Swarm Tracing": "集群追踪",
+  "Leader (Orchestrator)": "主控（编排者）",
+  "Sub-Agent": "子智能体",
+  "Max Delegation Depth": "最大委派深度",
+  "Timeout (ms)": "超时时间（毫秒）",
+  "Enabled": "已启用",
+  "New Rule": "新建规则",
+  "Edit Orchestration Rule": "编辑编排规则",
+  "New Orchestration Rule": "新建编排规则",
+  "Rule created": "规则已创建",
+  "Rule updated": "规则已更新",
+  "Rule deleted": "规则已删除",
+  "Sub-Agent Conversation": "子智能体对话",
+  "Task Summary": "任务摘要",
+  "Parent Session": "父会话",
+  "No sub-agent executions yet": "暂无子智能体执行记录"
+}

package/dist/server/migrations/20260615000000-normalize-ai-employee-tool-bindings.js

@@ -0,0 +1,63 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var normalize_ai_employee_tool_bindings_exports = {};
+__export(normalize_ai_employee_tool_bindings_exports, {
+  default: () => NormalizeAIEmployeeToolBindings
+});
+module.exports = __toCommonJS(normalize_ai_employee_tool_bindings_exports);
+var import_server = require("@nocobase/server");
+var import_skill_settings = require("../utils/skill-settings");
+class NormalizeAIEmployeeToolBindings extends import_server.Migration {
+  on = "afterLoad";
+  appVersion = ">=0.1.0";
+  async up() {
+    var _a, _b, _c, _d;
+    const repo = this.db.getRepository(
+      "aiEmployees"
+    );
+    if (!repo) return;
+    const rows = await repo.find({});
+    let updated = 0;
+    for (const row of rows) {
+      const skillSettings = ((_a = row.get) == null ? void 0 : _a.call(row, "skillSettings")) ?? row.skillSettings;
+      const normalized = (0, import_skill_settings.normalizeAIEmployeeSkillSettings)(skillSettings);
+      if (!normalized.changed) continue;
+      await row.update({
+        skillSettings: normalized.skillSettings
+      });
+      updated += 1;
+    }
+    if (updated > 0) {
+      (_d = (_c = (_b = this.app) == null ? void 0 : _b.logger) == null ? void 0 : _c.info) == null ? void 0 : _d.call(
+        _c,
+        `[AgentOrchestrator] Normalized AI employee tool bindings (${updated}).`
+      );
+    }
+  }
+  async down() {
+  }
+}

package/dist/server/plugin.js

@@ -50,6 +50,8 @@ var import_agent_loop = require("./resources/agent-loop");
 var import_RunEventBus = require("./services/RunEventBus");
 var import_plugin = __toESM(require("./skill-hub/plugin"));
 var import_AgentLoopService = require("./services/AgentLoopService");
+var import_ctx_utils = require("./utils/ctx-utils");
+var import_ai_manager = require("./utils/ai-manager");
 class PluginAgentOrchestratorServer extends import_server.Plugin {
   skillHub;
   agentLoopService;
@@ -95,7 +97,21 @@ class PluginAgentOrchestratorServer extends import_server.Plugin {
     this.app.acl.allow("skillHub", "test", "loggedIn");
     this.app.acl.allow("skillHub", "download", "loggedIn");
     this.app.acl.allow("skillHub", "listTemplates", "loggedIn");
-    const toolsManager = this.app.aiManager.toolsManager;
+    this.app.resourceManager.use(
+      async (ctx, next) => {
+        const { resourceName, actionName } = ctx.action || {};
+        if (resourceName === "skillExecutions" && (actionName === "list" || actionName === "get")) {
+          if (!(0, import_ctx_utils.isAdminUser)(ctx)) {
+            const userId = (0, import_ctx_utils.currentUserId)(ctx);
+            const ownerFilter = userId ? { triggeredById: userId } : { triggeredById: null };
+            ctx.action.mergeParams({ filter: ownerFilter });
+          }
+        }
+        await next();
+      },
+      { tag: "orchestrator-skill-executions-scope", after: "acl" }
+    );
+    const toolsManager = (0, import_ai_manager.getAIToolsManager)(this.app);
     toolsManager.registerTools((0, import_orchestrator_plan.createOrchestratorPlanTools)(this, this.agentLoopService));
     toolsManager.registerTools((0, import_external_rag_search.createExternalRagSearchTool)(this));
     toolsManager.registerDynamicTools((0, import_delegate_task.createDelegateToolsProvider)(this));
@@ -110,6 +126,21 @@ class PluginAgentOrchestratorServer extends import_server.Plugin {
             ctx.throw(400, "runId query parameter is required.");
             return;
           }
+          if (!(0, import_ctx_utils.isAdminUser)(ctx)) {
+            const userId = (0, import_ctx_utils.currentUserId)(ctx);
+            const run = await ctx.db.getRepository("agentLoopRuns").findOne({
+              filter: { id: runId }
+            });
+            if (!run) {
+              ctx.throw(404, "Run not found.");
+              return;
+            }
+            const ownerId = run.get ? run.get("userId") : run.userId;
+            if (!userId || String(ownerId) !== String(userId)) {
+              ctx.throw(403, "You cannot stream events for this run.");
+              return;
+            }
+          }
           ctx.type = "text/event-stream";
           ctx.set("Cache-Control", "no-cache");
           ctx.set("Connection", "keep-alive");

package/dist/server/services/AgentHarness.js

@@ -38,7 +38,9 @@ var import_TokenTracker = require("./TokenTracker");
 var import_ContextAggregator = require("./ContextAggregator");
 var import_CircuitBreaker = require("./CircuitBreaker");
 var import_ctx_utils = require("../utils/ctx-utils");
+var import_skill_settings = require("../utils/skill-settings");
 var import_logging = require("../utils/logging");
+var import_ai_manager = require("../utils/ai-manager");
 const ORCHESTRATOR_DEPTH_KEY = "__orchestratorDepth";
 const ORCHESTRATOR_PATH_KEY = "__orchestratorPath";
 function sanitizeToolPart(value) {
@@ -48,11 +50,11 @@ function buildDelegateToolName(leaderUsername, subAgentUsername) {
   return `delegate_${sanitizeToolPart(leaderUsername)}_to_${sanitizeToolPart(subAgentUsername)}`;
 }
 class AgentHarness {
-  constructor(plugin, registryService) {
+  constructor(plugin, registryService, tokenTracker) {
     this.plugin = plugin;
     this.registryService = registryService;
     this.spanService = new import_ExecutionSpanService.ExecutionSpanService(plugin);
-    this.tokenTracker = new import_TokenTracker.TokenTracker(plugin);
+    this.tokenTracker = tokenTracker || new import_TokenTracker.TokenTracker(plugin);
     this.contextAggregator = new import_ContextAggregator.ContextAggregator(plugin);
   }
   spanService;
@@ -117,25 +119,26 @@ class AgentHarness {
       2e4
     );
     const circuitBreaker = (0, import_CircuitBreaker.getCircuitBreaker)({ appLog: this.app });
-    if (!circuitBreaker.isAllowed(target)) {
-      const state = circuitBreaker.getState(target);
+    const circuitKey = (0, import_CircuitBreaker.subAgentCircuitKey)(run.leaderUsername, target);
+    if (!circuitBreaker.isAllowed(circuitKey)) {
+      const state = circuitBreaker.getState(circuitKey);
       throw new Error(
         `Sub-agent "${target}" circuit is open (${(state == null ? void 0 : state.failures) || 0} failures). Retry after the recovery timeout.`
       );
     }
     try {
       const result = await this.invokeNamedTool(run, step, toolName, { task, context }, settings, options);
-      circuitBreaker.recordSuccess(target);
+      circuitBreaker.recordSuccess(circuitKey);
       return result;
     } catch (e) {
       if ((e == null ? void 0 : e.message) !== "requires_approval") {
-        circuitBreaker.recordFailure(target);
+        circuitBreaker.recordFailure(circuitKey);
       }
       throw e;
     }
   }
   async invokeNamedTool(run, step, toolName, args, settings, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     if (String(toolName).startsWith("orchestrator_")) {
       throw new Error(`Tool step "${step.planKey}" cannot call internal orchestrator control tool "${toolName}".`);
     }
@@ -149,25 +152,34 @@ class AgentHarness {
         throw new Error(`Tool "${toolName}" is on the denied list for harness profile.`);
       }
     }
-    const toolsManager = (_b = (_a = this.app) == null ? void 0 : _a.aiManager) == null ? void 0 : _b.toolsManager;
-    const tool = await ((_c = toolsManager == null ? void 0 : toolsManager.getTools) == null ? void 0 : _c.call(toolsManager, toolName));
+    const toolsManager = (0, import_ai_manager.tryGetAIToolsManager)(this.app);
+    const tool = await ((_a = toolsManager == null ? void 0 : toolsManager.getTools) == null ? void 0 : _a.call(toolsManager, toolName));
     if (!(tool == null ? void 0 : tool.invoke)) {
       throw new Error(`Tool "${toolName}" was not found or is missing standard invoke handler.`);
     }
     const isDelegationTool = await this.registryService.isRegisteredDelegationTool(toolName);
-    const isStepAlreadyApproved = ((_d = step == null ? void 0 : step.approval) == null ? void 0 : _d.approved) === true;
+    const isStepAlreadyApproved = ((_b = step == null ? void 0 : step.approval) == null ? void 0 : _b.approved) === true;
     if (!isDelegationTool && !isStepAlreadyApproved && (tool.defaultPermission === "ASK" || settings.requireApprovalRiskLevel && tool.riskLevel && tool.riskLevel >= settings.requireApprovalRiskLevel)) {
       throw new Error("requires_approval");
     }
     const ctx = options.ctx || {};
     const previousEmployee = ctx._currentAIEmployee;
-    const previousStateEmployee = (_e = ctx.state) == null ? void 0 : _e.currentAIEmployee;
+    const previousStateEmployee = (_c = ctx.state) == null ? void 0 : _c.currentAIEmployee;
     if (run.leaderUsername) {
       ctx._currentAIEmployee = run.leaderUsername;
       ctx.state = { ...ctx.state || {}, currentAIEmployee: run.leaderUsername };
     }
+    const previousRuntime = ctx.runtime;
+    const toolCallId = `agent-loop-${run.id}-${step.id}`;
+    const runtime = {
+      toolCallId,
+      writer: (chunk) => {
+        this.app.log.trace(`[AgentHarness] Tool output:`, chunk);
+      }
+    };
+    ctx.runtime = runtime;
     try {
-      const result = await tool.invoke(ctx, args, `agent-loop-${run.id}-${step.id}`);
+      const result = await tool.invoke(ctx, args, runtime);
       if ((result == null ? void 0 : result.status) === "error") {
         throw new Error(result.content || `Tool "${toolName}" returned an error.`);
       }
@@ -177,6 +189,11 @@ class AgentHarness {
         result
       };
     } finally {
+      if (previousRuntime === void 0) {
+        delete ctx.runtime;
+      } else {
+        ctx.runtime = previousRuntime;
+      }
       if (previousEmployee === void 0) {
         delete ctx._currentAIEmployee;
       } else {
@@ -192,7 +209,7 @@ class AgentHarness {
     }
   }
   async runSubAgent(ctx, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const {
       leaderUsername,
       subAgentUsername,
@@ -211,6 +228,7 @@ class AgentHarness {
       agentLoopRunId,
       agentLoopStepId
     } = options;
+    const effectiveRootRunId = rootRunId || `run_${Date.now()}`;
     const startTime = Date.now();
     const currentDepth = options.currentDepth ?? 0;
     const currentPath = options.currentPath ?? [leaderUsername];
@@ -223,7 +241,7 @@ class AgentHarness {
       }
     ];
     const executionSpan = await this.spanService.create({
-      rootRunId: rootRunId || `run_${Date.now()}`,
+      rootRunId: effectiveRootRunId,
       parentSpanId,
       type: "sub_agent",
       status: "running",
@@ -274,18 +292,17 @@ class AgentHarness {
         model: modelSettings.model
       });
       const chatModel = provider.createModel();
-      const coreToolsManager = ctx.app.aiManager.toolsManager;
+      const coreToolsManager = (0, import_ai_manager.getAIToolsManager)(ctx.app);
       const allTools = await coreToolsManager.listTools();
-      const employeeSkills = (((_e = subAgentEmployee.skillSettings) == null ? void 0 : _e.skills) ?? []).map(
-        (s) => typeof s === "string" ? { name: s, autoCall: false } : { name: s == null ? void 0 : s.name, autoCall: (s == null ? void 0 : s.autoCall) === true }
-      ).filter((s) => Boolean(s.name));
-      const employeeSkillMap = new Map(employeeSkills.map((s) => [s.name, s]));
+      const normalizedSkillSettings = (0, import_skill_settings.normalizeAIEmployeeSkillSettings)(subAgentEmployee.skillSettings).skillSettings;
+      const employeeTools = normalizedSkillSettings.tools.filter((tool) => Boolean(tool.name));
+      const employeeToolMap = new Map(employeeTools.map((tool) => [tool.name, tool]));
       const langchainTools = [];
       for (const toolEntry of allTools) {
         const entryName = toolEntry.definition.name;
         if (!entryName) continue;
-        const employeeSkill = employeeSkillMap.get(entryName);
-        if (!employeeSkill || employeeSkill.autoCall !== true || toolEntry.defaultPermission !== "ALLOW") {
+        const employeeTool = employeeToolMap.get(entryName);
+        if (!employeeTool || employeeTool.autoCall !== true || toolEntry.execution === "frontend") {
           continue;
         }
         langchainTools.push(
@@ -306,7 +323,7 @@ class AgentHarness {
               const toolStartedAt = Date.now();
               const isSkillHubTool = entryName === "skill_hub_execute" || entryName.startsWith("skill_hub_");
               const toolSpan = await this.spanService.create({
-                rootRunId: rootRunId || `run_${Date.now()}`,
+                rootRunId: effectiveRootRunId,
                 parentSpanId: executionSpanId,
                 type: isSkillHubTool ? "skill" : "tool",
                 status: "running",
@@ -325,7 +342,7 @@ class AgentHarness {
               });
               const toolSpanId = (toolSpan == null ? void 0 : toolSpan.id) ? String(toolSpan.id) : void 0;
               (0, import_ExecutionSpanService.setOrchestratorTraceContext)(invokeCtx, {
-                rootRunId,
+                rootRunId: effectiveRootRunId,
                 spanId: toolSpanId,
                 parentSpanId: executionSpanId,
                 toolCallId: `orch-${toolCallId}`,
@@ -342,8 +359,16 @@ class AgentHarness {
                 toolName: toolEntry.definition.name,
                 args: toolArgs
               });
+              const subToolCallId = `orch-${toolCallId}`;
+              const runtime = {
+                toolCallId: subToolCallId,
+                writer: (chunk) => {
+                  this.app.log.trace(`[AgentHarness] Tool output:`, chunk);
+                }
+              };
+              invokeCtx.runtime = runtime;
               try {
-                const res = await toolEntry.invoke(invokeCtx, toolArgs, `orch-${toolCallId}`);
+                const res = await toolEntry.invoke(invokeCtx, toolArgs, runtime);
                 const output = (0, import_ctx_utils.trimText)((res == null ? void 0 : res.content) ?? (res == null ? void 0 : res.result) ?? res, 5e4);
                 trace.push({
                   type: "tool_result",
@@ -388,13 +413,13 @@ class AgentHarness {
         llm: chatModel,
         tools: langchainTools
       });
-      let systemPrompt = ((_f = subAgentEmployee.chatSettings) == null ? void 0 : _f.systemPrompt) || subAgentEmployee.bio || `You are an AI assistant named "${subAgentEmployee.nickname || subAgentUsername}". ${subAgentEmployee.about || ""}`;
+      let systemPrompt = ((_e = subAgentEmployee.chatSettings) == null ? void 0 : _e.systemPrompt) || subAgentEmployee.bio || `You are an AI assistant named "${subAgentEmployee.nickname || subAgentUsername}". ${subAgentEmployee.about || ""}`;
       try {
         const kbPlugin = ctx.app.pm.get("plugin-knowledge-base");
         if (kbPlugin == null ? void 0 : kbPlugin.sessionContext) {
-          const sessionId = ((_i = (_h = (_g = ctx.action) == null ? void 0 : _g.params) == null ? void 0 : _h.values) == null ? void 0 : _i.sessionId) || ((_k = (_j = ctx.action) == null ? void 0 : _j.params) == null ? void 0 : _k.sessionId) || ((_l = ctx.state) == null ? void 0 : _l.sessionId);
+          const sessionId = ((_h = (_g = (_f = ctx.action) == null ? void 0 : _f.params) == null ? void 0 : _g.values) == null ? void 0 : _h.sessionId) || ((_j = (_i = ctx.action) == null ? void 0 : _i.params) == null ? void 0 : _j.sessionId) || ((_k = ctx.state) == null ? void 0 : _k.sessionId);
           const contextSummary = await kbPlugin.sessionContext.buildSummary(
-            { rootRunId, ...sessionId ? { sessionId } : {} },
+            { rootRunId: effectiveRootRunId, ...sessionId ? { sessionId } : {} },
             6e3
           );
           if (contextSummary) {

package/dist/server/services/AgentLoopController.js

@@ -670,7 +670,7 @@ class AgentLoopController {
       const target = step.target || "";
       if (target) {
         const circuitBreaker = (0, import_CircuitBreaker.getCircuitBreaker)();
-        const state = circuitBreaker.getState(target);
+        const state = circuitBreaker.getState((0, import_CircuitBreaker.subAgentCircuitKey)(run.leaderUsername, target));
         const attempt = Number(step.attempt || 0);
         const shouldRoute = (state == null ? void 0 : state.state) === "open" || state && state.failures >= 2 && attempt >= 1;
         if (shouldRoute) {
@@ -846,6 +846,8 @@ class AgentLoopController {
         const results = await Promise.allSettled(
           runningSteps.map((step) => this.harness.executeStep(snapshot.run, step, options))
         );
+        let batchBackoffMs = 0;
+        let approvalBreak = false;
         for (let i = 0; i < results.length; i++) {
           const runningStep = runningSteps[i];
           const result = results[i];
@@ -862,6 +864,7 @@ class AgentLoopController {
                 { prompt: `Execution of step "${runningStep.title}" requires permission.` },
                 { userId: options.userId, reason: "Dynamic tool approval required by policy." }
               );
+              approvalBreak = true;
               break;
             }
             snapshot = await this.failStep(runningStep.id, (error == null ? void 0 : error.message) || String(error), {
@@ -874,10 +877,13 @@ class AgentLoopController {
               const baseDelay = 1e3;
               const maxDelay = 6e4;
               const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
-              await new Promise((resolve) => setTimeout(resolve, delay));
+              batchBackoffMs = Math.max(batchBackoffMs, delay);
             }
           }
         }
+        if (!approvalBreak && batchBackoffMs > 0) {
+          await new Promise((resolve) => setTimeout(resolve, batchBackoffMs));
+        }
         snapshot = await this.getRunSnapshot(runId);
         if (snapshot.run.status === "waiting_user") {
           break;

package/dist/server/services/AgentLoopService.js

@@ -43,8 +43,8 @@ class AgentLoopService {
     this.plannerService = new import_AgentPlannerService.AgentPlannerService();
     this.validator = new import_AgentPlanValidator.AgentPlanValidator();
     this.repository = new import_AgentLoopRepository.AgentLoopRepository(plugin);
-    this.harness = new import_AgentHarness.AgentHarness(plugin, this.registryService);
     const tokenTracker = new import_TokenTracker.TokenTracker(plugin);
+    this.harness = new import_AgentHarness.AgentHarness(plugin, this.registryService, tokenTracker);
     this.controller = new import_AgentLoopController.AgentLoopController(
       this.registryService,
       this.plannerService,

package/dist/server/services/AgentRegistryService.js

@@ -30,6 +30,33 @@ __export(AgentRegistryService_exports, {
 });
 module.exports = __toCommonJS(AgentRegistryService_exports);
 var import_ctx_utils = require("../utils/ctx-utils");
+function extractModelRef(value) {
+  if (!value) return void 0;
+  const isValid = (m) => Boolean((m == null ? void 0 : m.llmService) && (m == null ? void 0 : m.model));
+  if (value.enabled) {
+    const models = Array.isArray(value.models) ? value.models : [];
+    const first = models.find(isValid);
+    if (first) {
+      return { llmService: first.llmService, model: first.model };
+    }
+  }
+  if (isValid(value)) {
+    return { llmService: value.llmService, model: value.model };
+  }
+  return void 0;
+}
+function sanitizeToolPart(value) {
+  return (value || "").replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+function buildDelegateToolName(leaderUsername, subAgentUsername) {
+  return `delegate_${sanitizeToolPart(leaderUsername)}_to_${sanitizeToolPart(subAgentUsername)}`;
+}
+function buildDispatchToolName(leaderUsername) {
+  return `dispatch_subagents_${sanitizeToolPart(leaderUsername)}`;
+}
+function buildLegacyDelegateToolName(subAgentUsername) {
+  return `delegate_to_${sanitizeToolPart(subAgentUsername)}`;
+}
 class AgentRegistryService {
   constructor(plugin) {
     this.plugin = plugin;
@@ -85,22 +112,22 @@ class AgentRegistryService {
     if (!subAgent) {
       throw new Error(`Sub-agent "${subAgentUsername}" was not found.`);
     }
-    const hasModelSettings = (val) => {
-      return Boolean((val == null ? void 0 : val.llmService) && (val == null ? void 0 : val.model));
-    };
-    let modelSettings = hasModelSettings(dynamicValues) ? dynamicValues : void 0;
-    if (!modelSettings) {
-      if (hasModelSettings(subAgent.modelSettings)) {
-        modelSettings = subAgent.modelSettings;
-      }
+    const dynamic = extractModelRef(dynamicValues);
+    if (dynamic) {
+      return dynamic;
     }
-    if (!modelSettings && leaderUsername) {
+    const subAgentModel = extractModelRef(subAgent.modelSettings);
+    if (subAgentModel) {
+      return subAgentModel;
+    }
+    if (leaderUsername) {
       const leader = await this.getAIEmployee(leaderUsername);
-      if (leader && hasModelSettings(leader.modelSettings)) {
-        modelSettings = leader.modelSettings;
+      const leaderModel = extractModelRef(leader == null ? void 0 : leader.modelSettings);
+      if (leaderModel) {
+        return leaderModel;
       }
     }
-    return modelSettings;
+    return void 0;
   }
   /**
    * Find alternative sub-agents for the same leader, excluding a specific one.
@@ -140,42 +167,26 @@ class AgentRegistryService {
     try {
       const configRepo = this.db.getRepository("orchestratorConfig");
       if (!configRepo) return false;
+      const configs = await configRepo.find({
+        filter: { enabled: true }
+      });
+      if (!configs || configs.length === 0) return false;
       if (toolName.startsWith("dispatch_subagents_")) {
-        const leader = toolName.substring("dispatch_subagents_".length);
-        const count = await configRepo.count({
-          filter: {
-            leaderUsername: leader,
-            enabled: true
-          }
-        });
-        return count > 0;
-      }
-      if (toolName.startsWith("delegate_") && toolName.includes("_to_")) {
-        const parts = toolName.substring("delegate_".length).split("_to_");
-        if (parts.length === 2) {
-          const [leader, subAgent] = parts;
-          const count = await configRepo.count({
-            filter: {
-              leaderUsername: leader,
-              subAgentUsername: subAgent,
-              enabled: true
-            }
-          });
-          if (count > 0) return true;
-        }
+        return configs.some((config) => buildDispatchToolName(config.leaderUsername || "") === toolName);
       }
       if (toolName.startsWith("delegate_to_")) {
-        const subAgent = toolName.substring("delegate_to_".length);
-        const configs = await configRepo.find({
-          filter: {
-            subAgentUsername: subAgent,
-            enabled: true
-          }
-        });
-        if ((configs == null ? void 0 : configs.length) === 1) {
+        const matchingConfigs = configs.filter(
+          (config) => buildLegacyDelegateToolName(config.subAgentUsername || "") === toolName
+        );
+        if (matchingConfigs.length === 1) {
           return true;
         }
       }
+      if (toolName.startsWith("delegate_") && toolName.includes("_to_")) {
+        return configs.some(
+          (config) => buildDelegateToolName(config.leaderUsername || "", config.subAgentUsername || "") === toolName
+        );
+      }
       return false;
     } catch {
       return false;

package/dist/server/services/CircuitBreaker.js

@@ -27,7 +27,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var CircuitBreaker_exports = {};
 __export(CircuitBreaker_exports, {
   CircuitBreakerRegistry: () => CircuitBreakerRegistry,
-  getCircuitBreaker: () => getCircuitBreaker
+  getCircuitBreaker: () => getCircuitBreaker,
+  subAgentCircuitKey: () => subAgentCircuitKey
 });
 module.exports = __toCommonJS(CircuitBreaker_exports);
 class CircuitBreakerRegistry {
@@ -106,6 +107,9 @@ class CircuitBreakerRegistry {
     return Array.from(this.circuits.keys());
   }
 }
+function subAgentCircuitKey(leaderUsername, target) {
+  return leaderUsername ? `${leaderUsername}::${target}` : target;
+}
 let globalInstance = null;
 function getCircuitBreaker(options) {
   if (!globalInstance) {
@@ -116,5 +120,6 @@ function getCircuitBreaker(options) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CircuitBreakerRegistry,
-  getCircuitBreaker
+  getCircuitBreaker,
+  subAgentCircuitKey
 });