plugin-agent-orchestrator 1.2.0 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (223) hide show
  1. package/LICENSE +201 -0
  2. package/dist/client/{117.2e4cb0477da3db1f.js → 117.6c69b6a87751dd18.js} +1 -1
  3. package/dist/client/{253.93deb9e0192e76a5.js → 253.52f62e1bc0e9520a.js} +1 -1
  4. package/dist/client/{404.498d2d9516dd1dce.js → 404.86593f98c9768ed5.js} +1 -1
  5. package/dist/client/{627.fdd60bcc0f3a9cf6.js → 453.fa2d169576262213.js} +1 -1
  6. package/dist/client/{53.774ff07505d521fa.js → 53.567db3ae078650c6.js} +1 -1
  7. package/dist/client/{619.e342b0fa467d39ca.js → 619.01713281e5e951d3.js} +1 -1
  8. package/dist/client/652.69da1598312b3a3f.js +10 -0
  9. package/dist/client/773.648965568ff476f9.js +10 -0
  10. package/dist/client/{981.e0546ffc34afedcd.js → 981.37e7aeecdb1ef6fa.js} +1 -1
  11. package/dist/client/{993.5d04b510835ab0d2.js → 993.ac89f3852990918d.js} +1 -1
  12. package/dist/client/index.js +1 -1
  13. package/dist/client-v2/{117.ccf43ae8631f7d74.js → 117.c982d79ff68738f5.js} +1 -1
  14. package/dist/client-v2/{214.cdf76752053a8990.js → 214.94c4257bf2838577.js} +1 -1
  15. package/dist/client-v2/{253.1198df22f5baf304.js → 253.8e19956d2a44dfb8.js} +1 -1
  16. package/dist/client-v2/{264.78887ff88f969467.js → 264.80e8e358c8c6c2e5.js} +1 -1
  17. package/dist/client-v2/{404.9ba964c28a151c81.js → 404.ab032b79c95dab6f.js} +1 -1
  18. package/dist/client-v2/{41.b28cf7a675a603d1.js → 41.cd5610fcf7446127.js} +1 -1
  19. package/dist/client-v2/{627.e16f4a0dd596c3e6.js → 453.42c6d70628d56cc2.js} +1 -1
  20. package/dist/client-v2/{53.282081f97e4308c6.js → 53.37c08089a648f89a.js} +1 -1
  21. package/dist/client-v2/{619.8c03913873785fb6.js → 619.6e9618550101e819.js} +1 -1
  22. package/dist/client-v2/652.eeba4e0c38367321.js +10 -0
  23. package/dist/client-v2/{70.9166ed70906d041f.js → 70.332698e53eb59677.js} +1 -1
  24. package/dist/client-v2/773.4de2ba5acb07318c.js +10 -0
  25. package/dist/client-v2/981.76060f466e6f7c11.js +10 -0
  26. package/dist/client-v2/{993.ca5b28f1e2b4c1ef.js → 993.f8cdb5172566ce75.js} +1 -1
  27. package/dist/client-v2/index.js +1 -1
  28. package/dist/externalVersion.js +4 -1
  29. package/dist/locale/en-US.json +80 -1
  30. package/dist/locale/vi-VN.json +5 -1
  31. package/dist/locale/zh-CN.json +80 -1
  32. package/dist/node_modules/acorn/LICENSE +21 -0
  33. package/dist/node_modules/acorn/bin/acorn +4 -0
  34. package/dist/node_modules/acorn/dist/acorn.d.mts +857 -0
  35. package/dist/node_modules/acorn/dist/acorn.d.ts +857 -0
  36. package/dist/node_modules/acorn/dist/acorn.js +1 -0
  37. package/dist/node_modules/acorn/dist/bin.js +90 -0
  38. package/dist/node_modules/acorn/package.json +1 -0
  39. package/dist/node_modules/acorn-walk/LICENSE +21 -0
  40. package/dist/node_modules/acorn-walk/dist/walk.d.mts +177 -0
  41. package/dist/node_modules/acorn-walk/dist/walk.d.ts +177 -0
  42. package/dist/node_modules/acorn-walk/dist/walk.js +1 -0
  43. package/dist/node_modules/acorn-walk/node_modules/.bin/acorn +15 -0
  44. package/dist/node_modules/acorn-walk/node_modules/.bin/acorn.cmd +7 -0
  45. package/dist/node_modules/acorn-walk/node_modules/acorn/bin/acorn +4 -0
  46. package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.d.mts +866 -0
  47. package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.d.ts +866 -0
  48. package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.js +6174 -0
  49. package/dist/node_modules/acorn-walk/node_modules/acorn/dist/bin.js +90 -0
  50. package/dist/node_modules/acorn-walk/node_modules/acorn/package.json +50 -0
  51. package/dist/node_modules/acorn-walk/package.json +1 -0
  52. package/dist/node_modules/adm-zip/package.json +1 -1
  53. package/dist/node_modules/ajv/package.json +1 -1
  54. package/dist/node_modules/zod/package.json +1 -1
  55. package/dist/server/collections/agent-auto-approval-checkpoints.js +47 -0
  56. package/dist/server/collections/agent-execution-spans.js +3 -3
  57. package/dist/server/collections/agent-hierarchy-invocations.js +59 -0
  58. package/dist/server/collections/agent-routing-graph-locks.js +40 -0
  59. package/dist/server/collections/agent-session-auto-approvals.js +45 -0
  60. package/dist/server/collections/orchestrator-config.js +17 -0
  61. package/dist/server/migrations/20261119000000-widen-native-employee-identifiers.js +59 -0
  62. package/dist/server/plugin.js +80 -12
  63. package/dist/server/resources/agent-auto-approval.js +80 -0
  64. package/dist/server/resources/hierarchical-routing.js +60 -0
  65. package/dist/server/services/AutoApprovalCheckpoint.js +133 -0
  66. package/dist/server/services/CodeValidator.js +8 -4
  67. package/dist/server/services/GovernanceAdmission.js +60 -0
  68. package/dist/server/services/HarnessCompiler.js +3 -0
  69. package/dist/server/services/HarnessSchema.js +13 -1
  70. package/dist/server/services/HierarchicalAgentRuntime.js +925 -0
  71. package/dist/server/services/HierarchyEnrollmentGuard.js +216 -0
  72. package/dist/server/services/HierarchyInvocationJournal.js +157 -0
  73. package/dist/server/services/HierarchyRequestCancellation.js +150 -0
  74. package/dist/server/services/LoopRunRepository.js +1 -1
  75. package/dist/server/services/LoopRunStateMachine.js +2 -2
  76. package/dist/server/services/LoopWorkerService.js +7 -7
  77. package/dist/server/services/ParallelInterruptActionsPatch.js +132 -0
  78. package/dist/server/services/PluginAiRuntimeAdapter.js +107 -9
  79. package/dist/server/services/RoutingBindingRepository.js +156 -0
  80. package/dist/server/services/RoutingBindingValidation.js +161 -0
  81. package/dist/server/services/SandboxRunner.js +19 -0
  82. package/dist/server/services/SessionAutoApproval.js +173 -0
  83. package/dist/server/services/VerificationService.js +2 -2
  84. package/dist/server/skill-hub/plugin.js +17 -0
  85. package/dist/server/skill-hub/services/RegistrySkillInstallationService.js +2 -2
  86. package/dist/server/skill-hub/services/registry-node-package.js +191 -0
  87. package/dist/server/skill-hub/tasks/SkillExecutionTask.js +21 -6
  88. package/dist/server/tools/skill-execute.js +1 -0
  89. package/dist/server/utils/ensure-indexes.js +1 -0
  90. package/package.json +5 -2
  91. package/src/client/SkillPages.tsx +1 -8
  92. package/src/client/__tests__/embedded-settings.test.tsx +1 -8
  93. package/src/client/plugin.tsx +3 -8
  94. package/src/client/skill-hub/tools/InteractionSchemasProvider.tsx +21 -6
  95. package/src/client/skill-hub/tools/SkillHubCard.tsx +22 -16
  96. package/src/client/skill-hub/tools/__tests__/skill-hub-card.test.tsx +255 -0
  97. package/src/client/skill-hub/tools/registerSkillLoopCards.ts +12 -3
  98. package/src/client-v2/__tests__/embedded-settings.test.tsx +20 -11
  99. package/src/client-v2/__tests__/hierarchical-routing-settings.test.tsx +350 -0
  100. package/src/client-v2/auto-approval/AutoApprovalBridge.tsx +513 -0
  101. package/src/client-v2/auto-approval/AutoApprovalProvider.tsx +399 -0
  102. package/src/client-v2/auto-approval/__tests__/session-auto-approval.test.tsx +1676 -0
  103. package/src/client-v2/components/AgentBindingsTab.tsx +275 -3
  104. package/src/client-v2/components/AgentRunsTab.tsx +1 -8
  105. package/src/client-v2/components/EmployeeGovernanceTab.tsx +1 -8
  106. package/src/client-v2/components/HarnessProfilesTab.tsx +4 -8
  107. package/src/client-v2/components/HarnessSettingsForm.tsx +221 -0
  108. package/src/client-v2/components/UsageGovernanceTab.tsx +1 -8
  109. package/src/client-v2/pages/AgentBindingsPage.tsx +1 -8
  110. package/src/client-v2/pages/ApprovalsPage.tsx +1 -8
  111. package/src/client-v2/pages/EmployeeGovernancePage.tsx +1 -8
  112. package/src/client-v2/pages/ExecutionHistoryPage.tsx +1 -8
  113. package/src/client-v2/pages/HarnessProfilesPage.tsx +1 -8
  114. package/src/client-v2/pages/KnowledgeAccessPage.tsx +1 -8
  115. package/src/client-v2/pages/LoopSettingsPage.tsx +1 -8
  116. package/src/client-v2/pages/MemoryInspectorPage.tsx +1 -8
  117. package/src/client-v2/pages/RetrievalTracePage.tsx +1 -8
  118. package/src/client-v2/pages/RulesPage.tsx +1 -8
  119. package/src/client-v2/pages/SkillDefinitionsPage.tsx +1 -8
  120. package/src/client-v2/pages/SkillMetricsPage.tsx +1 -8
  121. package/src/client-v2/pages/TracingPage.tsx +1 -8
  122. package/src/client-v2/pages/UsageGovernancePage.tsx +1 -8
  123. package/src/client-v2/plugin.tsx +3 -8
  124. package/src/client-v2/skill-hub/tools/__tests__/interactions.test.ts +17 -1
  125. package/src/client-v2/skill-hub/tools/interactions.ts +12 -3
  126. package/src/locale/en-US.json +80 -1
  127. package/src/locale/vi-VN.json +5 -1
  128. package/src/locale/zh-CN.json +80 -1
  129. package/src/server/__tests__/agent-governance.integration.test.ts +1 -8
  130. package/src/server/__tests__/agent-monitor-acl.integration.test.ts +1 -8
  131. package/src/server/__tests__/agent-usage-report.integration.test.ts +1 -8
  132. package/src/server/__tests__/auto-approval-checkpoint.integration.test.ts +295 -0
  133. package/src/server/__tests__/harness-capabilities.test.ts +1 -8
  134. package/src/server/__tests__/harness-compiler.test.ts +64 -0
  135. package/src/server/__tests__/harness-tool-plan.test.ts +1 -8
  136. package/src/server/__tests__/hierarchical-routing.integration.test.ts +2318 -0
  137. package/src/server/__tests__/hierarchy-invocation-journal.integration.test.ts +119 -0
  138. package/src/server/__tests__/loop-approval-decision.test.ts +59 -12
  139. package/src/server/__tests__/loop-budget-service.test.ts +1 -8
  140. package/src/server/__tests__/loop-run-repository.test.ts +1 -8
  141. package/src/server/__tests__/loop-trigger-service.test.ts +1 -8
  142. package/src/server/__tests__/loop-worker-claim.test.ts +46 -9
  143. package/src/server/__tests__/loop-worker-execution.test.ts +1 -8
  144. package/src/server/__tests__/native-agent-monitor-sync.test.ts +1 -8
  145. package/src/server/__tests__/native-hierarchy-probe.integration.test.ts +527 -0
  146. package/src/server/__tests__/native-sub-agent-observer.test.ts +1 -8
  147. package/src/server/__tests__/native-usage-attribution.integration.test.ts +1 -8
  148. package/src/server/__tests__/parallel-interrupt-actions.test.ts +342 -0
  149. package/src/server/__tests__/plugin-ai-runtime-adapter.test.ts +403 -0
  150. package/src/server/__tests__/registry-node-package.test.ts +299 -0
  151. package/src/server/__tests__/routing-binding-graph.integration.test.ts +217 -0
  152. package/src/server/__tests__/routing-binding-validation.test.ts +256 -0
  153. package/src/server/__tests__/session-auto-approval.integration.test.ts +329 -0
  154. package/src/server/__tests__/skill-execute.test.ts +11 -0
  155. package/src/server/__tests__/skill-review-guard.test.ts +171 -0
  156. package/src/server/__tests__/token-tracker.test.ts +1 -8
  157. package/src/server/__tests__/tracing-retention-policy.test.ts +1 -8
  158. package/src/server/__tests__/usage-ledger.integration.test.ts +1 -8
  159. package/src/server/collections/agent-auto-approval-checkpoints.ts +18 -0
  160. package/src/server/collections/agent-execution-spans.ts +4 -11
  161. package/src/server/collections/agent-governance-audit-events.ts +1 -8
  162. package/src/server/collections/agent-governance-policies.ts +1 -8
  163. package/src/server/collections/agent-governance-policy-versions.ts +1 -8
  164. package/src/server/collections/agent-governance-prompt-bindings.ts +1 -8
  165. package/src/server/collections/agent-hierarchy-invocations.ts +30 -0
  166. package/src/server/collections/agent-loop-runs.ts +1 -8
  167. package/src/server/collections/agent-routing-graph-locks.ts +11 -0
  168. package/src/server/collections/agent-session-auto-approvals.ts +16 -0
  169. package/src/server/collections/orchestrator-config.ts +26 -0
  170. package/src/server/migrations/20261110000000-add-usage-pricing-snapshots.ts +1 -8
  171. package/src/server/migrations/20261110010000-add-usage-department-attribution.ts +1 -8
  172. package/src/server/migrations/20261119000000-widen-native-employee-identifiers.ts +37 -0
  173. package/src/server/plugin.ts +72 -8
  174. package/src/server/resources/agent-auto-approval.ts +51 -0
  175. package/src/server/resources/agent-governance.ts +1 -8
  176. package/src/server/resources/agent-harness-profile.ts +1 -8
  177. package/src/server/resources/agent-monitor.ts +1 -8
  178. package/src/server/resources/agent-usage.ts +1 -8
  179. package/src/server/resources/hierarchical-routing.ts +39 -0
  180. package/src/server/resources/native-monitor-format.ts +1 -8
  181. package/src/server/resources/tracing.ts +1 -8
  182. package/src/server/services/AgentGovernanceService.ts +1 -8
  183. package/src/server/services/AutoApprovalCheckpoint.ts +140 -0
  184. package/src/server/services/CodeValidator.ts +23 -4
  185. package/src/server/services/DepartmentAttribution.ts +1 -8
  186. package/src/server/services/ExecutionSpanService.ts +1 -8
  187. package/src/server/services/GovernanceAdmission.ts +83 -8
  188. package/src/server/services/HarnessCapabilities.ts +1 -8
  189. package/src/server/services/HarnessCompiler.ts +12 -0
  190. package/src/server/services/HarnessSchema.ts +30 -0
  191. package/src/server/services/HierarchicalAgentRuntime.ts +1052 -0
  192. package/src/server/services/HierarchyEnrollmentGuard.ts +211 -0
  193. package/src/server/services/HierarchyInvocationJournal.ts +172 -0
  194. package/src/server/services/HierarchyRequestCancellation.ts +132 -0
  195. package/src/server/services/LoopBudgetService.ts +1 -8
  196. package/src/server/services/LoopRunRepository.ts +2 -9
  197. package/src/server/services/LoopRunStateMachine.ts +3 -10
  198. package/src/server/services/LoopTriggerService.ts +1 -8
  199. package/src/server/services/LoopWorkerService.ts +8 -19
  200. package/src/server/services/ManagedPromptProtection.ts +1 -8
  201. package/src/server/services/NativeAgentMonitorSyncService.ts +1 -8
  202. package/src/server/services/NativeSubAgentObserver.ts +1 -8
  203. package/src/server/services/NativeUsageAttribution.ts +1 -8
  204. package/src/server/services/ParallelInterruptActionsPatch.ts +164 -0
  205. package/src/server/services/PluginAiRuntimeAdapter.ts +140 -9
  206. package/src/server/services/RoutingBindingRepository.ts +146 -0
  207. package/src/server/services/RoutingBindingValidation.ts +161 -0
  208. package/src/server/services/SandboxRunner.ts +35 -1
  209. package/src/server/services/SessionAutoApproval.ts +167 -0
  210. package/src/server/services/TokenTracker.ts +1 -8
  211. package/src/server/services/TracingRetentionPolicy.ts +1 -8
  212. package/src/server/services/VerificationService.ts +3 -10
  213. package/src/server/skill-hub/plugin.ts +40 -0
  214. package/src/server/skill-hub/services/RegistrySkillInstallationService.ts +11 -1
  215. package/src/server/skill-hub/services/registry-node-package.ts +191 -0
  216. package/src/server/skill-hub/tasks/SkillExecutionTask.ts +34 -5
  217. package/src/server/tools/skill-execute.ts +10 -0
  218. package/src/server/utils/ensure-indexes.ts +2 -8
  219. package/dist/client/418.6f01da17774a5a25.js +0 -10
  220. package/dist/client/652.477e21bfff67bc1c.js +0 -10
  221. package/dist/client-v2/418.55b6b28cda8bb5f3.js +0 -10
  222. package/dist/client-v2/652.1a48364774d5383a.js +0 -10
  223. package/dist/client-v2/981.a81521f0296c7db8.js +0 -10
