plugin-agent-orchestrator 1.1.7 → 1.2.0
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/README.md +207 -204
- package/client-v2.d.ts +2 -2
- package/client-v2.js +1 -1
- package/client.d.ts +2 -2
- package/client.js +1 -1
- package/dist/client/117.2e4cb0477da3db1f.js +10 -0
- package/dist/client/253.93deb9e0192e76a5.js +10 -0
- package/dist/client/325.8f7f509bdb35e142.js +10 -0
- package/dist/client/404.498d2d9516dd1dce.js +10 -0
- package/dist/client/418.6f01da17774a5a25.js +10 -0
- package/dist/client/53.774ff07505d521fa.js +10 -0
- package/dist/client/619.e342b0fa467d39ca.js +10 -0
- package/dist/client/627.fdd60bcc0f3a9cf6.js +10 -0
- package/dist/client/652.477e21bfff67bc1c.js +10 -0
- package/dist/client/981.e0546ffc34afedcd.js +10 -0
- package/dist/client/993.5d04b510835ab0d2.js +10 -0
- package/dist/client/index.js +1 -1
- package/dist/client-v2/117.ccf43ae8631f7d74.js +10 -0
- package/dist/client-v2/214.cdf76752053a8990.js +10 -0
- package/dist/client-v2/253.1198df22f5baf304.js +10 -0
- package/dist/client-v2/264.78887ff88f969467.js +10 -0
- package/dist/client-v2/325.fafe5a6e83ba9cb3.js +10 -0
- package/dist/client-v2/404.9ba964c28a151c81.js +10 -0
- package/dist/client-v2/{41.3deb9e57a0f64fc4.js → 41.b28cf7a675a603d1.js} +1 -1
- package/dist/client-v2/418.55b6b28cda8bb5f3.js +10 -0
- package/dist/client-v2/{53.349fff8db80b19d4.js → 53.282081f97e4308c6.js} +1 -1
- package/dist/client-v2/{619.0a2144aaffefe018.js → 619.8c03913873785fb6.js} +1 -1
- package/dist/client-v2/627.e16f4a0dd596c3e6.js +10 -0
- package/dist/client-v2/652.1a48364774d5383a.js +10 -0
- package/dist/client-v2/{70.ffff2997c10fd4b0.js → 70.9166ed70906d041f.js} +1 -1
- package/dist/client-v2/{981.e4a1f41cfc94a856.js → 981.a81521f0296c7db8.js} +1 -1
- package/dist/client-v2/993.ca5b28f1e2b4c1ef.js +10 -0
- package/dist/client-v2/index.js +1 -1
- package/dist/externalVersion.js +10 -7
- package/dist/locale/en-US.json +229 -1
- package/dist/locale/zh-CN.json +229 -1
- package/dist/node_modules/adm-zip/adm-zip.js +1 -1
- package/dist/node_modules/adm-zip/package.json +1 -1
- package/dist/node_modules/ajv/package.json +1 -1
- package/dist/node_modules/zod/index.cjs +1 -1
- package/dist/node_modules/zod/package.json +1 -1
- package/dist/server/collections/agent-execution-spans.js +145 -6
- package/dist/server/collections/agent-governance-audit-events.js +47 -0
- package/dist/server/collections/agent-governance-policies.js +47 -0
- package/dist/server/collections/agent-governance-policy-versions.js +48 -0
- package/dist/server/collections/agent-governance-prompt-bindings.js +50 -0
- package/dist/server/collections/agent-loop-runs.js +23 -5
- package/dist/server/migrations/20261110000000-add-usage-pricing-snapshots.js +117 -0
- package/dist/server/migrations/20261110010000-add-usage-department-attribution.js +54 -0
- package/dist/server/plugin.js +114 -33
- package/dist/server/resources/agent-governance.js +192 -0
- package/dist/server/resources/agent-harness-profile.js +11 -3
- package/dist/server/resources/agent-monitor.js +109 -339
- package/dist/server/resources/agent-usage.js +423 -0
- package/dist/server/resources/native-monitor-format.js +179 -0
- package/dist/server/resources/tracing.js +35 -12
- package/dist/server/services/AgentGovernanceService.js +500 -0
- package/dist/server/services/DepartmentAttribution.js +65 -0
- package/dist/server/services/ExecutionSpanService.js +96 -3
- package/dist/server/services/GovernanceAdmission.js +211 -0
- package/dist/server/services/HarnessCapabilities.js +118 -0
- package/dist/server/services/LoopBudgetService.js +29 -11
- package/dist/server/services/LoopRunRepository.js +15 -6
- package/dist/server/services/LoopRunStateMachine.js +18 -7
- package/dist/server/services/LoopTriggerService.js +1 -1
- package/dist/server/services/LoopWorkerService.js +66 -32
- package/dist/server/services/ManagedPromptProtection.js +99 -0
- package/dist/server/services/NativeAgentMonitorSyncService.js +584 -0
- package/dist/server/services/NativeSubAgentObserver.js +141 -508
- package/dist/server/services/NativeUsageAttribution.js +97 -0
- package/dist/server/services/TokenTracker.js +787 -104
- package/dist/server/services/TracingRetentionPolicy.js +66 -0
- package/dist/server/services/VerificationService.js +18 -8
- package/dist/server/skill-hub/sandbox-config.json +6 -6
- package/dist/server/utils/ensure-indexes.js +14 -5
- package/package.json +63 -53
- package/server.d.ts +2 -2
- package/server.js +1 -1
- package/src/client/AgentRunsTab.tsx +2 -2
- package/src/client/ApprovalsTab.tsx +2 -2
- package/src/client/HarnessProfilesTab.tsx +2 -2
- package/src/client/OrchestratorSettings.tsx +152 -152
- package/src/client/SkillPages.tsx +41 -0
- package/src/client/__tests__/embedded-settings.test.tsx +232 -0
- package/src/client/hooks/useRunEventStream.ts +76 -76
- package/src/client/index.tsx +2 -2
- package/src/client/plugin.tsx +76 -32
- package/src/client/skill-hub/components/ExecutionHistory.tsx +200 -200
- package/src/client/skill-hub/components/GitSkillImport.tsx +562 -562
- package/src/client/skill-hub/components/LoopSettings.tsx +331 -331
- package/src/client/skill-hub/components/SkillEditor.tsx +460 -460
- package/src/client/skill-hub/components/SkillManager.tsx +194 -194
- package/src/client/skill-hub/components/SkillMetrics.tsx +162 -162
- package/src/client/skill-hub/components/SkillTestPanel.tsx +141 -141
- package/src/client/skill-hub/index.tsx +6 -6
- package/src/client/skill-hub/locale.ts +16 -16
- package/src/client/skill-hub/tools/InteractionSchemasProvider.tsx +132 -132
- package/src/client/skill-hub/tools/SkillHubCard.tsx +104 -104
- package/src/client/skill-hub/tools/loopTemplates.ts +52 -52
- package/src/client/skill-hub/tools/registerSkillLoopCards.ts +71 -71
- package/src/client/skill-hub/utils/jsonFields.ts +41 -41
- package/src/client-v2/__tests__/embedded-settings.test.tsx +193 -0
- package/src/client-v2/components/AIEmployeeSelect.tsx +47 -47
- package/src/client-v2/components/AIEmployeesContext.tsx +97 -97
- package/src/client-v2/components/AgentBindingsTab.tsx +269 -269
- package/src/client-v2/components/AgentRunsTab.tsx +92 -83
- package/src/client-v2/components/ApprovalsTab.tsx +337 -337
- package/src/client-v2/components/EmployeeGovernanceTab.tsx +702 -0
- package/src/client-v2/components/HarnessProfilesTab.tsx +704 -541
- package/src/client-v2/components/KnowledgeAccessTab.tsx +116 -116
- package/src/client-v2/components/RetrievalTraceTab.tsx +162 -162
- package/src/client-v2/components/UsageGovernanceTab.tsx +386 -0
- package/src/client-v2/index.tsx +1 -1
- package/src/client-v2/pages/AgentBindingsPage.tsx +22 -13
- package/src/client-v2/pages/ApprovalsPage.tsx +19 -10
- package/src/client-v2/pages/EmployeeGovernancePage.tsx +22 -0
- package/src/client-v2/pages/ExecutionHistoryPage.tsx +19 -10
- package/src/client-v2/pages/HarnessProfilesPage.tsx +19 -10
- package/src/client-v2/pages/KnowledgeAccessPage.tsx +19 -10
- package/src/client-v2/pages/LoopSettingsPage.tsx +19 -10
- package/src/client-v2/pages/MemoryInspectorPage.tsx +22 -13
- package/src/client-v2/pages/RetrievalTracePage.tsx +19 -10
- package/src/client-v2/pages/RulesPage.tsx +22 -13
- package/src/client-v2/pages/SkillDefinitionsPage.tsx +19 -10
- package/src/client-v2/pages/SkillMetricsPage.tsx +19 -10
- package/src/client-v2/pages/TracingPage.tsx +22 -13
- package/src/client-v2/pages/UsageGovernancePage.tsx +22 -0
- package/src/client-v2/plugin.tsx +139 -99
- package/src/client-v2/skill-hub/components/ExecutionHistory.tsx +196 -196
- package/src/client-v2/skill-hub/components/FileLinkList.tsx +37 -37
- package/src/client-v2/skill-hub/components/GitSkillImport.tsx +539 -539
- package/src/client-v2/skill-hub/components/LoopSettings.tsx +331 -331
- package/src/client-v2/skill-hub/components/SkillEditor.tsx +453 -453
- package/src/client-v2/skill-hub/components/SkillManager.tsx +191 -174
- package/src/client-v2/skill-hub/components/SkillMetrics.tsx +162 -162
- package/src/client-v2/skill-hub/components/SkillTestPanel.tsx +135 -135
- package/src/client-v2/skill-hub/locale.ts +13 -13
- package/src/client-v2/skill-hub/tools/InteractionSchemasProvider.tsx +62 -0
- package/src/client-v2/skill-hub/tools/SkillHubCard.tsx +104 -0
- package/src/client-v2/skill-hub/tools/__tests__/interactions.test.ts +110 -0
- package/src/client-v2/skill-hub/tools/interactions.ts +128 -0
- package/src/client-v2/skill-hub/tools/loopTemplates.ts +52 -52
- package/src/client-v2/skill-hub/utils/jsonFields.ts +41 -41
- package/src/client-v2/utils/jsonFields.ts +41 -41
- package/src/index.ts +2 -2
- package/src/locale/en-US.json +229 -1
- package/src/locale/zh-CN.json +229 -1
- package/src/server/__tests__/agent-execution-context.test.ts +18 -18
- package/src/server/__tests__/agent-governance.integration.test.ts +392 -0
- package/src/server/__tests__/agent-knowledge-insights.test.ts +123 -123
- package/src/server/__tests__/agent-monitor-acl.integration.test.ts +274 -0
- package/src/server/__tests__/agent-registry-service.test.ts +147 -147
- package/src/server/__tests__/agent-runtime-lifecycle.test.ts +46 -46
- package/src/server/__tests__/agent-usage-report.integration.test.ts +342 -0
- package/src/server/__tests__/code-validator.test.ts +63 -63
- package/src/server/__tests__/external-rag-search.test.ts +107 -107
- package/src/server/__tests__/harness-capabilities.test.ts +95 -0
- package/src/server/__tests__/harness-compiler.test.ts +214 -214
- package/src/server/__tests__/harness-profile-service.test.ts +167 -167
- package/src/server/__tests__/harness-runtime-policy.test.ts +293 -293
- package/src/server/__tests__/harness-tool-plan.test.ts +182 -172
- package/src/server/__tests__/input-schema-validator.test.ts +26 -26
- package/src/server/__tests__/loop-approval-decision.test.ts +577 -512
- package/src/server/__tests__/loop-approval-expiry.test.ts +258 -258
- package/src/server/__tests__/loop-budget-service.test.ts +36 -0
- package/src/server/__tests__/loop-pattern-schema.test.ts +73 -73
- package/src/server/__tests__/loop-run-repository.test.ts +32 -0
- package/src/server/__tests__/loop-run-state-machine.test.ts +101 -101
- package/src/server/__tests__/loop-trigger-service.test.ts +192 -148
- package/src/server/__tests__/loop-worker-claim.test.ts +72 -9
- package/src/server/__tests__/loop-worker-execution.test.ts +382 -317
- package/src/server/__tests__/native-agent-monitor-sync.test.ts +350 -0
- package/src/server/__tests__/native-sub-agent-observer.test.ts +470 -662
- package/src/server/__tests__/native-usage-attribution.integration.test.ts +175 -0
- package/src/server/__tests__/skill-access-service.test.ts +64 -64
- package/src/server/__tests__/skill-execute.test.ts +70 -70
- package/src/server/__tests__/skill-execution-task-policy.test.ts +140 -140
- package/src/server/__tests__/skill-sandbox-worker-mode.test.ts +15 -15
- package/src/server/__tests__/skill-settings.test.ts +63 -63
- package/src/server/__tests__/skill-tool-name.test.ts +23 -23
- package/src/server/__tests__/token-tracker.test.ts +639 -0
- package/src/server/__tests__/tool-loop-detection.test.ts +276 -276
- package/src/server/__tests__/tracing-retention-policy.test.ts +37 -0
- package/src/server/__tests__/usage-ledger.integration.test.ts +194 -0
- package/src/server/collections/agent-execution-spans.ts +393 -245
- package/src/server/collections/agent-governance-audit-events.ts +26 -0
- package/src/server/collections/agent-governance-policies.ts +26 -0
- package/src/server/collections/agent-governance-policy-versions.ts +27 -0
- package/src/server/collections/agent-governance-prompt-bindings.ts +29 -0
- package/src/server/collections/agent-loop-action-approvals.ts +39 -39
- package/src/server/collections/agent-loop-runs.ts +396 -369
- package/src/server/collections/agent-loop-steps.ts +220 -220
- package/src/server/collections/agent-memory-contexts.ts +95 -95
- package/src/server/collections/orchestrator-config.ts +87 -87
- package/src/server/collections/orchestrator-logs.ts +116 -116
- package/src/server/collections/skill-definitions.ts +159 -159
- package/src/server/collections/skill-executions.ts +154 -154
- package/src/server/collections/skill-loop-configs.ts +65 -65
- package/src/server/collections/skill-metrics.ts +36 -36
- package/src/server/collections/skill-registry-installations.ts +41 -41
- package/src/server/collections/skill-worker-configs.ts +86 -86
- package/src/server/index.ts +1 -1
- package/src/server/migrations/20260423000000-add-progress-fields.ts +50 -50
- package/src/server/migrations/20260425000000-add-interaction-schema.ts +37 -37
- package/src/server/migrations/20260427000000-add-tracing-detail-fields.ts +41 -41
- package/src/server/migrations/20260427000001-change-other-json-to-text.ts +61 -61
- package/src/server/migrations/20260524001000-add-plan-approval-and-harness-profiles.ts +145 -145
- package/src/server/migrations/20260601000000-add-token-fields.ts +89 -89
- package/src/server/migrations/20260615000000-normalize-ai-employee-tool-bindings.ts +39 -39
- package/src/server/migrations/20260621000000-native-policy-profile-defaults.ts +190 -190
- package/src/server/migrations/20260727000000-remove-unused-knowledge-scopes.ts +25 -25
- package/src/server/migrations/20260727010000-backfill-skill-tool-names.ts +45 -45
- package/src/server/migrations/20261110000000-add-usage-pricing-snapshots.ts +117 -0
- package/src/server/migrations/20261110010000-add-usage-department-attribution.ts +35 -0
- package/src/server/plugin.ts +674 -573
- package/src/server/resources/agent-governance.ts +168 -0
- package/src/server/resources/agent-harness-profile.ts +110 -94
- package/src/server/resources/agent-knowledge-insights.ts +306 -306
- package/src/server/resources/agent-loop-approval.ts +84 -84
- package/src/server/resources/agent-loop-events-stream.ts +108 -108
- package/src/server/resources/agent-loop.ts +252 -252
- package/src/server/resources/agent-monitor.ts +215 -482
- package/src/server/resources/agent-usage.ts +420 -0
- package/src/server/resources/native-monitor-format.ts +157 -0
- package/src/server/resources/tracing.ts +303 -267
- package/src/server/services/AgentExecutionContext.ts +23 -23
- package/src/server/services/AgentGovernanceService.ts +548 -0
- package/src/server/services/AgentMemoryContextService.ts +344 -344
- package/src/server/services/AgentRegistryService.ts +220 -220
- package/src/server/services/AgentRuntimeLifecycle.ts +64 -64
- package/src/server/services/CodeValidator.ts +238 -238
- package/src/server/services/DepartmentAttribution.ts +54 -0
- package/src/server/services/DurableCircuitBreakerService.ts +235 -235
- package/src/server/services/ExecutionSpanService.ts +278 -146
- package/src/server/services/FileManager.ts +159 -159
- package/src/server/services/GovernanceAdmission.ts +239 -0
- package/src/server/services/HarnessCapabilities.ts +119 -0
- package/src/server/services/HarnessCompiler.ts +170 -170
- package/src/server/services/HarnessProfileService.ts +235 -235
- package/src/server/services/HarnessSchema.ts +194 -194
- package/src/server/services/InputSchemaValidator.ts +44 -44
- package/src/server/services/LoopBudgetService.ts +332 -271
- package/src/server/services/LoopControlService.ts +120 -120
- package/src/server/services/LoopPatternSchema.ts +231 -231
- package/src/server/services/LoopPatternService.ts +171 -171
- package/src/server/services/LoopRunRepository.ts +350 -332
- package/src/server/services/LoopRunStateMachine.ts +545 -525
- package/src/server/services/LoopSchedulerService.ts +195 -195
- package/src/server/services/LoopTriggerService.ts +169 -159
- package/src/server/services/LoopWorkerService.ts +986 -912
- package/src/server/services/ManagedPromptProtection.ts +88 -0
- package/src/server/services/NativeAgentMonitorSyncService.ts +691 -0
- package/src/server/services/NativeSubAgentObserver.ts +331 -757
- package/src/server/services/NativeUsageAttribution.ts +98 -0
- package/src/server/services/PathLockService.ts +317 -317
- package/src/server/services/PluginAiRuntimeAdapter.ts +387 -387
- package/src/server/services/RunEventBus.ts +58 -58
- package/src/server/services/SandboxRunner.ts +492 -492
- package/src/server/services/SkillAccessService.ts +175 -175
- package/src/server/services/SkillManager.ts +585 -585
- package/src/server/services/SkillRepositoryService.ts +236 -236
- package/src/server/services/TokenTracker.ts +1158 -287
- package/src/server/services/ToolLoopDetectionService.ts +210 -210
- package/src/server/services/TracingRetentionPolicy.ts +56 -0
- package/src/server/services/VerificationSchema.ts +31 -31
- package/src/server/services/VerificationService.ts +332 -313
- package/src/server/services/WorkerEnvManager.ts +198 -198
- package/src/server/services/__tests__/SkillRepositoryService.test.ts +33 -33
- package/src/server/services/harness-runtime-policy.ts +134 -134
- package/src/server/services/pythonGuardTemplate.ts +87 -87
- package/src/server/services/sandboxCapabilities.ts +348 -348
- package/src/server/skill-hub/actions/__tests__/git-import.test.ts +563 -563
- package/src/server/skill-hub/actions/git-import.ts +936 -936
- package/src/server/skill-hub/mcp/McpController.ts +107 -107
- package/src/server/skill-hub/middlewares/git-import-request-method-policy.ts +51 -51
- package/src/server/skill-hub/plugin.ts +1232 -1232
- package/src/server/skill-hub/sandbox-config.json +6 -6
- package/src/server/skill-hub/services/RegistrySkillInstallationService.ts +281 -281
- package/src/server/skill-hub/services/__tests__/RegistrySkillInstallationService.test.ts +295 -295
- package/src/server/skill-hub/tasks/SkillExecutionTask.ts +568 -568
- package/src/server/skill-hub/utils/json-fields.ts +57 -57
- package/src/server/tools/delegate-task.ts +30 -30
- package/src/server/tools/external-rag-search.ts +329 -329
- package/src/server/tools/skill-execute.ts +216 -216
- package/src/server/types.ts +21 -21
- package/src/server/utils/ai-manager.ts +24 -24
- package/src/server/utils/ctx-utils.ts +132 -132
- package/src/server/utils/ensure-indexes.ts +119 -96
- package/src/server/utils/ha-lock.ts +80 -80
- package/src/server/utils/loop-pattern-context.ts +84 -84
- package/src/server/utils/record-utils.ts +19 -19
- package/src/server/utils/skill-settings.ts +135 -135
- package/src/server/utils/skill-tool-name.ts +58 -58
- package/dist/client-v2/117.7565cff57c39318a.js +0 -10
- package/dist/client-v2/214.106635011859dede.js +0 -10
- package/dist/client-v2/253.59577b40d9875be0.js +0 -10
- package/dist/client-v2/264.7ed8bee71fa5935c.js +0 -10
- package/dist/client-v2/418.41ed200e7d6da332.js +0 -10
- package/dist/client-v2/794.a67a2614405ba627.js +0 -10
- package/dist/client-v2/993.b0688fdc5ccb000a.js +0 -10
- package/dist/node_modules/simple-git/dist/cjs/index.js +0 -7399
- package/dist/node_modules/simple-git/dist/esm/index.js +0 -4745
- package/dist/node_modules/simple-git/dist/esm/package.json +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/api.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/args/log-format.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-construct-error.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-error.d.ts +0 -30
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-plugin-error.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-response-error.d.ts +0 -32
- package/dist/node_modules/simple-git/dist/src/lib/errors/task-configuration-error.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/git-factory.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/git-logger.d.ts +0 -21
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-branch-delete.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-branch.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-commit.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-diff-summary.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-fetch.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-list-log-summary.d.ts +0 -6
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-merge.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-move.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-pull.d.ts +0 -6
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-push.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-remote-messages.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-remote-objects.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/abort-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/block-unsafe-operations-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/command-config-prefixing-plugin.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/plugins/completion-detection.plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/custom-binary.plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/error-detection.plugin.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/plugins/index.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/plugins/plugin-store.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/plugins/progress-monitor-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/simple-git-plugin.d.ts +0 -48
- package/dist/node_modules/simple-git/dist/src/lib/plugins/spawn-options-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/suffix-paths.plugin.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/plugins/timout-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/responses/BranchDeleteSummary.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/responses/BranchSummary.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/responses/CheckIgnore.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/responses/CleanSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/ConfigList.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/responses/DiffSummary.d.ts +0 -10
- package/dist/node_modules/simple-git/dist/src/lib/responses/FileStatusSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/GetRemoteSummary.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/responses/InitSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/MergeSummary.d.ts +0 -16
- package/dist/node_modules/simple-git/dist/src/lib/responses/PullSummary.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/responses/StatusSummary.d.ts +0 -19
- package/dist/node_modules/simple-git/dist/src/lib/responses/TagList.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/runners/git-executor-chain.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/runners/git-executor.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/runners/promise-wrapped.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/runners/scheduler.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/runners/tasks-pending-queue.d.ts +0 -23
- package/dist/node_modules/simple-git/dist/src/lib/simple-git-api.d.ts +0 -20
- package/dist/node_modules/simple-git/dist/src/lib/task-callback.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/apply-patch.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/branch.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/tasks/change-working-directory.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/check-ignore.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/check-is-repo.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/checkout.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/clean.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/tasks/clone.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/commit.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/config.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/tasks/count-objects.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/diff-name-status.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/diff.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/fetch.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/first-commit.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/grep.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/hash-object.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/init.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/log.d.ts +0 -32
- package/dist/node_modules/simple-git/dist/src/lib/tasks/merge.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/move.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/pull.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/push.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/remote.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/tasks/reset.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/tasks/show.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/stash-list.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/status.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/sub-module.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/tag.d.ts +0 -18
- package/dist/node_modules/simple-git/dist/src/lib/tasks/task.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/tasks/version.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/types/handlers.d.ts +0 -21
- package/dist/node_modules/simple-git/dist/src/lib/types/index.d.ts +0 -136
- package/dist/node_modules/simple-git/dist/src/lib/types/tasks.d.ts +0 -19
- package/dist/node_modules/simple-git/dist/src/lib/utils/argument-filters.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/utils/exit-codes.d.ts +0 -10
- package/dist/node_modules/simple-git/dist/src/lib/utils/git-output-streams.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/utils/index.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/utils/line-parser.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/utils/simple-git-options.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/utils/task-options.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/utils/task-parser.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/utils/util.d.ts +0 -47
- package/dist/node_modules/simple-git/dist/typings/errors.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/typings/index.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/typings/response.d.ts +0 -556
- package/dist/node_modules/simple-git/dist/typings/simple-git.d.ts +0 -1033
- package/dist/node_modules/simple-git/dist/typings/types.d.ts +0 -22
- package/dist/node_modules/simple-git/node_modules/debug/package.json +0 -64
- package/dist/node_modules/simple-git/node_modules/debug/src/browser.js +0 -272
- package/dist/node_modules/simple-git/node_modules/debug/src/common.js +0 -292
- package/dist/node_modules/simple-git/node_modules/debug/src/index.js +0 -10
- package/dist/node_modules/simple-git/node_modules/debug/src/node.js +0 -263
- package/dist/node_modules/simple-git/package.json +0 -1
- package/dist/node_modules/simple-git/promise.js +0 -17
|
@@ -0,0 +1,342 @@
|
|
|
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 { PluginAgentOrchestratorServer } from '../plugin';
|
|
12
|
+
|
|
13
|
+
const FROM = '2026-11-01T00:00:00.000Z';
|
|
14
|
+
const TO = '2026-11-11T00:00:00.000Z';
|
|
15
|
+
|
|
16
|
+
type UsageCall = {
|
|
17
|
+
id: number;
|
|
18
|
+
usageIdentity: string;
|
|
19
|
+
usageOccurredAt: Date;
|
|
20
|
+
model: string;
|
|
21
|
+
employeeUsername: string;
|
|
22
|
+
userId: number;
|
|
23
|
+
departmentId: string | number | null;
|
|
24
|
+
departmentAttribution?: string | null;
|
|
25
|
+
usageSource: 'actual' | 'estimated' | 'missing';
|
|
26
|
+
inputTokens: number | null;
|
|
27
|
+
outputTokens: number | null;
|
|
28
|
+
totalTokens: number | null;
|
|
29
|
+
cost: number | null;
|
|
30
|
+
priceCurrency: string | null;
|
|
31
|
+
pricingStatus: string;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
describe('agent usage reporting over HTTP', () => {
|
|
35
|
+
let app: MockServer;
|
|
36
|
+
let adminAgent: ReturnType<MockServer['agent']>;
|
|
37
|
+
let memberAgent: ReturnType<MockServer['agent']>;
|
|
38
|
+
let departmentId: string;
|
|
39
|
+
let inferredUserId: number;
|
|
40
|
+
let unassignedUserId: number;
|
|
41
|
+
let callIds: Record<string, string>;
|
|
42
|
+
|
|
43
|
+
beforeAll(async () => {
|
|
44
|
+
app = await createMockServer({
|
|
45
|
+
plugins: ['nocobase', PluginAgentOrchestratorServer],
|
|
46
|
+
name: `agent-usage-report-${process.pid}`,
|
|
47
|
+
acl: true,
|
|
48
|
+
skipSupervisor: true,
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
const users = app.db.getRepository('users');
|
|
52
|
+
const admin = await users.findOne({ filter: { 'roles.name': 'root' } });
|
|
53
|
+
if (!admin) throw new Error('Mock server did not create its root user.');
|
|
54
|
+
const member = await users.create({
|
|
55
|
+
values: { username: `usage-report-member-${process.pid}`, roles: ['member'] },
|
|
56
|
+
});
|
|
57
|
+
const inferredUser = await users.create({
|
|
58
|
+
values: { username: `usage-report-inferred-${process.pid}`, roles: ['member'] },
|
|
59
|
+
});
|
|
60
|
+
const unassignedUser = await users.create({
|
|
61
|
+
values: { username: `usage-report-unassigned-${process.pid}`, roles: ['member'] },
|
|
62
|
+
});
|
|
63
|
+
adminAgent = await app.agent().login(admin);
|
|
64
|
+
memberAgent = await app.agent().login(member);
|
|
65
|
+
inferredUserId = Number(inferredUser.id);
|
|
66
|
+
unassignedUserId = Number(unassignedUser.id);
|
|
67
|
+
|
|
68
|
+
const userCollection = app.db.getCollection('users');
|
|
69
|
+
if (!userCollection.hasField('mainDepartmentId')) {
|
|
70
|
+
userCollection.addField('mainDepartmentId', { type: 'bigInt', allowNull: true });
|
|
71
|
+
await userCollection.sync();
|
|
72
|
+
}
|
|
73
|
+
departmentId = '9007199254740993';
|
|
74
|
+
const otherDepartmentId = (BigInt(departmentId) + 1n).toString();
|
|
75
|
+
const memberships = app.db.collection({
|
|
76
|
+
name: 'departmentsUsers',
|
|
77
|
+
fields: [
|
|
78
|
+
{ name: 'userId', type: 'bigInt', allowNull: false },
|
|
79
|
+
{ name: 'departmentId', type: 'bigInt', allowNull: false },
|
|
80
|
+
],
|
|
81
|
+
});
|
|
82
|
+
await memberships.sync();
|
|
83
|
+
await app.db.getRepository('users').update({
|
|
84
|
+
filterByTk: inferredUserId,
|
|
85
|
+
values: { mainDepartmentId: departmentId },
|
|
86
|
+
});
|
|
87
|
+
await app.db.getRepository('departmentsUsers').create({
|
|
88
|
+
values: { userId: inferredUserId, departmentId },
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
const spans = app.db.getRepository('agentExecutionSpans');
|
|
92
|
+
const common = {
|
|
93
|
+
source: 'native-plugin-ai',
|
|
94
|
+
type: 'model_call',
|
|
95
|
+
status: 'success',
|
|
96
|
+
pricingStatus: 'configured',
|
|
97
|
+
createdAt: new Date('2026-11-05T00:00:00.000Z'),
|
|
98
|
+
updatedAt: new Date('2026-11-05T00:00:00.000Z'),
|
|
99
|
+
};
|
|
100
|
+
const calls: Array<Omit<UsageCall, 'id'> & { rootRunId: string; startedAt: Date }> = [
|
|
101
|
+
{
|
|
102
|
+
...common,
|
|
103
|
+
rootRunId: 'usage-report-a',
|
|
104
|
+
startedAt: new Date('2026-11-09T12:00:00.000Z'),
|
|
105
|
+
usageIdentity: 'usage-report:a',
|
|
106
|
+
usageOccurredAt: new Date('2026-11-09T12:00:00.000Z'),
|
|
107
|
+
model: 'model-alpha',
|
|
108
|
+
employeeUsername: 'employee-alice',
|
|
109
|
+
userId: inferredUserId,
|
|
110
|
+
departmentId,
|
|
111
|
+
departmentAttribution: 'snapshot',
|
|
112
|
+
usageSource: 'actual',
|
|
113
|
+
inputTokens: 100,
|
|
114
|
+
outputTokens: 50,
|
|
115
|
+
totalTokens: 150,
|
|
116
|
+
cost: 0.2,
|
|
117
|
+
priceCurrency: 'USD',
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
...common,
|
|
121
|
+
rootRunId: 'usage-report-b',
|
|
122
|
+
startedAt: new Date('2026-11-08T12:00:00.000Z'),
|
|
123
|
+
usageIdentity: 'usage-report:b',
|
|
124
|
+
usageOccurredAt: new Date('2026-11-08T12:00:00.000Z'),
|
|
125
|
+
model: 'model-beta',
|
|
126
|
+
employeeUsername: 'employee-bob',
|
|
127
|
+
userId: inferredUserId,
|
|
128
|
+
departmentId: null,
|
|
129
|
+
departmentAttribution: null,
|
|
130
|
+
usageSource: 'estimated',
|
|
131
|
+
inputTokens: 20,
|
|
132
|
+
outputTokens: 10,
|
|
133
|
+
totalTokens: 30,
|
|
134
|
+
cost: null,
|
|
135
|
+
priceCurrency: null,
|
|
136
|
+
pricingStatus: 'unpriced',
|
|
137
|
+
},
|
|
138
|
+
{
|
|
139
|
+
...common,
|
|
140
|
+
rootRunId: 'usage-report-c',
|
|
141
|
+
startedAt: new Date('2026-11-07T12:00:00.000Z'),
|
|
142
|
+
usageIdentity: 'usage-report:c',
|
|
143
|
+
usageOccurredAt: new Date('2026-11-07T12:00:00.000Z'),
|
|
144
|
+
model: 'model-alpha',
|
|
145
|
+
employeeUsername: 'employee-alice',
|
|
146
|
+
userId: unassignedUserId,
|
|
147
|
+
departmentId: null,
|
|
148
|
+
departmentAttribution: null,
|
|
149
|
+
usageSource: 'missing',
|
|
150
|
+
inputTokens: null,
|
|
151
|
+
outputTokens: null,
|
|
152
|
+
totalTokens: null,
|
|
153
|
+
cost: null,
|
|
154
|
+
priceCurrency: null,
|
|
155
|
+
pricingStatus: 'unpriced',
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
...common,
|
|
159
|
+
rootRunId: 'usage-report-d',
|
|
160
|
+
startedAt: new Date('2026-11-06T12:00:00.000Z'),
|
|
161
|
+
usageIdentity: 'usage-report:d',
|
|
162
|
+
usageOccurredAt: new Date('2026-11-06T12:00:00.000Z'),
|
|
163
|
+
model: 'model-gamma',
|
|
164
|
+
employeeUsername: 'employee-carol',
|
|
165
|
+
userId: unassignedUserId,
|
|
166
|
+
departmentId: otherDepartmentId,
|
|
167
|
+
departmentAttribution: 'snapshot',
|
|
168
|
+
usageSource: 'actual',
|
|
169
|
+
inputTokens: 200,
|
|
170
|
+
outputTokens: 100,
|
|
171
|
+
totalTokens: 300,
|
|
172
|
+
cost: 1.4,
|
|
173
|
+
priceCurrency: 'EUR',
|
|
174
|
+
},
|
|
175
|
+
{
|
|
176
|
+
...common,
|
|
177
|
+
rootRunId: 'usage-report-e',
|
|
178
|
+
startedAt: new Date('2026-11-05T12:00:00.000Z'),
|
|
179
|
+
usageIdentity: 'usage-report:e',
|
|
180
|
+
usageOccurredAt: new Date('2026-11-05T12:00:00.000Z'),
|
|
181
|
+
model: 'model-gamma',
|
|
182
|
+
employeeUsername: 'employee-carol',
|
|
183
|
+
userId: inferredUserId,
|
|
184
|
+
departmentId,
|
|
185
|
+
departmentAttribution: 'snapshot',
|
|
186
|
+
usageSource: 'actual',
|
|
187
|
+
inputTokens: 50,
|
|
188
|
+
outputTokens: 25,
|
|
189
|
+
totalTokens: 75,
|
|
190
|
+
cost: 0.6,
|
|
191
|
+
priceCurrency: 'USD',
|
|
192
|
+
},
|
|
193
|
+
];
|
|
194
|
+
|
|
195
|
+
callIds = {};
|
|
196
|
+
for (const call of calls) {
|
|
197
|
+
const { rootRunId, startedAt, ...values } = call;
|
|
198
|
+
const row = await spans.create({ values: { ...values, rootRunId, startedAt } });
|
|
199
|
+
callIds[rootRunId.slice(-1)] = String(row.id);
|
|
200
|
+
}
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
afterAll(async () => {
|
|
204
|
+
await app?.destroy();
|
|
205
|
+
});
|
|
206
|
+
|
|
207
|
+
it('allows administrators to query reports and denies authenticated members', async () => {
|
|
208
|
+
const adminResponse = await adminAgent.resource('agentUsage').summary({ from: FROM, to: TO });
|
|
209
|
+
expect(adminResponse.status).toBe(200);
|
|
210
|
+
expect(adminResponse.body.data.data.calls).toBe(5);
|
|
211
|
+
|
|
212
|
+
const memberResponse = await memberAgent.resource('agentUsage').summary({ from: FROM, to: TO });
|
|
213
|
+
expect(memberResponse.status).toBe(403);
|
|
214
|
+
await expect(memberAgent.resource('agentUsage').calls({ from: FROM, to: TO })).resolves.toMatchObject({
|
|
215
|
+
status: 403,
|
|
216
|
+
});
|
|
217
|
+
await expect(
|
|
218
|
+
memberAgent.resource('agentUsage').breakdown({ from: FROM, to: TO, groupBy: 'model' }),
|
|
219
|
+
).resolves.toMatchObject({
|
|
220
|
+
status: 403,
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
it('filters calls by date, model, employee, user, and snapshot department', async () => {
|
|
225
|
+
const dateFilter = {
|
|
226
|
+
from: '2026-11-09T00:00:00.000Z',
|
|
227
|
+
to: '2026-11-10T00:00:00.000Z',
|
|
228
|
+
};
|
|
229
|
+
const individualFilters = [
|
|
230
|
+
{ model: 'model-alpha' },
|
|
231
|
+
{ employeeUsername: 'employee-alice' },
|
|
232
|
+
{ userId: inferredUserId },
|
|
233
|
+
{ departmentId },
|
|
234
|
+
];
|
|
235
|
+
for (const filter of individualFilters) {
|
|
236
|
+
const filtered = await adminAgent.resource('agentUsage').calls({ ...dateFilter, ...filter });
|
|
237
|
+
expect(
|
|
238
|
+
filtered.body.data.data.map((row: UsageCall) => row.usageIdentity),
|
|
239
|
+
`Filter ${JSON.stringify(filter)} should retain the matching call.`,
|
|
240
|
+
).toContain('usage-report:a');
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
const response = await adminAgent.resource('agentUsage').calls({
|
|
244
|
+
...dateFilter,
|
|
245
|
+
model: 'model-alpha',
|
|
246
|
+
employeeUsername: 'employee-alice',
|
|
247
|
+
userId: inferredUserId,
|
|
248
|
+
departmentId,
|
|
249
|
+
page: 1,
|
|
250
|
+
pageSize: 10,
|
|
251
|
+
});
|
|
252
|
+
|
|
253
|
+
expect(response.status).toBe(200);
|
|
254
|
+
expect(response.body.data.data).toHaveLength(1);
|
|
255
|
+
expect(response.body.data.data[0]).toMatchObject({
|
|
256
|
+
id: callIds.a,
|
|
257
|
+
usageIdentity: 'usage-report:a',
|
|
258
|
+
departmentId,
|
|
259
|
+
departmentAttribution: 'snapshot',
|
|
260
|
+
});
|
|
261
|
+
|
|
262
|
+
const outsideRange = await adminAgent.resource('agentUsage').calls({
|
|
263
|
+
from: FROM,
|
|
264
|
+
to: '2026-11-09T00:00:00.000Z',
|
|
265
|
+
model: 'model-alpha',
|
|
266
|
+
});
|
|
267
|
+
expect(outsideRange.status).toBe(200);
|
|
268
|
+
expect(outsideRange.body.data.data.map((row: UsageCall) => row.usageIdentity)).toContain('usage-report:c');
|
|
269
|
+
expect(outsideRange.body.data.data.map((row: UsageCall) => row.usageIdentity)).not.toContain('usage-report:a');
|
|
270
|
+
});
|
|
271
|
+
|
|
272
|
+
it('reports missing and estimated usage, inferred and unknown departments, and currency-separated costs', async () => {
|
|
273
|
+
const response = await adminAgent.resource('agentUsage').summary({
|
|
274
|
+
from: FROM,
|
|
275
|
+
to: TO,
|
|
276
|
+
includeInferredDepartment: true,
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
expect(response.status).toBe(200);
|
|
280
|
+
expect(response.body.data.data).toMatchObject({
|
|
281
|
+
calls: 5,
|
|
282
|
+
actualCalls: 3,
|
|
283
|
+
estimatedCalls: 1,
|
|
284
|
+
missingCalls: 1,
|
|
285
|
+
unpricedCalls: 2,
|
|
286
|
+
snapshotCalls: 3,
|
|
287
|
+
inferredCalls: 1,
|
|
288
|
+
unattributedCalls: 1,
|
|
289
|
+
inputTokens: null,
|
|
290
|
+
outputTokens: null,
|
|
291
|
+
totalTokens: null,
|
|
292
|
+
});
|
|
293
|
+
expect(response.body.data.data.knownTotalTokens).toBe(555);
|
|
294
|
+
expect(response.body.data.data.totalTokensReportedCalls).toBe(4);
|
|
295
|
+
expect(response.body.data.data.coverage.departmentAttribution).toBe('snapshot-or-current-membership-inference');
|
|
296
|
+
expect(response.body.data.data.coverage.inferenceAvailable).toBe(true);
|
|
297
|
+
expect(response.body.data.data.costByCurrency).toEqual(
|
|
298
|
+
expect.arrayContaining([
|
|
299
|
+
expect.objectContaining({ currency: 'EUR', knownCost: 1.4 }),
|
|
300
|
+
expect.objectContaining({ currency: 'USD', knownCost: 0.8 }),
|
|
301
|
+
]),
|
|
302
|
+
);
|
|
303
|
+
|
|
304
|
+
const breakdown = await adminAgent.resource('agentUsage').breakdown({
|
|
305
|
+
from: FROM,
|
|
306
|
+
to: TO,
|
|
307
|
+
groupBy: 'departmentId',
|
|
308
|
+
includeInferredDepartment: true,
|
|
309
|
+
page: 1,
|
|
310
|
+
pageSize: 100,
|
|
311
|
+
});
|
|
312
|
+
expect(breakdown.status).toBe(200);
|
|
313
|
+
expect(breakdown.body.data.data).toEqual(
|
|
314
|
+
expect.arrayContaining([
|
|
315
|
+
expect.objectContaining({ key: departmentId, departmentAttribution: 'snapshot', currency: 'USD' }),
|
|
316
|
+
expect.objectContaining({ key: departmentId, departmentAttribution: 'inferred', currency: null }),
|
|
317
|
+
expect.objectContaining({ key: null, departmentAttribution: 'unknown', currency: null }),
|
|
318
|
+
]),
|
|
319
|
+
);
|
|
320
|
+
});
|
|
321
|
+
|
|
322
|
+
it('paginates persisted calls in stable time order and rejects invalid filters', async () => {
|
|
323
|
+
const first = await adminAgent.resource('agentUsage').calls({ from: FROM, to: TO, page: 1, pageSize: 2 });
|
|
324
|
+
const second = await adminAgent.resource('agentUsage').calls({ from: FROM, to: TO, page: 2, pageSize: 2 });
|
|
325
|
+
const third = await adminAgent.resource('agentUsage').calls({ from: FROM, to: TO, page: 3, pageSize: 2 });
|
|
326
|
+
|
|
327
|
+
expect(first.status).toBe(200);
|
|
328
|
+
expect(first.body.data.meta).toMatchObject({ count: 5, page: 1, pageSize: 2, totalPage: 3 });
|
|
329
|
+
expect(first.body.data.data.map((row: UsageCall) => row.usageIdentity)).toEqual([
|
|
330
|
+
'usage-report:a',
|
|
331
|
+
'usage-report:b',
|
|
332
|
+
]);
|
|
333
|
+
expect(second.body.data.data.map((row: UsageCall) => row.usageIdentity)).toEqual([
|
|
334
|
+
'usage-report:c',
|
|
335
|
+
'usage-report:d',
|
|
336
|
+
]);
|
|
337
|
+
expect(third.body.data.data.map((row: UsageCall) => row.usageIdentity)).toEqual(['usage-report:e']);
|
|
338
|
+
|
|
339
|
+
const invalid = await adminAgent.resource('agentUsage').calls({ from: TO, to: FROM });
|
|
340
|
+
expect(invalid.status).toBe(400);
|
|
341
|
+
});
|
|
342
|
+
});
|
|
@@ -1,63 +1,63 @@
|
|
|
1
|
-
import { afterEach, describe, expect, it } from 'vitest';
|
|
2
|
-
import { CodeValidator, CodeValidationError } from '../services/CodeValidator';
|
|
3
|
-
|
|
4
|
-
const validator = new CodeValidator();
|
|
5
|
-
|
|
6
|
-
describe('CodeValidator.validate — dangerous patterns', () => {
|
|
7
|
-
it('blocks node child_process and dynamic require', () => {
|
|
8
|
-
expect(() => validator.validate(`require('child_process')`, 'node')).toThrow(CodeValidationError);
|
|
9
|
-
expect(() => validator.validate(`const m = 'fs'; require(m);`, 'node')).toThrow(CodeValidationError);
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
it('blocks node indirect eval / Function constructor / dynamic import', () => {
|
|
13
|
-
expect(() => validator.validate(`eval('1+1')`, 'node')).toThrow(CodeValidationError);
|
|
14
|
-
expect(() => validator.validate(`new Function('return 1')()`, 'node')).toThrow(CodeValidationError);
|
|
15
|
-
expect(() => validator.validate(`import('fs')`, 'node')).toThrow(CodeValidationError);
|
|
16
|
-
expect(() => validator.validate(`process.binding('spawn_sync')`, 'node')).toThrow(CodeValidationError);
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
it('blocks python subprocess / socket / importlib / getattr bypass', () => {
|
|
20
|
-
expect(() => validator.validate(`import subprocess`, 'python')).toThrow(CodeValidationError);
|
|
21
|
-
expect(() => validator.validate(`import socket`, 'python')).toThrow(CodeValidationError);
|
|
22
|
-
expect(() => validator.validate(`import importlib`, 'python')).toThrow(CodeValidationError);
|
|
23
|
-
expect(() => validator.validate(`getattr(os, 'sys' + 'tem')('id')`, 'python')).toThrow(CodeValidationError);
|
|
24
|
-
expect(() => validator.validate(`__import__('os')`, 'python')).toThrow(CodeValidationError);
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
it('allows benign code', () => {
|
|
28
|
-
expect(() => validator.validate(`const fs = require('fs'); fs.writeFileSync('x', '1');`, 'node')).not.toThrow();
|
|
29
|
-
expect(() => validator.validate(`import json\nprint(json.dumps({'a': 1}))`, 'python')).not.toThrow();
|
|
30
|
-
});
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
describe('CodeValidator.validateImports — allowlist', () => {
|
|
34
|
-
afterEach(() => {
|
|
35
|
-
delete process.env.SKILL_HUB_ALLOW_ANY_IMPORT;
|
|
36
|
-
});
|
|
37
|
-
|
|
38
|
-
it('blocks stdlib network modules even when whitelist is empty (exfiltration hole)', () => {
|
|
39
|
-
// urllib / ftplib are stdlib (no install needed) and must NOT pass on empty whitelist.
|
|
40
|
-
expect(() => validator.validateImports(`import urllib.request`, 'python', [])).toThrow(CodeValidationError);
|
|
41
|
-
expect(() => validator.validateImports(`import ftplib`, 'python', [])).toThrow(CodeValidationError);
|
|
42
|
-
});
|
|
43
|
-
|
|
44
|
-
it('allows builtins on empty whitelist', () => {
|
|
45
|
-
expect(() => validator.validateImports(`import json`, 'python', [])).not.toThrow();
|
|
46
|
-
});
|
|
47
|
-
|
|
48
|
-
it('allows whitelisted package and maps PyPI→import name', () => {
|
|
49
|
-
expect(() => validator.validateImports(`import requests`, 'python', ['requests'])).not.toThrow();
|
|
50
|
-
expect(() => validator.validateImports(`from docx import Document`, 'python', ['python-docx'])).not.toThrow();
|
|
51
|
-
});
|
|
52
|
-
|
|
53
|
-
it('blocks non-whitelisted node package but allows builtins', () => {
|
|
54
|
-
expect(() => validator.validateImports(`require('lodash')`, 'node', [])).toThrow(CodeValidationError);
|
|
55
|
-
expect(() => validator.validateImports(`require('lodash')`, 'node', ['lodash'])).not.toThrow();
|
|
56
|
-
expect(() => validator.validateImports(`require('path')`, 'node', [])).not.toThrow();
|
|
57
|
-
});
|
|
58
|
-
|
|
59
|
-
it('honours SKILL_HUB_ALLOW_ANY_IMPORT escape hatch on empty whitelist', () => {
|
|
60
|
-
process.env.SKILL_HUB_ALLOW_ANY_IMPORT = 'true';
|
|
61
|
-
expect(() => validator.validateImports(`import urllib.request`, 'python', [])).not.toThrow();
|
|
62
|
-
});
|
|
63
|
-
});
|
|
1
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { CodeValidator, CodeValidationError } from '../services/CodeValidator';
|
|
3
|
+
|
|
4
|
+
const validator = new CodeValidator();
|
|
5
|
+
|
|
6
|
+
describe('CodeValidator.validate — dangerous patterns', () => {
|
|
7
|
+
it('blocks node child_process and dynamic require', () => {
|
|
8
|
+
expect(() => validator.validate(`require('child_process')`, 'node')).toThrow(CodeValidationError);
|
|
9
|
+
expect(() => validator.validate(`const m = 'fs'; require(m);`, 'node')).toThrow(CodeValidationError);
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it('blocks node indirect eval / Function constructor / dynamic import', () => {
|
|
13
|
+
expect(() => validator.validate(`eval('1+1')`, 'node')).toThrow(CodeValidationError);
|
|
14
|
+
expect(() => validator.validate(`new Function('return 1')()`, 'node')).toThrow(CodeValidationError);
|
|
15
|
+
expect(() => validator.validate(`import('fs')`, 'node')).toThrow(CodeValidationError);
|
|
16
|
+
expect(() => validator.validate(`process.binding('spawn_sync')`, 'node')).toThrow(CodeValidationError);
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
it('blocks python subprocess / socket / importlib / getattr bypass', () => {
|
|
20
|
+
expect(() => validator.validate(`import subprocess`, 'python')).toThrow(CodeValidationError);
|
|
21
|
+
expect(() => validator.validate(`import socket`, 'python')).toThrow(CodeValidationError);
|
|
22
|
+
expect(() => validator.validate(`import importlib`, 'python')).toThrow(CodeValidationError);
|
|
23
|
+
expect(() => validator.validate(`getattr(os, 'sys' + 'tem')('id')`, 'python')).toThrow(CodeValidationError);
|
|
24
|
+
expect(() => validator.validate(`__import__('os')`, 'python')).toThrow(CodeValidationError);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('allows benign code', () => {
|
|
28
|
+
expect(() => validator.validate(`const fs = require('fs'); fs.writeFileSync('x', '1');`, 'node')).not.toThrow();
|
|
29
|
+
expect(() => validator.validate(`import json\nprint(json.dumps({'a': 1}))`, 'python')).not.toThrow();
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
describe('CodeValidator.validateImports — allowlist', () => {
|
|
34
|
+
afterEach(() => {
|
|
35
|
+
delete process.env.SKILL_HUB_ALLOW_ANY_IMPORT;
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('blocks stdlib network modules even when whitelist is empty (exfiltration hole)', () => {
|
|
39
|
+
// urllib / ftplib are stdlib (no install needed) and must NOT pass on empty whitelist.
|
|
40
|
+
expect(() => validator.validateImports(`import urllib.request`, 'python', [])).toThrow(CodeValidationError);
|
|
41
|
+
expect(() => validator.validateImports(`import ftplib`, 'python', [])).toThrow(CodeValidationError);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it('allows builtins on empty whitelist', () => {
|
|
45
|
+
expect(() => validator.validateImports(`import json`, 'python', [])).not.toThrow();
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it('allows whitelisted package and maps PyPI→import name', () => {
|
|
49
|
+
expect(() => validator.validateImports(`import requests`, 'python', ['requests'])).not.toThrow();
|
|
50
|
+
expect(() => validator.validateImports(`from docx import Document`, 'python', ['python-docx'])).not.toThrow();
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it('blocks non-whitelisted node package but allows builtins', () => {
|
|
54
|
+
expect(() => validator.validateImports(`require('lodash')`, 'node', [])).toThrow(CodeValidationError);
|
|
55
|
+
expect(() => validator.validateImports(`require('lodash')`, 'node', ['lodash'])).not.toThrow();
|
|
56
|
+
expect(() => validator.validateImports(`require('path')`, 'node', [])).not.toThrow();
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it('honours SKILL_HUB_ALLOW_ANY_IMPORT escape hatch on empty whitelist', () => {
|
|
60
|
+
process.env.SKILL_HUB_ALLOW_ANY_IMPORT = 'true';
|
|
61
|
+
expect(() => validator.validateImports(`import urllib.request`, 'python', [])).not.toThrow();
|
|
62
|
+
});
|
|
63
|
+
});
|