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.
- package/LICENSE +201 -0
- package/dist/client/{117.2e4cb0477da3db1f.js → 117.6c69b6a87751dd18.js} +1 -1
- package/dist/client/{253.93deb9e0192e76a5.js → 253.52f62e1bc0e9520a.js} +1 -1
- package/dist/client/{404.498d2d9516dd1dce.js → 404.86593f98c9768ed5.js} +1 -1
- package/dist/client/{627.fdd60bcc0f3a9cf6.js → 453.fa2d169576262213.js} +1 -1
- package/dist/client/{53.774ff07505d521fa.js → 53.567db3ae078650c6.js} +1 -1
- package/dist/client/{619.e342b0fa467d39ca.js → 619.01713281e5e951d3.js} +1 -1
- package/dist/client/652.69da1598312b3a3f.js +10 -0
- package/dist/client/773.648965568ff476f9.js +10 -0
- package/dist/client/{981.e0546ffc34afedcd.js → 981.37e7aeecdb1ef6fa.js} +1 -1
- package/dist/client/{993.5d04b510835ab0d2.js → 993.ac89f3852990918d.js} +1 -1
- package/dist/client/index.js +1 -1
- package/dist/client-v2/{117.ccf43ae8631f7d74.js → 117.c982d79ff68738f5.js} +1 -1
- package/dist/client-v2/{214.cdf76752053a8990.js → 214.94c4257bf2838577.js} +1 -1
- package/dist/client-v2/{253.1198df22f5baf304.js → 253.8e19956d2a44dfb8.js} +1 -1
- package/dist/client-v2/{264.78887ff88f969467.js → 264.80e8e358c8c6c2e5.js} +1 -1
- package/dist/client-v2/{404.9ba964c28a151c81.js → 404.ab032b79c95dab6f.js} +1 -1
- package/dist/client-v2/{41.b28cf7a675a603d1.js → 41.cd5610fcf7446127.js} +1 -1
- package/dist/client-v2/{627.e16f4a0dd596c3e6.js → 453.42c6d70628d56cc2.js} +1 -1
- package/dist/client-v2/{53.282081f97e4308c6.js → 53.37c08089a648f89a.js} +1 -1
- package/dist/client-v2/{619.8c03913873785fb6.js → 619.6e9618550101e819.js} +1 -1
- package/dist/client-v2/652.eeba4e0c38367321.js +10 -0
- package/dist/client-v2/{70.9166ed70906d041f.js → 70.332698e53eb59677.js} +1 -1
- package/dist/client-v2/773.4de2ba5acb07318c.js +10 -0
- package/dist/client-v2/981.76060f466e6f7c11.js +10 -0
- package/dist/client-v2/{993.ca5b28f1e2b4c1ef.js → 993.f8cdb5172566ce75.js} +1 -1
- package/dist/client-v2/index.js +1 -1
- package/dist/externalVersion.js +4 -1
- package/dist/locale/en-US.json +80 -1
- package/dist/locale/vi-VN.json +5 -1
- package/dist/locale/zh-CN.json +80 -1
- package/dist/node_modules/acorn/LICENSE +21 -0
- package/dist/node_modules/acorn/bin/acorn +4 -0
- package/dist/node_modules/acorn/dist/acorn.d.mts +857 -0
- package/dist/node_modules/acorn/dist/acorn.d.ts +857 -0
- package/dist/node_modules/acorn/dist/acorn.js +1 -0
- package/dist/node_modules/acorn/dist/bin.js +90 -0
- package/dist/node_modules/acorn/package.json +1 -0
- package/dist/node_modules/acorn-walk/LICENSE +21 -0
- package/dist/node_modules/acorn-walk/dist/walk.d.mts +177 -0
- package/dist/node_modules/acorn-walk/dist/walk.d.ts +177 -0
- package/dist/node_modules/acorn-walk/dist/walk.js +1 -0
- package/dist/node_modules/acorn-walk/node_modules/.bin/acorn +15 -0
- package/dist/node_modules/acorn-walk/node_modules/.bin/acorn.cmd +7 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/bin/acorn +4 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.d.mts +866 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.d.ts +866 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/dist/acorn.js +6174 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/dist/bin.js +90 -0
- package/dist/node_modules/acorn-walk/node_modules/acorn/package.json +50 -0
- package/dist/node_modules/acorn-walk/package.json +1 -0
- package/dist/node_modules/adm-zip/package.json +1 -1
- package/dist/node_modules/ajv/package.json +1 -1
- package/dist/node_modules/zod/package.json +1 -1
- package/dist/server/collections/agent-auto-approval-checkpoints.js +47 -0
- package/dist/server/collections/agent-execution-spans.js +3 -3
- package/dist/server/collections/agent-hierarchy-invocations.js +59 -0
- package/dist/server/collections/agent-routing-graph-locks.js +40 -0
- package/dist/server/collections/agent-session-auto-approvals.js +45 -0
- package/dist/server/collections/orchestrator-config.js +17 -0
- package/dist/server/migrations/20261119000000-widen-native-employee-identifiers.js +59 -0
- package/dist/server/plugin.js +80 -12
- package/dist/server/resources/agent-auto-approval.js +80 -0
- package/dist/server/resources/hierarchical-routing.js +60 -0
- package/dist/server/services/AutoApprovalCheckpoint.js +133 -0
- package/dist/server/services/CodeValidator.js +8 -4
- package/dist/server/services/GovernanceAdmission.js +60 -0
- package/dist/server/services/HarnessCompiler.js +3 -0
- package/dist/server/services/HarnessSchema.js +13 -1
- package/dist/server/services/HierarchicalAgentRuntime.js +925 -0
- package/dist/server/services/HierarchyEnrollmentGuard.js +216 -0
- package/dist/server/services/HierarchyInvocationJournal.js +157 -0
- package/dist/server/services/HierarchyRequestCancellation.js +150 -0
- package/dist/server/services/LoopRunRepository.js +1 -1
- package/dist/server/services/LoopRunStateMachine.js +2 -2
- package/dist/server/services/LoopWorkerService.js +7 -7
- package/dist/server/services/ParallelInterruptActionsPatch.js +132 -0
- package/dist/server/services/PluginAiRuntimeAdapter.js +107 -9
- package/dist/server/services/RoutingBindingRepository.js +156 -0
- package/dist/server/services/RoutingBindingValidation.js +161 -0
- package/dist/server/services/SandboxRunner.js +19 -0
- package/dist/server/services/SessionAutoApproval.js +173 -0
- package/dist/server/services/VerificationService.js +2 -2
- package/dist/server/skill-hub/plugin.js +17 -0
- package/dist/server/skill-hub/services/RegistrySkillInstallationService.js +2 -2
- package/dist/server/skill-hub/services/registry-node-package.js +191 -0
- package/dist/server/skill-hub/tasks/SkillExecutionTask.js +21 -6
- package/dist/server/tools/skill-execute.js +1 -0
- package/dist/server/utils/ensure-indexes.js +1 -0
- package/package.json +5 -2
- package/src/client/SkillPages.tsx +1 -8
- package/src/client/__tests__/embedded-settings.test.tsx +1 -8
- package/src/client/plugin.tsx +3 -8
- package/src/client/skill-hub/tools/InteractionSchemasProvider.tsx +21 -6
- package/src/client/skill-hub/tools/SkillHubCard.tsx +22 -16
- package/src/client/skill-hub/tools/__tests__/skill-hub-card.test.tsx +255 -0
- package/src/client/skill-hub/tools/registerSkillLoopCards.ts +12 -3
- package/src/client-v2/__tests__/embedded-settings.test.tsx +20 -11
- package/src/client-v2/__tests__/hierarchical-routing-settings.test.tsx +350 -0
- package/src/client-v2/auto-approval/AutoApprovalBridge.tsx +513 -0
- package/src/client-v2/auto-approval/AutoApprovalProvider.tsx +399 -0
- package/src/client-v2/auto-approval/__tests__/session-auto-approval.test.tsx +1676 -0
- package/src/client-v2/components/AgentBindingsTab.tsx +275 -3
- package/src/client-v2/components/AgentRunsTab.tsx +1 -8
- package/src/client-v2/components/EmployeeGovernanceTab.tsx +1 -8
- package/src/client-v2/components/HarnessProfilesTab.tsx +4 -8
- package/src/client-v2/components/HarnessSettingsForm.tsx +221 -0
- package/src/client-v2/components/UsageGovernanceTab.tsx +1 -8
- package/src/client-v2/pages/AgentBindingsPage.tsx +1 -8
- package/src/client-v2/pages/ApprovalsPage.tsx +1 -8
- package/src/client-v2/pages/EmployeeGovernancePage.tsx +1 -8
- package/src/client-v2/pages/ExecutionHistoryPage.tsx +1 -8
- package/src/client-v2/pages/HarnessProfilesPage.tsx +1 -8
- package/src/client-v2/pages/KnowledgeAccessPage.tsx +1 -8
- package/src/client-v2/pages/LoopSettingsPage.tsx +1 -8
- package/src/client-v2/pages/MemoryInspectorPage.tsx +1 -8
- package/src/client-v2/pages/RetrievalTracePage.tsx +1 -8
- package/src/client-v2/pages/RulesPage.tsx +1 -8
- package/src/client-v2/pages/SkillDefinitionsPage.tsx +1 -8
- package/src/client-v2/pages/SkillMetricsPage.tsx +1 -8
- package/src/client-v2/pages/TracingPage.tsx +1 -8
- package/src/client-v2/pages/UsageGovernancePage.tsx +1 -8
- package/src/client-v2/plugin.tsx +3 -8
- package/src/client-v2/skill-hub/tools/__tests__/interactions.test.ts +17 -1
- package/src/client-v2/skill-hub/tools/interactions.ts +12 -3
- package/src/locale/en-US.json +80 -1
- package/src/locale/vi-VN.json +5 -1
- package/src/locale/zh-CN.json +80 -1
- package/src/server/__tests__/agent-governance.integration.test.ts +1 -8
- package/src/server/__tests__/agent-monitor-acl.integration.test.ts +1 -8
- package/src/server/__tests__/agent-usage-report.integration.test.ts +1 -8
- package/src/server/__tests__/auto-approval-checkpoint.integration.test.ts +295 -0
- package/src/server/__tests__/harness-capabilities.test.ts +1 -8
- package/src/server/__tests__/harness-compiler.test.ts +64 -0
- package/src/server/__tests__/harness-tool-plan.test.ts +1 -8
- package/src/server/__tests__/hierarchical-routing.integration.test.ts +2318 -0
- package/src/server/__tests__/hierarchy-invocation-journal.integration.test.ts +119 -0
- package/src/server/__tests__/loop-approval-decision.test.ts +59 -12
- package/src/server/__tests__/loop-budget-service.test.ts +1 -8
- package/src/server/__tests__/loop-run-repository.test.ts +1 -8
- package/src/server/__tests__/loop-trigger-service.test.ts +1 -8
- package/src/server/__tests__/loop-worker-claim.test.ts +46 -9
- package/src/server/__tests__/loop-worker-execution.test.ts +1 -8
- package/src/server/__tests__/native-agent-monitor-sync.test.ts +1 -8
- package/src/server/__tests__/native-hierarchy-probe.integration.test.ts +527 -0
- package/src/server/__tests__/native-sub-agent-observer.test.ts +1 -8
- package/src/server/__tests__/native-usage-attribution.integration.test.ts +1 -8
- package/src/server/__tests__/parallel-interrupt-actions.test.ts +342 -0
- package/src/server/__tests__/plugin-ai-runtime-adapter.test.ts +403 -0
- package/src/server/__tests__/registry-node-package.test.ts +299 -0
- package/src/server/__tests__/routing-binding-graph.integration.test.ts +217 -0
- package/src/server/__tests__/routing-binding-validation.test.ts +256 -0
- package/src/server/__tests__/session-auto-approval.integration.test.ts +329 -0
- package/src/server/__tests__/skill-execute.test.ts +11 -0
- package/src/server/__tests__/skill-review-guard.test.ts +171 -0
- package/src/server/__tests__/token-tracker.test.ts +1 -8
- package/src/server/__tests__/tracing-retention-policy.test.ts +1 -8
- package/src/server/__tests__/usage-ledger.integration.test.ts +1 -8
- package/src/server/collections/agent-auto-approval-checkpoints.ts +18 -0
- package/src/server/collections/agent-execution-spans.ts +4 -11
- package/src/server/collections/agent-governance-audit-events.ts +1 -8
- package/src/server/collections/agent-governance-policies.ts +1 -8
- package/src/server/collections/agent-governance-policy-versions.ts +1 -8
- package/src/server/collections/agent-governance-prompt-bindings.ts +1 -8
- package/src/server/collections/agent-hierarchy-invocations.ts +30 -0
- package/src/server/collections/agent-loop-runs.ts +1 -8
- package/src/server/collections/agent-routing-graph-locks.ts +11 -0
- package/src/server/collections/agent-session-auto-approvals.ts +16 -0
- package/src/server/collections/orchestrator-config.ts +26 -0
- package/src/server/migrations/20261110000000-add-usage-pricing-snapshots.ts +1 -8
- package/src/server/migrations/20261110010000-add-usage-department-attribution.ts +1 -8
- package/src/server/migrations/20261119000000-widen-native-employee-identifiers.ts +37 -0
- package/src/server/plugin.ts +72 -8
- package/src/server/resources/agent-auto-approval.ts +51 -0
- package/src/server/resources/agent-governance.ts +1 -8
- package/src/server/resources/agent-harness-profile.ts +1 -8
- package/src/server/resources/agent-monitor.ts +1 -8
- package/src/server/resources/agent-usage.ts +1 -8
- package/src/server/resources/hierarchical-routing.ts +39 -0
- package/src/server/resources/native-monitor-format.ts +1 -8
- package/src/server/resources/tracing.ts +1 -8
- package/src/server/services/AgentGovernanceService.ts +1 -8
- package/src/server/services/AutoApprovalCheckpoint.ts +140 -0
- package/src/server/services/CodeValidator.ts +23 -4
- package/src/server/services/DepartmentAttribution.ts +1 -8
- package/src/server/services/ExecutionSpanService.ts +1 -8
- package/src/server/services/GovernanceAdmission.ts +83 -8
- package/src/server/services/HarnessCapabilities.ts +1 -8
- package/src/server/services/HarnessCompiler.ts +12 -0
- package/src/server/services/HarnessSchema.ts +30 -0
- package/src/server/services/HierarchicalAgentRuntime.ts +1052 -0
- package/src/server/services/HierarchyEnrollmentGuard.ts +211 -0
- package/src/server/services/HierarchyInvocationJournal.ts +172 -0
- package/src/server/services/HierarchyRequestCancellation.ts +132 -0
- package/src/server/services/LoopBudgetService.ts +1 -8
- package/src/server/services/LoopRunRepository.ts +2 -9
- package/src/server/services/LoopRunStateMachine.ts +3 -10
- package/src/server/services/LoopTriggerService.ts +1 -8
- package/src/server/services/LoopWorkerService.ts +8 -19
- package/src/server/services/ManagedPromptProtection.ts +1 -8
- package/src/server/services/NativeAgentMonitorSyncService.ts +1 -8
- package/src/server/services/NativeSubAgentObserver.ts +1 -8
- package/src/server/services/NativeUsageAttribution.ts +1 -8
- package/src/server/services/ParallelInterruptActionsPatch.ts +164 -0
- package/src/server/services/PluginAiRuntimeAdapter.ts +140 -9
- package/src/server/services/RoutingBindingRepository.ts +146 -0
- package/src/server/services/RoutingBindingValidation.ts +161 -0
- package/src/server/services/SandboxRunner.ts +35 -1
- package/src/server/services/SessionAutoApproval.ts +167 -0
- package/src/server/services/TokenTracker.ts +1 -8
- package/src/server/services/TracingRetentionPolicy.ts +1 -8
- package/src/server/services/VerificationService.ts +3 -10
- package/src/server/skill-hub/plugin.ts +40 -0
- package/src/server/skill-hub/services/RegistrySkillInstallationService.ts +11 -1
- package/src/server/skill-hub/services/registry-node-package.ts +191 -0
- package/src/server/skill-hub/tasks/SkillExecutionTask.ts +34 -5
- package/src/server/tools/skill-execute.ts +10 -0
- package/src/server/utils/ensure-indexes.ts +2 -8
- package/dist/client/418.6f01da17774a5a25.js +0 -10
- package/dist/client/652.477e21bfff67bc1c.js +0 -10
- package/dist/client-v2/418.55b6b28cda8bb5f3.js +0 -10
- package/dist/client-v2/652.1a48364774d5383a.js +0 -10
- package/dist/client-v2/981.a81521f0296c7db8.js +0 -10
|
@@ -0,0 +1,119 @@
|
|
|
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
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { createMockServer, type MockServer } from '@nocobase/test';
|
|
11
|
+
import { beforeAll, afterAll, describe, expect, it } from 'vitest';
|
|
12
|
+
import { PluginAgentOrchestratorServer } from '../plugin';
|
|
13
|
+
import {
|
|
14
|
+
HierarchyInvocationJournal,
|
|
15
|
+
type HierarchyInvocationKey,
|
|
16
|
+
type ReserveHierarchyInvocation,
|
|
17
|
+
} from '../services/HierarchyInvocationJournal';
|
|
18
|
+
|
|
19
|
+
const suffix = `${process.pid}-${Date.now()}`;
|
|
20
|
+
|
|
21
|
+
function invocation(overrides: Partial<ReserveHierarchyInvocation> = {}): ReserveHierarchyInvocation {
|
|
22
|
+
return {
|
|
23
|
+
ownerId: 7001,
|
|
24
|
+
rootSessionId: `root-${suffix}`,
|
|
25
|
+
parentSessionId: `parent-${suffix}`,
|
|
26
|
+
parentToolCallId: `tool-${suffix}`,
|
|
27
|
+
parentEmployee: 'orchestrator',
|
|
28
|
+
employeeUsername: 'specialist',
|
|
29
|
+
role: 'specialist',
|
|
30
|
+
question: 'Find the requested evidence.',
|
|
31
|
+
snapshot: {
|
|
32
|
+
profileTag: 'test-profile',
|
|
33
|
+
profileVersion: 2,
|
|
34
|
+
profileVersionId: 22,
|
|
35
|
+
policy: { tools: { allow: ['read_file'] } },
|
|
36
|
+
model: { llmService: 'mock', model: 'specialist-lite' },
|
|
37
|
+
ancestors: ['orchestrator'],
|
|
38
|
+
},
|
|
39
|
+
...overrides,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function keyOf(input: ReserveHierarchyInvocation): HierarchyInvocationKey {
|
|
44
|
+
return {
|
|
45
|
+
ownerId: input.ownerId,
|
|
46
|
+
parentSessionId: input.parentSessionId,
|
|
47
|
+
parentToolCallId: input.parentToolCallId,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
describe('hierarchy invocation journal persistence', () => {
|
|
52
|
+
let app: MockServer;
|
|
53
|
+
let journal: HierarchyInvocationJournal;
|
|
54
|
+
|
|
55
|
+
beforeAll(async () => {
|
|
56
|
+
app = await createMockServer({
|
|
57
|
+
plugins: ['nocobase', PluginAgentOrchestratorServer],
|
|
58
|
+
name: `hierarchy-invocation-journal-${suffix}`,
|
|
59
|
+
skipSupervisor: true,
|
|
60
|
+
});
|
|
61
|
+
journal = new HierarchyInvocationJournal(app.db);
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
afterAll(async () => {
|
|
65
|
+
await app?.destroy();
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('reserves one owner-scoped idempotency key and rejects conflicting reuse', async () => {
|
|
69
|
+
const input = invocation();
|
|
70
|
+
const first = await journal.reserve(input);
|
|
71
|
+
const retry = await journal.reserve(input);
|
|
72
|
+
|
|
73
|
+
expect(retry.get('id')).toBe(first.get('id'));
|
|
74
|
+
expect(retry.get('status')).toBe('reserved');
|
|
75
|
+
await expect(journal.reserve(invocation({ ...input, question: 'A different task.' }))).rejects.toThrow(
|
|
76
|
+
'identity does not match',
|
|
77
|
+
);
|
|
78
|
+
await expect(journal.claim({ ...keyOf(input), ownerId: input.ownerId + 1 })).rejects.toThrow('unavailable');
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it('claims with compare-and-swap, attaches the child, and fences completion to the active token', async () => {
|
|
82
|
+
const input = invocation({ parentToolCallId: `claim-${suffix}` });
|
|
83
|
+
const key = keyOf(input);
|
|
84
|
+
await journal.reserve(input);
|
|
85
|
+
|
|
86
|
+
const claims = await Promise.allSettled([journal.claim(key), journal.claim(key)]);
|
|
87
|
+
const acquired = claims.filter((result) => result.status === 'fulfilled');
|
|
88
|
+
const rejected = claims.filter((result) => result.status === 'rejected');
|
|
89
|
+
expect(acquired).toHaveLength(1);
|
|
90
|
+
expect(rejected).toHaveLength(1);
|
|
91
|
+
if (acquired[0].status !== 'fulfilled') throw new Error('Expected one active hierarchy claim.');
|
|
92
|
+
|
|
93
|
+
const { token } = acquired[0].value;
|
|
94
|
+
await journal.attachChild(key, token, `child-${suffix}`);
|
|
95
|
+
await expect(journal.complete(key, 'stale-token', { messageId: 'stale' })).rejects.toThrow('no longer active');
|
|
96
|
+
await journal.complete(key, token, { messageId: `result-${suffix}`, model: 'specialist-lite' });
|
|
97
|
+
const stored = await app.db.getRepository('agentHierarchyInvocations').findOne({
|
|
98
|
+
filter: { parentSessionId: key.parentSessionId, parentToolCallId: key.parentToolCallId },
|
|
99
|
+
});
|
|
100
|
+
expect(stored?.get('status')).toBe('succeeded');
|
|
101
|
+
expect(stored?.get('childSessionId')).toBe(`child-${suffix}`);
|
|
102
|
+
expect(stored?.get('result')).toEqual({ messageId: `result-${suffix}`, model: 'specialist-lite' });
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it('never automatically reclaims a running or uncertain invocation', async () => {
|
|
106
|
+
const input = invocation({ parentToolCallId: `uncertain-${suffix}` });
|
|
107
|
+
const key = keyOf(input);
|
|
108
|
+
await journal.reserve(input);
|
|
109
|
+
const { token } = await journal.claim(key);
|
|
110
|
+
await expect(journal.claim(key)).rejects.toThrow('not ready');
|
|
111
|
+
await journal.markUncertain(key, token);
|
|
112
|
+
await expect(journal.claim(key)).rejects.toThrow('not ready');
|
|
113
|
+
const uncertain = await journal.get(key);
|
|
114
|
+
expect(uncertain.get('status')).toBe('uncertain');
|
|
115
|
+
expect(uncertain.get('claimToken')).toBeNull();
|
|
116
|
+
await expect(journal.complete(key, token, { messageId: `late-${suffix}` })).rejects.toThrow('no longer active');
|
|
117
|
+
expect((await journal.get(key)).get('result')).toBeNull();
|
|
118
|
+
});
|
|
119
|
+
});
|
|
@@ -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 } from '@nocobase/database';
|
|
11
4
|
import type { Application } from '@nocobase/server';
|
|
@@ -104,6 +97,20 @@ class MemoryRepository {
|
|
|
104
97
|
}
|
|
105
98
|
}
|
|
106
99
|
|
|
100
|
+
class UniqueEventRepository extends MemoryRepository {
|
|
101
|
+
async create(options: Row) {
|
|
102
|
+
const values = (options.values as Row | undefined) || {};
|
|
103
|
+
const duplicate =
|
|
104
|
+
values.correlationKey !== undefined &&
|
|
105
|
+
values.correlationKey !== null &&
|
|
106
|
+
this.rows.some(
|
|
107
|
+
(row) => row.runId === values.runId && row.type === values.type && row.correlationKey === values.correlationKey,
|
|
108
|
+
);
|
|
109
|
+
if (duplicate) throw new Error('Unique constraint violation on (runId, type, correlationKey)');
|
|
110
|
+
return super.create(options);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
107
114
|
function createDatabase(repositories: Map<string, MemoryRepository>) {
|
|
108
115
|
return {
|
|
109
116
|
getRepository(name: string) {
|
|
@@ -162,7 +169,7 @@ describe('LoopRunRepository.decideApproval', () => {
|
|
|
162
169
|
const repositories = new Map<string, MemoryRepository>([
|
|
163
170
|
['agentLoopRuns', new MemoryRepository(runs)],
|
|
164
171
|
['agentLoopActionApprovals', new MemoryRepository(approvals)],
|
|
165
|
-
['agentLoopEvents', new
|
|
172
|
+
['agentLoopEvents', new UniqueEventRepository()],
|
|
166
173
|
]);
|
|
167
174
|
return { repositories, repository: new LoopRunRepository(createDatabase(repositories)) };
|
|
168
175
|
}
|
|
@@ -192,6 +199,37 @@ describe('LoopRunRepository.decideApproval', () => {
|
|
|
192
199
|
expect(events[0]).toMatchObject({ runId: 1, type: 'run_approval_decided', actorType: 'human' });
|
|
193
200
|
});
|
|
194
201
|
|
|
202
|
+
it('uses distinct event keys for successive approval rounds on one run', async () => {
|
|
203
|
+
const { repositories, repository } = setup([waitingRun()], [pendingApproval()]);
|
|
204
|
+
|
|
205
|
+
const first = await repository.decideApproval({
|
|
206
|
+
approvalId: 10,
|
|
207
|
+
userId: 7,
|
|
208
|
+
isAdmin: false,
|
|
209
|
+
decision: 'approved',
|
|
210
|
+
});
|
|
211
|
+
expect(first.requeued).toBe(true);
|
|
212
|
+
|
|
213
|
+
const approvals = repositories.get('agentLoopActionApprovals');
|
|
214
|
+
const runs = repositories.get('agentLoopRuns');
|
|
215
|
+
if (!approvals || !runs) throw new Error('Approval test repositories are missing.');
|
|
216
|
+
await approvals.create({ values: pendingApproval({ id: 11, toolCallId: 'call-2', inputHash: 'hash-2' }) });
|
|
217
|
+
await runs.update({ filterByTk: 1, values: { status: 'waiting_approval', approvalStatus: 'pending' } });
|
|
218
|
+
|
|
219
|
+
const second = await repository.decideApproval({
|
|
220
|
+
approvalId: 11,
|
|
221
|
+
userId: 7,
|
|
222
|
+
isAdmin: false,
|
|
223
|
+
decision: 'rejected',
|
|
224
|
+
});
|
|
225
|
+
|
|
226
|
+
expect(second.requeued).toBe(true);
|
|
227
|
+
const events = repositories.get('agentLoopEvents')?.rows || [];
|
|
228
|
+
expect(events).toHaveLength(2);
|
|
229
|
+
expect(events[0].correlationKey).not.toBe(events[1].correlationKey);
|
|
230
|
+
expect(new Set(events.map((event) => `${event.runId}:${event.type}:${event.correlationKey}`)).size).toBe(2);
|
|
231
|
+
});
|
|
232
|
+
|
|
195
233
|
it('records the decision but keeps the run parked while approvals remain pending', async () => {
|
|
196
234
|
const { repositories, repository } = setup(
|
|
197
235
|
[waitingRun()],
|
|
@@ -310,7 +348,7 @@ describe('LoopWorkerService approval resume-mode', () => {
|
|
|
310
348
|
|
|
311
349
|
const policy = loopPatternPolicySchema.parse({ maxConcurrency: 1 });
|
|
312
350
|
|
|
313
|
-
function createWorker(run: Row, approvals: Row[] = []) {
|
|
351
|
+
function createWorker(run: Row, approvals: Row[] = [], events: Row[] = []) {
|
|
314
352
|
const repositories = new Map<string, MemoryRepository>([
|
|
315
353
|
[
|
|
316
354
|
'agentLoopControlSettings',
|
|
@@ -321,7 +359,7 @@ describe('LoopWorkerService approval resume-mode', () => {
|
|
|
321
359
|
['agentLoopRuns', new MemoryRepository([{ ...run }])],
|
|
322
360
|
['agentLoopPatterns', new MemoryRepository([{ id: 1, enabled: true }])],
|
|
323
361
|
['agentLoopActionApprovals', new MemoryRepository(approvals)],
|
|
324
|
-
['agentLoopEvents', new
|
|
362
|
+
['agentLoopEvents', new UniqueEventRepository(events)],
|
|
325
363
|
['agentLoopSteps', new MemoryRepository()],
|
|
326
364
|
['aiMessages', new MemoryRepository()],
|
|
327
365
|
['agentLoopUsageBuckets', new MemoryRepository()],
|
|
@@ -402,7 +440,11 @@ describe('LoopWorkerService approval resume-mode', () => {
|
|
|
402
440
|
'resumes the interrupted role after a paused approval is %s and the owner resumes the run',
|
|
403
441
|
async (decision) => {
|
|
404
442
|
const run = resumedRun({ status: 'paused', approvalStatus: 'pending', lockedBy: null, lockedUntil: null });
|
|
405
|
-
const { repositories, database, worker } = createWorker(
|
|
443
|
+
const { repositories, database, worker } = createWorker(
|
|
444
|
+
run,
|
|
445
|
+
[pendingApproval()],
|
|
446
|
+
[{ id: 20, runId: 1, type: 'run_started', correlationKey: 'started:1' }],
|
|
447
|
+
);
|
|
406
448
|
const repository = new LoopRunRepository(database);
|
|
407
449
|
const stateMachine = new LoopRunStateMachine(database);
|
|
408
450
|
|
|
@@ -420,6 +462,11 @@ describe('LoopWorkerService approval resume-mode', () => {
|
|
|
420
462
|
expect(invokeCalls.map((call) => call.username)).toEqual(['maker-two']);
|
|
421
463
|
expect(repositories.get('agentLoopActionApprovals')?.rows[0].consumedAt).toBeInstanceOf(Date);
|
|
422
464
|
expect(repositories.get('agentLoopRuns')?.rows[0].status).toBe('verifying');
|
|
465
|
+
const startedEvents = (repositories.get('agentLoopEvents')?.rows || []).filter(
|
|
466
|
+
(event) => event.type === 'run_started',
|
|
467
|
+
);
|
|
468
|
+
expect(startedEvents).toHaveLength(2);
|
|
469
|
+
expect(startedEvents[0].correlationKey).not.toBe(startedEvents[1].correlationKey);
|
|
423
470
|
},
|
|
424
471
|
);
|
|
425
472
|
|
|
@@ -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 } from '@nocobase/database';
|
|
11
4
|
import { describe, expect, it } from 'vitest';
|
|
@@ -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, FindOptions } from '@nocobase/database';
|
|
11
4
|
import { describe, expect, it, vi } from 'vitest';
|
|
@@ -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 } from '@nocobase/database';
|
|
11
4
|
import { describe, expect, it, vi } from 'vitest';
|
|
@@ -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 } from '@nocobase/database';
|
|
11
4
|
import { describe, expect, it } from 'vitest';
|
|
@@ -84,6 +77,20 @@ class MemoryRepository {
|
|
|
84
77
|
}
|
|
85
78
|
}
|
|
86
79
|
|
|
80
|
+
class UniqueEventRepository extends MemoryRepository {
|
|
81
|
+
async create(options: Row) {
|
|
82
|
+
const values = (options.values as Row | undefined) || {};
|
|
83
|
+
const duplicate =
|
|
84
|
+
values.correlationKey !== undefined &&
|
|
85
|
+
values.correlationKey !== null &&
|
|
86
|
+
this.rows.some(
|
|
87
|
+
(row) => row.runId === values.runId && row.type === values.type && row.correlationKey === values.correlationKey,
|
|
88
|
+
);
|
|
89
|
+
if (duplicate) throw new Error('Unique constraint violation on (runId, type, correlationKey)');
|
|
90
|
+
return super.create(options);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
87
94
|
class TransactionQueue {
|
|
88
95
|
private tail = Promise.resolve();
|
|
89
96
|
|
|
@@ -130,7 +137,7 @@ function createStateMachine(input: { runs: Row[]; patterns?: Row[]; globalMaxCon
|
|
|
130
137
|
],
|
|
131
138
|
),
|
|
132
139
|
],
|
|
133
|
-
['agentLoopEvents', new
|
|
140
|
+
['agentLoopEvents', new UniqueEventRepository()],
|
|
134
141
|
[
|
|
135
142
|
'agentLoopControlSettings',
|
|
136
143
|
new MemoryRepository([
|
|
@@ -177,6 +184,36 @@ function createStateMachine(input: { runs: Row[]; patterns?: Row[]; globalMaxCon
|
|
|
177
184
|
}
|
|
178
185
|
|
|
179
186
|
describe('LoopRunStateMachine worker leases', () => {
|
|
187
|
+
it('retries a blocked candidate with a disabled pattern without starving the next queued run', async () => {
|
|
188
|
+
const { repositories, stateMachine } = createStateMachine({
|
|
189
|
+
runs: [run(1, 1, 'queued'), run(2, 2, 'queued'), run(3, 3, 'queued')],
|
|
190
|
+
patterns: [
|
|
191
|
+
{ id: 1, enabled: false },
|
|
192
|
+
{ id: 2, enabled: true },
|
|
193
|
+
{ id: 3, enabled: true },
|
|
194
|
+
],
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
const firstClaim = await stateMachine.claimNext('worker-a', 30_000);
|
|
198
|
+
expect(firstClaim?.run.id).toBe(2);
|
|
199
|
+
expect(repositories.get('agentLoopRuns')?.rows[0].status).toBe('blocked');
|
|
200
|
+
|
|
201
|
+
await stateMachine.transition({ runId: 1, to: 'queued', actorType: 'human', actorIdentity: '7' });
|
|
202
|
+
|
|
203
|
+
const retryClaim = await stateMachine.claimNext('worker-b', 30_000);
|
|
204
|
+
|
|
205
|
+
expect(retryClaim?.run.id).toBe(3);
|
|
206
|
+
expect(repositories.get('agentLoopRuns')?.rows[0]).toMatchObject({
|
|
207
|
+
status: 'blocked',
|
|
208
|
+
blockedReason: 'Loop pattern is disabled.',
|
|
209
|
+
});
|
|
210
|
+
const blockedEvents = (repositories.get('agentLoopEvents')?.rows || []).filter(
|
|
211
|
+
(event) => event.runId === 1 && event.type === 'run_blocked',
|
|
212
|
+
);
|
|
213
|
+
expect(blockedEvents).toHaveLength(2);
|
|
214
|
+
expect(blockedEvents[0].correlationKey).not.toBe(blockedEvents[1].correlationKey);
|
|
215
|
+
});
|
|
216
|
+
|
|
180
217
|
it('allows only one of two workers to claim a queued run', async () => {
|
|
181
218
|
const { repositories, stateMachine } = createStateMachine({ runs: [run(1, 1, 'queued')] });
|
|
182
219
|
const claims = await Promise.all([
|
|
@@ -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 } from '@nocobase/database';
|
|
11
4
|
import type { Application } from '@nocobase/server';
|
|
@@ -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 { createMockServer, type MockServer } from '@nocobase/test';
|