@@ -0,0 +1,211 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+
3
+ import type { Context, Next } from '@nocobase/actions';
4
+ import type { Model } from '@nocobase/database';
5
+ import type PluginAIServer from '@nocobase/plugin-ai/server';
6
+ import { listSystemTools } from '@nocobase/ai';
7
+ import { getAIToolsManager } from '../utils/ai-manager';
8
+ import { asRecord, read } from '../utils/record-utils';
9
+ import { HarnessProfileService } from './HarnessProfileService';
10
+ import { sessionAutoApprovalEnabled } from './SessionAutoApproval';
11
+
12
+ function names(value: unknown): string[] {
13
+ if (!Array.isArray(value)) return [];
14
+ return value
15
+ .map((item) => (typeof item === 'string' ? item : asRecord(item).name))
16
+ .filter((item): item is string => typeof item === 'string' && item.length > 0);
17
+ }
18
+
19
+ /** Managed children must only execute through the restricted hierarchy runtime. */
20
+ export async function guardManagedChildActions(ctx: Context, next: Next) {
21
+ const action = ctx.action;
22
+ if (action?.resourceName !== 'aiConversations') return next();
23
+ const sessionActions = [
24
+ 'sendMessages',
25
+ 'resendMessages',
26
+ 'resumeToolCall',
27
+ 'updateUserDecision',
28
+ 'updateToolArgs',
29
+ 'updateOptions',
30
+ 'abort',
31
+ ];
32
+ if (!sessionActions.includes(action.actionName)) return next();
33
+ const userId = ctx.auth?.user?.id;
34
+ const values = action.params?.values ?? {};
35
+ if (typeof values !== 'object' || Array.isArray(values)) {
36
+ return ctx.throw(400, ctx.t('Invalid conversation action input.'));
37
+ }
38
+ const id = action.actionName === 'updateOptions' ? action.params?.filterByTk : values.sessionId;
39
+ if (typeof id !== 'string' || !id.trim()) {
40
+ return ctx.throw(400, ctx.t('A single conversation identifier is required.'));
41
+ }
42
+ const messageActions = ['sendMessages', 'resendMessages', 'resumeToolCall', 'updateUserDecision', 'updateToolArgs'];
43
+ const messageId = action.actionName === 'sendMessages' ? values.editingMessageId : values.messageId;
44
+ const messageRequired = ['updateUserDecision', 'updateToolArgs'].includes(action.actionName);
45
+ const messageAbsent = messageId == null || messageId === '';
46
+ const validMessage =
47
+ (typeof messageId === 'string' && Boolean(messageId.trim())) ||
48
+ (typeof messageId === 'number' && Number.isSafeInteger(messageId) && messageId > 0);
49
+ if (
50
+ messageActions.includes(action.actionName) &&
51
+ ((messageRequired && messageAbsent) || (!messageAbsent && !validMessage))
52
+ ) {
53
+ return ctx.throw(400, ctx.t('A single message identifier is required.'));
54
+ }
55
+ if (
56
+ action.actionName === 'updateUserDecision' &&
57
+ (typeof values.toolCallId !== 'string' || !values.toolCallId.trim())
58
+ ) {
59
+ return ctx.throw(400, ctx.t('A single tool call identifier is required.'));
60
+ }
61
+ if (action.actionName === 'updateToolArgs' && (typeof values.tool?.id !== 'string' || !values.tool.id.trim())) {
62
+ return ctx.throw(400, ctx.t('A single tool call identifier is required.'));
63
+ }
64
+ if (!userId) return next();
65
+
66
+ const conversations = ctx.db.getRepository('aiConversations');
67
+ const conversation = await conversations.findOne({ filter: { sessionId: id, userId } });
68
+ if (!conversation) return next();
69
+ const isManagedChild = async (record: Model) => {
70
+ if (read(record, 'from') !== 'sub-agent') return false;
71
+ const childSessionId = read(record, 'sessionId');
72
+ const options = asRecord(read(record, 'options'));
73
+ // The marker also covers a crash between creating the child and attaching it to the journal.
74
+ if (typeof options.hierarchyRootSessionId === 'string' && typeof options.hierarchyParentSessionId === 'string') {
75
+ return Boolean(options.hierarchyRootSessionId && options.hierarchyParentSessionId);
76
+ }
77
+ const invocation = await ctx.db.getRepository('agentHierarchyInvocations').findOne({
78
+ filter: { childSessionId, ownerId: userId },
79
+ });
80
+ return Boolean(invocation);
81
+ };
82
+ if (await isManagedChild(conversation)) {
83
+ return ctx.throw(403, ctx.t('Managed child conversations cannot be modified directly.'));
84
+ }
85
+ if (messageActions.includes(action.actionName) && messageId) {
86
+ const message = await ctx.db.getRepository('aiMessages').findOne({ filter: { messageId } });
87
+ const messageSessionId = read(message, 'sessionId');
88
+ if (typeof messageSessionId === 'string' && messageSessionId !== id) {
89
+ const messageConversation = await conversations.findOne({ filter: { sessionId: messageSessionId, userId } });
90
+ if (messageConversation && (await isManagedChild(messageConversation))) {
91
+ return ctx.throw(403, ctx.t('Managed child conversations cannot be modified directly.'));
92
+ }
93
+ }
94
+ }
95
+ return next();
96
+ }
97
+
98
+ /**
99
+ * Enrollment applies only to employees with an explicitly enabled hierarchy binding.
100
+ * Native tools bypass the managed routing policy, so refuse a configuration where
101
+ * the root could directly call a managed worker tool or native employee dispatch.
102
+ */
103
+ export async function guardHierarchyEnrollment(ctx: Context, next: Next) {
104
+ const action = ctx.action;
105
+ if (
106
+ action?.resourceName !== 'aiConversations' ||
107
+ !['sendMessages', 'resendMessages', 'resumeToolCall'].includes(action.actionName)
108
+ ) {
109
+ return next();
110
+ }
111
+ const userId = ctx.auth?.user?.id;
112
+ const values = action.params?.values ?? {};
113
+ const sessionId = typeof values.sessionId === 'string' ? values.sessionId : '';
114
+ if (!userId || !sessionId) return next();
115
+ const conversation = await ctx.db.getRepository('aiConversations').findOne({ filter: { sessionId, userId } });
116
+ if (!conversation || read(conversation, 'from') === 'sub-agent') return next();
117
+ const storedUsername = read(conversation, 'aiEmployeeUsername');
118
+ const requested = typeof values.aiEmployee === 'string' ? values.aiEmployee : storedUsername;
119
+ if (typeof requested !== 'string' || !requested) return next();
120
+ const roots = await ctx.db.getRepository('orchestratorConfig').find({
121
+ filter: { leaderUsername: requested, enabled: true, routingEnabled: true, routingRole: 'specialist' },
122
+ });
123
+ if (!roots.length) return next();
124
+ if (requested !== storedUsername) return ctx.throw(403, ctx.t('The employee does not match the conversation.'));
125
+ const employee = await ctx.db.getRepository('aiEmployees').findOne({ filter: { username: requested } });
126
+ if (!employee) return ctx.throw(403, ctx.t('The AI employee is unavailable.'));
127
+ const settings = asRecord(read(employee, 'skillSettings'));
128
+ const options = asRecord(read(conversation, 'options'));
129
+ const configuredTools = new Set([...names(settings.tools), ...names(options.tools)]);
130
+ const profiles = new HarnessProfileService(ctx.db);
131
+ const workerTools = new Set<string>();
132
+ const autoApprove = await sessionAutoApprovalEnabled(ctx, sessionId);
133
+ for (const root of roots as Model[]) {
134
+ const specialist = read(root, 'subAgentUsername');
135
+ const workerBindings = await ctx.db.getRepository('orchestratorConfig').find({
136
+ filter: { leaderUsername: specialist, enabled: true, routingEnabled: true, routingRole: 'worker' },
137
+ });
138
+ for (const binding of workerBindings as Model[]) {
139
+ const tag = typeof read(binding, 'harnessTag') === 'string' ? String(read(binding, 'harnessTag')) : 'default';
140
+ const profile = await profiles.getPublishedByTag(tag);
141
+ if (!profile) return ctx.throw(403, ctx.t('The delegation policy profile is unavailable.'));
142
+ for (const name of profile.settings.tools.allow) workerTools.add(name);
143
+ if (autoApprove) for (const name of profile.settings.tools.ask) workerTools.add(name);
144
+ }
145
+ }
146
+ const generalTools = await getAIToolsManager(ctx.app).listTools({ scope: 'GENERAL', ctx, sessionId });
147
+ for (const tool of generalTools as Array<{ definition?: { name?: string } }>) {
148
+ if (tool.definition?.name) configuredTools.add(tool.definition.name);
149
+ }
150
+ const conversationSettings = asRecord(options.skillSettings);
151
+ const toolFilter = names(conversationSettings.tools);
152
+ const hasToolFilter =
153
+ Array.isArray(conversationSettings.tools) && (Boolean(conversationSettings.toolsVersion) || toolFilter.length > 0);
154
+ if (hasToolFilter) {
155
+ const systemTools = new Set(listSystemTools());
156
+ for (const name of configuredTools) {
157
+ if (!systemTools.has(name) && !toolFilter.includes(name)) configuredTools.delete(name);
158
+ }
159
+ }
160
+ const chatSettings = asRecord(read(employee, 'chatSettings'));
161
+ const ai = ctx.app.pm.get('ai') as PluginAIServer | undefined;
162
+ if (!ai?.ai?.skillsManager) return ctx.throw(403, ctx.t('The AI employee skills are unavailable.'));
163
+ const skillsManager = ai.ai.skillsManager;
164
+ if (chatSettings.enableSkills !== false) {
165
+ const general = await skillsManager.listSkills({ scope: 'GENERAL' });
166
+ const selected = names(settings.skills);
167
+ const specified = selected.length ? await skillsManager.getSkills(selected) : [];
168
+ const skillFilter = names(conversationSettings.skills);
169
+ const hasSkillFilter =
170
+ Array.isArray(conversationSettings.skills) &&
171
+ (Boolean(conversationSettings.skillsVersion) || skillFilter.length > 0);
172
+ for (const skill of [...general, ...specified]) {
173
+ if (hasSkillFilter && !skillFilter.includes(skill.name)) continue;
174
+ for (const name of names(skill.tools)) configuredTools.add(name);
175
+ }
176
+ }
177
+ // Native middleware also honours skills loaded earlier in this session, even after
178
+ // the employee's current skill list changes.
179
+ const loaded = await ctx.db.getRepository('aiToolMessages').find({
180
+ filter: { sessionId, toolName: 'getSkill', status: 'success' },
181
+ });
182
+ const loadedNames = new Set<string>();
183
+ for (const call of loaded as Model[]) {
184
+ let content = read(call, 'content');
185
+ if (typeof content === 'string') {
186
+ try {
187
+ content = JSON.parse(content);
188
+ } catch {
189
+ continue;
190
+ }
191
+ }
192
+ const name = asRecord(content).skillName;
193
+ if (typeof name === 'string' && name) loadedNames.add(name);
194
+ }
195
+ if (loadedNames.size) {
196
+ const loadedSkills = await skillsManager.getSkills([...loadedNames]);
197
+ for (const skill of loadedSkills) {
198
+ for (const name of names(skill.tools)) configuredTools.add(name);
199
+ }
200
+ }
201
+ if (configuredTools.has('dispatch-sub-agent-task')) {
202
+ return ctx.throw(403, ctx.t('Disable native AI employee dispatch before using managed hierarchy routing.'));
203
+ }
204
+ if ([...workerTools].some((name) => configuredTools.has(name))) {
205
+ return ctx.throw(
206
+ 403,
207
+ ctx.t('Remove managed worker tools from the parent employee before using hierarchy routing.'),
208
+ );
209
+ }
210
+ return next();
211
+ }
@@ -0,0 +1,172 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ import { createHash, randomUUID } from 'node:crypto';
3
+ import type { Database, Model } from '@nocobase/database';
4
+ import { read } from '../utils/record-utils';
5
+
6
+ export type HierarchyInvocationKey = {
7
+ ownerId: number;
8
+ parentSessionId: string;
9
+ parentToolCallId: string;
10
+ };
11
+
12
+ export type HierarchySnapshot = {
13
+ profileTag: string;
14
+ profileVersion: number;
15
+ profileVersionId: number;
16
+ policy: unknown;
17
+ model: { llmService: string; model: string };
18
+ provider?: string;
19
+ ancestors: string[];
20
+ bindingTimeout?: number;
21
+ bindingMaxDepth?: number;
22
+ };
23
+
24
+ export type ReserveHierarchyInvocation = HierarchyInvocationKey & {
25
+ rootSessionId: string;
26
+ parentEmployee: string;
27
+ employeeUsername: string;
28
+ role: 'specialist' | 'worker';
29
+ question: string;
30
+ snapshot: HierarchySnapshot;
31
+ };
32
+
33
+ function digest(question: string) {
34
+ return createHash('sha256').update(question, 'utf8').digest('hex');
35
+ }
36
+
37
+ function requireKey(key: HierarchyInvocationKey) {
38
+ if (!Number.isSafeInteger(key.ownerId) || key.ownerId <= 0 || !key.parentSessionId || !key.parentToolCallId) {
39
+ throw new Error('Invalid hierarchy invocation identity.');
40
+ }
41
+ }
42
+
43
+ /** Store for hierarchy invocations. It never reclaims uncertain in-flight work. */
44
+ export class HierarchyInvocationJournal {
45
+ constructor(private readonly database: Database) {}
46
+
47
+ private async findOwned(key: HierarchyInvocationKey) {
48
+ requireKey(key);
49
+ const row = await this.database.getRepository('agentHierarchyInvocations').findOne({
50
+ filter: { parentSessionId: key.parentSessionId, parentToolCallId: key.parentToolCallId, ownerId: key.ownerId },
51
+ });
52
+ if (!row) throw new Error('The hierarchy invocation is unavailable.');
53
+ return row;
54
+ }
55
+
56
+ async get(key: HierarchyInvocationKey) {
57
+ return this.findOwned(key);
58
+ }
59
+
60
+ private assertSame(row: Model, input: ReserveHierarchyInvocation) {
61
+ if (
62
+ Number(read(row, 'ownerId')) !== input.ownerId ||
63
+ read(row, 'rootSessionId') !== input.rootSessionId ||
64
+ read(row, 'parentEmployee') !== input.parentEmployee ||
65
+ read(row, 'employeeUsername') !== input.employeeUsername ||
66
+ read(row, 'role') !== input.role ||
67
+ read(row, 'questionHash') !== digest(input.question)
68
+ ) {
69
+ throw new Error('The hierarchy invocation identity does not match the existing request.');
70
+ }
71
+ return row;
72
+ }
73
+
74
+ async reserve(input: ReserveHierarchyInvocation): Promise<Model> {
75
+ requireKey(input);
76
+ if (!input.rootSessionId || !input.parentEmployee || !input.employeeUsername || !input.question) {
77
+ throw new Error('Incomplete hierarchy invocation.');
78
+ }
79
+ try {
80
+ return await this.database.getRepository('agentHierarchyInvocations').create({
81
+ values: {
82
+ ownerId: input.ownerId,
83
+ rootSessionId: input.rootSessionId,
84
+ parentSessionId: input.parentSessionId,
85
+ parentToolCallId: input.parentToolCallId,
86
+ parentEmployee: input.parentEmployee,
87
+ employeeUsername: input.employeeUsername,
88
+ role: input.role,
89
+ questionHash: digest(input.question),
90
+ snapshot: input.snapshot,
91
+ status: 'reserved',
92
+ },
93
+ });
94
+ } catch (error) {
95
+ if (!(error instanceof Error) || error.name !== 'SequelizeUniqueConstraintError') throw error;
96
+ return this.assertSame(await this.findOwned(input), input);
97
+ }
98
+ }
99
+
100
+ async claim(key: HierarchyInvocationKey) {
101
+ const row = await this.findOwned(key);
102
+ const status = read(row, 'status');
103
+ if (status !== 'reserved') throw new Error('The hierarchy invocation is not ready.');
104
+ const token = randomUUID();
105
+ const [updated] = await this.database
106
+ .getModel('agentHierarchyInvocations')
107
+ .update(
108
+ { status: 'running', claimToken: token },
109
+ { where: { id: read(row, 'id'), ownerId: key.ownerId, status } },
110
+ );
111
+ if (updated !== 1) throw new Error('The hierarchy invocation was claimed by another request.');
112
+ return { row, token };
113
+ }
114
+
115
+ private async updateClaim(key: HierarchyInvocationKey, token: string, values: Record<string, unknown>) {
116
+ requireKey(key);
117
+ if (!token) throw new Error('A hierarchy claim is required.');
118
+ const [updated] = await this.database.getModel('agentHierarchyInvocations').update(values, {
119
+ where: {
120
+ parentSessionId: key.parentSessionId,
121
+ parentToolCallId: key.parentToolCallId,
122
+ ownerId: key.ownerId,
123
+ status: 'running',
124
+ claimToken: token,
125
+ },
126
+ });
127
+ if (updated !== 1) throw new Error('The hierarchy claim is no longer active.');
128
+ }
129
+
130
+ async attachChild(key: HierarchyInvocationKey, token: string, childSessionId: string) {
131
+ if (!childSessionId) throw new Error('A child session is required.');
132
+ await this.updateClaim(key, token, { childSessionId });
133
+ }
134
+
135
+ async complete(key: HierarchyInvocationKey, token: string, result: unknown, signal?: AbortSignal) {
136
+ if (signal?.aborted) throw new Error('The hierarchy invocation was cancelled.');
137
+ await this.updateClaim(key, token, { status: 'succeeded', claimToken: null, result });
138
+ if (signal?.aborted) {
139
+ await this.database.getModel('agentHierarchyInvocations').update(
140
+ { status: 'uncertain', result: null },
141
+ {
142
+ where: {
143
+ parentSessionId: key.parentSessionId,
144
+ parentToolCallId: key.parentToolCallId,
145
+ ownerId: key.ownerId,
146
+ status: 'succeeded',
147
+ },
148
+ },
149
+ );
150
+ throw new Error('The hierarchy invocation was cancelled.');
151
+ }
152
+ }
153
+
154
+ async markUncertain(key: HierarchyInvocationKey, token: string) {
155
+ await this.updateClaim(key, token, { status: 'uncertain', claimToken: null });
156
+ }
157
+
158
+ async invalidateCompleted(key: HierarchyInvocationKey) {
159
+ requireKey(key);
160
+ await this.database.getModel('agentHierarchyInvocations').update(
161
+ { status: 'uncertain', result: null },
162
+ {
163
+ where: {
164
+ parentSessionId: key.parentSessionId,
165
+ parentToolCallId: key.parentToolCallId,
166
+ ownerId: key.ownerId,
167
+ status: 'succeeded',
168
+ },
169
+ },
170
+ );
171
+ }
172
+ }
@@ -0,0 +1,132 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+
3
+ import type { Context, Next } from '@nocobase/actions';
4
+ import type { Plugin } from '@nocobase/server';
5
+ import { asRecord, read } from '../utils/record-utils';
6
+
7
+ type ActiveRequest = {
8
+ ownerId: string;
9
+ sessionId: string;
10
+ controller: AbortController;
11
+ removeNativeListener?: () => void;
12
+ };
13
+
14
+ // The actual request Context is the capability; clients cannot supply it in a tool call.
15
+ const contextRequests = new WeakMap<object, ActiveRequest>();
16
+
17
+ export function hierarchyRequestSignal(ctx: Context, nativeSignal?: AbortSignal): AbortSignal | undefined {
18
+ const request = contextRequests.get(ctx);
19
+ if (!request) return nativeSignal;
20
+ if (nativeSignal && !request.removeNativeListener) {
21
+ const abort = () => request.controller.abort();
22
+ if (nativeSignal.aborted) abort();
23
+ else {
24
+ nativeSignal.addEventListener('abort', abort, { once: true });
25
+ request.removeNativeListener = () => nativeSignal.removeEventListener('abort', abort);
26
+ }
27
+ }
28
+ return request.controller.signal;
29
+ }
30
+
31
+ export function hasHierarchyRequest(ctx: Context) {
32
+ return contextRequests.has(ctx);
33
+ }
34
+
35
+ /** Cancellation is scoped to this plugin instance, authenticated owner, session, and actual request. */
36
+ export class HierarchyRequestCancellation {
37
+ private readonly active = new Map<string, Set<ActiveRequest>>();
38
+
39
+ constructor(private readonly plugin: Plugin) {}
40
+
41
+ private cancel(ownerId: string, sessionId: string) {
42
+ for (const request of this.active.get(sessionId) ?? []) {
43
+ if (request.ownerId === ownerId) request.controller.abort();
44
+ }
45
+ }
46
+
47
+ async middleware(ctx: Context, next: Next) {
48
+ const action = ctx.action;
49
+ if (action?.resourceName !== 'aiConversations') return next();
50
+ const userId = ctx.auth?.user?.id;
51
+ const values = action.params?.values ?? {};
52
+ const sessionId = typeof values.sessionId === 'string' ? values.sessionId : '';
53
+ if (!userId || !sessionId) return next();
54
+ const isAbort = action.actionName === 'abort';
55
+ if (!isAbort && !['sendMessages', 'resendMessages', 'resumeToolCall'].includes(action.actionName)) return next();
56
+ const conversation = await ctx.db.getRepository('aiConversations').findOne({ filter: { sessionId, userId } });
57
+ if (!conversation || read(conversation, 'from') === 'sub-agent') return next();
58
+ const ownerId = String(userId);
59
+ const username = read(conversation, 'aiEmployeeUsername');
60
+ if (typeof username !== 'string' || !username) return next();
61
+ const binding = await ctx.db.getRepository('orchestratorConfig').findOne({
62
+ filter: { leaderUsername: username, enabled: true, routingEnabled: true, routingRole: 'specialist' },
63
+ });
64
+ if (isAbort) {
65
+ const locallyManaged = [...(this.active.get(sessionId) ?? [])].some((request) => request.ownerId === ownerId);
66
+ if (!binding && !locallyManaged) {
67
+ const recorded = await ctx.db.getRepository('agentHierarchyInvocations').findOne({
68
+ filter: { rootSessionId: sessionId, ownerId: userId },
69
+ });
70
+ if (!recorded) return next();
71
+ }
72
+ this.cancel(ownerId, sessionId);
73
+ try {
74
+ if (!this.plugin.name) throw new Error('Plugin name is unavailable.');
75
+ await this.plugin.app.syncMessageManager.publish(this.plugin.name, {
76
+ type: 'hierarchy:abort',
77
+ ownerId,
78
+ sessionId,
79
+ });
80
+ } catch {
81
+ try {
82
+ this.plugin.app.logger.warn('[AgentOrchestrator] Could not synchronize managed request cancellation.');
83
+ } catch {
84
+ // Logging must not prevent the native cancellation action.
85
+ }
86
+ }
87
+ return next();
88
+ }
89
+ if (!binding) return next();
90
+
91
+ const request: ActiveRequest = { ownerId, sessionId, controller: new AbortController() };
92
+ let requests = this.active.get(sessionId);
93
+ if (!requests) this.active.set(sessionId, (requests = new Set()));
94
+ requests.add(request);
95
+ contextRequests.set(ctx, request);
96
+ const cleanup = () => {
97
+ request.removeNativeListener?.();
98
+ if (contextRequests.get(ctx) === request) contextRequests.delete(ctx);
99
+ requests.delete(request);
100
+ if (!requests.size && this.active.get(sessionId) === requests) this.active.delete(sessionId);
101
+ };
102
+ // Resume is always SSE in native AI. Normal streaming keeps the host's SSE lifecycle.
103
+ const nonStreaming = action.actionName !== 'resumeToolCall' && values.stream === false;
104
+ try {
105
+ const result = await next();
106
+ if (nonStreaming && request.controller.signal.aborted) {
107
+ return ctx.throw(499, ctx.t('The managed request was cancelled.'));
108
+ }
109
+ return result;
110
+ } catch (error) {
111
+ if (nonStreaming && request.controller.signal.aborted) {
112
+ return ctx.throw(499, ctx.t('The managed request was cancelled.'));
113
+ }
114
+ throw error;
115
+ } finally {
116
+ cleanup();
117
+ }
118
+ }
119
+
120
+ handleSyncMessage(message: unknown) {
121
+ const value = asRecord(message);
122
+ if (value.type !== 'hierarchy:abort') return;
123
+ if (typeof value.ownerId !== 'string' || typeof value.sessionId !== 'string') return;
124
+ this.cancel(value.ownerId, value.sessionId);
125
+ }
126
+
127
+ abortAll() {
128
+ for (const requests of this.active.values()) {
129
+ for (const request of requests) request.controller.abort();
130
+ }
131
+ }
132
+ }
@@ -1,11 +1,4 @@
1
- /**
2
- * This file is part of the NocoBase (R) project.
3
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
- * Authors: NocoBase Team.
5
- *
6
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
- * For more information, please refer to: https://www.nocobase.com/agreement.
8
- */
1
+ // SPDX-License-Identifier: Apache-2.0
9
2
 
