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
|
@@ -1,238 +1,238 @@
|
|
|
1
|
-
interface ForbiddenPattern {
|
|
2
|
-
pattern: RegExp;
|
|
3
|
-
reason: string;
|
|
4
|
-
}
|
|
5
|
-
|
|
6
|
-
const DANGEROUS_NODE_PATTERNS: ForbiddenPattern[] = [
|
|
7
|
-
{ pattern: /require\s*\(\s*['"]child_process['"]\s*\)/, reason: 'child_process module not allowed' },
|
|
8
|
-
{ pattern: /require\s*\(\s*['"]cluster['"]\s*\)/, reason: 'cluster module not allowed' },
|
|
9
|
-
{ pattern: /require\s*\(\s*['"]dgram['"]\s*\)/, reason: 'dgram module not allowed' },
|
|
10
|
-
{ pattern: /require\s*\(\s*['"]net['"]\s*\)/, reason: 'net module not allowed' },
|
|
11
|
-
{ pattern: /require\s*\(\s*['"]http['"]\s*\)/, reason: 'http module not allowed' },
|
|
12
|
-
{ pattern: /require\s*\(\s*['"]https['"]\s*\)/, reason: 'https module not allowed' },
|
|
13
|
-
{ pattern: /require\s*\(\s*['"]vm['"]\s*\)/, reason: 'vm module not allowed' },
|
|
14
|
-
{ pattern: /require\s*\(\s*['"]worker_threads['"]\s*\)/, reason: 'worker_threads module not allowed' },
|
|
15
|
-
{ pattern: /require\s*\(\s*['"]inspector['"]\s*\)/, reason: 'inspector module not allowed' },
|
|
16
|
-
{ pattern: /require\s*\(\s*['"]v8['"]\s*\)/, reason: 'v8 module not allowed' },
|
|
17
|
-
{ pattern: /process\.exit/, reason: 'process.exit not allowed' },
|
|
18
|
-
{ pattern: /process\.env(?!\s*\.OUTPUT_DIR)/, reason: 'process.env access not allowed (use OUTPUT_DIR only)' },
|
|
19
|
-
{ pattern: /process\.kill/, reason: 'process.kill not allowed' },
|
|
20
|
-
{ pattern: /process\.binding\s*\(/, reason: 'process.binding not allowed' },
|
|
21
|
-
{ pattern: /\bglobalThis\b/, reason: 'globalThis access not allowed' },
|
|
22
|
-
// Indirect eval / dynamic Function construction (bypasses the import allowlist).
|
|
23
|
-
{ pattern: /\beval\s*\(/, reason: 'eval not allowed' },
|
|
24
|
-
{ pattern: /\bnew\s+Function\s*\(/, reason: 'new Function() not allowed' },
|
|
25
|
-
{ pattern: /\bFunction\s*\(/, reason: 'Function() constructor not allowed' },
|
|
26
|
-
// Dynamic import() can pull arbitrary modules at runtime, bypassing require() checks.
|
|
27
|
-
{ pattern: /\bimport\s*\(/, reason: 'dynamic import() not allowed' },
|
|
28
|
-
// require resolved from a non-literal expression (e.g. require(varName)).
|
|
29
|
-
{ pattern: /require\s*\(\s*(?!['"])/, reason: 'require() with a non-literal argument not allowed' },
|
|
30
|
-
];
|
|
31
|
-
|
|
32
|
-
const DANGEROUS_PYTHON_PATTERNS: ForbiddenPattern[] = [
|
|
33
|
-
{ pattern: /import\s+subprocess/, reason: 'subprocess module not allowed' },
|
|
34
|
-
{ pattern: /from\s+subprocess\s+import/, reason: 'subprocess module not allowed' },
|
|
35
|
-
{ pattern: /import\s+shutil/, reason: 'shutil module not allowed' },
|
|
36
|
-
{ pattern: /import\s+socket/, reason: 'socket module not allowed' },
|
|
37
|
-
{ pattern: /import\s+ctypes/, reason: 'ctypes module not allowed' },
|
|
38
|
-
{ pattern: /import\s+pickle/, reason: 'pickle module not allowed' },
|
|
39
|
-
{ pattern: /import\s+marshal/, reason: 'marshal module not allowed' },
|
|
40
|
-
{ pattern: /import\s+importlib/, reason: 'importlib module not allowed' },
|
|
41
|
-
{
|
|
42
|
-
pattern: /from\s+(?:socket|ctypes|pickle|marshal|importlib)\s+import/,
|
|
43
|
-
reason: 'restricted module import not allowed',
|
|
44
|
-
},
|
|
45
|
-
{ pattern: /__import__\s*\(/, reason: '__import__ not allowed' },
|
|
46
|
-
{ pattern: /\bimportlib\b/, reason: 'importlib access not allowed' },
|
|
47
|
-
{ pattern: /os\.system\s*\(/, reason: 'os.system not allowed' },
|
|
48
|
-
{ pattern: /os\.popen\s*\(/, reason: 'os.popen not allowed' },
|
|
49
|
-
{ pattern: /os\.exec\w*\s*\(/, reason: 'os.exec* not allowed' },
|
|
50
|
-
{ pattern: /os\.spawn\w*\s*\(/, reason: 'os.spawn* not allowed' },
|
|
51
|
-
{ pattern: /os\.fork\s*\(/, reason: 'os.fork not allowed' },
|
|
52
|
-
// getattr/setattr can reconstruct blocked names like getattr(os,'sys'+'tem').
|
|
53
|
-
{ pattern: /\bgetattr\s*\(/, reason: 'getattr not allowed (can bypass name checks)' },
|
|
54
|
-
{ pattern: /\bsetattr\s*\(/, reason: 'setattr not allowed' },
|
|
55
|
-
{ pattern: /\b__builtins__\b/, reason: '__builtins__ access not allowed' },
|
|
56
|
-
{ pattern: /\beval\s*\(/, reason: 'eval not allowed' },
|
|
57
|
-
{ pattern: /\bexec\s*\(/, reason: 'exec not allowed' },
|
|
58
|
-
{ pattern: /\bcompile\s*\(/, reason: 'compile not allowed' },
|
|
59
|
-
];
|
|
60
|
-
|
|
61
|
-
/** Built-in Node.js modules that are always allowed in sandbox code */
|
|
62
|
-
const NODE_BUILTINS = [
|
|
63
|
-
'fs',
|
|
64
|
-
'path',
|
|
65
|
-
'os',
|
|
66
|
-
'crypto',
|
|
67
|
-
'util',
|
|
68
|
-
'stream',
|
|
69
|
-
'buffer',
|
|
70
|
-
'querystring',
|
|
71
|
-
'url',
|
|
72
|
-
'assert',
|
|
73
|
-
'events',
|
|
74
|
-
'string_decoder',
|
|
75
|
-
'zlib',
|
|
76
|
-
];
|
|
77
|
-
|
|
78
|
-
/** Built-in Python modules that are always allowed in sandbox code */
|
|
79
|
-
const PYTHON_BUILTINS = [
|
|
80
|
-
'os',
|
|
81
|
-
'sys',
|
|
82
|
-
'json',
|
|
83
|
-
'math',
|
|
84
|
-
'datetime',
|
|
85
|
-
'collections',
|
|
86
|
-
'itertools',
|
|
87
|
-
'functools',
|
|
88
|
-
'pathlib',
|
|
89
|
-
'typing',
|
|
90
|
-
'io',
|
|
91
|
-
'csv',
|
|
92
|
-
're',
|
|
93
|
-
'string',
|
|
94
|
-
'textwrap',
|
|
95
|
-
'decimal',
|
|
96
|
-
'fractions',
|
|
97
|
-
'random',
|
|
98
|
-
'statistics',
|
|
99
|
-
'runpy',
|
|
100
|
-
'copy',
|
|
101
|
-
'enum',
|
|
102
|
-
'dataclasses',
|
|
103
|
-
'abc',
|
|
104
|
-
'contextlib',
|
|
105
|
-
'operator',
|
|
106
|
-
'time',
|
|
107
|
-
'calendar',
|
|
108
|
-
'locale',
|
|
109
|
-
'struct',
|
|
110
|
-
'hashlib',
|
|
111
|
-
'base64',
|
|
112
|
-
'binascii',
|
|
113
|
-
'codecs',
|
|
114
|
-
'unicodedata',
|
|
115
|
-
'pprint',
|
|
116
|
-
'warnings',
|
|
117
|
-
'traceback',
|
|
118
|
-
'logging',
|
|
119
|
-
'unittest',
|
|
120
|
-
'argparse',
|
|
121
|
-
'ast',
|
|
122
|
-
'tempfile',
|
|
123
|
-
'xml',
|
|
124
|
-
'zipfile',
|
|
125
|
-
// Pre-installed local packages (trusted, bundled with plugin)
|
|
126
|
-
'svg_to_pptx',
|
|
127
|
-
];
|
|
128
|
-
|
|
129
|
-
/**
|
|
130
|
-
* Maps PyPI package names to their Python import names
|
|
131
|
-
* (only where they differ from the package name).
|
|
132
|
-
*/
|
|
133
|
-
const PYTHON_IMPORT_NAME_MAP: Record<string, string> = {
|
|
134
|
-
'python-docx': 'docx',
|
|
135
|
-
'python-pptx': 'pptx',
|
|
136
|
-
Pillow: 'PIL',
|
|
137
|
-
pyyaml: 'yaml',
|
|
138
|
-
};
|
|
139
|
-
|
|
140
|
-
export class CodeValidator {
|
|
141
|
-
/**
|
|
142
|
-
* Check code against forbidden patterns (dangerous modules/functions).
|
|
143
|
-
* @throws CodeValidationError if a forbidden pattern is found.
|
|
144
|
-
*/
|
|
145
|
-
validate(code: string, language: 'node' | 'python'): void {
|
|
146
|
-
const patterns = language === 'node' ? DANGEROUS_NODE_PATTERNS : DANGEROUS_PYTHON_PATTERNS;
|
|
147
|
-
|
|
148
|
-
for (const { pattern, reason } of patterns) {
|
|
149
|
-
if (pattern.test(code)) {
|
|
150
|
-
throw new CodeValidationError(reason, pattern.source);
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
/**
|
|
156
|
-
* Validate that code only imports packages in the allowlist (builtins +
|
|
157
|
-
* whitelist). Called after the basic forbidden pattern check.
|
|
158
|
-
*
|
|
159
|
-
* An empty whitelist does NOT skip validation: only built-in modules are
|
|
160
|
-
* then allowed. This closes an exfiltration hole — stdlib modules such as
|
|
161
|
-
* Python `urllib`/`socket`/`ftplib` need no install, so skipping the check
|
|
162
|
-
* when the env was not initialized would let a skill open outbound
|
|
163
|
-
* connections. Set SKILL_HUB_ALLOW_ANY_IMPORT=true to restore the old
|
|
164
|
-
* skip-when-empty behaviour for legacy deployments.
|
|
165
|
-
*
|
|
166
|
-
* @param code - The code to validate
|
|
167
|
-
* @param language - 'node' or 'python'
|
|
168
|
-
* @param whitelist - Allowed package names (from skillWorkerConfigs.packageWhitelist)
|
|
169
|
-
*/
|
|
170
|
-
validateImports(code: string, language: 'node' | 'python', whitelist: string[]): void {
|
|
171
|
-
if (!whitelist?.length && process.env.SKILL_HUB_ALLOW_ANY_IMPORT === 'true') {
|
|
172
|
-
return;
|
|
173
|
-
}
|
|
174
|
-
const list = whitelist || [];
|
|
175
|
-
|
|
176
|
-
if (language === 'node') {
|
|
177
|
-
this.validateNodeImports(code, list);
|
|
178
|
-
} else if (language === 'python') {
|
|
179
|
-
this.validatePythonImports(code, list);
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
/**
|
|
184
|
-
* Check Node.js require() calls against the whitelist.
|
|
185
|
-
* Built-in modules (fs, path, etc.) are always allowed.
|
|
186
|
-
*/
|
|
187
|
-
private validateNodeImports(code: string, whitelist: string[]): void {
|
|
188
|
-
// Match require statements with string literal arguments (non-relative paths)
|
|
189
|
-
const requires = [...code.matchAll(/require\s*\(\s*['"]([^'"./][^'"]*)['"]\s*\)/g)];
|
|
190
|
-
|
|
191
|
-
for (const match of requires) {
|
|
192
|
-
const raw = match[1];
|
|
193
|
-
// Handle scoped packages (e.g. '@org/lib') and subpaths (e.g. 'lib/utils')
|
|
194
|
-
const pkgName = raw.startsWith('@') ? raw.split('/').slice(0, 2).join('/') : raw.split('/')[0];
|
|
195
|
-
|
|
196
|
-
if (NODE_BUILTINS.includes(pkgName)) continue;
|
|
197
|
-
if (whitelist.includes(pkgName)) continue;
|
|
198
|
-
|
|
199
|
-
throw new CodeValidationError(
|
|
200
|
-
`Package "${pkgName}" is not in the allowed whitelist. Allowed: ${whitelist.join(', ')}`,
|
|
201
|
-
`require('${pkgName}')`,
|
|
202
|
-
);
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
/**
|
|
207
|
-
* Check Python import/from statements against the whitelist.
|
|
208
|
-
* Built-in modules (os, sys, json, etc.) are always allowed.
|
|
209
|
-
* Handles PyPI→import name mapping (e.g., python-docx → docx, Pillow → PIL).
|
|
210
|
-
*/
|
|
211
|
-
private validatePythonImports(code: string, whitelist: string[]): void {
|
|
212
|
-
// Match: import pkg, from pkg import ..., import pkg.sub
|
|
213
|
-
const imports = [...code.matchAll(/(?:^|\n)\s*(?:import|from)\s+([a-zA-Z_][a-zA-Z0-9_]*)/g)];
|
|
214
|
-
|
|
215
|
-
// Build allowed import names from whitelist
|
|
216
|
-
const allowedImports = new Set([...PYTHON_BUILTINS, ...whitelist.map((p) => PYTHON_IMPORT_NAME_MAP[p] || p)]);
|
|
217
|
-
|
|
218
|
-
for (const match of imports) {
|
|
219
|
-
const pkg = match[1];
|
|
220
|
-
if (allowedImports.has(pkg)) continue;
|
|
221
|
-
|
|
222
|
-
throw new CodeValidationError(
|
|
223
|
-
`Module "${pkg}" is not in the allowed whitelist. Allowed: ${[...allowedImports].join(', ')}`,
|
|
224
|
-
`import ${pkg}`,
|
|
225
|
-
);
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
export class CodeValidationError extends Error {
|
|
231
|
-
constructor(
|
|
232
|
-
message: string,
|
|
233
|
-
public matchedPattern: string,
|
|
234
|
-
) {
|
|
235
|
-
super(`Code validation failed: ${message}`);
|
|
236
|
-
(this as any).name = 'CodeValidationError';
|
|
237
|
-
}
|
|
238
|
-
}
|
|
1
|
+
interface ForbiddenPattern {
|
|
2
|
+
pattern: RegExp;
|
|
3
|
+
reason: string;
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
const DANGEROUS_NODE_PATTERNS: ForbiddenPattern[] = [
|
|
7
|
+
{ pattern: /require\s*\(\s*['"]child_process['"]\s*\)/, reason: 'child_process module not allowed' },
|
|
8
|
+
{ pattern: /require\s*\(\s*['"]cluster['"]\s*\)/, reason: 'cluster module not allowed' },
|
|
9
|
+
{ pattern: /require\s*\(\s*['"]dgram['"]\s*\)/, reason: 'dgram module not allowed' },
|
|
10
|
+
{ pattern: /require\s*\(\s*['"]net['"]\s*\)/, reason: 'net module not allowed' },
|
|
11
|
+
{ pattern: /require\s*\(\s*['"]http['"]\s*\)/, reason: 'http module not allowed' },
|
|
12
|
+
{ pattern: /require\s*\(\s*['"]https['"]\s*\)/, reason: 'https module not allowed' },
|
|
13
|
+
{ pattern: /require\s*\(\s*['"]vm['"]\s*\)/, reason: 'vm module not allowed' },
|
|
14
|
+
{ pattern: /require\s*\(\s*['"]worker_threads['"]\s*\)/, reason: 'worker_threads module not allowed' },
|
|
15
|
+
{ pattern: /require\s*\(\s*['"]inspector['"]\s*\)/, reason: 'inspector module not allowed' },
|
|
16
|
+
{ pattern: /require\s*\(\s*['"]v8['"]\s*\)/, reason: 'v8 module not allowed' },
|
|
17
|
+
{ pattern: /process\.exit/, reason: 'process.exit not allowed' },
|
|
18
|
+
{ pattern: /process\.env(?!\s*\.OUTPUT_DIR)/, reason: 'process.env access not allowed (use OUTPUT_DIR only)' },
|
|
19
|
+
{ pattern: /process\.kill/, reason: 'process.kill not allowed' },
|
|
20
|
+
{ pattern: /process\.binding\s*\(/, reason: 'process.binding not allowed' },
|
|
21
|
+
{ pattern: /\bglobalThis\b/, reason: 'globalThis access not allowed' },
|
|
22
|
+
// Indirect eval / dynamic Function construction (bypasses the import allowlist).
|
|
23
|
+
{ pattern: /\beval\s*\(/, reason: 'eval not allowed' },
|
|
24
|
+
{ pattern: /\bnew\s+Function\s*\(/, reason: 'new Function() not allowed' },
|
|
25
|
+
{ pattern: /\bFunction\s*\(/, reason: 'Function() constructor not allowed' },
|
|
26
|
+
// Dynamic import() can pull arbitrary modules at runtime, bypassing require() checks.
|
|
27
|
+
{ pattern: /\bimport\s*\(/, reason: 'dynamic import() not allowed' },
|
|
28
|
+
// require resolved from a non-literal expression (e.g. require(varName)).
|
|
29
|
+
{ pattern: /require\s*\(\s*(?!['"])/, reason: 'require() with a non-literal argument not allowed' },
|
|
30
|
+
];
|
|
31
|
+
|
|
32
|
+
const DANGEROUS_PYTHON_PATTERNS: ForbiddenPattern[] = [
|
|
33
|
+
{ pattern: /import\s+subprocess/, reason: 'subprocess module not allowed' },
|
|
34
|
+
{ pattern: /from\s+subprocess\s+import/, reason: 'subprocess module not allowed' },
|
|
35
|
+
{ pattern: /import\s+shutil/, reason: 'shutil module not allowed' },
|
|
36
|
+
{ pattern: /import\s+socket/, reason: 'socket module not allowed' },
|
|
37
|
+
{ pattern: /import\s+ctypes/, reason: 'ctypes module not allowed' },
|
|
38
|
+
{ pattern: /import\s+pickle/, reason: 'pickle module not allowed' },
|
|
39
|
+
{ pattern: /import\s+marshal/, reason: 'marshal module not allowed' },
|
|
40
|
+
{ pattern: /import\s+importlib/, reason: 'importlib module not allowed' },
|
|
41
|
+
{
|
|
42
|
+
pattern: /from\s+(?:socket|ctypes|pickle|marshal|importlib)\s+import/,
|
|
43
|
+
reason: 'restricted module import not allowed',
|
|
44
|
+
},
|
|
45
|
+
{ pattern: /__import__\s*\(/, reason: '__import__ not allowed' },
|
|
46
|
+
{ pattern: /\bimportlib\b/, reason: 'importlib access not allowed' },
|
|
47
|
+
{ pattern: /os\.system\s*\(/, reason: 'os.system not allowed' },
|
|
48
|
+
{ pattern: /os\.popen\s*\(/, reason: 'os.popen not allowed' },
|
|
49
|
+
{ pattern: /os\.exec\w*\s*\(/, reason: 'os.exec* not allowed' },
|
|
50
|
+
{ pattern: /os\.spawn\w*\s*\(/, reason: 'os.spawn* not allowed' },
|
|
51
|
+
{ pattern: /os\.fork\s*\(/, reason: 'os.fork not allowed' },
|
|
52
|
+
// getattr/setattr can reconstruct blocked names like getattr(os,'sys'+'tem').
|
|
53
|
+
{ pattern: /\bgetattr\s*\(/, reason: 'getattr not allowed (can bypass name checks)' },
|
|
54
|
+
{ pattern: /\bsetattr\s*\(/, reason: 'setattr not allowed' },
|
|
55
|
+
{ pattern: /\b__builtins__\b/, reason: '__builtins__ access not allowed' },
|
|
56
|
+
{ pattern: /\beval\s*\(/, reason: 'eval not allowed' },
|
|
57
|
+
{ pattern: /\bexec\s*\(/, reason: 'exec not allowed' },
|
|
58
|
+
{ pattern: /\bcompile\s*\(/, reason: 'compile not allowed' },
|
|
59
|
+
];
|
|
60
|
+
|
|
61
|
+
/** Built-in Node.js modules that are always allowed in sandbox code */
|
|
62
|
+
const NODE_BUILTINS = [
|
|
63
|
+
'fs',
|
|
64
|
+
'path',
|
|
65
|
+
'os',
|
|
66
|
+
'crypto',
|
|
67
|
+
'util',
|
|
68
|
+
'stream',
|
|
69
|
+
'buffer',
|
|
70
|
+
'querystring',
|
|
71
|
+
'url',
|
|
72
|
+
'assert',
|
|
73
|
+
'events',
|
|
74
|
+
'string_decoder',
|
|
75
|
+
'zlib',
|
|
76
|
+
];
|
|
77
|
+
|
|
78
|
+
/** Built-in Python modules that are always allowed in sandbox code */
|
|
79
|
+
const PYTHON_BUILTINS = [
|
|
80
|
+
'os',
|
|
81
|
+
'sys',
|
|
82
|
+
'json',
|
|
83
|
+
'math',
|
|
84
|
+
'datetime',
|
|
85
|
+
'collections',
|
|
86
|
+
'itertools',
|
|
87
|
+
'functools',
|
|
88
|
+
'pathlib',
|
|
89
|
+
'typing',
|
|
90
|
+
'io',
|
|
91
|
+
'csv',
|
|
92
|
+
're',
|
|
93
|
+
'string',
|
|
94
|
+
'textwrap',
|
|
95
|
+
'decimal',
|
|
96
|
+
'fractions',
|
|
97
|
+
'random',
|
|
98
|
+
'statistics',
|
|
99
|
+
'runpy',
|
|
100
|
+
'copy',
|
|
101
|
+
'enum',
|
|
102
|
+
'dataclasses',
|
|
103
|
+
'abc',
|
|
104
|
+
'contextlib',
|
|
105
|
+
'operator',
|
|
106
|
+
'time',
|
|
107
|
+
'calendar',
|
|
108
|
+
'locale',
|
|
109
|
+
'struct',
|
|
110
|
+
'hashlib',
|
|
111
|
+
'base64',
|
|
112
|
+
'binascii',
|
|
113
|
+
'codecs',
|
|
114
|
+
'unicodedata',
|
|
115
|
+
'pprint',
|
|
116
|
+
'warnings',
|
|
117
|
+
'traceback',
|
|
118
|
+
'logging',
|
|
119
|
+
'unittest',
|
|
120
|
+
'argparse',
|
|
121
|
+
'ast',
|
|
122
|
+
'tempfile',
|
|
123
|
+
'xml',
|
|
124
|
+
'zipfile',
|
|
125
|
+
// Pre-installed local packages (trusted, bundled with plugin)
|
|
126
|
+
'svg_to_pptx',
|
|
127
|
+
];
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Maps PyPI package names to their Python import names
|
|
131
|
+
* (only where they differ from the package name).
|
|
132
|
+
*/
|
|
133
|
+
const PYTHON_IMPORT_NAME_MAP: Record<string, string> = {
|
|
134
|
+
'python-docx': 'docx',
|
|
135
|
+
'python-pptx': 'pptx',
|
|
136
|
+
Pillow: 'PIL',
|
|
137
|
+
pyyaml: 'yaml',
|
|
138
|
+
};
|
|
139
|
+
|
|
140
|
+
export class CodeValidator {
|
|
141
|
+
/**
|
|
142
|
+
* Check code against forbidden patterns (dangerous modules/functions).
|
|
143
|
+
* @throws CodeValidationError if a forbidden pattern is found.
|
|
144
|
+
*/
|
|
145
|
+
validate(code: string, language: 'node' | 'python'): void {
|
|
146
|
+
const patterns = language === 'node' ? DANGEROUS_NODE_PATTERNS : DANGEROUS_PYTHON_PATTERNS;
|
|
147
|
+
|
|
148
|
+
for (const { pattern, reason } of patterns) {
|
|
149
|
+
if (pattern.test(code)) {
|
|
150
|
+
throw new CodeValidationError(reason, pattern.source);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* Validate that code only imports packages in the allowlist (builtins +
|
|
157
|
+
* whitelist). Called after the basic forbidden pattern check.
|
|
158
|
+
*
|
|
159
|
+
* An empty whitelist does NOT skip validation: only built-in modules are
|
|
160
|
+
* then allowed. This closes an exfiltration hole — stdlib modules such as
|
|
161
|
+
* Python `urllib`/`socket`/`ftplib` need no install, so skipping the check
|
|
162
|
+
* when the env was not initialized would let a skill open outbound
|
|
163
|
+
* connections. Set SKILL_HUB_ALLOW_ANY_IMPORT=true to restore the old
|
|
164
|
+
* skip-when-empty behaviour for legacy deployments.
|
|
165
|
+
*
|
|
166
|
+
* @param code - The code to validate
|
|
167
|
+
* @param language - 'node' or 'python'
|
|
168
|
+
* @param whitelist - Allowed package names (from skillWorkerConfigs.packageWhitelist)
|
|
169
|
+
*/
|
|
170
|
+
validateImports(code: string, language: 'node' | 'python', whitelist: string[]): void {
|
|
171
|
+
if (!whitelist?.length && process.env.SKILL_HUB_ALLOW_ANY_IMPORT === 'true') {
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
const list = whitelist || [];
|
|
175
|
+
|
|
176
|
+
if (language === 'node') {
|
|
177
|
+
this.validateNodeImports(code, list);
|
|
178
|
+
} else if (language === 'python') {
|
|
179
|
+
this.validatePythonImports(code, list);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/**
|
|
184
|
+
* Check Node.js require() calls against the whitelist.
|
|
185
|
+
* Built-in modules (fs, path, etc.) are always allowed.
|
|
186
|
+
*/
|
|
187
|
+
private validateNodeImports(code: string, whitelist: string[]): void {
|
|
188
|
+
// Match require statements with string literal arguments (non-relative paths)
|
|
189
|
+
const requires = [...code.matchAll(/require\s*\(\s*['"]([^'"./][^'"]*)['"]\s*\)/g)];
|
|
190
|
+
|
|
191
|
+
for (const match of requires) {
|
|
192
|
+
const raw = match[1];
|
|
193
|
+
// Handle scoped packages (e.g. '@org/lib') and subpaths (e.g. 'lib/utils')
|
|
194
|
+
const pkgName = raw.startsWith('@') ? raw.split('/').slice(0, 2).join('/') : raw.split('/')[0];
|
|
195
|
+
|
|
196
|
+
if (NODE_BUILTINS.includes(pkgName)) continue;
|
|
197
|
+
if (whitelist.includes(pkgName)) continue;
|
|
198
|
+
|
|
199
|
+
throw new CodeValidationError(
|
|
200
|
+
`Package "${pkgName}" is not in the allowed whitelist. Allowed: ${whitelist.join(', ')}`,
|
|
201
|
+
`require('${pkgName}')`,
|
|
202
|
+
);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Check Python import/from statements against the whitelist.
|
|
208
|
+
* Built-in modules (os, sys, json, etc.) are always allowed.
|
|
209
|
+
* Handles PyPI→import name mapping (e.g., python-docx → docx, Pillow → PIL).
|
|
210
|
+
*/
|
|
211
|
+
private validatePythonImports(code: string, whitelist: string[]): void {
|
|
212
|
+
// Match: import pkg, from pkg import ..., import pkg.sub
|
|
213
|
+
const imports = [...code.matchAll(/(?:^|\n)\s*(?:import|from)\s+([a-zA-Z_][a-zA-Z0-9_]*)/g)];
|
|
214
|
+
|
|
215
|
+
// Build allowed import names from whitelist
|
|
216
|
+
const allowedImports = new Set([...PYTHON_BUILTINS, ...whitelist.map((p) => PYTHON_IMPORT_NAME_MAP[p] || p)]);
|
|
217
|
+
|
|
218
|
+
for (const match of imports) {
|
|
219
|
+
const pkg = match[1];
|
|
220
|
+
if (allowedImports.has(pkg)) continue;
|
|
221
|
+
|
|
222
|
+
throw new CodeValidationError(
|
|
223
|
+
`Module "${pkg}" is not in the allowed whitelist. Allowed: ${[...allowedImports].join(', ')}`,
|
|
224
|
+
`import ${pkg}`,
|
|
225
|
+
);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
export class CodeValidationError extends Error {
|
|
231
|
+
constructor(
|
|
232
|
+
message: string,
|
|
233
|
+
public matchedPattern: string,
|
|
234
|
+
) {
|
|
235
|
+
super(`Code validation failed: ${message}`);
|
|
236
|
+
(this as any).name = 'CodeValidationError';
|
|
237
|
+
}
|
|
238
|
+
}
|
|
@@ -0,0 +1,54 @@
|
|
|
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 type { Database } from '@nocobase/database';
|
|
11
|
+
import { literal } from 'sequelize';
|
|
12
|
+
import type { Transaction } from 'sequelize';
|
|
13
|
+
import { read } from '../utils/record-utils';
|
|
14
|
+
|
|
15
|
+
export type DepartmentResolution = {
|
|
16
|
+
departmentId: string | number | null;
|
|
17
|
+
status: 'resolved' | 'unassigned' | 'invalid_membership' | 'departments_unavailable';
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
/** Resolve the user's canonical main department without trusting a request-supplied department. */
|
|
21
|
+
export async function resolveUserDepartment(
|
|
22
|
+
db: Database,
|
|
23
|
+
userId: string | number,
|
|
24
|
+
transaction?: Transaction,
|
|
25
|
+
): Promise<DepartmentResolution> {
|
|
26
|
+
if (!db.hasCollection('users') || !db.hasCollection('departmentsUsers')) {
|
|
27
|
+
return { departmentId: null, status: 'departments_unavailable' };
|
|
28
|
+
}
|
|
29
|
+
if (typeof userId === 'number' && !Number.isSafeInteger(userId)) {
|
|
30
|
+
return { departmentId: null, status: 'invalid_membership' };
|
|
31
|
+
}
|
|
32
|
+
const users = db.getRepository('users');
|
|
33
|
+
const memberships = db.getRepository('departmentsUsers');
|
|
34
|
+
const mainDepartmentAttribute = users.model.rawAttributes.mainDepartmentId;
|
|
35
|
+
if (!mainDepartmentAttribute) return { departmentId: null, status: 'departments_unavailable' };
|
|
36
|
+
const mainDepartmentField = mainDepartmentAttribute.field || 'mainDepartmentId';
|
|
37
|
+
const query = db.sequelize.getQueryInterface().queryGenerator as unknown as {
|
|
38
|
+
quoteIdentifier: (value: string) => string;
|
|
39
|
+
};
|
|
40
|
+
const castType = ['mysql', 'mariadb'].includes(db.sequelize.getDialect()) ? 'CHAR' : 'TEXT';
|
|
41
|
+
const user = await users.model.findOne({
|
|
42
|
+
where: { id: userId },
|
|
43
|
+
attributes: [[literal(`CAST(${query.quoteIdentifier(mainDepartmentField)} AS ${castType})`), 'mainDepartmentId']],
|
|
44
|
+
transaction,
|
|
45
|
+
raw: true,
|
|
46
|
+
});
|
|
47
|
+
const departmentId = read(user, 'mainDepartmentId');
|
|
48
|
+
if (departmentId == null || departmentId === '') return { departmentId: null, status: 'unassigned' };
|
|
49
|
+
if (typeof departmentId !== 'string' && typeof departmentId !== 'number') {
|
|
50
|
+
return { departmentId: null, status: 'invalid_membership' };
|
|
51
|
+
}
|
|
52
|
+
const membership = await memberships.findOne({ filter: { userId, departmentId }, transaction });
|
|
53
|
+
return membership ? { departmentId, status: 'resolved' } : { departmentId: null, status: 'invalid_membership' };
|
|
54
|
+
}
|