plugin-agent-orchestrator 1.1.8 → 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 -33
- 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 -111
- 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,639 @@
|
|
|
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 { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
11
|
+
import { TokenTracker, usageFromAIUsageEvent } from '../services/TokenTracker';
|
|
12
|
+
|
|
13
|
+
type Row = Record<string, unknown>;
|
|
14
|
+
|
|
15
|
+
class MemoryRepository {
|
|
16
|
+
rows: Row[];
|
|
17
|
+
private nextId: number;
|
|
18
|
+
|
|
19
|
+
constructor(rows: Row[] = []) {
|
|
20
|
+
this.rows = rows;
|
|
21
|
+
this.nextId = Math.max(0, ...rows.map((row) => Number(row.id) || 0)) + 1;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
async find(options: Record<string, unknown> = {}) {
|
|
25
|
+
const filter = (options.filter || {}) as Row;
|
|
26
|
+
return this.rows.filter((row) => Object.entries(filter).every(([key, value]) => row[key] === value));
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
async findOne(options: Record<string, unknown> = {}) {
|
|
30
|
+
const id = options.filterByTk;
|
|
31
|
+
if (id !== undefined) return this.rows.find((row) => row.id === id) ?? null;
|
|
32
|
+
return (await this.find(options))[0] ?? null;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
async create(options: Record<string, unknown>) {
|
|
36
|
+
const values = options.values as Row;
|
|
37
|
+
const row = { id: this.nextId++, ...values };
|
|
38
|
+
this.rows.push(row);
|
|
39
|
+
return row;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
async update(options: Record<string, unknown>) {
|
|
43
|
+
const values = options.values as Row;
|
|
44
|
+
const row = this.rows.find((item) => item.id === options.filterByTk);
|
|
45
|
+
if (row) Object.assign(row, values);
|
|
46
|
+
return row;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
function createTracker(options: { spans?: Row[]; runs?: Row[]; events?: Row[] } = {}) {
|
|
51
|
+
const spanRepo = new MemoryRepository(options.spans);
|
|
52
|
+
const runRepo = new MemoryRepository(options.runs ?? [{ id: 7, budgetMaxTokens: 0, budgetMaxCost: 0 }]);
|
|
53
|
+
const eventRepo = new MemoryRepository(options.events);
|
|
54
|
+
const repositories = new Map([
|
|
55
|
+
['agentExecutionSpans', spanRepo],
|
|
56
|
+
['agentLoopRuns', runRepo],
|
|
57
|
+
['aiUsageEvents', eventRepo],
|
|
58
|
+
]);
|
|
59
|
+
const plugin = {
|
|
60
|
+
app: { log: { warn: vi.fn() } },
|
|
61
|
+
db: { getRepository: (name: string) => repositories.get(name) },
|
|
62
|
+
};
|
|
63
|
+
return { tracker: new TokenTracker(plugin), spanRepo, runRepo, eventRepo };
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
describe('TokenTracker', () => {
|
|
67
|
+
const originalModelPricing = process.env.ORCHESTRATOR_MODEL_PRICING_JSON;
|
|
68
|
+
const originalInputPrice = process.env.ORCHESTRATOR_PRICE_PER_1K_INPUT;
|
|
69
|
+
const originalOutputPrice = process.env.ORCHESTRATOR_PRICE_PER_1K_OUTPUT;
|
|
70
|
+
|
|
71
|
+
beforeEach(() => {
|
|
72
|
+
delete process.env.ORCHESTRATOR_MODEL_PRICING_JSON;
|
|
73
|
+
delete process.env.ORCHESTRATOR_PRICE_PER_1K_INPUT;
|
|
74
|
+
delete process.env.ORCHESTRATOR_PRICE_PER_1K_OUTPUT;
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
afterEach(() => {
|
|
78
|
+
if (originalModelPricing === undefined) delete process.env.ORCHESTRATOR_MODEL_PRICING_JSON;
|
|
79
|
+
else process.env.ORCHESTRATOR_MODEL_PRICING_JSON = originalModelPricing;
|
|
80
|
+
if (originalInputPrice === undefined) delete process.env.ORCHESTRATOR_PRICE_PER_1K_INPUT;
|
|
81
|
+
else process.env.ORCHESTRATOR_PRICE_PER_1K_INPUT = originalInputPrice;
|
|
82
|
+
if (originalOutputPrice === undefined) delete process.env.ORCHESTRATOR_PRICE_PER_1K_OUTPUT;
|
|
83
|
+
else process.env.ORCHESTRATOR_PRICE_PER_1K_OUTPUT = originalOutputPrice;
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it('keeps loop step IDs separate from execution span IDs', async () => {
|
|
87
|
+
const { tracker, spanRepo } = createTracker({
|
|
88
|
+
spans: [{ id: 12, type: 'sub_agent', inputTokens: 2, outputTokens: 3, cost: null }],
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
await tracker.trackLoopInvocationUsage({
|
|
92
|
+
runId: 7,
|
|
93
|
+
stepId: 12,
|
|
94
|
+
sessionId: 'session-1',
|
|
95
|
+
messageId: 'message-1',
|
|
96
|
+
usage: null,
|
|
97
|
+
input: 'prompt text',
|
|
98
|
+
output: 'answer text',
|
|
99
|
+
role: 'leader',
|
|
100
|
+
employeeUsername: 'planner',
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
expect(spanRepo.rows[0]).toMatchObject({ id: 12, type: 'sub_agent', inputTokens: 2, outputTokens: 3 });
|
|
104
|
+
expect(spanRepo.rows).toContainEqual(
|
|
105
|
+
expect.objectContaining({
|
|
106
|
+
type: 'invocation_summary',
|
|
107
|
+
agentLoopStepId: 12,
|
|
108
|
+
usageSource: 'estimated',
|
|
109
|
+
cost: null,
|
|
110
|
+
pricingStatus: 'unpriced',
|
|
111
|
+
}),
|
|
112
|
+
);
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
it('updates one usage identity on retry and resume instead of counting it twice', async () => {
|
|
116
|
+
const { tracker, spanRepo, runRepo } = createTracker();
|
|
117
|
+
const usage = { inputTokens: 10, outputTokens: 4, totalTokens: 14 };
|
|
118
|
+
const event = {
|
|
119
|
+
sessionId: 'session-1',
|
|
120
|
+
messageId: 'message-1',
|
|
121
|
+
eventType: 'llm_message',
|
|
122
|
+
inputTokens: usage.inputTokens,
|
|
123
|
+
outputTokens: usage.outputTokens,
|
|
124
|
+
totalTokens: usage.totalTokens,
|
|
125
|
+
cachedTokens: 0,
|
|
126
|
+
reasoningTokens: 0,
|
|
127
|
+
rawUsageMetadata: { input_tokens: 10, output_tokens: 4, total_tokens: 14 },
|
|
128
|
+
model: 'model-a',
|
|
129
|
+
provider: 'provider-a',
|
|
130
|
+
};
|
|
131
|
+
const first = await tracker.recordModelCallUsage({
|
|
132
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
133
|
+
nativeIdentity: 'ai-usage-event:session-1:message-1',
|
|
134
|
+
sessionId: 'session-1',
|
|
135
|
+
messageId: 'message-1',
|
|
136
|
+
usage,
|
|
137
|
+
model: 'model-a',
|
|
138
|
+
provider: 'provider-a',
|
|
139
|
+
runId: 7,
|
|
140
|
+
source: 'ai_usage_event',
|
|
141
|
+
});
|
|
142
|
+
const second = await tracker.recordModelCallUsage({
|
|
143
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
144
|
+
nativeIdentity: 'ai-usage-event:session-1:message-1',
|
|
145
|
+
sessionId: 'session-1',
|
|
146
|
+
messageId: 'message-1',
|
|
147
|
+
usage,
|
|
148
|
+
model: 'model-a',
|
|
149
|
+
provider: 'provider-a',
|
|
150
|
+
runId: 7,
|
|
151
|
+
source: 'ai_usage_event',
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
expect(first).toBe(second);
|
|
155
|
+
expect(spanRepo.rows.filter((row) => row.type === 'model_call')).toHaveLength(1);
|
|
156
|
+
expect(runRepo.rows[0]).toMatchObject({ totalInputTokens: 10, totalOutputTokens: 4, totalTokens: 14 });
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
it('replaces estimates with actual usage and preserves the actual provider counts', async () => {
|
|
160
|
+
process.env.ORCHESTRATOR_MODEL_PRICING_JSON = JSON.stringify({
|
|
161
|
+
'provider-a/model-a': {
|
|
162
|
+
inputPer1k: 0.002,
|
|
163
|
+
outputPer1k: 0.008,
|
|
164
|
+
currency: 'USD',
|
|
165
|
+
version: 'pricing-v3',
|
|
166
|
+
},
|
|
167
|
+
});
|
|
168
|
+
const { tracker, spanRepo } = createTracker({
|
|
169
|
+
spans: [
|
|
170
|
+
{
|
|
171
|
+
id: 3,
|
|
172
|
+
type: 'model_call',
|
|
173
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
174
|
+
usageSource: 'estimated',
|
|
175
|
+
usageOrigin: 'text_length_estimate',
|
|
176
|
+
inputTokens: 100,
|
|
177
|
+
outputTokens: 20,
|
|
178
|
+
totalTokens: 120,
|
|
179
|
+
cost: null,
|
|
180
|
+
pricingStatus: 'unpriced',
|
|
181
|
+
},
|
|
182
|
+
],
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
await tracker.recordModelCallUsage({
|
|
186
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
187
|
+
sessionId: 'session-1',
|
|
188
|
+
messageId: 'message-1',
|
|
189
|
+
usage: { inputTokens: 80, outputTokens: 10, totalTokens: 90 },
|
|
190
|
+
model: 'model-a',
|
|
191
|
+
provider: 'provider-a',
|
|
192
|
+
source: 'ai_usage_event',
|
|
193
|
+
});
|
|
194
|
+
|
|
195
|
+
expect(spanRepo.rows[0]).toMatchObject({
|
|
196
|
+
usageSource: 'actual',
|
|
197
|
+
inputTokens: 80,
|
|
198
|
+
outputTokens: 10,
|
|
199
|
+
totalTokens: 90,
|
|
200
|
+
pricingStatus: 'configured',
|
|
201
|
+
priceVersion: 'pricing-v3',
|
|
202
|
+
});
|
|
203
|
+
expect(spanRepo.rows[0].cost).toBeCloseTo(0.00024, 8);
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
it('keeps the original price snapshot on replay and applies it to corrected actual counts', async () => {
|
|
207
|
+
process.env.ORCHESTRATOR_MODEL_PRICING_JSON = JSON.stringify({
|
|
208
|
+
'provider-a/model-a': {
|
|
209
|
+
inputPer1k: 0.002,
|
|
210
|
+
outputPer1k: 0.008,
|
|
211
|
+
currency: 'USD',
|
|
212
|
+
version: 'pricing-v1',
|
|
213
|
+
},
|
|
214
|
+
});
|
|
215
|
+
const { tracker, spanRepo } = createTracker();
|
|
216
|
+
const base = {
|
|
217
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
218
|
+
sessionId: 'session-1',
|
|
219
|
+
messageId: 'message-1',
|
|
220
|
+
model: 'model-a',
|
|
221
|
+
provider: 'provider-a',
|
|
222
|
+
source: 'ai_usage_event' as const,
|
|
223
|
+
};
|
|
224
|
+
|
|
225
|
+
await tracker.recordModelCallUsage({
|
|
226
|
+
...base,
|
|
227
|
+
usage: { inputTokens: 80, outputTokens: 10, totalTokens: 90 },
|
|
228
|
+
});
|
|
229
|
+
process.env.ORCHESTRATOR_MODEL_PRICING_JSON = JSON.stringify({
|
|
230
|
+
'provider-a/model-a': {
|
|
231
|
+
inputPer1k: 0.02,
|
|
232
|
+
outputPer1k: 0.08,
|
|
233
|
+
currency: 'USD',
|
|
234
|
+
version: 'pricing-v2',
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
await tracker.recordModelCallUsage({
|
|
239
|
+
...base,
|
|
240
|
+
usage: { inputTokens: 80, outputTokens: 10, totalTokens: 90 },
|
|
241
|
+
});
|
|
242
|
+
expect(spanRepo.rows[0]).toMatchObject({ usageSource: 'actual', priceVersion: 'pricing-v1' });
|
|
243
|
+
expect(spanRepo.rows[0].cost).toBeCloseTo(0.00024, 8);
|
|
244
|
+
|
|
245
|
+
await tracker.recordModelCallUsage({
|
|
246
|
+
...base,
|
|
247
|
+
usage: { inputTokens: 160, outputTokens: 20, totalTokens: 180 },
|
|
248
|
+
});
|
|
249
|
+
expect(spanRepo.rows[0]).toMatchObject({
|
|
250
|
+
inputTokens: 160,
|
|
251
|
+
outputTokens: 20,
|
|
252
|
+
totalTokens: 180,
|
|
253
|
+
priceVersion: 'pricing-v1',
|
|
254
|
+
});
|
|
255
|
+
expect(spanRepo.rows[0].cost).toBeCloseTo(0.00048, 8);
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
it('does not let missing usage replace an existing actual model call', async () => {
|
|
259
|
+
const { tracker, spanRepo } = createTracker();
|
|
260
|
+
const base = {
|
|
261
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
262
|
+
sessionId: 'session-1',
|
|
263
|
+
messageId: 'message-1',
|
|
264
|
+
model: 'model-a',
|
|
265
|
+
provider: 'provider-a',
|
|
266
|
+
source: 'ai_usage_event' as const,
|
|
267
|
+
};
|
|
268
|
+
|
|
269
|
+
await tracker.recordModelCallUsage({
|
|
270
|
+
...base,
|
|
271
|
+
usage: { inputTokens: 10, outputTokens: 4, totalTokens: 14 },
|
|
272
|
+
});
|
|
273
|
+
await tracker.recordModelCallUsage({ ...base, usage: null });
|
|
274
|
+
|
|
275
|
+
expect(spanRepo.rows).toHaveLength(1);
|
|
276
|
+
expect(spanRepo.rows[0]).toMatchObject({
|
|
277
|
+
usageSource: 'actual',
|
|
278
|
+
inputTokens: 10,
|
|
279
|
+
outputTokens: 4,
|
|
280
|
+
totalTokens: 14,
|
|
281
|
+
});
|
|
282
|
+
});
|
|
283
|
+
|
|
284
|
+
it('accepts provider-confirmed zero counts but rejects ambiguous zero defaults', () => {
|
|
285
|
+
expect(
|
|
286
|
+
usageFromAIUsageEvent({
|
|
287
|
+
inputTokens: 0,
|
|
288
|
+
outputTokens: 0,
|
|
289
|
+
totalTokens: 0,
|
|
290
|
+
rawUsageMetadata: { input_tokens: 0, output_tokens: 0, total_tokens: 0 },
|
|
291
|
+
}),
|
|
292
|
+
).toEqual({ inputTokens: 0, outputTokens: 0, totalTokens: 0 });
|
|
293
|
+
expect(
|
|
294
|
+
usageFromAIUsageEvent({
|
|
295
|
+
inputTokens: 0,
|
|
296
|
+
outputTokens: 0,
|
|
297
|
+
totalTokens: 0,
|
|
298
|
+
rawUsageMetadata: {},
|
|
299
|
+
}),
|
|
300
|
+
).toBeNull();
|
|
301
|
+
});
|
|
302
|
+
|
|
303
|
+
it('uses the native occurrence time for the model-call span', async () => {
|
|
304
|
+
const { tracker, spanRepo } = createTracker();
|
|
305
|
+
const occurredAt = new Date('2026-11-09T12:34:56.000Z');
|
|
306
|
+
|
|
307
|
+
await tracker.recordModelCallUsage({
|
|
308
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
309
|
+
sessionId: 'session-1',
|
|
310
|
+
messageId: 'message-1',
|
|
311
|
+
usage: { inputTokens: 2, outputTokens: 3, totalTokens: 5 },
|
|
312
|
+
source: 'ai_usage_event',
|
|
313
|
+
occurredAt,
|
|
314
|
+
});
|
|
315
|
+
|
|
316
|
+
expect(spanRepo.rows[0]).toMatchObject({ usageOccurredAt: occurredAt, startedAt: occurredAt, endedAt: occurredAt });
|
|
317
|
+
});
|
|
318
|
+
|
|
319
|
+
it('reports failed persistence without claiming the model call was recorded', async () => {
|
|
320
|
+
const { tracker, spanRepo } = createTracker();
|
|
321
|
+
vi.spyOn(spanRepo, 'create').mockRejectedValue(new Error('fixture write failure'));
|
|
322
|
+
|
|
323
|
+
await expect(
|
|
324
|
+
tracker.recordModelCallUsage({
|
|
325
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
326
|
+
sessionId: 'session-1',
|
|
327
|
+
messageId: 'message-1',
|
|
328
|
+
usage: { inputTokens: 10, outputTokens: 4, totalTokens: 14 },
|
|
329
|
+
source: 'ai_usage_event',
|
|
330
|
+
}),
|
|
331
|
+
).resolves.toBeUndefined();
|
|
332
|
+
expect(spanRepo.rows).toHaveLength(0);
|
|
333
|
+
});
|
|
334
|
+
|
|
335
|
+
it('does not count parent span tokens or invocation summaries with model-call totals', async () => {
|
|
336
|
+
const { tracker, runRepo } = createTracker({
|
|
337
|
+
spans: [
|
|
338
|
+
{ id: 1, type: 'sub_agent', agentLoopRunId: 7, inputTokens: 900, outputTokens: 300, cost: 2 },
|
|
339
|
+
{
|
|
340
|
+
id: 2,
|
|
341
|
+
type: 'invocation_summary',
|
|
342
|
+
agentLoopRunId: 7,
|
|
343
|
+
inputTokens: 800,
|
|
344
|
+
outputTokens: 200,
|
|
345
|
+
cost: 1,
|
|
346
|
+
},
|
|
347
|
+
{
|
|
348
|
+
id: 3,
|
|
349
|
+
type: 'model_call',
|
|
350
|
+
agentLoopRunId: 7,
|
|
351
|
+
usageSource: 'actual',
|
|
352
|
+
pricingStatus: 'unpriced',
|
|
353
|
+
inputTokens: 70,
|
|
354
|
+
outputTokens: 30,
|
|
355
|
+
totalTokens: 100,
|
|
356
|
+
cost: null,
|
|
357
|
+
},
|
|
358
|
+
],
|
|
359
|
+
});
|
|
360
|
+
|
|
361
|
+
await tracker.accumulateToRun(7);
|
|
362
|
+
|
|
363
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
364
|
+
totalInputTokens: 70,
|
|
365
|
+
totalOutputTokens: 30,
|
|
366
|
+
totalTokens: 100,
|
|
367
|
+
totalCost: null,
|
|
368
|
+
usageStatus: 'actual',
|
|
369
|
+
pricingStatus: 'unpriced',
|
|
370
|
+
});
|
|
371
|
+
});
|
|
372
|
+
|
|
373
|
+
it('keeps missing usage and unpriced cost explicit instead of turning them into zeros', async () => {
|
|
374
|
+
const { tracker, spanRepo, runRepo } = createTracker();
|
|
375
|
+
|
|
376
|
+
await tracker.recordModelCallUsage({
|
|
377
|
+
usageIdentity: 'ai-usage-event:session-1:message-1',
|
|
378
|
+
sessionId: 'session-1',
|
|
379
|
+
messageId: 'message-1',
|
|
380
|
+
usage: null,
|
|
381
|
+
model: 'model-a',
|
|
382
|
+
provider: 'provider-a',
|
|
383
|
+
runId: 7,
|
|
384
|
+
source: 'ai_usage_event',
|
|
385
|
+
});
|
|
386
|
+
|
|
387
|
+
expect(spanRepo.rows[0]).toMatchObject({
|
|
388
|
+
usageSource: 'missing',
|
|
389
|
+
inputTokens: null,
|
|
390
|
+
outputTokens: null,
|
|
391
|
+
totalTokens: null,
|
|
392
|
+
cost: null,
|
|
393
|
+
pricingStatus: 'unpriced',
|
|
394
|
+
});
|
|
395
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
396
|
+
totalInputTokens: null,
|
|
397
|
+
totalOutputTokens: null,
|
|
398
|
+
totalTokens: null,
|
|
399
|
+
totalCost: null,
|
|
400
|
+
usageStatus: 'missing',
|
|
401
|
+
pricingStatus: 'unpriced',
|
|
402
|
+
});
|
|
403
|
+
});
|
|
404
|
+
|
|
405
|
+
it('treats explicit zero-token usage as actual rather than estimating from text', async () => {
|
|
406
|
+
const { tracker, spanRepo } = createTracker({
|
|
407
|
+
spans: [{ id: 5, type: 'model_call', inputTokens: null, outputTokens: null, totalTokens: null, cost: null }],
|
|
408
|
+
});
|
|
409
|
+
|
|
410
|
+
await tracker.trackActualUsage(5, { inputTokens: 0, outputTokens: 0, totalTokens: 0 }, 'long prompt', 'response');
|
|
411
|
+
|
|
412
|
+
expect(spanRepo.rows[0]).toMatchObject({
|
|
413
|
+
usageSource: 'actual',
|
|
414
|
+
inputTokens: 0,
|
|
415
|
+
outputTokens: 0,
|
|
416
|
+
totalTokens: 0,
|
|
417
|
+
cost: null,
|
|
418
|
+
pricingStatus: 'unpriced',
|
|
419
|
+
});
|
|
420
|
+
});
|
|
421
|
+
|
|
422
|
+
it('synchronizes native event histories idempotently and distinguishes missing usage from zero', async () => {
|
|
423
|
+
const event = {
|
|
424
|
+
sessionId: 'session-2',
|
|
425
|
+
messageId: 'message-2',
|
|
426
|
+
eventType: 'llm_message',
|
|
427
|
+
inputTokens: 0,
|
|
428
|
+
outputTokens: 0,
|
|
429
|
+
totalTokens: 0,
|
|
430
|
+
rawUsageMetadata: {},
|
|
431
|
+
model: 'model-b',
|
|
432
|
+
provider: 'provider-b',
|
|
433
|
+
};
|
|
434
|
+
const { tracker, spanRepo } = createTracker({ events: [event] });
|
|
435
|
+
|
|
436
|
+
await tracker.syncNativeUsageEvents({ sessionId: 'session-2', runId: 7 });
|
|
437
|
+
await tracker.syncNativeUsageEvents({ sessionId: 'session-2', runId: 7 });
|
|
438
|
+
|
|
439
|
+
expect(spanRepo.rows.filter((row) => row.type === 'model_call')).toHaveLength(1);
|
|
440
|
+
expect(spanRepo.rows[0]).toMatchObject({ usageSource: 'missing', inputTokens: null, cost: null });
|
|
441
|
+
});
|
|
442
|
+
|
|
443
|
+
it('keeps an empty native session incomplete until a provider-confirmed zero event is reconciled', async () => {
|
|
444
|
+
const { tracker, runRepo, eventRepo, spanRepo } = createTracker();
|
|
445
|
+
await tracker.trackLoopInvocationUsage({
|
|
446
|
+
runId: 7,
|
|
447
|
+
stepId: 3,
|
|
448
|
+
sessionId: 'session-empty',
|
|
449
|
+
messageId: 'message-empty',
|
|
450
|
+
usage: null,
|
|
451
|
+
input: 'prompt',
|
|
452
|
+
output: 'response',
|
|
453
|
+
role: 'leader',
|
|
454
|
+
employeeUsername: 'planner',
|
|
455
|
+
});
|
|
456
|
+
|
|
457
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
458
|
+
usageStatus: 'missing',
|
|
459
|
+
pricingStatus: 'unpriced',
|
|
460
|
+
totalCost: null,
|
|
461
|
+
usageIncompleteSessions: ['session-empty'],
|
|
462
|
+
});
|
|
463
|
+
await tracker.syncNativeUsageEvents({ sessionId: 'session-empty', runId: 7 });
|
|
464
|
+
expect(runRepo.rows[0].usageIncompleteSessions).toEqual(['session-empty']);
|
|
465
|
+
|
|
466
|
+
eventRepo.rows.push({
|
|
467
|
+
sessionId: 'session-empty',
|
|
468
|
+
messageId: 'message-empty',
|
|
469
|
+
eventType: 'llm_message',
|
|
470
|
+
inputTokens: 0,
|
|
471
|
+
outputTokens: 0,
|
|
472
|
+
totalTokens: 0,
|
|
473
|
+
rawUsageMetadata: { input_tokens: 0, output_tokens: 0, total_tokens: 0 },
|
|
474
|
+
occurredAt: new Date('2026-11-09T12:34:56.000Z'),
|
|
475
|
+
});
|
|
476
|
+
await tracker.syncNativeUsageEvents({ sessionId: 'session-empty', runId: 7 });
|
|
477
|
+
|
|
478
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
479
|
+
usageStatus: 'actual',
|
|
480
|
+
totalInputTokens: 0,
|
|
481
|
+
totalOutputTokens: 0,
|
|
482
|
+
totalTokens: 0,
|
|
483
|
+
usageIncompleteSessions: [],
|
|
484
|
+
});
|
|
485
|
+
expect(spanRepo.rows.filter((row) => row.type === 'model_call')).toHaveLength(1);
|
|
486
|
+
});
|
|
487
|
+
|
|
488
|
+
it('persists incomplete status on a partial ingestion failure and clears it after reconciliation', async () => {
|
|
489
|
+
const { tracker, spanRepo, runRepo } = createTracker({
|
|
490
|
+
spans: [
|
|
491
|
+
{
|
|
492
|
+
id: 1,
|
|
493
|
+
type: 'model_call',
|
|
494
|
+
usageIdentity: 'prior-known-call',
|
|
495
|
+
agentLoopRunId: 7,
|
|
496
|
+
usageSource: 'actual',
|
|
497
|
+
pricingStatus: 'configured',
|
|
498
|
+
priceCurrency: 'USD',
|
|
499
|
+
inputTokens: 9,
|
|
500
|
+
outputTokens: 4,
|
|
501
|
+
totalTokens: 13,
|
|
502
|
+
cost: 0.02,
|
|
503
|
+
},
|
|
504
|
+
],
|
|
505
|
+
runs: [
|
|
506
|
+
{
|
|
507
|
+
id: 7,
|
|
508
|
+
budgetMaxTokens: 100,
|
|
509
|
+
budgetMaxCost: 0,
|
|
510
|
+
invocationCount: 1,
|
|
511
|
+
totalInputTokens: 9,
|
|
512
|
+
totalOutputTokens: 4,
|
|
513
|
+
totalTokens: 13,
|
|
514
|
+
totalCost: 0.02,
|
|
515
|
+
usageStatus: 'actual',
|
|
516
|
+
pricingStatus: 'configured',
|
|
517
|
+
usageIncompleteSessions: [],
|
|
518
|
+
},
|
|
519
|
+
],
|
|
520
|
+
events: [
|
|
521
|
+
{
|
|
522
|
+
sessionId: 'session-partial',
|
|
523
|
+
messageId: 'message-1',
|
|
524
|
+
eventType: 'llm_message',
|
|
525
|
+
inputTokens: 10,
|
|
526
|
+
outputTokens: 5,
|
|
527
|
+
totalTokens: 15,
|
|
528
|
+
rawUsageMetadata: { input_tokens: 10, output_tokens: 5, total_tokens: 15 },
|
|
529
|
+
},
|
|
530
|
+
{
|
|
531
|
+
sessionId: 'session-partial',
|
|
532
|
+
messageId: 'message-2',
|
|
533
|
+
eventType: 'llm_message',
|
|
534
|
+
inputTokens: 4,
|
|
535
|
+
outputTokens: 3,
|
|
536
|
+
totalTokens: 7,
|
|
537
|
+
rawUsageMetadata: { input_tokens: 4, output_tokens: 3, total_tokens: 7 },
|
|
538
|
+
},
|
|
539
|
+
],
|
|
540
|
+
});
|
|
541
|
+
const originalCreate = spanRepo.create.bind(spanRepo);
|
|
542
|
+
vi.spyOn(spanRepo, 'create').mockImplementation(async (options) => {
|
|
543
|
+
const values = options.values as Row;
|
|
544
|
+
if (values.usageIdentity === 'ai-usage-event:session-partial:message-2') {
|
|
545
|
+
throw new Error('fixture write failure');
|
|
546
|
+
}
|
|
547
|
+
return originalCreate(options);
|
|
548
|
+
});
|
|
549
|
+
|
|
550
|
+
await expect(tracker.syncNativeUsageEvents({ sessionId: 'session-partial', runId: 7 })).resolves.toBe(-1);
|
|
551
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
552
|
+
usageStatus: 'partial',
|
|
553
|
+
pricingStatus: 'unpriced',
|
|
554
|
+
totalTokens: 13,
|
|
555
|
+
totalCost: null,
|
|
556
|
+
usageIncompleteSessions: ['session-partial'],
|
|
557
|
+
});
|
|
558
|
+
await expect(tracker.checkBudget(7)).resolves.toMatchObject({ allowed: false });
|
|
559
|
+
|
|
560
|
+
vi.mocked(spanRepo.create).mockRestore();
|
|
561
|
+
await expect(tracker.syncNativeUsageEvents({ sessionId: 'session-partial', runId: 7 })).resolves.toBe(2);
|
|
562
|
+
expect(runRepo.rows[0]).toMatchObject({
|
|
563
|
+
usageStatus: 'actual',
|
|
564
|
+
totalTokens: 35,
|
|
565
|
+
usageIncompleteSessions: [],
|
|
566
|
+
});
|
|
567
|
+
await expect(tracker.checkBudget(7)).resolves.toMatchObject({ allowed: true });
|
|
568
|
+
});
|
|
569
|
+
|
|
570
|
+
it('fails closed for incomplete budgets even with a known token subtotal but allows an empty run', async () => {
|
|
571
|
+
for (const usageState of [
|
|
572
|
+
{ usageStatus: 'missing' },
|
|
573
|
+
{ usageStatus: 'partial' },
|
|
574
|
+
{ usageStatus: 'actual', usageIncompleteSessions: ['session-1'] },
|
|
575
|
+
]) {
|
|
576
|
+
const { tracker } = createTracker({
|
|
577
|
+
runs: [
|
|
578
|
+
{
|
|
579
|
+
id: 7,
|
|
580
|
+
budgetMaxTokens: 100,
|
|
581
|
+
budgetMaxCost: 0,
|
|
582
|
+
invocationCount: 1,
|
|
583
|
+
totalTokens: 24,
|
|
584
|
+
...usageState,
|
|
585
|
+
},
|
|
586
|
+
],
|
|
587
|
+
});
|
|
588
|
+
await expect(tracker.checkBudget(7)).resolves.toMatchObject({ allowed: false });
|
|
589
|
+
}
|
|
590
|
+
|
|
591
|
+
const emptyRun = createTracker({
|
|
592
|
+
runs: [{ id: 7, budgetMaxTokens: 100, budgetMaxCost: 0, invocationCount: 0, totalTokens: 0 }],
|
|
593
|
+
});
|
|
594
|
+
await expect(emptyRun.tracker.checkBudget(7)).resolves.toEqual({ allowed: true });
|
|
595
|
+
});
|
|
596
|
+
|
|
597
|
+
it('rejects malformed currency text and keeps valid non-USD cost out of USD totals', async () => {
|
|
598
|
+
const usage = { inputTokens: 10, outputTokens: 5, totalTokens: 15 };
|
|
599
|
+
process.env.ORCHESTRATOR_MODEL_PRICING_JSON = JSON.stringify({
|
|
600
|
+
'provider-a/model-invalid-currency': {
|
|
601
|
+
inputPer1k: 1,
|
|
602
|
+
outputPer1k: 1,
|
|
603
|
+
currency: 'US dollars long',
|
|
604
|
+
},
|
|
605
|
+
});
|
|
606
|
+
const invalid = createTracker();
|
|
607
|
+
await invalid.tracker.recordModelCallUsage({
|
|
608
|
+
usageIdentity: 'invalid-currency-call',
|
|
609
|
+
sessionId: 'session-1',
|
|
610
|
+
messageId: 'invalid-currency-message',
|
|
611
|
+
model: 'model-invalid-currency',
|
|
612
|
+
provider: 'provider-a',
|
|
613
|
+
usage,
|
|
614
|
+
source: 'ai_usage_event',
|
|
615
|
+
});
|
|
616
|
+
expect(invalid.spanRepo.rows[0]).toMatchObject({ pricingStatus: 'unpriced', priceCurrency: null, cost: null });
|
|
617
|
+
|
|
618
|
+
process.env.ORCHESTRATOR_MODEL_PRICING_JSON = JSON.stringify({
|
|
619
|
+
'provider-a/model-eur': {
|
|
620
|
+
inputPer1k: 1,
|
|
621
|
+
outputPer1k: 1,
|
|
622
|
+
currency: 'eur',
|
|
623
|
+
},
|
|
624
|
+
});
|
|
625
|
+
const nonUsd = createTracker();
|
|
626
|
+
await nonUsd.tracker.recordModelCallUsage({
|
|
627
|
+
usageIdentity: 'non-usd-call',
|
|
628
|
+
sessionId: 'session-1',
|
|
629
|
+
messageId: 'non-usd-message',
|
|
630
|
+
model: 'model-eur',
|
|
631
|
+
provider: 'provider-a',
|
|
632
|
+
usage,
|
|
633
|
+
source: 'ai_usage_event',
|
|
634
|
+
runId: 7,
|
|
635
|
+
});
|
|
636
|
+
expect(nonUsd.spanRepo.rows[0]).toMatchObject({ pricingStatus: 'non_usd', priceCurrency: 'EUR', cost: null });
|
|
637
|
+
expect(nonUsd.runRepo.rows[0]).toMatchObject({ totalCost: null, pricingStatus: 'non_usd' });
|
|
638
|
+
});
|
|
639
|
+
});
|