10
3
  import type { Database, Model } from '@nocobase/database';
11
4
  import type { LoopPatternPolicy } from './LoopPatternSchema';
@@ -1,11 +1,4 @@
1
- /**
2
- * This file is part of the NocoBase (R) project.
3
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
- * Authors: NocoBase Team.
5
- *
6
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
- * For more information, please refer to: https://www.nocobase.com/agreement.
8
- */
1
+ // SPDX-License-Identifier: Apache-2.0
9
2
 
10
3
  import type { Database, Model } from '@nocobase/database';
11
4
  import { getRunEventBus } from './RunEventBus';
@@ -277,7 +270,7 @@ export class LoopRunRepository {
277
270
  payload: { decision: input.decision },
278
271
  actorType: 'human',
279
272
  actorIdentity: String(decidedById),
280
- correlationKey: `approval-decided:${runId}`,
273
+ correlationKey: `approval-decided:${id}`,
281
274
  createdAt: now,
282
275
  },
283
276
  transaction,
@@ -1,11 +1,4 @@
1
- /**
2
- * This file is part of the NocoBase (R) project.
3
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
- * Authors: NocoBase Team.
5
- *
6
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
- * For more information, please refer to: https://www.nocobase.com/agreement.
8
- */
1
+ // SPDX-License-Identifier: Apache-2.0
9
2
 
