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,348 +1,348 @@
|
|
|
1
|
-
import { spawn } from 'child_process';
|
|
2
|
-
import { chmodSync, existsSync, readFileSync, statSync } from 'fs';
|
|
3
|
-
import { delimiter, join, resolve } from 'path';
|
|
4
|
-
|
|
5
|
-
const IS_WINDOWS = process.platform === 'win32';
|
|
6
|
-
|
|
7
|
-
export interface SandboxLogger {
|
|
8
|
-
info(message: string): void;
|
|
9
|
-
warn(message: string): void;
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
export type NodePermissionModel = 'permission' | 'experimental-permission' | 'unavailable' | 'unknown';
|
|
13
|
-
export type BwrapMode = 'unprivileged' | 'setuid' | 'unavailable';
|
|
14
|
-
export type SandboxIsolationLevel = 'bwrap' | 'hardened-spawn' | 'minimal';
|
|
15
|
-
export type SandboxNetworkMode = 'none' | 'inherit';
|
|
16
|
-
|
|
17
|
-
export interface SandboxIdentity {
|
|
18
|
-
username: string;
|
|
19
|
-
uid: number;
|
|
20
|
-
gid: number;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Result of the per-worker sandbox capability detection. Computed once at init
|
|
25
|
-
* (or lazily on the first execution) and read on every execution — never
|
|
26
|
-
* re-probed per execution.
|
|
27
|
-
*/
|
|
28
|
-
export interface SandboxCapabilities {
|
|
29
|
-
isolationLevel: SandboxIsolationLevel;
|
|
30
|
-
privilegeDropAvailable: boolean;
|
|
31
|
-
sandboxIdentity: SandboxIdentity | null;
|
|
32
|
-
nodePermissionModel: NodePermissionModel;
|
|
33
|
-
/** Confirmed CLI flag name, e.g. '--permission'; null when unavailable. */
|
|
34
|
-
nodePermissionFlag: string | null;
|
|
35
|
-
/** Whether '--allow-addons' is accepted alongside the permission flag. */
|
|
36
|
-
nodePermissionAllowAddons: boolean;
|
|
37
|
-
pythonGuardActive: boolean;
|
|
38
|
-
bwrapMode: BwrapMode;
|
|
39
|
-
network: SandboxNetworkMode;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
const DEFAULT_CAPABILITIES: SandboxCapabilities = {
|
|
43
|
-
isolationLevel: IS_WINDOWS ? 'minimal' : 'hardened-spawn',
|
|
44
|
-
privilegeDropAvailable: false,
|
|
45
|
-
sandboxIdentity: null,
|
|
46
|
-
nodePermissionModel: 'unknown',
|
|
47
|
-
nodePermissionFlag: null,
|
|
48
|
-
nodePermissionAllowAddons: false,
|
|
49
|
-
pythonGuardActive: false,
|
|
50
|
-
bwrapMode: 'unavailable',
|
|
51
|
-
network: 'none',
|
|
52
|
-
};
|
|
53
|
-
|
|
54
|
-
let current: SandboxCapabilities = { ...DEFAULT_CAPABILITIES };
|
|
55
|
-
let detectPromise: Promise<SandboxCapabilities> | null = null;
|
|
56
|
-
|
|
57
|
-
export function getSandboxCapabilities(): SandboxCapabilities {
|
|
58
|
-
return current;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
export function setSandboxCapabilities(next: SandboxCapabilities): void {
|
|
62
|
-
current = next;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
export function getSandboxUsername(): string {
|
|
66
|
-
return process.env.SKILL_HUB_SANDBOX_USER || 'nocobase-sandbox';
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
export function getPythonGuardDir(storagePath: string): string {
|
|
70
|
-
return resolve(storagePath, 'sandbox-workspace', 'py-guard');
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
export interface ProbeResult {
|
|
74
|
-
code: number | null;
|
|
75
|
-
stdout: string;
|
|
76
|
-
stderr: string;
|
|
77
|
-
/** Node error code (e.g. ENOENT) when the process failed to spawn. */
|
|
78
|
-
errorCode?: string;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
/**
|
|
82
|
-
* Run a short-lived probe/maintenance command without a shell. Never rejects —
|
|
83
|
-
* spawn failures surface as { code: null, errorCode }.
|
|
84
|
-
*/
|
|
85
|
-
export function runProbeCommand(
|
|
86
|
-
command: string,
|
|
87
|
-
args: string[],
|
|
88
|
-
timeoutMs = 10000,
|
|
89
|
-
options: { uid?: number; gid?: number } = {},
|
|
90
|
-
): Promise<ProbeResult> {
|
|
91
|
-
return new Promise<ProbeResult>((_resolve) => {
|
|
92
|
-
let stdout = '';
|
|
93
|
-
let stderr = '';
|
|
94
|
-
let settled = false;
|
|
95
|
-
let timer: NodeJS.Timeout | null = null;
|
|
96
|
-
|
|
97
|
-
const finish = (result: ProbeResult) => {
|
|
98
|
-
if (settled) return;
|
|
99
|
-
settled = true;
|
|
100
|
-
if (timer) clearTimeout(timer);
|
|
101
|
-
_resolve(result);
|
|
102
|
-
};
|
|
103
|
-
|
|
104
|
-
let child: ReturnType<typeof spawn>;
|
|
105
|
-
try {
|
|
106
|
-
child = spawn(command, args, {
|
|
107
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
108
|
-
uid: options.uid,
|
|
109
|
-
gid: options.gid,
|
|
110
|
-
});
|
|
111
|
-
} catch (error) {
|
|
112
|
-
finish({ code: null, stdout: '', stderr: String((error as Error).message || error), errorCode: 'SPAWN' });
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
timer = setTimeout(() => {
|
|
117
|
-
child.kill('SIGTERM');
|
|
118
|
-
finish({ code: null, stdout, stderr: `${stderr}\n[probe timed out after ${timeoutMs}ms]` });
|
|
119
|
-
}, timeoutMs);
|
|
120
|
-
|
|
121
|
-
child.stdout?.on('data', (chunk: Buffer) => {
|
|
122
|
-
if (stdout.length < 4096) stdout += chunk.toString();
|
|
123
|
-
});
|
|
124
|
-
child.stderr?.on('data', (chunk: Buffer) => {
|
|
125
|
-
if (stderr.length < 4096) stderr += chunk.toString();
|
|
126
|
-
});
|
|
127
|
-
child.on('error', (error: NodeJS.ErrnoException) => {
|
|
128
|
-
finish({ code: null, stdout, stderr: error.message, errorCode: error.code });
|
|
129
|
-
});
|
|
130
|
-
child.on('close', (code) => {
|
|
131
|
-
finish({ code, stdout, stderr });
|
|
132
|
-
});
|
|
133
|
-
});
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
function resolveBinaryPath(name: string): string | null {
|
|
137
|
-
for (const dir of (process.env.PATH || '').split(delimiter)) {
|
|
138
|
-
if (!dir) continue;
|
|
139
|
-
const candidate = join(dir, name);
|
|
140
|
-
if (existsSync(candidate)) return candidate;
|
|
141
|
-
}
|
|
142
|
-
return null;
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
/**
|
|
146
|
-
* Resolve uid/gid of the dedicated sandbox user by reading /etc/passwd
|
|
147
|
-
* directly (no per-execution subprocess).
|
|
148
|
-
*/
|
|
149
|
-
export function resolveSandboxIdentity(username: string): SandboxIdentity | null {
|
|
150
|
-
try {
|
|
151
|
-
const passwd = readFileSync('/etc/passwd', 'utf-8');
|
|
152
|
-
for (const line of passwd.split('\n')) {
|
|
153
|
-
const parts = line.split(':');
|
|
154
|
-
if (parts[0] === username && parts.length >= 4) {
|
|
155
|
-
const uid = Number(parts[2]);
|
|
156
|
-
const gid = Number(parts[3]);
|
|
157
|
-
if (Number.isInteger(uid) && uid >= 0 && Number.isInteger(gid) && gid >= 0) {
|
|
158
|
-
return { username, uid, gid };
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
} catch {
|
|
163
|
-
// /etc/passwd unreadable — treat as no identity
|
|
164
|
-
}
|
|
165
|
-
return null;
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
async function detectNodePermissionFlag(
|
|
169
|
-
logger: SandboxLogger,
|
|
170
|
-
): Promise<{ model: NodePermissionModel; flag: string | null; allowAddons: boolean }> {
|
|
171
|
-
const [majorRaw, minorRaw] = process.versions.node.split('.');
|
|
172
|
-
const major = Number(majorRaw);
|
|
173
|
-
const minor = Number(minorRaw);
|
|
174
|
-
|
|
175
|
-
let candidates: string[];
|
|
176
|
-
if (major > 22 || (major === 22 && minor >= 13)) {
|
|
177
|
-
candidates = ['--permission', '--experimental-permission'];
|
|
178
|
-
} else if (major >= 20) {
|
|
179
|
-
candidates = ['--experimental-permission', '--permission'];
|
|
180
|
-
} else {
|
|
181
|
-
logger.info(`[skill-hub] Node ${process.versions.node} has no permission model; skipping that layer`);
|
|
182
|
-
return { model: 'unavailable', flag: null, allowAddons: false };
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
for (const flag of candidates) {
|
|
186
|
-
// Smoke-test with --allow-addons first (needed for whitelisted native
|
|
187
|
-
// packages like sharp); fall back to the bare flag on older 20.x lines.
|
|
188
|
-
const withAddons = await runProbeCommand(
|
|
189
|
-
'node',
|
|
190
|
-
[flag, '--allow-fs-read=/', '--allow-addons', '-e', 'process.exit(0)'],
|
|
191
|
-
15000,
|
|
192
|
-
);
|
|
193
|
-
if (withAddons.code === 0) {
|
|
194
|
-
return { model: flag === '--permission' ? 'permission' : 'experimental-permission', flag, allowAddons: true };
|
|
195
|
-
}
|
|
196
|
-
const bare = await runProbeCommand('node', [flag, '--allow-fs-read=/', '-e', 'process.exit(0)'], 15000);
|
|
197
|
-
if (bare.code === 0) {
|
|
198
|
-
return { model: flag === '--permission' ? 'permission' : 'experimental-permission', flag, allowAddons: false };
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
|
|
202
|
-
logger.warn('[skill-hub] Node permission model flags rejected by the local node binary; layer disabled');
|
|
203
|
-
return { model: 'unavailable', flag: null, allowAddons: false };
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
const BWRAP_SMOKE_ARGS = [
|
|
207
|
-
'--unshare-user',
|
|
208
|
-
'--unshare-pid',
|
|
209
|
-
'--ro-bind',
|
|
210
|
-
'/',
|
|
211
|
-
'/',
|
|
212
|
-
'--dev',
|
|
213
|
-
'/dev',
|
|
214
|
-
'--proc',
|
|
215
|
-
'/proc',
|
|
216
|
-
'--',
|
|
217
|
-
'true',
|
|
218
|
-
];
|
|
219
|
-
|
|
220
|
-
async function detectBwrap(logger: SandboxLogger, identity: SandboxIdentity | null): Promise<BwrapMode> {
|
|
221
|
-
if (process.platform !== 'linux') return 'unavailable';
|
|
222
|
-
|
|
223
|
-
const version = await runProbeCommand('bwrap', ['--version'], 5000);
|
|
224
|
-
if (version.errorCode === 'ENOENT') {
|
|
225
|
-
logger.info('[skill-hub] bwrap not installed; using hardened spawn isolation (Layer 1)');
|
|
226
|
-
return 'unavailable';
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
// Probe under the same uid/gid the real execution will use, so a root-only
|
|
230
|
-
// userns permission does not produce a false positive.
|
|
231
|
-
const probeIds = identity && process.getuid?.() === 0 ? { uid: identity.uid, gid: identity.gid } : {};
|
|
232
|
-
const unprivileged = await runProbeCommand('bwrap', BWRAP_SMOKE_ARGS, 10000, probeIds);
|
|
233
|
-
if (unprivileged.code === 0) return 'unprivileged';
|
|
234
|
-
|
|
235
|
-
if (process.getuid?.() === 0) {
|
|
236
|
-
const bwrapPath = resolveBinaryPath('bwrap');
|
|
237
|
-
if (bwrapPath) {
|
|
238
|
-
try {
|
|
239
|
-
const mode = statSync(bwrapPath).mode;
|
|
240
|
-
if (!(mode & 0o4000)) {
|
|
241
|
-
chmodSync(bwrapPath, (mode & 0o7777) | 0o4000);
|
|
242
|
-
}
|
|
243
|
-
const retried = await runProbeCommand('bwrap', BWRAP_SMOKE_ARGS, 10000, probeIds);
|
|
244
|
-
if (retried.code === 0) return 'setuid';
|
|
245
|
-
logger.warn(
|
|
246
|
-
`[skill-hub] bwrap unusable even with setuid bit — likely unprivileged user namespaces disabled at the host kernel and no-new-privileges set on the container: ${retried.stderr
|
|
247
|
-
.trim()
|
|
248
|
-
.slice(0, 200)}`,
|
|
249
|
-
);
|
|
250
|
-
} catch (error) {
|
|
251
|
-
logger.warn(`[skill-hub] Could not apply setuid fallback to bwrap: ${(error as Error).message}`);
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
} else {
|
|
255
|
-
logger.warn(
|
|
256
|
-
`[skill-hub] bwrap installed but namespace creation failed (unprivileged userns disabled?): ${unprivileged.stderr
|
|
257
|
-
.trim()
|
|
258
|
-
.slice(0, 200)}`,
|
|
259
|
-
);
|
|
260
|
-
}
|
|
261
|
-
return 'unavailable';
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
async function detectSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
265
|
-
const network: SandboxNetworkMode = process.env.SKILL_HUB_SANDBOX_NET === 'inherit' ? 'inherit' : 'none';
|
|
266
|
-
|
|
267
|
-
const pythonGuardActive =
|
|
268
|
-
process.env.SKILL_HUB_PY_GUARD !== 'false' && existsSync(join(getPythonGuardDir(storagePath), 'sitecustomize.py'));
|
|
269
|
-
|
|
270
|
-
let nodePermission: { model: NodePermissionModel; flag: string | null; allowAddons: boolean };
|
|
271
|
-
try {
|
|
272
|
-
nodePermission = await detectNodePermissionFlag(logger);
|
|
273
|
-
} catch (error) {
|
|
274
|
-
logger.warn(`[skill-hub] Node permission model detection failed: ${(error as Error).message}`);
|
|
275
|
-
nodePermission = { model: 'unavailable', flag: null, allowAddons: false };
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
let identity: SandboxIdentity | null = null;
|
|
279
|
-
let privilegeDropAvailable = false;
|
|
280
|
-
let bwrapMode: BwrapMode = 'unavailable';
|
|
281
|
-
|
|
282
|
-
if (!IS_WINDOWS) {
|
|
283
|
-
identity = resolveSandboxIdentity(getSandboxUsername());
|
|
284
|
-
privilegeDropAvailable = process.getuid?.() === 0 && identity !== null;
|
|
285
|
-
if (!privilegeDropAvailable) {
|
|
286
|
-
logger.warn(
|
|
287
|
-
`[skill-hub] Privilege drop unavailable (root=${
|
|
288
|
-
process.getuid?.() === 0
|
|
289
|
-
}, sandbox user "${getSandboxUsername()}" resolved=${identity !== null}); executions run as the worker user`,
|
|
290
|
-
);
|
|
291
|
-
}
|
|
292
|
-
try {
|
|
293
|
-
bwrapMode = await detectBwrap(logger, privilegeDropAvailable ? identity : null);
|
|
294
|
-
} catch (error) {
|
|
295
|
-
logger.warn(`[skill-hub] bwrap detection failed: ${(error as Error).message}`);
|
|
296
|
-
bwrapMode = 'unavailable';
|
|
297
|
-
}
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
const isolationLevel: SandboxIsolationLevel =
|
|
301
|
-
bwrapMode !== 'unavailable' ? 'bwrap' : IS_WINDOWS ? 'minimal' : 'hardened-spawn';
|
|
302
|
-
|
|
303
|
-
const capabilities: SandboxCapabilities = {
|
|
304
|
-
isolationLevel,
|
|
305
|
-
privilegeDropAvailable,
|
|
306
|
-
sandboxIdentity: privilegeDropAvailable ? identity : null,
|
|
307
|
-
nodePermissionModel: nodePermission.model,
|
|
308
|
-
nodePermissionFlag: nodePermission.flag,
|
|
309
|
-
nodePermissionAllowAddons: nodePermission.allowAddons,
|
|
310
|
-
pythonGuardActive,
|
|
311
|
-
bwrapMode,
|
|
312
|
-
network,
|
|
313
|
-
};
|
|
314
|
-
|
|
315
|
-
logger.info(
|
|
316
|
-
`[skill-hub] Sandbox isolation level: ${capabilities.isolationLevel}` +
|
|
317
|
-
` (privilege drop: ${capabilities.privilegeDropAvailable ? 'active' : 'off'},` +
|
|
318
|
-
` node permission model: ${capabilities.nodePermissionModel},` +
|
|
319
|
-
` python guard: ${capabilities.pythonGuardActive ? 'active' : 'off'},` +
|
|
320
|
-
` bwrap: ${capabilities.bwrapMode}, network: ${capabilities.network})`,
|
|
321
|
-
);
|
|
322
|
-
|
|
323
|
-
return capabilities;
|
|
324
|
-
}
|
|
325
|
-
|
|
326
|
-
/**
|
|
327
|
-
* Lazily detect capabilities once per worker process (memoized). Used by
|
|
328
|
-
* SandboxRunner so the first execution after boot has real capability data
|
|
329
|
-
* without requiring an admin-triggered init.
|
|
330
|
-
*/
|
|
331
|
-
export function ensureSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
332
|
-
if (!detectPromise) {
|
|
333
|
-
detectPromise = detectSandboxCapabilities(logger, storagePath).then((caps) => {
|
|
334
|
-
current = caps;
|
|
335
|
-
return caps;
|
|
336
|
-
});
|
|
337
|
-
}
|
|
338
|
-
return detectPromise;
|
|
339
|
-
}
|
|
340
|
-
|
|
341
|
-
/** Force a fresh detection run — called from WorkerEnvManager.executeInit(). */
|
|
342
|
-
export function refreshSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
343
|
-
detectPromise = detectSandboxCapabilities(logger, storagePath).then((caps) => {
|
|
344
|
-
current = caps;
|
|
345
|
-
return caps;
|
|
346
|
-
});
|
|
347
|
-
return detectPromise;
|
|
348
|
-
}
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
import { chmodSync, existsSync, readFileSync, statSync } from 'fs';
|
|
3
|
+
import { delimiter, join, resolve } from 'path';
|
|
4
|
+
|
|
5
|
+
const IS_WINDOWS = process.platform === 'win32';
|
|
6
|
+
|
|
7
|
+
export interface SandboxLogger {
|
|
8
|
+
info(message: string): void;
|
|
9
|
+
warn(message: string): void;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export type NodePermissionModel = 'permission' | 'experimental-permission' | 'unavailable' | 'unknown';
|
|
13
|
+
export type BwrapMode = 'unprivileged' | 'setuid' | 'unavailable';
|
|
14
|
+
export type SandboxIsolationLevel = 'bwrap' | 'hardened-spawn' | 'minimal';
|
|
15
|
+
export type SandboxNetworkMode = 'none' | 'inherit';
|
|
16
|
+
|
|
17
|
+
export interface SandboxIdentity {
|
|
18
|
+
username: string;
|
|
19
|
+
uid: number;
|
|
20
|
+
gid: number;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Result of the per-worker sandbox capability detection. Computed once at init
|
|
25
|
+
* (or lazily on the first execution) and read on every execution — never
|
|
26
|
+
* re-probed per execution.
|
|
27
|
+
*/
|
|
28
|
+
export interface SandboxCapabilities {
|
|
29
|
+
isolationLevel: SandboxIsolationLevel;
|
|
30
|
+
privilegeDropAvailable: boolean;
|
|
31
|
+
sandboxIdentity: SandboxIdentity | null;
|
|
32
|
+
nodePermissionModel: NodePermissionModel;
|
|
33
|
+
/** Confirmed CLI flag name, e.g. '--permission'; null when unavailable. */
|
|
34
|
+
nodePermissionFlag: string | null;
|
|
35
|
+
/** Whether '--allow-addons' is accepted alongside the permission flag. */
|
|
36
|
+
nodePermissionAllowAddons: boolean;
|
|
37
|
+
pythonGuardActive: boolean;
|
|
38
|
+
bwrapMode: BwrapMode;
|
|
39
|
+
network: SandboxNetworkMode;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const DEFAULT_CAPABILITIES: SandboxCapabilities = {
|
|
43
|
+
isolationLevel: IS_WINDOWS ? 'minimal' : 'hardened-spawn',
|
|
44
|
+
privilegeDropAvailable: false,
|
|
45
|
+
sandboxIdentity: null,
|
|
46
|
+
nodePermissionModel: 'unknown',
|
|
47
|
+
nodePermissionFlag: null,
|
|
48
|
+
nodePermissionAllowAddons: false,
|
|
49
|
+
pythonGuardActive: false,
|
|
50
|
+
bwrapMode: 'unavailable',
|
|
51
|
+
network: 'none',
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
let current: SandboxCapabilities = { ...DEFAULT_CAPABILITIES };
|
|
55
|
+
let detectPromise: Promise<SandboxCapabilities> | null = null;
|
|
56
|
+
|
|
57
|
+
export function getSandboxCapabilities(): SandboxCapabilities {
|
|
58
|
+
return current;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export function setSandboxCapabilities(next: SandboxCapabilities): void {
|
|
62
|
+
current = next;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export function getSandboxUsername(): string {
|
|
66
|
+
return process.env.SKILL_HUB_SANDBOX_USER || 'nocobase-sandbox';
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export function getPythonGuardDir(storagePath: string): string {
|
|
70
|
+
return resolve(storagePath, 'sandbox-workspace', 'py-guard');
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export interface ProbeResult {
|
|
74
|
+
code: number | null;
|
|
75
|
+
stdout: string;
|
|
76
|
+
stderr: string;
|
|
77
|
+
/** Node error code (e.g. ENOENT) when the process failed to spawn. */
|
|
78
|
+
errorCode?: string;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Run a short-lived probe/maintenance command without a shell. Never rejects —
|
|
83
|
+
* spawn failures surface as { code: null, errorCode }.
|
|
84
|
+
*/
|
|
85
|
+
export function runProbeCommand(
|
|
86
|
+
command: string,
|
|
87
|
+
args: string[],
|
|
88
|
+
timeoutMs = 10000,
|
|
89
|
+
options: { uid?: number; gid?: number } = {},
|
|
90
|
+
): Promise<ProbeResult> {
|
|
91
|
+
return new Promise<ProbeResult>((_resolve) => {
|
|
92
|
+
let stdout = '';
|
|
93
|
+
let stderr = '';
|
|
94
|
+
let settled = false;
|
|
95
|
+
let timer: NodeJS.Timeout | null = null;
|
|
96
|
+
|
|
97
|
+
const finish = (result: ProbeResult) => {
|
|
98
|
+
if (settled) return;
|
|
99
|
+
settled = true;
|
|
100
|
+
if (timer) clearTimeout(timer);
|
|
101
|
+
_resolve(result);
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
let child: ReturnType<typeof spawn>;
|
|
105
|
+
try {
|
|
106
|
+
child = spawn(command, args, {
|
|
107
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
108
|
+
uid: options.uid,
|
|
109
|
+
gid: options.gid,
|
|
110
|
+
});
|
|
111
|
+
} catch (error) {
|
|
112
|
+
finish({ code: null, stdout: '', stderr: String((error as Error).message || error), errorCode: 'SPAWN' });
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
timer = setTimeout(() => {
|
|
117
|
+
child.kill('SIGTERM');
|
|
118
|
+
finish({ code: null, stdout, stderr: `${stderr}\n[probe timed out after ${timeoutMs}ms]` });
|
|
119
|
+
}, timeoutMs);
|
|
120
|
+
|
|
121
|
+
child.stdout?.on('data', (chunk: Buffer) => {
|
|
122
|
+
if (stdout.length < 4096) stdout += chunk.toString();
|
|
123
|
+
});
|
|
124
|
+
child.stderr?.on('data', (chunk: Buffer) => {
|
|
125
|
+
if (stderr.length < 4096) stderr += chunk.toString();
|
|
126
|
+
});
|
|
127
|
+
child.on('error', (error: NodeJS.ErrnoException) => {
|
|
128
|
+
finish({ code: null, stdout, stderr: error.message, errorCode: error.code });
|
|
129
|
+
});
|
|
130
|
+
child.on('close', (code) => {
|
|
131
|
+
finish({ code, stdout, stderr });
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
function resolveBinaryPath(name: string): string | null {
|
|
137
|
+
for (const dir of (process.env.PATH || '').split(delimiter)) {
|
|
138
|
+
if (!dir) continue;
|
|
139
|
+
const candidate = join(dir, name);
|
|
140
|
+
if (existsSync(candidate)) return candidate;
|
|
141
|
+
}
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* Resolve uid/gid of the dedicated sandbox user by reading /etc/passwd
|
|
147
|
+
* directly (no per-execution subprocess).
|
|
148
|
+
*/
|
|
149
|
+
export function resolveSandboxIdentity(username: string): SandboxIdentity | null {
|
|
150
|
+
try {
|
|
151
|
+
const passwd = readFileSync('/etc/passwd', 'utf-8');
|
|
152
|
+
for (const line of passwd.split('\n')) {
|
|
153
|
+
const parts = line.split(':');
|
|
154
|
+
if (parts[0] === username && parts.length >= 4) {
|
|
155
|
+
const uid = Number(parts[2]);
|
|
156
|
+
const gid = Number(parts[3]);
|
|
157
|
+
if (Number.isInteger(uid) && uid >= 0 && Number.isInteger(gid) && gid >= 0) {
|
|
158
|
+
return { username, uid, gid };
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
} catch {
|
|
163
|
+
// /etc/passwd unreadable — treat as no identity
|
|
164
|
+
}
|
|
165
|
+
return null;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
async function detectNodePermissionFlag(
|
|
169
|
+
logger: SandboxLogger,
|
|
170
|
+
): Promise<{ model: NodePermissionModel; flag: string | null; allowAddons: boolean }> {
|
|
171
|
+
const [majorRaw, minorRaw] = process.versions.node.split('.');
|
|
172
|
+
const major = Number(majorRaw);
|
|
173
|
+
const minor = Number(minorRaw);
|
|
174
|
+
|
|
175
|
+
let candidates: string[];
|
|
176
|
+
if (major > 22 || (major === 22 && minor >= 13)) {
|
|
177
|
+
candidates = ['--permission', '--experimental-permission'];
|
|
178
|
+
} else if (major >= 20) {
|
|
179
|
+
candidates = ['--experimental-permission', '--permission'];
|
|
180
|
+
} else {
|
|
181
|
+
logger.info(`[skill-hub] Node ${process.versions.node} has no permission model; skipping that layer`);
|
|
182
|
+
return { model: 'unavailable', flag: null, allowAddons: false };
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
for (const flag of candidates) {
|
|
186
|
+
// Smoke-test with --allow-addons first (needed for whitelisted native
|
|
187
|
+
// packages like sharp); fall back to the bare flag on older 20.x lines.
|
|
188
|
+
const withAddons = await runProbeCommand(
|
|
189
|
+
'node',
|
|
190
|
+
[flag, '--allow-fs-read=/', '--allow-addons', '-e', 'process.exit(0)'],
|
|
191
|
+
15000,
|
|
192
|
+
);
|
|
193
|
+
if (withAddons.code === 0) {
|
|
194
|
+
return { model: flag === '--permission' ? 'permission' : 'experimental-permission', flag, allowAddons: true };
|
|
195
|
+
}
|
|
196
|
+
const bare = await runProbeCommand('node', [flag, '--allow-fs-read=/', '-e', 'process.exit(0)'], 15000);
|
|
197
|
+
if (bare.code === 0) {
|
|
198
|
+
return { model: flag === '--permission' ? 'permission' : 'experimental-permission', flag, allowAddons: false };
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
logger.warn('[skill-hub] Node permission model flags rejected by the local node binary; layer disabled');
|
|
203
|
+
return { model: 'unavailable', flag: null, allowAddons: false };
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
const BWRAP_SMOKE_ARGS = [
|
|
207
|
+
'--unshare-user',
|
|
208
|
+
'--unshare-pid',
|
|
209
|
+
'--ro-bind',
|
|
210
|
+
'/',
|
|
211
|
+
'/',
|
|
212
|
+
'--dev',
|
|
213
|
+
'/dev',
|
|
214
|
+
'--proc',
|
|
215
|
+
'/proc',
|
|
216
|
+
'--',
|
|
217
|
+
'true',
|
|
218
|
+
];
|
|
219
|
+
|
|
220
|
+
async function detectBwrap(logger: SandboxLogger, identity: SandboxIdentity | null): Promise<BwrapMode> {
|
|
221
|
+
if (process.platform !== 'linux') return 'unavailable';
|
|
222
|
+
|
|
223
|
+
const version = await runProbeCommand('bwrap', ['--version'], 5000);
|
|
224
|
+
if (version.errorCode === 'ENOENT') {
|
|
225
|
+
logger.info('[skill-hub] bwrap not installed; using hardened spawn isolation (Layer 1)');
|
|
226
|
+
return 'unavailable';
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// Probe under the same uid/gid the real execution will use, so a root-only
|
|
230
|
+
// userns permission does not produce a false positive.
|
|
231
|
+
const probeIds = identity && process.getuid?.() === 0 ? { uid: identity.uid, gid: identity.gid } : {};
|
|
232
|
+
const unprivileged = await runProbeCommand('bwrap', BWRAP_SMOKE_ARGS, 10000, probeIds);
|
|
233
|
+
if (unprivileged.code === 0) return 'unprivileged';
|
|
234
|
+
|
|
235
|
+
if (process.getuid?.() === 0) {
|
|
236
|
+
const bwrapPath = resolveBinaryPath('bwrap');
|
|
237
|
+
if (bwrapPath) {
|
|
238
|
+
try {
|
|
239
|
+
const mode = statSync(bwrapPath).mode;
|
|
240
|
+
if (!(mode & 0o4000)) {
|
|
241
|
+
chmodSync(bwrapPath, (mode & 0o7777) | 0o4000);
|
|
242
|
+
}
|
|
243
|
+
const retried = await runProbeCommand('bwrap', BWRAP_SMOKE_ARGS, 10000, probeIds);
|
|
244
|
+
if (retried.code === 0) return 'setuid';
|
|
245
|
+
logger.warn(
|
|
246
|
+
`[skill-hub] bwrap unusable even with setuid bit — likely unprivileged user namespaces disabled at the host kernel and no-new-privileges set on the container: ${retried.stderr
|
|
247
|
+
.trim()
|
|
248
|
+
.slice(0, 200)}`,
|
|
249
|
+
);
|
|
250
|
+
} catch (error) {
|
|
251
|
+
logger.warn(`[skill-hub] Could not apply setuid fallback to bwrap: ${(error as Error).message}`);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
} else {
|
|
255
|
+
logger.warn(
|
|
256
|
+
`[skill-hub] bwrap installed but namespace creation failed (unprivileged userns disabled?): ${unprivileged.stderr
|
|
257
|
+
.trim()
|
|
258
|
+
.slice(0, 200)}`,
|
|
259
|
+
);
|
|
260
|
+
}
|
|
261
|
+
return 'unavailable';
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
async function detectSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
265
|
+
const network: SandboxNetworkMode = process.env.SKILL_HUB_SANDBOX_NET === 'inherit' ? 'inherit' : 'none';
|
|
266
|
+
|
|
267
|
+
const pythonGuardActive =
|
|
268
|
+
process.env.SKILL_HUB_PY_GUARD !== 'false' && existsSync(join(getPythonGuardDir(storagePath), 'sitecustomize.py'));
|
|
269
|
+
|
|
270
|
+
let nodePermission: { model: NodePermissionModel; flag: string | null; allowAddons: boolean };
|
|
271
|
+
try {
|
|
272
|
+
nodePermission = await detectNodePermissionFlag(logger);
|
|
273
|
+
} catch (error) {
|
|
274
|
+
logger.warn(`[skill-hub] Node permission model detection failed: ${(error as Error).message}`);
|
|
275
|
+
nodePermission = { model: 'unavailable', flag: null, allowAddons: false };
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
let identity: SandboxIdentity | null = null;
|
|
279
|
+
let privilegeDropAvailable = false;
|
|
280
|
+
let bwrapMode: BwrapMode = 'unavailable';
|
|
281
|
+
|
|
282
|
+
if (!IS_WINDOWS) {
|
|
283
|
+
identity = resolveSandboxIdentity(getSandboxUsername());
|
|
284
|
+
privilegeDropAvailable = process.getuid?.() === 0 && identity !== null;
|
|
285
|
+
if (!privilegeDropAvailable) {
|
|
286
|
+
logger.warn(
|
|
287
|
+
`[skill-hub] Privilege drop unavailable (root=${
|
|
288
|
+
process.getuid?.() === 0
|
|
289
|
+
}, sandbox user "${getSandboxUsername()}" resolved=${identity !== null}); executions run as the worker user`,
|
|
290
|
+
);
|
|
291
|
+
}
|
|
292
|
+
try {
|
|
293
|
+
bwrapMode = await detectBwrap(logger, privilegeDropAvailable ? identity : null);
|
|
294
|
+
} catch (error) {
|
|
295
|
+
logger.warn(`[skill-hub] bwrap detection failed: ${(error as Error).message}`);
|
|
296
|
+
bwrapMode = 'unavailable';
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
const isolationLevel: SandboxIsolationLevel =
|
|
301
|
+
bwrapMode !== 'unavailable' ? 'bwrap' : IS_WINDOWS ? 'minimal' : 'hardened-spawn';
|
|
302
|
+
|
|
303
|
+
const capabilities: SandboxCapabilities = {
|
|
304
|
+
isolationLevel,
|
|
305
|
+
privilegeDropAvailable,
|
|
306
|
+
sandboxIdentity: privilegeDropAvailable ? identity : null,
|
|
307
|
+
nodePermissionModel: nodePermission.model,
|
|
308
|
+
nodePermissionFlag: nodePermission.flag,
|
|
309
|
+
nodePermissionAllowAddons: nodePermission.allowAddons,
|
|
310
|
+
pythonGuardActive,
|
|
311
|
+
bwrapMode,
|
|
312
|
+
network,
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
logger.info(
|
|
316
|
+
`[skill-hub] Sandbox isolation level: ${capabilities.isolationLevel}` +
|
|
317
|
+
` (privilege drop: ${capabilities.privilegeDropAvailable ? 'active' : 'off'},` +
|
|
318
|
+
` node permission model: ${capabilities.nodePermissionModel},` +
|
|
319
|
+
` python guard: ${capabilities.pythonGuardActive ? 'active' : 'off'},` +
|
|
320
|
+
` bwrap: ${capabilities.bwrapMode}, network: ${capabilities.network})`,
|
|
321
|
+
);
|
|
322
|
+
|
|
323
|
+
return capabilities;
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
/**
|
|
327
|
+
* Lazily detect capabilities once per worker process (memoized). Used by
|
|
328
|
+
* SandboxRunner so the first execution after boot has real capability data
|
|
329
|
+
* without requiring an admin-triggered init.
|
|
330
|
+
*/
|
|
331
|
+
export function ensureSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
332
|
+
if (!detectPromise) {
|
|
333
|
+
detectPromise = detectSandboxCapabilities(logger, storagePath).then((caps) => {
|
|
334
|
+
current = caps;
|
|
335
|
+
return caps;
|
|
336
|
+
});
|
|
337
|
+
}
|
|
338
|
+
return detectPromise;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
/** Force a fresh detection run — called from WorkerEnvManager.executeInit(). */
|
|
342
|
+
export function refreshSandboxCapabilities(logger: SandboxLogger, storagePath: string): Promise<SandboxCapabilities> {
|
|
343
|
+
detectPromise = detectSandboxCapabilities(logger, storagePath).then((caps) => {
|
|
344
|
+
current = caps;
|
|
345
|
+
return caps;
|
|
346
|
+
});
|
|
347
|
+
return detectPromise;
|
|
348
|
+
}
|