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,62 @@
|
|
|
1
|
+
import { useApp, type ToolsManager } from '@nocobase/client-v2';
|
|
2
|
+
import React, { createContext, useContext, useEffect, useState } from 'react';
|
|
3
|
+
import { loadInteractions, type SkillInteraction } from './interactions';
|
|
4
|
+
import { SkillHubCard } from './SkillHubCard';
|
|
5
|
+
|
|
6
|
+
const Context = createContext(new Map<string, SkillInteraction>());
|
|
7
|
+
const registered = new WeakMap<ToolsManager, Set<string>>();
|
|
8
|
+
export const useInteractions = () => useContext(Context);
|
|
9
|
+
|
|
10
|
+
export function registerSkillCard(manager: ToolsManager, name: string) {
|
|
11
|
+
let names = registered.get(manager);
|
|
12
|
+
if (!names) registered.set(manager, (names = new Set()));
|
|
13
|
+
if (names.has(name)) return;
|
|
14
|
+
manager.registerTools(name, { ui: { card: SkillHubCard } });
|
|
15
|
+
names.add(name);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function InteractionSchemasProvider({ children }: React.PropsWithChildren) {
|
|
19
|
+
const app = useApp();
|
|
20
|
+
const api = app.apiClient;
|
|
21
|
+
const [token, setToken] = useState(() => api.auth.getToken());
|
|
22
|
+
const [version, setVersion] = useState(0);
|
|
23
|
+
const [interactions, setInteractions] = useState(new Map<string, SkillInteraction>());
|
|
24
|
+
|
|
25
|
+
useEffect(() => {
|
|
26
|
+
const refresh = () => setVersion((current) => current + 1);
|
|
27
|
+
const authChanged = (event: Event) => {
|
|
28
|
+
const detail = (event as CustomEvent<{ token?: string | null }>).detail;
|
|
29
|
+
setToken(detail && 'token' in detail ? detail.token || '' : api.auth.getToken());
|
|
30
|
+
refresh();
|
|
31
|
+
};
|
|
32
|
+
window.addEventListener('skill-hub-loop-settings-changed', refresh);
|
|
33
|
+
app.eventBus.addEventListener('auth:tokenChanged', authChanged);
|
|
34
|
+
app.eventBus.addEventListener('auth:roleChanged', refresh);
|
|
35
|
+
return () => {
|
|
36
|
+
window.removeEventListener('skill-hub-loop-settings-changed', refresh);
|
|
37
|
+
app.eventBus.removeEventListener('auth:tokenChanged', authChanged);
|
|
38
|
+
app.eventBus.removeEventListener('auth:roleChanged', refresh);
|
|
39
|
+
};
|
|
40
|
+
}, [app, api.auth]);
|
|
41
|
+
|
|
42
|
+
useEffect(() => {
|
|
43
|
+
let cancelled = false;
|
|
44
|
+
setInteractions(new Map());
|
|
45
|
+
if (token) {
|
|
46
|
+
loadInteractions(api)
|
|
47
|
+
.then((next) => {
|
|
48
|
+
if (cancelled) return;
|
|
49
|
+
for (const interaction of next.values()) registerSkillCard(app.aiManager.toolsManager, interaction.toolName);
|
|
50
|
+
setInteractions(next);
|
|
51
|
+
})
|
|
52
|
+
.catch(() => {
|
|
53
|
+
// The generic review card remains available if this user cannot list skill definitions.
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
return () => {
|
|
57
|
+
cancelled = true;
|
|
58
|
+
};
|
|
59
|
+
}, [app, api, token, version]);
|
|
60
|
+
|
|
61
|
+
return <Context.Provider value={interactions}>{children}</Context.Provider>;
|
|
62
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import type { ToolsUIProperties } from '@nocobase/client-v2';
|
|
2
|
+
import { useRequest } from 'ahooks';
|
|
3
|
+
import { App, Button, Card, Checkbox, Form, Input, InputNumber, Radio, Select, Space, Typography } from 'antd';
|
|
4
|
+
import React, { useEffect, useRef } from 'react';
|
|
5
|
+
import { useTranslation } from 'react-i18next';
|
|
6
|
+
import { useInteractions } from './InteractionSchemasProvider';
|
|
7
|
+
import { asRecord, editedSkillArgs, getToolInteraction } from './interactions';
|
|
8
|
+
|
|
9
|
+
export function SkillHubCard({ toolCall, decisions }: ToolsUIProperties) {
|
|
10
|
+
const { t } = useTranslation(['plugin-agent-orchestrator', 'client']);
|
|
11
|
+
const { message } = App.useApp();
|
|
12
|
+
const interactions = useInteractions();
|
|
13
|
+
const schema = getToolInteraction(interactions, toolCall.name, toolCall.args);
|
|
14
|
+
const [form] = Form.useForm<Record<string, unknown>>();
|
|
15
|
+
const busy = useRef(false);
|
|
16
|
+
const generic = toolCall.name === 'skill_hub_execute';
|
|
17
|
+
const needsApproval = ['init', 'interrupted', 'waiting'].includes(toolCall.invokeStatus);
|
|
18
|
+
|
|
19
|
+
useEffect(() => {
|
|
20
|
+
if (!needsApproval) return;
|
|
21
|
+
form.resetFields();
|
|
22
|
+
const args = asRecord(toolCall.args);
|
|
23
|
+
form.setFieldsValue(generic ? asRecord(args.input) : args);
|
|
24
|
+
}, [form, toolCall.id, toolCall.args, schema, generic, needsApproval]);
|
|
25
|
+
|
|
26
|
+
const submit = useRequest(
|
|
27
|
+
async (reject = false) => {
|
|
28
|
+
if (busy.current) return;
|
|
29
|
+
busy.current = true;
|
|
30
|
+
try {
|
|
31
|
+
if (reject) await decisions.reject('user_cancel');
|
|
32
|
+
else if (!schema || schema.type === 'confirm') await decisions.approve();
|
|
33
|
+
else {
|
|
34
|
+
let values: Record<string, unknown>;
|
|
35
|
+
try {
|
|
36
|
+
values = await form.validateFields();
|
|
37
|
+
} catch {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
await decisions.edit(editedSkillArgs(toolCall.name, toolCall.args, schema, values));
|
|
41
|
+
}
|
|
42
|
+
} finally {
|
|
43
|
+
busy.current = false;
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
{ manual: true, onError: () => message.error(t('Failed to submit skill decision')) },
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
if (!needsApproval) return null;
|
|
50
|
+
return (
|
|
51
|
+
<Card size="small" style={{ marginTop: 8 }}>
|
|
52
|
+
<Typography.Paragraph>
|
|
53
|
+
{schema?.prompt || t('Review this Skill Hub tool call before execution.')}
|
|
54
|
+
</Typography.Paragraph>
|
|
55
|
+
<Form form={form} layout="vertical" disabled={submit.loading} style={{ marginBottom: 8 }}>
|
|
56
|
+
{schema?.type === 'select' && (
|
|
57
|
+
<Form.Item name="choice" label={t('Choice')} rules={[{ required: true }]}>
|
|
58
|
+
<Radio.Group>
|
|
59
|
+
{schema.options?.map((option) => (
|
|
60
|
+
<Radio key={String(option.value)} value={option.value}>
|
|
61
|
+
{option.label}
|
|
62
|
+
</Radio>
|
|
63
|
+
))}
|
|
64
|
+
</Radio.Group>
|
|
65
|
+
</Form.Item>
|
|
66
|
+
)}
|
|
67
|
+
{schema?.type === 'form' &&
|
|
68
|
+
Object.entries(schema.fields || {}).map(([key, field]) => (
|
|
69
|
+
<Form.Item
|
|
70
|
+
key={key}
|
|
71
|
+
name={key}
|
|
72
|
+
label={field.title || key}
|
|
73
|
+
valuePropName={field.type === 'boolean' && !field.enum ? 'checked' : 'value'}
|
|
74
|
+
rules={[{ required: field.required }]}
|
|
75
|
+
>
|
|
76
|
+
{field.enum?.some((value) => typeof value === 'boolean') ? (
|
|
77
|
+
<Radio.Group options={field.enum.map((value) => ({ value, label: String(value) }))} />
|
|
78
|
+
) : field.enum ? (
|
|
79
|
+
<Select
|
|
80
|
+
options={field.enum
|
|
81
|
+
.filter((value): value is string | number => typeof value !== 'boolean')
|
|
82
|
+
.map((value) => ({ value, label: String(value) }))}
|
|
83
|
+
/>
|
|
84
|
+
) : field.type === 'number' || field.type === 'integer' ? (
|
|
85
|
+
<InputNumber precision={field.type === 'integer' ? 0 : undefined} style={{ width: '100%' }} />
|
|
86
|
+
) : field.type === 'boolean' ? (
|
|
87
|
+
<Checkbox />
|
|
88
|
+
) : (
|
|
89
|
+
<Input />
|
|
90
|
+
)}
|
|
91
|
+
</Form.Item>
|
|
92
|
+
))}
|
|
93
|
+
</Form>
|
|
94
|
+
<Space>
|
|
95
|
+
<Button type="primary" loading={submit.loading} onClick={() => submit.run(false)}>
|
|
96
|
+
{t('Run')}
|
|
97
|
+
</Button>
|
|
98
|
+
<Button disabled={submit.loading} onClick={() => submit.run(true)}>
|
|
99
|
+
{t('Cancel')}
|
|
100
|
+
</Button>
|
|
101
|
+
</Space>
|
|
102
|
+
</Card>
|
|
103
|
+
);
|
|
104
|
+
}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import {
|
|
3
|
+
buildInteractions,
|
|
4
|
+
editedSkillArgs,
|
|
5
|
+
getToolInteraction,
|
|
6
|
+
loadInteractions,
|
|
7
|
+
parseInteraction,
|
|
8
|
+
} from '../interactions';
|
|
9
|
+
|
|
10
|
+
describe('V2 Skill Hub interactions', () => {
|
|
11
|
+
it('supports legacy fenced/double encoded JSON and validates the review schema', () => {
|
|
12
|
+
const schema = { type: 'form', fields: { approved: { type: 'boolean', enum: [false, true, null, {}] } } };
|
|
13
|
+
const parsed = parseInteraction(JSON.stringify(JSON.stringify(schema)));
|
|
14
|
+
expect(parsed?.fields?.approved.enum).toEqual([false, true]);
|
|
15
|
+
expect(parseInteraction('```json\n{"type":"confirm","prompt":"review"}\n```')?.prompt).toBe('review');
|
|
16
|
+
expect(parseInteraction('{broken')).toBeUndefined();
|
|
17
|
+
expect(parseInteraction({ type: 'unsupported' })).toBeUndefined();
|
|
18
|
+
expect(parseInteraction(null)).toBeUndefined();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it('honors persisted tool names after skill renames and falls back to the server legacy naming algorithm', () => {
|
|
22
|
+
const map = buildInteractions(
|
|
23
|
+
[
|
|
24
|
+
{ id: 1, name: 'Renamed skill', toolName: 'skill_hub_old_name', interactionSchema: { type: 'confirm' } },
|
|
25
|
+
{ id: 2, name: ' Other / Skill ', interactionSchema: { type: 'form' } },
|
|
26
|
+
{ id: 3, name: '---' },
|
|
27
|
+
],
|
|
28
|
+
[],
|
|
29
|
+
);
|
|
30
|
+
expect(map.has('skill_hub_old_name')).toBe(true);
|
|
31
|
+
expect(map.has('skill_hub_renamed_skill')).toBe(false);
|
|
32
|
+
expect(map.has('skill_hub_other_skill')).toBe(true);
|
|
33
|
+
expect(map.size).toBe(2);
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
it('matches the server newest loop override, prompt inheritance and prompt-only confirmation', () => {
|
|
37
|
+
const map = buildInteractions(
|
|
38
|
+
[
|
|
39
|
+
{ id: '9007199254740993', name: 'one', interactionSchema: { type: 'form', prompt: 'legacy' } },
|
|
40
|
+
{ id: 2, name: 'two' },
|
|
41
|
+
],
|
|
42
|
+
[
|
|
43
|
+
{
|
|
44
|
+
skillId: '9007199254740993',
|
|
45
|
+
schema: { type: 'select', options: [{ label: 'Yes', value: 1 }] },
|
|
46
|
+
prompt: 'newest',
|
|
47
|
+
},
|
|
48
|
+
{ skillId: '9007199254740993', schema: { type: 'confirm', prompt: 'older' } },
|
|
49
|
+
{ skillId: 2, prompt: 'confirm this' },
|
|
50
|
+
],
|
|
51
|
+
);
|
|
52
|
+
expect(map.get('skill_hub_one')?.schema).toMatchObject({ type: 'select', prompt: 'newest' });
|
|
53
|
+
expect(map.get('skill_hub_two')?.schema).toEqual({ type: 'confirm', prompt: 'confirm this' });
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('does not apply an execution form to generic list/describe calls and resolves generic execution by exact skill name', () => {
|
|
57
|
+
const map = buildInteractions(
|
|
58
|
+
[{ id: 1, name: 'Renamed Skill', toolName: 'skill_hub_old', interactionSchema: { type: 'form' } }],
|
|
59
|
+
[],
|
|
60
|
+
);
|
|
61
|
+
expect(
|
|
62
|
+
getToolInteraction(map, 'skill_hub_execute', { action: 'list', skillName: 'Renamed Skill' }),
|
|
63
|
+
).toBeUndefined();
|
|
64
|
+
expect(
|
|
65
|
+
getToolInteraction(map, 'skill_hub_execute', { action: 'describe', skillName: 'Renamed Skill' }),
|
|
66
|
+
).toBeUndefined();
|
|
67
|
+
expect(getToolInteraction(map, 'skill_hub_execute', { action: 'execute', skillName: 'Renamed Skill' })?.type).toBe(
|
|
68
|
+
'form',
|
|
69
|
+
);
|
|
70
|
+
expect(getToolInteraction(map, 'skill_hub_old', {})?.type).toBe('form');
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it('preserves generic action/name and untouched input fields when editing, including false and zero', () => {
|
|
74
|
+
const args = { action: 'execute', skillName: 'test', input: { unchanged: 42, approved: true } };
|
|
75
|
+
expect(editedSkillArgs('skill_hub_execute', args, { type: 'form' }, { approved: false, count: 0 })).toEqual({
|
|
76
|
+
...args,
|
|
77
|
+
input: { unchanged: 42, approved: false, count: 0 },
|
|
78
|
+
});
|
|
79
|
+
expect(args.input.approved).toBe(true);
|
|
80
|
+
expect(editedSkillArgs('skill_hub_test', { unchanged: 42 }, { type: 'form' }, { updated: 1 })).toEqual({
|
|
81
|
+
unchanged: 42,
|
|
82
|
+
updated: 1,
|
|
83
|
+
});
|
|
84
|
+
expect(editedSkillArgs('skill_hub_execute', args, { type: 'select' }, { choice: 'yes' })).toEqual({
|
|
85
|
+
...args,
|
|
86
|
+
input: { choice: 'yes' },
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it('loads all enabled skills with persisted identities and the same loop ordering as the server', async () => {
|
|
91
|
+
const request = vi.fn().mockResolvedValue({ data: { data: [] } });
|
|
92
|
+
await loadInteractions({ request });
|
|
93
|
+
expect(request.mock.calls[0][0].params).toMatchObject({
|
|
94
|
+
fields: ['id', 'name', 'toolName', 'interactionSchema'],
|
|
95
|
+
paginate: false,
|
|
96
|
+
});
|
|
97
|
+
expect(request.mock.calls[1][0].params).toMatchObject({ sort: ['-updatedAt'], paginate: false });
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it('retains legacy review schemas when loop-config access fails, but rejects when skill definitions are unavailable', async () => {
|
|
101
|
+
const request = vi
|
|
102
|
+
.fn()
|
|
103
|
+
.mockResolvedValueOnce({ data: { data: [{ id: 1, name: 'legacy', interactionSchema: { type: 'confirm' } }] } })
|
|
104
|
+
.mockRejectedValueOnce(new Error('unavailable'));
|
|
105
|
+
expect((await loadInteractions({ request })).get('skill_hub_legacy')?.schema?.type).toBe('confirm');
|
|
106
|
+
await expect(loadInteractions({ request: vi.fn().mockRejectedValue(new Error('unauthorized')) })).rejects.toThrow(
|
|
107
|
+
'unauthorized',
|
|
108
|
+
);
|
|
109
|
+
});
|
|
110
|
+
});
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import type { APIClient } from '@nocobase/client-v2';
|
|
2
|
+
import { parseJsonText } from '../utils/jsonFields';
|
|
3
|
+
|
|
4
|
+
type Field = { type?: string; title?: string; required?: boolean; enum?: Array<string | number | boolean> };
|
|
5
|
+
export type InteractionSchema = {
|
|
6
|
+
type: 'form' | 'select' | 'confirm';
|
|
7
|
+
prompt?: string;
|
|
8
|
+
fields?: Record<string, Field>;
|
|
9
|
+
options?: Array<{ label: string; value: string | number }>;
|
|
10
|
+
};
|
|
11
|
+
export type SkillDefinition = {
|
|
12
|
+
id: string | number;
|
|
13
|
+
name: string;
|
|
14
|
+
toolName?: string;
|
|
15
|
+
interactionSchema?: unknown;
|
|
16
|
+
};
|
|
17
|
+
export type LoopConfig = { skillId: string | number; schema?: unknown; prompt?: string };
|
|
18
|
+
export type SkillInteraction = { skillName: string; toolName: string; schema?: InteractionSchema };
|
|
19
|
+
|
|
20
|
+
export function asRecord(value: unknown): Record<string, unknown> {
|
|
21
|
+
return value && typeof value === 'object' && !Array.isArray(value) ? (value as Record<string, unknown>) : {};
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function parseInteraction(value: unknown): InteractionSchema | undefined {
|
|
25
|
+
const record = asRecord(parseJsonText<unknown>(value, null));
|
|
26
|
+
if (!['form', 'select', 'confirm'].includes(String(record.type))) return;
|
|
27
|
+
const options = Array.isArray(record.options)
|
|
28
|
+
? record.options.flatMap((option) => {
|
|
29
|
+
const row = asRecord(option);
|
|
30
|
+
return typeof row.label === 'string' && (typeof row.value === 'string' || typeof row.value === 'number')
|
|
31
|
+
? [{ label: row.label, value: row.value }]
|
|
32
|
+
: [];
|
|
33
|
+
})
|
|
34
|
+
: undefined;
|
|
35
|
+
const fields = Object.fromEntries(
|
|
36
|
+
Object.entries(asRecord(record.fields)).map(([key, value]) => {
|
|
37
|
+
const field = asRecord(value);
|
|
38
|
+
return [
|
|
39
|
+
key,
|
|
40
|
+
{
|
|
41
|
+
type: typeof field.type === 'string' ? field.type : undefined,
|
|
42
|
+
title: typeof field.title === 'string' ? field.title : undefined,
|
|
43
|
+
required: field.required === true,
|
|
44
|
+
enum: Array.isArray(field.enum)
|
|
45
|
+
? field.enum.filter((item): item is string | number | boolean =>
|
|
46
|
+
['string', 'number', 'boolean'].includes(typeof item),
|
|
47
|
+
)
|
|
48
|
+
: undefined,
|
|
49
|
+
},
|
|
50
|
+
];
|
|
51
|
+
}),
|
|
52
|
+
);
|
|
53
|
+
return {
|
|
54
|
+
type: record.type as InteractionSchema['type'],
|
|
55
|
+
prompt: typeof record.prompt === 'string' ? record.prompt : undefined,
|
|
56
|
+
options,
|
|
57
|
+
fields,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export function buildInteractions(skills: SkillDefinition[], loops: LoopConfig[]): Map<string, SkillInteraction> {
|
|
62
|
+
const bySkillId = new Map<string, LoopConfig>();
|
|
63
|
+
// The API is sorted newest first, matching the server's loop-config selection.
|
|
64
|
+
for (const loop of loops) if (!bySkillId.has(String(loop.skillId))) bySkillId.set(String(loop.skillId), loop);
|
|
65
|
+
const interactions = new Map<string, SkillInteraction>();
|
|
66
|
+
for (const skill of skills) {
|
|
67
|
+
const normalized = skill.name
|
|
68
|
+
.trim()
|
|
69
|
+
.toLowerCase()
|
|
70
|
+
.replace(/[^a-z0-9_]/g, '_')
|
|
71
|
+
.replace(/_+/g, '_')
|
|
72
|
+
.replace(/^_|_$/g, '');
|
|
73
|
+
const toolName = skill.toolName?.trim() || (normalized ? `skill_hub_${normalized}` : undefined);
|
|
74
|
+
if (!toolName) continue;
|
|
75
|
+
const loop = bySkillId.get(String(skill.id));
|
|
76
|
+
const loopSchema = parseInteraction(loop?.schema);
|
|
77
|
+
const schema = loopSchema
|
|
78
|
+
? { ...loopSchema, prompt: loopSchema.prompt || loop?.prompt }
|
|
79
|
+
: loop?.prompt
|
|
80
|
+
? { type: 'confirm' as const, prompt: loop.prompt }
|
|
81
|
+
: parseInteraction(skill.interactionSchema);
|
|
82
|
+
interactions.set(toolName, { skillName: skill.name, toolName, schema });
|
|
83
|
+
}
|
|
84
|
+
return interactions;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export async function loadInteractions(api: Pick<APIClient, 'request'>) {
|
|
88
|
+
const [skills, loops] = await Promise.all([
|
|
89
|
+
api.request<{ data: SkillDefinition[] }>({
|
|
90
|
+
url: 'skillDefinitions:list',
|
|
91
|
+
skipNotify: true,
|
|
92
|
+
params: { filter: { enabled: true }, fields: ['id', 'name', 'toolName', 'interactionSchema'], paginate: false },
|
|
93
|
+
}),
|
|
94
|
+
api
|
|
95
|
+
.request<{ data: LoopConfig[] }>({
|
|
96
|
+
url: 'skillLoopConfigs:list',
|
|
97
|
+
skipNotify: true,
|
|
98
|
+
params: {
|
|
99
|
+
filter: { enabled: true },
|
|
100
|
+
fields: ['skillId', 'schema', 'prompt'],
|
|
101
|
+
sort: ['-updatedAt'],
|
|
102
|
+
paginate: false,
|
|
103
|
+
},
|
|
104
|
+
})
|
|
105
|
+
.catch(() => ({ data: { data: [] } })),
|
|
106
|
+
]);
|
|
107
|
+
return buildInteractions(skills.data.data, loops.data.data);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export function getToolInteraction(interactions: Map<string, SkillInteraction>, name: string, args: unknown) {
|
|
111
|
+
const values = asRecord(args);
|
|
112
|
+
if (name !== 'skill_hub_execute') return interactions.get(name)?.schema;
|
|
113
|
+
if (values.action !== 'execute') return;
|
|
114
|
+
return [...interactions.values()].find((item) => item.skillName === values.skillName)?.schema;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
export function editedSkillArgs(
|
|
118
|
+
name: string,
|
|
119
|
+
args: unknown,
|
|
120
|
+
schema: InteractionSchema,
|
|
121
|
+
values: Record<string, unknown>,
|
|
122
|
+
) {
|
|
123
|
+
const original = asRecord(args);
|
|
124
|
+
if (name === 'skill_hub_execute') {
|
|
125
|
+
return { ...original, input: schema.type === 'select' ? values : { ...asRecord(original.input), ...values } };
|
|
126
|
+
}
|
|
127
|
+
return schema.type === 'select' ? values : { ...original, ...values };
|
|
128
|
+
}
|
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
export type InteractionSchema = {
|
|
2
|
-
type: 'form' | 'select' | 'confirm';
|
|
3
|
-
prompt: string;
|
|
4
|
-
options?: { label: string; value: string | number }[];
|
|
5
|
-
fields?: Record<string, { type?: string; title?: string; required?: boolean; enum?: any[] }>;
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
export type LoopTemplate = {
|
|
9
|
-
key: string;
|
|
10
|
-
title: string;
|
|
11
|
-
description: string;
|
|
12
|
-
schema: InteractionSchema;
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
export const LOOP_TEMPLATES: LoopTemplate[] = [
|
|
16
|
-
{
|
|
17
|
-
key: 'confirm',
|
|
18
|
-
title: 'Confirm before run',
|
|
19
|
-
description: 'Ask the user to approve or cancel the skill call.',
|
|
20
|
-
schema: {
|
|
21
|
-
type: 'confirm',
|
|
22
|
-
prompt: 'Review this skill call before execution.',
|
|
23
|
-
},
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
key: 'review-input',
|
|
27
|
-
title: 'Review editable input',
|
|
28
|
-
description: 'Show selected input fields so the user can edit them before running.',
|
|
29
|
-
schema: {
|
|
30
|
-
type: 'form',
|
|
31
|
-
prompt: 'Review and edit the skill input before execution.',
|
|
32
|
-
fields: {},
|
|
33
|
-
},
|
|
34
|
-
},
|
|
35
|
-
{
|
|
36
|
-
key: 'choose-option',
|
|
37
|
-
title: 'Choose one option',
|
|
38
|
-
description: 'Ask the user to choose one option before running.',
|
|
39
|
-
schema: {
|
|
40
|
-
type: 'select',
|
|
41
|
-
prompt: 'Choose how to run this skill.',
|
|
42
|
-
options: [
|
|
43
|
-
{ label: 'Default', value: 'default' },
|
|
44
|
-
{ label: 'Careful', value: 'careful' },
|
|
45
|
-
],
|
|
46
|
-
},
|
|
47
|
-
},
|
|
48
|
-
];
|
|
49
|
-
|
|
50
|
-
export function getLoopTemplate(key?: string) {
|
|
51
|
-
return LOOP_TEMPLATES.find((template) => template.key === key) || LOOP_TEMPLATES[0];
|
|
52
|
-
}
|
|
1
|
+
export type InteractionSchema = {
|
|
2
|
+
type: 'form' | 'select' | 'confirm';
|
|
3
|
+
prompt: string;
|
|
4
|
+
options?: { label: string; value: string | number }[];
|
|
5
|
+
fields?: Record<string, { type?: string; title?: string; required?: boolean; enum?: any[] }>;
|
|
6
|
+
};
|
|
7
|
+
|
|
8
|
+
export type LoopTemplate = {
|
|
9
|
+
key: string;
|
|
10
|
+
title: string;
|
|
11
|
+
description: string;
|
|
12
|
+
schema: InteractionSchema;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export const LOOP_TEMPLATES: LoopTemplate[] = [
|
|
16
|
+
{
|
|
17
|
+
key: 'confirm',
|
|
18
|
+
title: 'Confirm before run',
|
|
19
|
+
description: 'Ask the user to approve or cancel the skill call.',
|
|
20
|
+
schema: {
|
|
21
|
+
type: 'confirm',
|
|
22
|
+
prompt: 'Review this skill call before execution.',
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
key: 'review-input',
|
|
27
|
+
title: 'Review editable input',
|
|
28
|
+
description: 'Show selected input fields so the user can edit them before running.',
|
|
29
|
+
schema: {
|
|
30
|
+
type: 'form',
|
|
31
|
+
prompt: 'Review and edit the skill input before execution.',
|
|
32
|
+
fields: {},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
key: 'choose-option',
|
|
37
|
+
title: 'Choose one option',
|
|
38
|
+
description: 'Ask the user to choose one option before running.',
|
|
39
|
+
schema: {
|
|
40
|
+
type: 'select',
|
|
41
|
+
prompt: 'Choose how to run this skill.',
|
|
42
|
+
options: [
|
|
43
|
+
{ label: 'Default', value: 'default' },
|
|
44
|
+
{ label: 'Careful', value: 'careful' },
|
|
45
|
+
],
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
];
|
|
49
|
+
|
|
50
|
+
export function getLoopTemplate(key?: string) {
|
|
51
|
+
return LOOP_TEMPLATES.find((template) => template.key === key) || LOOP_TEMPLATES[0];
|
|
52
|
+
}
|
|
@@ -1,41 +1,41 @@
|
|
|
1
|
-
export function parseJsonText<T = any>(value: any, fallback: T): T {
|
|
2
|
-
if (value === undefined || value === null || value === '') return fallback;
|
|
3
|
-
if (typeof value !== 'string') return value;
|
|
4
|
-
|
|
5
|
-
const trimmed = value.trim();
|
|
6
|
-
const fenced = trimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
|
|
7
|
-
const json = fenced ? fenced[1].trim() : trimmed;
|
|
8
|
-
|
|
9
|
-
try {
|
|
10
|
-
let parsed = JSON.parse(json);
|
|
11
|
-
if (typeof parsed === 'string') {
|
|
12
|
-
const innerTrimmed = parsed.trim();
|
|
13
|
-
const innerFenced = innerTrimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
|
|
14
|
-
const innerJson = innerFenced ? innerFenced[1].trim() : innerTrimmed;
|
|
15
|
-
try {
|
|
16
|
-
parsed = JSON.parse(innerJson);
|
|
17
|
-
} catch {
|
|
18
|
-
// keep the string form if the inner payload is not JSON
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
return parsed;
|
|
22
|
-
} catch {
|
|
23
|
-
return fallback;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export function formatJsonText(value: any, fallback: any = null): string {
|
|
28
|
-
const parsed = parseJsonText(value, undefined);
|
|
29
|
-
const normalized =
|
|
30
|
-
parsed === undefined ? (value === undefined || value === null || value === '' ? fallback : value) : parsed;
|
|
31
|
-
if (normalized === undefined || normalized === null) return '';
|
|
32
|
-
if (typeof normalized === 'string') return normalized;
|
|
33
|
-
return JSON.stringify(normalized, null, 2);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
export function stringifyJsonText(value: any, fallback: any = null): string {
|
|
37
|
-
const parsed = parseJsonText(value, undefined);
|
|
38
|
-
const normalized =
|
|
39
|
-
parsed === undefined ? (value === undefined || value === null || value === '' ? fallback : value) : parsed;
|
|
40
|
-
return `\`\`\`json\n${JSON.stringify(normalized, null, 2)}\n\`\`\``;
|
|
41
|
-
}
|
|
1
|
+
export function parseJsonText<T = any>(value: any, fallback: T): T {
|
|
2
|
+
if (value === undefined || value === null || value === '') return fallback;
|
|
3
|
+
if (typeof value !== 'string') return value;
|
|
4
|
+
|
|
5
|
+
const trimmed = value.trim();
|
|
6
|
+
const fenced = trimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
|
|
7
|
+
const json = fenced ? fenced[1].trim() : trimmed;
|
|
8
|
+
|
|
9
|
+
try {
|
|
10
|
+
let parsed = JSON.parse(json);
|
|
11
|
+
if (typeof parsed === 'string') {
|
|
12
|
+
const innerTrimmed = parsed.trim();
|
|
13
|
+
const innerFenced = innerTrimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
|
|
14
|
+
const innerJson = innerFenced ? innerFenced[1].trim() : innerTrimmed;
|
|
15
|
+
try {
|
|
16
|
+
parsed = JSON.parse(innerJson);
|
|
17
|
+
} catch {
|
|
18
|
+
// keep the string form if the inner payload is not JSON
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return parsed;
|
|
22
|
+
} catch {
|
|
23
|
+
return fallback;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export function formatJsonText(value: any, fallback: any = null): string {
|
|
28
|
+
const parsed = parseJsonText(value, undefined);
|
|
29
|
+
const normalized =
|
|
30
|
+
parsed === undefined ? (value === undefined || value === null || value === '' ? fallback : value) : parsed;
|
|
31
|
+
if (normalized === undefined || normalized === null) return '';
|
|
32
|
+
if (typeof normalized === 'string') return normalized;
|
|
33
|
+
return JSON.stringify(normalized, null, 2);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export function stringifyJsonText(value: any, fallback: any = null): string {
|
|
37
|
+
const parsed = parseJsonText(value, undefined);
|
|
38
|
+
const normalized =
|
|
39
|
+
parsed === undefined ? (value === undefined || value === null || value === '' ? fallback : value) : parsed;
|
|
40
|
+
return `\`\`\`json\n${JSON.stringify(normalized, null, 2)}\n\`\`\``;
|
|
41
|
+
}
|