10
3
  import { randomUUID } from 'node:crypto';
11
4
  import type { Database, Model, Repository, Transaction } from '@nocobase/database';
@@ -276,7 +269,7 @@ export class LoopRunStateMachine {
276
269
  payload: { reason: blockedReason },
277
270
  actorType: 'worker',
278
271
  actorIdentity: normalizedWorkerId,
279
- correlationKey: `claim-blocked:${runId}`,
272
+ correlationKey: `claim-blocked:${randomUUID()}`,
280
273
  createdAt: now,
281
274
  },
282
275
  transaction,
@@ -404,7 +397,7 @@ export class LoopRunStateMachine {
404
397
  payload: { reason, expiredApprovals: overdue.length },
405
398
  actorType: 'system',
406
399
  actorIdentity: 'approval-reaper',
407
- correlationKey: `approval-expired:${runId}`,
400
+ correlationKey: `approval-expired:${String(read(overdue[0], 'id'))}`,
408
401
  createdAt: now,
409
402
  },
410
403
  transaction,
@@ -1,11 +1,4 @@
1
- /**
2
- * This file is part of the NocoBase (R) project.
3
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
- * Authors: NocoBase Team.
5
- *
6
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
- * For more information, please refer to: https://www.nocobase.com/agreement.
8
- */
1
+ // SPDX-License-Identifier: Apache-2.0
9
2
 
