plugin-agent-orchestrator 1.2.0 → 1.2.1
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 +55 -0
- 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/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__/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 +58 -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/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
|
@@ -88,20 +88,49 @@ function textContent(messages) {
|
|
|
88
88
|
}
|
|
89
89
|
return "";
|
|
90
90
|
}
|
|
91
|
-
function
|
|
91
|
+
function invalidInterrupt(app) {
|
|
92
|
+
var _a, _b;
|
|
93
|
+
const message = "Invalid AI tool interruption payload.";
|
|
94
|
+
return new Error(((_b = (_a = app.i18n) == null ? void 0 : _a.t) == null ? void 0 : _b.call(_a, message, { ns: "plugin-agent-orchestrator" })) || message);
|
|
95
|
+
}
|
|
96
|
+
function interruptedFrom(result, app) {
|
|
97
|
+
const invalidPayload = () => invalidInterrupt(app);
|
|
92
98
|
const interrupts = result.__interrupt__;
|
|
93
|
-
if (
|
|
99
|
+
if (interrupts == null) return [];
|
|
100
|
+
if (!Array.isArray(interrupts) || interrupts.length > 1) throw invalidPayload();
|
|
94
101
|
const calls = [];
|
|
95
102
|
for (const interrupt of interrupts) {
|
|
103
|
+
if (!interrupt || typeof interrupt !== "object") throw invalidPayload();
|
|
96
104
|
const value = interrupt.value ?? interrupt;
|
|
105
|
+
if (!value || typeof value !== "object") throw invalidPayload();
|
|
97
106
|
const record = value;
|
|
107
|
+
const interruptId = String(interrupt.id || record.interruptId || "");
|
|
108
|
+
if (Array.isArray(record.actionRequests)) {
|
|
109
|
+
if (!record.actionRequests.length || !interruptId) throw invalidPayload();
|
|
110
|
+
for (const action of record.actionRequests) {
|
|
111
|
+
if (!action || typeof action !== "object") throw invalidPayload();
|
|
112
|
+
const request = action;
|
|
113
|
+
let details;
|
|
114
|
+
try {
|
|
115
|
+
details = JSON.parse(String(request.description));
|
|
116
|
+
} catch {
|
|
117
|
+
throw invalidPayload();
|
|
118
|
+
}
|
|
119
|
+
if (!details || typeof details !== "object" || typeof details.toolCallId !== "string" || !details.toolCallId || typeof details.toolCallName !== "string" || !details.toolCallName || !("args" in request)) {
|
|
120
|
+
throw invalidPayload();
|
|
121
|
+
}
|
|
122
|
+
calls.push({ toolCallId: details.toolCallId, toolName: details.toolCallName, args: request.args, interruptId });
|
|
123
|
+
}
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
98
126
|
const toolCallId = String(record.toolCallId || record.tool_call_id || "");
|
|
99
|
-
|
|
127
|
+
const toolName = String(record.name || record.toolName || "");
|
|
128
|
+
if (!toolCallId || !toolName || !interruptId) throw invalidPayload();
|
|
100
129
|
calls.push({
|
|
101
130
|
toolCallId,
|
|
102
|
-
toolName
|
|
131
|
+
toolName,
|
|
103
132
|
args: record.args ?? record.input ?? {},
|
|
104
|
-
interruptId
|
|
133
|
+
interruptId
|
|
105
134
|
});
|
|
106
135
|
}
|
|
107
136
|
return calls;
|
|
@@ -162,13 +191,15 @@ class PluginAiRuntimeAdapter {
|
|
|
162
191
|
async invoke(input) {
|
|
163
192
|
const { aiEmployee } = await this.buildEmployee(input);
|
|
164
193
|
const result = await aiEmployee.invoke({
|
|
165
|
-
userMessages: [{ role: "user", content: input.prompt }],
|
|
194
|
+
userMessages: [{ role: "user", content: { type: "text", content: input.prompt } }],
|
|
166
195
|
signal: input.signal
|
|
167
196
|
});
|
|
197
|
+
const interrupted = interruptedFrom(result, this.app);
|
|
198
|
+
await this.repairInterruptedCalls(input, result, interrupted);
|
|
168
199
|
return {
|
|
169
200
|
sessionId: input.sessionId,
|
|
170
201
|
messageId: String(result.messageId || ""),
|
|
171
|
-
interrupted
|
|
202
|
+
interrupted,
|
|
172
203
|
content: textContent(result.messages),
|
|
173
204
|
tokenUsage: extractTokenUsageFromResult(result)
|
|
174
205
|
};
|
|
@@ -196,18 +227,85 @@ class PluginAiRuntimeAdapter {
|
|
|
196
227
|
if (!userDecisions) throw new Error("The interrupted tool calls are not all ready to resume.");
|
|
197
228
|
const { aiEmployee } = await this.buildEmployee(input);
|
|
198
229
|
const result = await aiEmployee.invoke({
|
|
199
|
-
messageId: input.messageId,
|
|
200
230
|
userDecisions,
|
|
201
231
|
signal: input.signal
|
|
202
232
|
});
|
|
233
|
+
const interrupted = interruptedFrom(result, this.app);
|
|
234
|
+
await this.repairInterruptedCalls(input, result, interrupted);
|
|
203
235
|
return {
|
|
204
236
|
sessionId: input.sessionId,
|
|
205
237
|
messageId: String(result.messageId || input.messageId),
|
|
206
|
-
interrupted
|
|
238
|
+
interrupted,
|
|
207
239
|
content: textContent(result.messages),
|
|
208
240
|
tokenUsage: extractTokenUsageFromResult(result)
|
|
209
241
|
};
|
|
210
242
|
}
|
|
243
|
+
async repairInterruptedCalls(input, result, calls) {
|
|
244
|
+
var _a, _b;
|
|
245
|
+
if (new Set(calls.map((call) => call.toolName)).size === calls.length) return;
|
|
246
|
+
const invalidPayload = () => invalidInterrupt(this.app);
|
|
247
|
+
const interrupt = result.__interrupt__[0];
|
|
248
|
+
const requests = (_a = interrupt.value) == null ? void 0 : _a.actionRequests;
|
|
249
|
+
const reviews = (_b = interrupt.value) == null ? void 0 : _b.reviewConfigs;
|
|
250
|
+
const messageId = String(result.messageId || "");
|
|
251
|
+
if (!Array.isArray(requests) || requests.length !== calls.length || !messageId) throw invalidPayload();
|
|
252
|
+
if (new Set(calls.map((call) => call.toolCallId)).size !== calls.length) throw invalidPayload();
|
|
253
|
+
await this.app.db.sequelize.transaction(async (transaction) => {
|
|
254
|
+
const messages = this.app.db.getModel("aiMessages");
|
|
255
|
+
const toolMessages = this.app.db.getModel("aiToolMessages");
|
|
256
|
+
const message = await messages.findOne({
|
|
257
|
+
where: { sessionId: input.sessionId, messageId, role: input.username },
|
|
258
|
+
transaction,
|
|
259
|
+
lock: transaction.LOCK.UPDATE
|
|
260
|
+
});
|
|
261
|
+
const messageCalls = (0, import_record_utils.read)(message, "toolCalls");
|
|
262
|
+
if (!message || !Array.isArray(messageCalls)) throw invalidPayload();
|
|
263
|
+
for (const [order, call] of calls.entries()) {
|
|
264
|
+
const request = requests[order];
|
|
265
|
+
const description = request.description;
|
|
266
|
+
const details = JSON.parse(String(description));
|
|
267
|
+
if (request.name !== call.toolName || details.sessionId !== input.sessionId || details.username !== input.username || details.from !== "main-agent" || !messageCalls.some((item) => (0, import_record_utils.read)(item, "id") === call.toolCallId && (0, import_record_utils.read)(item, "name") === call.toolName)) {
|
|
268
|
+
throw invalidPayload();
|
|
269
|
+
}
|
|
270
|
+
const where = {
|
|
271
|
+
sessionId: input.sessionId,
|
|
272
|
+
messageId,
|
|
273
|
+
toolCallId: call.toolCallId,
|
|
274
|
+
toolName: call.toolName
|
|
275
|
+
};
|
|
276
|
+
const toolMessage = await toolMessages.findOne({ where, transaction, lock: transaction.LOCK.UPDATE });
|
|
277
|
+
const status = (0, import_record_utils.read)(toolMessage, "invokeStatus");
|
|
278
|
+
if (!toolMessage || status !== "init" && status !== "interrupted" || (0, import_record_utils.read)(toolMessage, "userDecision")) {
|
|
279
|
+
throw invalidPayload();
|
|
280
|
+
}
|
|
281
|
+
const review = Array.isArray(reviews) ? reviews.find((item) => (0, import_record_utils.read)(item, "actionName") === call.toolName) : null;
|
|
282
|
+
const [updated] = await toolMessages.update(
|
|
283
|
+
{
|
|
284
|
+
invokeStatus: "interrupted",
|
|
285
|
+
interruptActionOrder: order,
|
|
286
|
+
interruptAction: {
|
|
287
|
+
order,
|
|
288
|
+
description,
|
|
289
|
+
allowedDecisions: (0, import_record_utils.read)(review, "allowedDecisions"),
|
|
290
|
+
toolCall: { id: call.toolCallId, name: call.toolName },
|
|
291
|
+
currentConversation: { sessionId: input.sessionId, from: details.from, username: input.username }
|
|
292
|
+
}
|
|
293
|
+
},
|
|
294
|
+
{ where: { ...where, invokeStatus: status }, transaction }
|
|
295
|
+
);
|
|
296
|
+
if (updated !== 1) throw invalidPayload();
|
|
297
|
+
}
|
|
298
|
+
const metadata = (0, import_record_utils.read)(message, "metadata");
|
|
299
|
+
const existingMetadata = metadata && typeof metadata === "object" && !Array.isArray(metadata) ? metadata : {};
|
|
300
|
+
if ((0, import_record_utils.read)(existingMetadata, "interruptId") !== calls[0].interruptId) {
|
|
301
|
+
const [updated] = await messages.update(
|
|
302
|
+
{ metadata: { ...existingMetadata, interruptId: calls[0].interruptId } },
|
|
303
|
+
{ where: { sessionId: input.sessionId, messageId }, transaction }
|
|
304
|
+
);
|
|
305
|
+
if (updated !== 1) throw invalidPayload();
|
|
306
|
+
}
|
|
307
|
+
});
|
|
308
|
+
}
|
|
211
309
|
// The employee model is re-read per invocation and mutated only in memory. `isAutoCall` reads
|
|
212
310
|
// `employee.skillSettings` off the Sequelize dataValues, so `set()` without `save()` gates this
|
|
213
311
|
// run's tool calls without touching the shared employee configuration.
|
|
@@ -0,0 +1,156 @@
|
|
|
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
|
+
var __defProp = Object.defineProperty;
|
|
11
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
12
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
13
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
14
|
+
var __export = (target, all) => {
|
|
15
|
+
for (var name in all)
|
|
16
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
17
|
+
};
|
|
18
|
+
var __copyProps = (to, from, except, desc) => {
|
|
19
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
20
|
+
for (let key of __getOwnPropNames(from))
|
|
21
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
22
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
23
|
+
}
|
|
24
|
+
return to;
|
|
25
|
+
};
|
|
26
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
27
|
+
var RoutingBindingRepository_exports = {};
|
|
28
|
+
__export(RoutingBindingRepository_exports, {
|
|
29
|
+
RoutingBindingRepository: () => RoutingBindingRepository,
|
|
30
|
+
initializeRoutingGraphLock: () => initializeRoutingGraphLock
|
|
31
|
+
});
|
|
32
|
+
module.exports = __toCommonJS(RoutingBindingRepository_exports);
|
|
33
|
+
var import_database = require("@nocobase/database");
|
|
34
|
+
var import_record_utils = require("../utils/record-utils");
|
|
35
|
+
var import_RoutingBindingValidation = require("./RoutingBindingValidation");
|
|
36
|
+
const graphLockKey = "routing";
|
|
37
|
+
const graphFields = ["leaderUsername", "subAgentUsername", "routingEnabled", "enabled"];
|
|
38
|
+
function couldAddEdge(values) {
|
|
39
|
+
if (Array.isArray(values)) return values.some(couldAddEdge);
|
|
40
|
+
if (!values || typeof values !== "object") return false;
|
|
41
|
+
const patch = values;
|
|
42
|
+
const fields = graphFields.filter((field) => Object.prototype.hasOwnProperty.call(patch, field));
|
|
43
|
+
return fields.some((field) => field !== "enabled" && field !== "routingEnabled" || patch[field] !== false);
|
|
44
|
+
}
|
|
45
|
+
function couldCreateEdge(values) {
|
|
46
|
+
if (Array.isArray(values)) return values.some(couldCreateEdge);
|
|
47
|
+
if (!values || typeof values !== "object") return false;
|
|
48
|
+
const value = values.routingEnabled;
|
|
49
|
+
return value != null && value !== false;
|
|
50
|
+
}
|
|
51
|
+
function sqliteIsBusy(error) {
|
|
52
|
+
var _a, _b;
|
|
53
|
+
if (!error || typeof error !== "object") return false;
|
|
54
|
+
const value = error;
|
|
55
|
+
return [value.code, (_a = value.parent) == null ? void 0 : _a.code, (_b = value.original) == null ? void 0 : _b.code].some(
|
|
56
|
+
(code) => typeof code === "string" && /^(SQLITE_BUSY|SQLITE_LOCKED)/.test(code)
|
|
57
|
+
);
|
|
58
|
+
}
|
|
59
|
+
function edgeChanged(before, after) {
|
|
60
|
+
return !before || (0, import_record_utils.read)(before, "leaderUsername") !== (0, import_record_utils.read)(after, "leaderUsername") || (0, import_record_utils.read)(before, "subAgentUsername") !== (0, import_record_utils.read)(after, "subAgentUsername");
|
|
61
|
+
}
|
|
62
|
+
async function initializeRoutingGraphLock(database) {
|
|
63
|
+
const model = database.getModel("agentRoutingGraphLocks");
|
|
64
|
+
await model.findOrCreate({ where: { key: graphLockKey }, defaults: { key: graphLockKey, marker: 0 } });
|
|
65
|
+
}
|
|
66
|
+
class RoutingBindingRepository extends import_database.Repository {
|
|
67
|
+
graphTransactions = /* @__PURE__ */ new WeakSet();
|
|
68
|
+
async withGraphLock(suppliedTransaction, operation) {
|
|
69
|
+
for (let attempt = 0; ; attempt += 1) {
|
|
70
|
+
let writeStarted = false;
|
|
71
|
+
const afterCommit = [];
|
|
72
|
+
try {
|
|
73
|
+
const result = await this.database.sequelize.transaction(
|
|
74
|
+
{ transaction: suppliedTransaction ?? void 0 },
|
|
75
|
+
async (transaction) => {
|
|
76
|
+
if (suppliedTransaction) {
|
|
77
|
+
transaction.afterCommit = (callback) => {
|
|
78
|
+
if (typeof callback !== "function") throw new Error("afterCommit callback must be a function.");
|
|
79
|
+
afterCommit.push(callback);
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
const lockModel = this.database.getModel("agentRoutingGraphLocks");
|
|
83
|
+
const [affected] = await lockModel.update(
|
|
84
|
+
{ marker: (0, import_database.literal)("1 - marker") },
|
|
85
|
+
{ where: { key: graphLockKey }, transaction }
|
|
86
|
+
);
|
|
87
|
+
if (affected !== 1) throw new Error("The routing graph lock has not been initialized.");
|
|
88
|
+
const query = {
|
|
89
|
+
filter: { routingEnabled: true, enabled: true },
|
|
90
|
+
transaction,
|
|
91
|
+
lock: transaction.LOCK.UPDATE
|
|
92
|
+
};
|
|
93
|
+
const before = await this.find(query);
|
|
94
|
+
writeStarted = true;
|
|
95
|
+
this.graphTransactions.add(transaction);
|
|
96
|
+
let result2;
|
|
97
|
+
try {
|
|
98
|
+
result2 = await operation(transaction);
|
|
99
|
+
} finally {
|
|
100
|
+
this.graphTransactions.delete(transaction);
|
|
101
|
+
}
|
|
102
|
+
const after = await this.find(query);
|
|
103
|
+
const previous = new Map(before.map((row) => [String((0, import_record_utils.read)(row, "id")), row]));
|
|
104
|
+
for (const binding of after) {
|
|
105
|
+
const id = (0, import_record_utils.read)(binding, "id");
|
|
106
|
+
const candidate = {
|
|
107
|
+
leaderUsername: (0, import_record_utils.read)(binding, "leaderUsername"),
|
|
108
|
+
subAgentUsername: (0, import_record_utils.read)(binding, "subAgentUsername"),
|
|
109
|
+
routingEnabled: (0, import_record_utils.read)(binding, "routingEnabled"),
|
|
110
|
+
enabled: (0, import_record_utils.read)(binding, "enabled")
|
|
111
|
+
};
|
|
112
|
+
if (edgeChanged(previous.get(String(id)), binding) && (0, import_RoutingBindingValidation.routingWouldCycle)(candidate, after, id)) {
|
|
113
|
+
throw new import_RoutingBindingValidation.RoutingCycleError();
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return result2;
|
|
117
|
+
}
|
|
118
|
+
);
|
|
119
|
+
for (const callback of afterCommit) suppliedTransaction == null ? void 0 : suppliedTransaction.afterCommit(callback);
|
|
120
|
+
return result;
|
|
121
|
+
} catch (error) {
|
|
122
|
+
if (suppliedTransaction || writeStarted || attempt >= 3 || !sqliteIsBusy(error)) throw error;
|
|
123
|
+
await new Promise((resolve) => setTimeout(resolve, 25 * 2 ** attempt));
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
async create(options) {
|
|
128
|
+
if (!couldCreateEdge(options.values) || options.transaction && this.graphTransactions.has(options.transaction)) {
|
|
129
|
+
return super.create(options);
|
|
130
|
+
}
|
|
131
|
+
return this.withGraphLock(options.transaction, (transaction) => super.create({ ...options, transaction }));
|
|
132
|
+
}
|
|
133
|
+
async createMany(options) {
|
|
134
|
+
if (!couldCreateEdge(options.records) || options.transaction && this.graphTransactions.has(options.transaction)) {
|
|
135
|
+
return super.createMany(options);
|
|
136
|
+
}
|
|
137
|
+
return this.withGraphLock(options.transaction, (transaction) => super.createMany({ ...options, transaction }));
|
|
138
|
+
}
|
|
139
|
+
async update(options) {
|
|
140
|
+
if (!couldAddEdge(options.values) || options.transaction && this.graphTransactions.has(options.transaction)) {
|
|
141
|
+
return super.update(options);
|
|
142
|
+
}
|
|
143
|
+
return this.withGraphLock(options.transaction, (transaction) => super.update({ ...options, transaction }));
|
|
144
|
+
}
|
|
145
|
+
async updateMany(options) {
|
|
146
|
+
if (!couldAddEdge(options.records) || options.transaction && this.graphTransactions.has(options.transaction)) {
|
|
147
|
+
return super.updateMany(options);
|
|
148
|
+
}
|
|
149
|
+
return this.withGraphLock(options.transaction, (transaction) => super.updateMany({ ...options, transaction }));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
153
|
+
0 && (module.exports = {
|
|
154
|
+
RoutingBindingRepository,
|
|
155
|
+
initializeRoutingGraphLock
|
|
156
|
+
});
|
|
@@ -0,0 +1,161 @@
|
|
|
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
|
+
var __defProp = Object.defineProperty;
|
|
11
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
12
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
13
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
14
|
+
var __export = (target, all) => {
|
|
15
|
+
for (var name in all)
|
|
16
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
17
|
+
};
|
|
18
|
+
var __copyProps = (to, from, except, desc) => {
|
|
19
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
20
|
+
for (let key of __getOwnPropNames(from))
|
|
21
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
22
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
23
|
+
}
|
|
24
|
+
return to;
|
|
25
|
+
};
|
|
26
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
27
|
+
var RoutingBindingValidation_exports = {};
|
|
28
|
+
__export(RoutingBindingValidation_exports, {
|
|
29
|
+
RoutingCycleError: () => RoutingCycleError,
|
|
30
|
+
routingBindingError: () => routingBindingError,
|
|
31
|
+
routingWouldCycle: () => routingWouldCycle,
|
|
32
|
+
validateRoutingBindingAction: () => validateRoutingBindingAction
|
|
33
|
+
});
|
|
34
|
+
module.exports = __toCommonJS(RoutingBindingValidation_exports);
|
|
35
|
+
var import_record_utils = require("../utils/record-utils");
|
|
36
|
+
const routingFields = ["routingEnabled", "routingRole", "routingPrompt", "llmService", "model"];
|
|
37
|
+
const identityFields = ["leaderUsername", "subAgentUsername", "enabled", "harnessTag"];
|
|
38
|
+
const bindingFields = [...identityFields, ...routingFields];
|
|
39
|
+
class RoutingCycleError extends Error {
|
|
40
|
+
status = 400;
|
|
41
|
+
statusCode = 400;
|
|
42
|
+
expose = true;
|
|
43
|
+
constructor() {
|
|
44
|
+
super("This binding would create a delegation cycle.");
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function nonBlank(value) {
|
|
48
|
+
return typeof value === "string" && value.trim().length > 0;
|
|
49
|
+
}
|
|
50
|
+
function scalarBindingId(value) {
|
|
51
|
+
return typeof value === "string" && Boolean(value.trim()) || typeof value === "number" && Number.isSafeInteger(value) && value > 0;
|
|
52
|
+
}
|
|
53
|
+
function routingBindingError(binding) {
|
|
54
|
+
if (binding.routingEnabled !== true) return null;
|
|
55
|
+
if (!nonBlank(binding.leaderUsername) || !nonBlank(binding.subAgentUsername)) {
|
|
56
|
+
return "Routing requires a parent and a target employee.";
|
|
57
|
+
}
|
|
58
|
+
if (binding.leaderUsername.trim() === binding.subAgentUsername.trim()) {
|
|
59
|
+
return "An employee cannot delegate to itself.";
|
|
60
|
+
}
|
|
61
|
+
if (binding.routingRole !== "specialist" && binding.routingRole !== "worker") {
|
|
62
|
+
return "Choose a routing role for the target employee.";
|
|
63
|
+
}
|
|
64
|
+
if (binding.llmService != null && typeof binding.llmService !== "string" || binding.model != null && typeof binding.model !== "string" || Boolean(nonBlank(binding.llmService)) !== Boolean(nonBlank(binding.model))) {
|
|
65
|
+
return "Select both an LLM service and a model, or leave both empty.";
|
|
66
|
+
}
|
|
67
|
+
if (binding.routingPrompt != null && (typeof binding.routingPrompt !== "string" || binding.routingPrompt.length > 4e3)) {
|
|
68
|
+
return "The routing description must be 4000 characters or fewer.";
|
|
69
|
+
}
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
function routingWouldCycle(binding, rows, excludeId) {
|
|
73
|
+
if (binding.routingEnabled !== true || binding.enabled === false) return false;
|
|
74
|
+
if (!nonBlank(binding.leaderUsername) || !nonBlank(binding.subAgentUsername)) return false;
|
|
75
|
+
const parent = binding.leaderUsername.trim();
|
|
76
|
+
const queue = [binding.subAgentUsername.trim()];
|
|
77
|
+
const visited = /* @__PURE__ */ new Set();
|
|
78
|
+
const edges = rows.filter((row) => excludeId == null || String((0, import_record_utils.read)(row, "id")) !== String(excludeId)).filter((row) => (0, import_record_utils.read)(row, "enabled") !== false && (0, import_record_utils.read)(row, "routingEnabled") === true).map((row) => ({ parent: (0, import_record_utils.read)(row, "leaderUsername"), target: (0, import_record_utils.read)(row, "subAgentUsername") })).filter((edge) => nonBlank(edge.parent) && nonBlank(edge.target));
|
|
79
|
+
while (queue.length) {
|
|
80
|
+
const current = queue.shift();
|
|
81
|
+
if (!current) continue;
|
|
82
|
+
if (current === parent) return true;
|
|
83
|
+
if (visited.has(current)) continue;
|
|
84
|
+
visited.add(current);
|
|
85
|
+
for (const edge of edges) {
|
|
86
|
+
if (edge.parent.trim() === current) queue.push(edge.target.trim());
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
async function validateRoutingBinding(ctx, next) {
|
|
92
|
+
const { resourceName, actionName, params } = ctx.action || {};
|
|
93
|
+
if (resourceName !== "orchestratorConfig" || !["create", "update"].includes(actionName)) return next();
|
|
94
|
+
const values = params == null ? void 0 : params.values;
|
|
95
|
+
if (!values || typeof values !== "object") return next();
|
|
96
|
+
if (Array.isArray(values)) {
|
|
97
|
+
if (values.some(
|
|
98
|
+
(item) => item && typeof item === "object" && [...routingFields, ...identityFields].some((field) => field in item)
|
|
99
|
+
)) {
|
|
100
|
+
return ctx.throw(400, ctx.t("Update routing settings for one binding at a time."));
|
|
101
|
+
}
|
|
102
|
+
return next();
|
|
103
|
+
}
|
|
104
|
+
const patch = values;
|
|
105
|
+
if ("routingEnabled" in patch && typeof patch.routingEnabled !== "boolean") {
|
|
106
|
+
return ctx.throw(400, ctx.t("Routing enabled must be a boolean."));
|
|
107
|
+
}
|
|
108
|
+
let current;
|
|
109
|
+
if (actionName === "update") {
|
|
110
|
+
const key = params.filterByTk;
|
|
111
|
+
if (!scalarBindingId(key)) {
|
|
112
|
+
if (routingFields.some((field) => field in patch)) {
|
|
113
|
+
return ctx.throw(400, ctx.t("Update routing settings for one binding at a time."));
|
|
114
|
+
}
|
|
115
|
+
if (identityFields.some((field) => field in patch)) {
|
|
116
|
+
if (key != null && (!Array.isArray(key) || !key.length || !key.every(scalarBindingId))) {
|
|
117
|
+
return ctx.throw(400, ctx.t("Update routing settings for one binding at a time."));
|
|
118
|
+
}
|
|
119
|
+
const filter = params.filter && typeof params.filter === "object" ? params.filter : {};
|
|
120
|
+
const targets = Array.isArray(key) ? { id: key } : {};
|
|
121
|
+
const affected = await ctx.db.getRepository("orchestratorConfig").findOne({
|
|
122
|
+
filter: { $and: [filter, targets, { routingEnabled: true }] }
|
|
123
|
+
});
|
|
124
|
+
if (affected) return ctx.throw(400, ctx.t("Update routing settings for one binding at a time."));
|
|
125
|
+
}
|
|
126
|
+
return next();
|
|
127
|
+
}
|
|
128
|
+
current = await ctx.db.getRepository("orchestratorConfig").findOne({ filterByTk: key });
|
|
129
|
+
if (!current) return next();
|
|
130
|
+
}
|
|
131
|
+
const merged = {};
|
|
132
|
+
for (const field of bindingFields) {
|
|
133
|
+
merged[field] = field in patch ? patch[field] : (0, import_record_utils.read)(current, field);
|
|
134
|
+
}
|
|
135
|
+
const error = routingBindingError(merged);
|
|
136
|
+
if (error) return ctx.throw(400, ctx.t(error));
|
|
137
|
+
if (merged.routingEnabled === true && merged.enabled !== false) {
|
|
138
|
+
const rows = await ctx.db.getRepository("orchestratorConfig").find({
|
|
139
|
+
filter: { routingEnabled: true, enabled: true }
|
|
140
|
+
});
|
|
141
|
+
if (routingWouldCycle(merged, rows, actionName === "update" ? params.filterByTk : void 0)) {
|
|
142
|
+
return ctx.throw(400, ctx.t("This binding would create a delegation cycle."));
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return next();
|
|
146
|
+
}
|
|
147
|
+
async function validateRoutingBindingAction(ctx, next) {
|
|
148
|
+
try {
|
|
149
|
+
return await validateRoutingBinding(ctx, next);
|
|
150
|
+
} catch (error) {
|
|
151
|
+
if (error instanceof RoutingCycleError) return ctx.throw(400, ctx.t(error.message));
|
|
152
|
+
throw error;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
156
|
+
0 && (module.exports = {
|
|
157
|
+
RoutingCycleError,
|
|
158
|
+
routingBindingError,
|
|
159
|
+
routingWouldCycle,
|
|
160
|
+
validateRoutingBindingAction
|
|
161
|
+
});
|
|
@@ -136,6 +136,7 @@ class SandboxRunner {
|
|
|
136
136
|
signal,
|
|
137
137
|
packageWhitelist,
|
|
138
138
|
skillDir,
|
|
139
|
+
packageSnapshotDir,
|
|
139
140
|
inputArgs
|
|
140
141
|
} = options;
|
|
141
142
|
this.validator.validate(code, language);
|
|
@@ -151,8 +152,26 @@ class SandboxRunner {
|
|
|
151
152
|
let identity = !IS_WINDOWS && ((_a = process.getuid) == null ? void 0 : _a.call(process)) === 0 && capabilities.privilegeDropAvailable ? capabilities.sandboxIdentity : null;
|
|
152
153
|
if (identity) {
|
|
153
154
|
try {
|
|
155
|
+
const snapshotPaths = [];
|
|
156
|
+
if (packageSnapshotDir) {
|
|
157
|
+
const expected = (0, import_path.resolve)(workDir, "skill");
|
|
158
|
+
if ((0, import_path.resolve)(packageSnapshotDir) !== expected || (0, import_fs.lstatSync)(packageSnapshotDir).isSymbolicLink() || (0, import_fs.realpathSync)(packageSnapshotDir) !== (0, import_path.resolve)((0, import_fs.realpathSync)(workDir), "skill")) {
|
|
159
|
+
throw new Error("Invalid skill package snapshot path.");
|
|
160
|
+
}
|
|
161
|
+
const collect = (path) => {
|
|
162
|
+
const stat = (0, import_fs.lstatSync)(path);
|
|
163
|
+
if (stat.isSymbolicLink()) throw new Error("Invalid skill package snapshot path.");
|
|
164
|
+
snapshotPaths.push(path);
|
|
165
|
+
if (stat.isDirectory()) {
|
|
166
|
+
for (const entry of (0, import_fs.readdirSync)(path)) collect((0, import_path.resolve)(path, entry));
|
|
167
|
+
}
|
|
168
|
+
};
|
|
169
|
+
collect(packageSnapshotDir);
|
|
170
|
+
}
|
|
154
171
|
this.fileManager.chownExecDir(execId, identity.uid, identity.gid);
|
|
172
|
+
for (const path of snapshotPaths) (0, import_fs.chownSync)(path, identity.uid, identity.gid);
|
|
155
173
|
} catch (error) {
|
|
174
|
+
if (packageSnapshotDir) throw error;
|
|
156
175
|
this.logger.warn(
|
|
157
176
|
`[skill-hub] chown of exec dir failed for ${execId}; running without privilege drop: ${error.message}`
|
|
158
177
|
);
|