10
3
  import { randomUUID } from 'node:crypto';
11
4
  import type { Database, Model } from '@nocobase/database';
@@ -1,11 +1,4 @@
1
- /**
2
- * This file is part of the NocoBase (R) project.
3
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
- * Authors: NocoBase Team.
5
- *
6
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
- * For more information, please refer to: https://www.nocobase.com/agreement.
8
- */
1
+ // SPDX-License-Identifier: Apache-2.0
9
2
 
10
3
  import { createHash, randomUUID } from 'node:crypto';
11
4
  import type { Database, Model } from '@nocobase/database';
@@ -313,7 +306,7 @@ export class LoopWorkerService {
313
306
  eventType: 'run_waiting_approval',
314
307
  title: 'Waiting for action approval',
315
308
  content: 'Run requeued while its approval decisions are still pending.',
316
- correlationKey: `approval-repark:${snapshot.id}`,
309
+ correlationKey: `approval-repark:${leaseToken}`,
317
310
  values: { approvalStatus: 'pending' },
318
311
  });
319
312
  return;
@@ -336,9 +329,7 @@ export class LoopWorkerService {
336
329
  : snapshot.resumeContext
337
330
  ? `${snapshot.resumeContext.username} resumed after approval decisions.`
338
331
  : `Leader ${snapshot.leaderUsername} began working on the goal.`,
339
- correlationKey: snapshot.verificationRecoverySummary
340
- ? `verification-recovery-started:${leaseToken}`
341
- : `started:${snapshot.id}`,
332
+ correlationKey: `started:${leaseToken}`,
342
333
  values: {
343
334
  currentRole: snapshot.verificationRecoverySummary
344
335
  ? 'verifier'
@@ -509,9 +500,7 @@ export class LoopWorkerService {
509
500
  eventType: 'run_verifying',
510
501
  title: 'Verification started',
511
502
  content: `Verifier ${snapshot.verifierUsername} is reviewing the reported result.`,
512
- correlationKey: snapshot.verificationRecoverySummary
513
- ? `verification-recovery:${leaseToken}`
514
- : `verifying:${snapshot.id}`,
503
+ correlationKey: `verifying:${leaseToken}`,
515
504
  values: {
516
505
  currentRole: 'verifier',
517
506
  finalAnswer: makerSummary,
@@ -602,7 +591,7 @@ export class LoopWorkerService {
602
591
  eventType: deadlocked ? 'run_blocked' : 'run_waiting_lock',
603
592
  title: deadlocked ? 'Run blocked by a lock cycle' : 'Waiting for repository paths',
604
593
  content: `Blocked by run(s): ${lock.blockers.join(', ')}.`,
605
- correlationKey: `lock:${snapshot.id}:${lock.blockers.join('-')}`,
594
+ correlationKey: `lock:${leaseToken}`,
606
595
  values: deadlocked ? { blockedReason: 'Path lock wait graph contains a cycle.' } : {},
607
596
  });
608
597
  return false;
@@ -807,7 +796,7 @@ export class LoopWorkerService {
807
796
  eventType: finding.level === 'block' ? 'run_blocked' : 'run_escalated',
808
797
  title: finding.level === 'block' ? 'Run blocked by tool loop detection' : 'Run escalated by tool loop detection',
809
798
  content: reason,
810
- correlationKey: `tool-loop-${finding.level}:${snapshot.id}:${finding.signature}`,
799
+ correlationKey: `tool-loop-${finding.level}:${leaseToken}`,
811
800
  values: finding.level === 'block' ? { blockedReason: reason } : { escalationReason: reason },
812
801
  });
813
802
  return 'halt';
@@ -901,7 +890,7 @@ export class LoopWorkerService {
901
890
  eventType: 'run_waiting_approval',
902
891
  title: 'Waiting for action approval',
903
892
  content: `${outcome.interrupted.length} tool call(s) require approval.`,
904
- correlationKey: `approval:${snapshot.id}:${outcome.messageId}`,
893
+ correlationKey: `approval:${leaseToken}`,
905
894
  values: { approvalStatus: 'pending', messageId: outcome.messageId },
906
895
  });
907
896
  }
@@ -927,7 +916,7 @@ export class LoopWorkerService {
927
916
  eventType: 'run_failed',
928
917
  title: 'Run failed',
929
918
  content: message,
930
- correlationKey: `failed:${runId}`,
919
+ correlationKey: `failed:${leaseToken}`,
931
920
  values: { summary: message },
932
921
  });
933
922
  } catch (transitionError) {