plugin-agent-orchestrator 1.1.7 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +207 -204
- package/client-v2.d.ts +2 -2
- package/client-v2.js +1 -1
- package/client.d.ts +2 -2
- package/client.js +1 -1
- package/dist/client/117.2e4cb0477da3db1f.js +10 -0
- package/dist/client/253.93deb9e0192e76a5.js +10 -0
- package/dist/client/325.8f7f509bdb35e142.js +10 -0
- package/dist/client/404.498d2d9516dd1dce.js +10 -0
- package/dist/client/418.6f01da17774a5a25.js +10 -0
- package/dist/client/53.774ff07505d521fa.js +10 -0
- package/dist/client/619.e342b0fa467d39ca.js +10 -0
- package/dist/client/627.fdd60bcc0f3a9cf6.js +10 -0
- package/dist/client/652.477e21bfff67bc1c.js +10 -0
- package/dist/client/981.e0546ffc34afedcd.js +10 -0
- package/dist/client/993.5d04b510835ab0d2.js +10 -0
- package/dist/client/index.js +1 -1
- package/dist/client-v2/117.ccf43ae8631f7d74.js +10 -0
- package/dist/client-v2/214.cdf76752053a8990.js +10 -0
- package/dist/client-v2/253.1198df22f5baf304.js +10 -0
- package/dist/client-v2/264.78887ff88f969467.js +10 -0
- package/dist/client-v2/325.fafe5a6e83ba9cb3.js +10 -0
- package/dist/client-v2/404.9ba964c28a151c81.js +10 -0
- package/dist/client-v2/{41.3deb9e57a0f64fc4.js → 41.b28cf7a675a603d1.js} +1 -1
- package/dist/client-v2/418.55b6b28cda8bb5f3.js +10 -0
- package/dist/client-v2/{53.349fff8db80b19d4.js → 53.282081f97e4308c6.js} +1 -1
- package/dist/client-v2/{619.0a2144aaffefe018.js → 619.8c03913873785fb6.js} +1 -1
- package/dist/client-v2/627.e16f4a0dd596c3e6.js +10 -0
- package/dist/client-v2/652.1a48364774d5383a.js +10 -0
- package/dist/client-v2/{70.ffff2997c10fd4b0.js → 70.9166ed70906d041f.js} +1 -1
- package/dist/client-v2/{981.e4a1f41cfc94a856.js → 981.a81521f0296c7db8.js} +1 -1
- package/dist/client-v2/993.ca5b28f1e2b4c1ef.js +10 -0
- package/dist/client-v2/index.js +1 -1
- package/dist/externalVersion.js +10 -7
- package/dist/locale/en-US.json +229 -1
- package/dist/locale/zh-CN.json +229 -1
- package/dist/node_modules/adm-zip/adm-zip.js +1 -1
- package/dist/node_modules/adm-zip/package.json +1 -1
- package/dist/node_modules/ajv/package.json +1 -1
- package/dist/node_modules/zod/index.cjs +1 -1
- package/dist/node_modules/zod/package.json +1 -1
- package/dist/server/collections/agent-execution-spans.js +145 -6
- package/dist/server/collections/agent-governance-audit-events.js +47 -0
- package/dist/server/collections/agent-governance-policies.js +47 -0
- package/dist/server/collections/agent-governance-policy-versions.js +48 -0
- package/dist/server/collections/agent-governance-prompt-bindings.js +50 -0
- package/dist/server/collections/agent-loop-runs.js +23 -5
- package/dist/server/migrations/20261110000000-add-usage-pricing-snapshots.js +117 -0
- package/dist/server/migrations/20261110010000-add-usage-department-attribution.js +54 -0
- package/dist/server/plugin.js +114 -33
- package/dist/server/resources/agent-governance.js +192 -0
- package/dist/server/resources/agent-harness-profile.js +11 -3
- package/dist/server/resources/agent-monitor.js +109 -339
- package/dist/server/resources/agent-usage.js +423 -0
- package/dist/server/resources/native-monitor-format.js +179 -0
- package/dist/server/resources/tracing.js +35 -12
- package/dist/server/services/AgentGovernanceService.js +500 -0
- package/dist/server/services/DepartmentAttribution.js +65 -0
- package/dist/server/services/ExecutionSpanService.js +96 -3
- package/dist/server/services/GovernanceAdmission.js +211 -0
- package/dist/server/services/HarnessCapabilities.js +118 -0
- package/dist/server/services/LoopBudgetService.js +29 -11
- package/dist/server/services/LoopRunRepository.js +15 -6
- package/dist/server/services/LoopRunStateMachine.js +18 -7
- package/dist/server/services/LoopTriggerService.js +1 -1
- package/dist/server/services/LoopWorkerService.js +66 -32
- package/dist/server/services/ManagedPromptProtection.js +99 -0
- package/dist/server/services/NativeAgentMonitorSyncService.js +584 -0
- package/dist/server/services/NativeSubAgentObserver.js +141 -508
- package/dist/server/services/NativeUsageAttribution.js +97 -0
- package/dist/server/services/TokenTracker.js +787 -104
- package/dist/server/services/TracingRetentionPolicy.js +66 -0
- package/dist/server/services/VerificationService.js +18 -8
- package/dist/server/skill-hub/sandbox-config.json +6 -6
- package/dist/server/utils/ensure-indexes.js +14 -5
- package/package.json +63 -53
- package/server.d.ts +2 -2
- package/server.js +1 -1
- package/src/client/AgentRunsTab.tsx +2 -2
- package/src/client/ApprovalsTab.tsx +2 -2
- package/src/client/HarnessProfilesTab.tsx +2 -2
- package/src/client/OrchestratorSettings.tsx +152 -152
- package/src/client/SkillPages.tsx +41 -0
- package/src/client/__tests__/embedded-settings.test.tsx +232 -0
- package/src/client/hooks/useRunEventStream.ts +76 -76
- package/src/client/index.tsx +2 -2
- package/src/client/plugin.tsx +76 -32
- package/src/client/skill-hub/components/ExecutionHistory.tsx +200 -200
- package/src/client/skill-hub/components/GitSkillImport.tsx +562 -562
- package/src/client/skill-hub/components/LoopSettings.tsx +331 -331
- package/src/client/skill-hub/components/SkillEditor.tsx +460 -460
- package/src/client/skill-hub/components/SkillManager.tsx +194 -194
- package/src/client/skill-hub/components/SkillMetrics.tsx +162 -162
- package/src/client/skill-hub/components/SkillTestPanel.tsx +141 -141
- package/src/client/skill-hub/index.tsx +6 -6
- package/src/client/skill-hub/locale.ts +16 -16
- package/src/client/skill-hub/tools/InteractionSchemasProvider.tsx +132 -132
- package/src/client/skill-hub/tools/SkillHubCard.tsx +104 -104
- package/src/client/skill-hub/tools/loopTemplates.ts +52 -52
- package/src/client/skill-hub/tools/registerSkillLoopCards.ts +71 -71
- package/src/client/skill-hub/utils/jsonFields.ts +41 -41
- package/src/client-v2/__tests__/embedded-settings.test.tsx +193 -0
- package/src/client-v2/components/AIEmployeeSelect.tsx +47 -47
- package/src/client-v2/components/AIEmployeesContext.tsx +97 -97
- package/src/client-v2/components/AgentBindingsTab.tsx +269 -269
- package/src/client-v2/components/AgentRunsTab.tsx +92 -83
- package/src/client-v2/components/ApprovalsTab.tsx +337 -337
- package/src/client-v2/components/EmployeeGovernanceTab.tsx +702 -0
- package/src/client-v2/components/HarnessProfilesTab.tsx +704 -541
- package/src/client-v2/components/KnowledgeAccessTab.tsx +116 -116
- package/src/client-v2/components/RetrievalTraceTab.tsx +162 -162
- package/src/client-v2/components/UsageGovernanceTab.tsx +386 -0
- package/src/client-v2/index.tsx +1 -1
- package/src/client-v2/pages/AgentBindingsPage.tsx +22 -13
- package/src/client-v2/pages/ApprovalsPage.tsx +19 -10
- package/src/client-v2/pages/EmployeeGovernancePage.tsx +22 -0
- package/src/client-v2/pages/ExecutionHistoryPage.tsx +19 -10
- package/src/client-v2/pages/HarnessProfilesPage.tsx +19 -10
- package/src/client-v2/pages/KnowledgeAccessPage.tsx +19 -10
- package/src/client-v2/pages/LoopSettingsPage.tsx +19 -10
- package/src/client-v2/pages/MemoryInspectorPage.tsx +22 -13
- package/src/client-v2/pages/RetrievalTracePage.tsx +19 -10
- package/src/client-v2/pages/RulesPage.tsx +22 -13
- package/src/client-v2/pages/SkillDefinitionsPage.tsx +19 -10
- package/src/client-v2/pages/SkillMetricsPage.tsx +19 -10
- package/src/client-v2/pages/TracingPage.tsx +22 -13
- package/src/client-v2/pages/UsageGovernancePage.tsx +22 -0
- package/src/client-v2/plugin.tsx +139 -99
- package/src/client-v2/skill-hub/components/ExecutionHistory.tsx +196 -196
- package/src/client-v2/skill-hub/components/FileLinkList.tsx +37 -37
- package/src/client-v2/skill-hub/components/GitSkillImport.tsx +539 -539
- package/src/client-v2/skill-hub/components/LoopSettings.tsx +331 -331
- package/src/client-v2/skill-hub/components/SkillEditor.tsx +453 -453
- package/src/client-v2/skill-hub/components/SkillManager.tsx +191 -174
- package/src/client-v2/skill-hub/components/SkillMetrics.tsx +162 -162
- package/src/client-v2/skill-hub/components/SkillTestPanel.tsx +135 -135
- package/src/client-v2/skill-hub/locale.ts +13 -13
- package/src/client-v2/skill-hub/tools/InteractionSchemasProvider.tsx +62 -0
- package/src/client-v2/skill-hub/tools/SkillHubCard.tsx +104 -0
- package/src/client-v2/skill-hub/tools/__tests__/interactions.test.ts +110 -0
- package/src/client-v2/skill-hub/tools/interactions.ts +128 -0
- package/src/client-v2/skill-hub/tools/loopTemplates.ts +52 -52
- package/src/client-v2/skill-hub/utils/jsonFields.ts +41 -41
- package/src/client-v2/utils/jsonFields.ts +41 -41
- package/src/index.ts +2 -2
- package/src/locale/en-US.json +229 -1
- package/src/locale/zh-CN.json +229 -1
- package/src/server/__tests__/agent-execution-context.test.ts +18 -18
- package/src/server/__tests__/agent-governance.integration.test.ts +392 -0
- package/src/server/__tests__/agent-knowledge-insights.test.ts +123 -123
- package/src/server/__tests__/agent-monitor-acl.integration.test.ts +274 -0
- package/src/server/__tests__/agent-registry-service.test.ts +147 -147
- package/src/server/__tests__/agent-runtime-lifecycle.test.ts +46 -46
- package/src/server/__tests__/agent-usage-report.integration.test.ts +342 -0
- package/src/server/__tests__/code-validator.test.ts +63 -63
- package/src/server/__tests__/external-rag-search.test.ts +107 -107
- package/src/server/__tests__/harness-capabilities.test.ts +95 -0
- package/src/server/__tests__/harness-compiler.test.ts +214 -214
- package/src/server/__tests__/harness-profile-service.test.ts +167 -167
- package/src/server/__tests__/harness-runtime-policy.test.ts +293 -293
- package/src/server/__tests__/harness-tool-plan.test.ts +182 -172
- package/src/server/__tests__/input-schema-validator.test.ts +26 -26
- package/src/server/__tests__/loop-approval-decision.test.ts +577 -512
- package/src/server/__tests__/loop-approval-expiry.test.ts +258 -258
- package/src/server/__tests__/loop-budget-service.test.ts +36 -0
- package/src/server/__tests__/loop-pattern-schema.test.ts +73 -73
- package/src/server/__tests__/loop-run-repository.test.ts +32 -0
- package/src/server/__tests__/loop-run-state-machine.test.ts +101 -101
- package/src/server/__tests__/loop-trigger-service.test.ts +192 -148
- package/src/server/__tests__/loop-worker-claim.test.ts +72 -9
- package/src/server/__tests__/loop-worker-execution.test.ts +382 -317
- package/src/server/__tests__/native-agent-monitor-sync.test.ts +350 -0
- package/src/server/__tests__/native-sub-agent-observer.test.ts +470 -662
- package/src/server/__tests__/native-usage-attribution.integration.test.ts +175 -0
- package/src/server/__tests__/skill-access-service.test.ts +64 -64
- package/src/server/__tests__/skill-execute.test.ts +70 -70
- package/src/server/__tests__/skill-execution-task-policy.test.ts +140 -140
- package/src/server/__tests__/skill-sandbox-worker-mode.test.ts +15 -15
- package/src/server/__tests__/skill-settings.test.ts +63 -63
- package/src/server/__tests__/skill-tool-name.test.ts +23 -23
- package/src/server/__tests__/token-tracker.test.ts +639 -0
- package/src/server/__tests__/tool-loop-detection.test.ts +276 -276
- package/src/server/__tests__/tracing-retention-policy.test.ts +37 -0
- package/src/server/__tests__/usage-ledger.integration.test.ts +194 -0
- package/src/server/collections/agent-execution-spans.ts +393 -245
- package/src/server/collections/agent-governance-audit-events.ts +26 -0
- package/src/server/collections/agent-governance-policies.ts +26 -0
- package/src/server/collections/agent-governance-policy-versions.ts +27 -0
- package/src/server/collections/agent-governance-prompt-bindings.ts +29 -0
- package/src/server/collections/agent-loop-action-approvals.ts +39 -39
- package/src/server/collections/agent-loop-runs.ts +396 -369
- package/src/server/collections/agent-loop-steps.ts +220 -220
- package/src/server/collections/agent-memory-contexts.ts +95 -95
- package/src/server/collections/orchestrator-config.ts +87 -87
- package/src/server/collections/orchestrator-logs.ts +116 -116
- package/src/server/collections/skill-definitions.ts +159 -159
- package/src/server/collections/skill-executions.ts +154 -154
- package/src/server/collections/skill-loop-configs.ts +65 -65
- package/src/server/collections/skill-metrics.ts +36 -36
- package/src/server/collections/skill-registry-installations.ts +41 -41
- package/src/server/collections/skill-worker-configs.ts +86 -86
- package/src/server/index.ts +1 -1
- package/src/server/migrations/20260423000000-add-progress-fields.ts +50 -50
- package/src/server/migrations/20260425000000-add-interaction-schema.ts +37 -37
- package/src/server/migrations/20260427000000-add-tracing-detail-fields.ts +41 -41
- package/src/server/migrations/20260427000001-change-other-json-to-text.ts +61 -61
- package/src/server/migrations/20260524001000-add-plan-approval-and-harness-profiles.ts +145 -145
- package/src/server/migrations/20260601000000-add-token-fields.ts +89 -89
- package/src/server/migrations/20260615000000-normalize-ai-employee-tool-bindings.ts +39 -39
- package/src/server/migrations/20260621000000-native-policy-profile-defaults.ts +190 -190
- package/src/server/migrations/20260727000000-remove-unused-knowledge-scopes.ts +25 -25
- package/src/server/migrations/20260727010000-backfill-skill-tool-names.ts +45 -45
- package/src/server/migrations/20261110000000-add-usage-pricing-snapshots.ts +117 -0
- package/src/server/migrations/20261110010000-add-usage-department-attribution.ts +35 -0
- package/src/server/plugin.ts +674 -573
- package/src/server/resources/agent-governance.ts +168 -0
- package/src/server/resources/agent-harness-profile.ts +110 -94
- package/src/server/resources/agent-knowledge-insights.ts +306 -306
- package/src/server/resources/agent-loop-approval.ts +84 -84
- package/src/server/resources/agent-loop-events-stream.ts +108 -108
- package/src/server/resources/agent-loop.ts +252 -252
- package/src/server/resources/agent-monitor.ts +215 -482
- package/src/server/resources/agent-usage.ts +420 -0
- package/src/server/resources/native-monitor-format.ts +157 -0
- package/src/server/resources/tracing.ts +303 -267
- package/src/server/services/AgentExecutionContext.ts +23 -23
- package/src/server/services/AgentGovernanceService.ts +548 -0
- package/src/server/services/AgentMemoryContextService.ts +344 -344
- package/src/server/services/AgentRegistryService.ts +220 -220
- package/src/server/services/AgentRuntimeLifecycle.ts +64 -64
- package/src/server/services/CodeValidator.ts +238 -238
- package/src/server/services/DepartmentAttribution.ts +54 -0
- package/src/server/services/DurableCircuitBreakerService.ts +235 -235
- package/src/server/services/ExecutionSpanService.ts +278 -146
- package/src/server/services/FileManager.ts +159 -159
- package/src/server/services/GovernanceAdmission.ts +239 -0
- package/src/server/services/HarnessCapabilities.ts +119 -0
- package/src/server/services/HarnessCompiler.ts +170 -170
- package/src/server/services/HarnessProfileService.ts +235 -235
- package/src/server/services/HarnessSchema.ts +194 -194
- package/src/server/services/InputSchemaValidator.ts +44 -44
- package/src/server/services/LoopBudgetService.ts +332 -271
- package/src/server/services/LoopControlService.ts +120 -120
- package/src/server/services/LoopPatternSchema.ts +231 -231
- package/src/server/services/LoopPatternService.ts +171 -171
- package/src/server/services/LoopRunRepository.ts +350 -332
- package/src/server/services/LoopRunStateMachine.ts +545 -525
- package/src/server/services/LoopSchedulerService.ts +195 -195
- package/src/server/services/LoopTriggerService.ts +169 -159
- package/src/server/services/LoopWorkerService.ts +986 -912
- package/src/server/services/ManagedPromptProtection.ts +88 -0
- package/src/server/services/NativeAgentMonitorSyncService.ts +691 -0
- package/src/server/services/NativeSubAgentObserver.ts +331 -757
- package/src/server/services/NativeUsageAttribution.ts +98 -0
- package/src/server/services/PathLockService.ts +317 -317
- package/src/server/services/PluginAiRuntimeAdapter.ts +387 -387
- package/src/server/services/RunEventBus.ts +58 -58
- package/src/server/services/SandboxRunner.ts +492 -492
- package/src/server/services/SkillAccessService.ts +175 -175
- package/src/server/services/SkillManager.ts +585 -585
- package/src/server/services/SkillRepositoryService.ts +236 -236
- package/src/server/services/TokenTracker.ts +1158 -287
- package/src/server/services/ToolLoopDetectionService.ts +210 -210
- package/src/server/services/TracingRetentionPolicy.ts +56 -0
- package/src/server/services/VerificationSchema.ts +31 -31
- package/src/server/services/VerificationService.ts +332 -313
- package/src/server/services/WorkerEnvManager.ts +198 -198
- package/src/server/services/__tests__/SkillRepositoryService.test.ts +33 -33
- package/src/server/services/harness-runtime-policy.ts +134 -134
- package/src/server/services/pythonGuardTemplate.ts +87 -87
- package/src/server/services/sandboxCapabilities.ts +348 -348
- package/src/server/skill-hub/actions/__tests__/git-import.test.ts +563 -563
- package/src/server/skill-hub/actions/git-import.ts +936 -936
- package/src/server/skill-hub/mcp/McpController.ts +107 -107
- package/src/server/skill-hub/middlewares/git-import-request-method-policy.ts +51 -51
- package/src/server/skill-hub/plugin.ts +1232 -1232
- package/src/server/skill-hub/sandbox-config.json +6 -6
- package/src/server/skill-hub/services/RegistrySkillInstallationService.ts +281 -281
- package/src/server/skill-hub/services/__tests__/RegistrySkillInstallationService.test.ts +295 -295
- package/src/server/skill-hub/tasks/SkillExecutionTask.ts +568 -568
- package/src/server/skill-hub/utils/json-fields.ts +57 -57
- package/src/server/tools/delegate-task.ts +30 -30
- package/src/server/tools/external-rag-search.ts +329 -329
- package/src/server/tools/skill-execute.ts +216 -216
- package/src/server/types.ts +21 -21
- package/src/server/utils/ai-manager.ts +24 -24
- package/src/server/utils/ctx-utils.ts +132 -132
- package/src/server/utils/ensure-indexes.ts +119 -96
- package/src/server/utils/ha-lock.ts +80 -80
- package/src/server/utils/loop-pattern-context.ts +84 -84
- package/src/server/utils/record-utils.ts +19 -19
- package/src/server/utils/skill-settings.ts +135 -135
- package/src/server/utils/skill-tool-name.ts +58 -58
- package/dist/client-v2/117.7565cff57c39318a.js +0 -10
- package/dist/client-v2/214.106635011859dede.js +0 -10
- package/dist/client-v2/253.59577b40d9875be0.js +0 -10
- package/dist/client-v2/264.7ed8bee71fa5935c.js +0 -10
- package/dist/client-v2/418.41ed200e7d6da332.js +0 -10
- package/dist/client-v2/794.a67a2614405ba627.js +0 -10
- package/dist/client-v2/993.b0688fdc5ccb000a.js +0 -10
- package/dist/node_modules/simple-git/dist/cjs/index.js +0 -7399
- package/dist/node_modules/simple-git/dist/esm/index.js +0 -4745
- package/dist/node_modules/simple-git/dist/esm/package.json +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/api.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/args/log-format.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-construct-error.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-error.d.ts +0 -30
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-plugin-error.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/errors/git-response-error.d.ts +0 -32
- package/dist/node_modules/simple-git/dist/src/lib/errors/task-configuration-error.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/git-factory.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/git-logger.d.ts +0 -21
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-branch-delete.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-branch.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-commit.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-diff-summary.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-fetch.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-list-log-summary.d.ts +0 -6
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-merge.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-move.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-pull.d.ts +0 -6
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-push.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-remote-messages.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/parsers/parse-remote-objects.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/abort-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/block-unsafe-operations-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/command-config-prefixing-plugin.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/plugins/completion-detection.plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/custom-binary.plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/error-detection.plugin.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/plugins/index.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/plugins/plugin-store.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/plugins/progress-monitor-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/simple-git-plugin.d.ts +0 -48
- package/dist/node_modules/simple-git/dist/src/lib/plugins/spawn-options-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/plugins/suffix-paths.plugin.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/plugins/timout-plugin.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/responses/BranchDeleteSummary.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/responses/BranchSummary.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/responses/CheckIgnore.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/responses/CleanSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/ConfigList.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/responses/DiffSummary.d.ts +0 -10
- package/dist/node_modules/simple-git/dist/src/lib/responses/FileStatusSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/GetRemoteSummary.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/responses/InitSummary.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/responses/MergeSummary.d.ts +0 -16
- package/dist/node_modules/simple-git/dist/src/lib/responses/PullSummary.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/responses/StatusSummary.d.ts +0 -19
- package/dist/node_modules/simple-git/dist/src/lib/responses/TagList.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/runners/git-executor-chain.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/runners/git-executor.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/runners/promise-wrapped.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/runners/scheduler.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/runners/tasks-pending-queue.d.ts +0 -23
- package/dist/node_modules/simple-git/dist/src/lib/simple-git-api.d.ts +0 -20
- package/dist/node_modules/simple-git/dist/src/lib/task-callback.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/apply-patch.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/branch.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/tasks/change-working-directory.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/check-ignore.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/check-is-repo.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/checkout.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/clean.d.ts +0 -25
- package/dist/node_modules/simple-git/dist/src/lib/tasks/clone.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/commit.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/config.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/tasks/count-objects.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/diff-name-status.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/diff.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/fetch.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/first-commit.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/grep.d.ts +0 -12
- package/dist/node_modules/simple-git/dist/src/lib/tasks/hash-object.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/init.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/log.d.ts +0 -32
- package/dist/node_modules/simple-git/dist/src/lib/tasks/merge.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/move.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/pull.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/push.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/tasks/remote.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/tasks/reset.d.ts +0 -11
- package/dist/node_modules/simple-git/dist/src/lib/tasks/show.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/tasks/stash-list.d.ts +0 -4
- package/dist/node_modules/simple-git/dist/src/lib/tasks/status.d.ts +0 -3
- package/dist/node_modules/simple-git/dist/src/lib/tasks/sub-module.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/tasks/tag.d.ts +0 -18
- package/dist/node_modules/simple-git/dist/src/lib/tasks/task.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/tasks/version.d.ts +0 -9
- package/dist/node_modules/simple-git/dist/src/lib/types/handlers.d.ts +0 -21
- package/dist/node_modules/simple-git/dist/src/lib/types/index.d.ts +0 -136
- package/dist/node_modules/simple-git/dist/src/lib/types/tasks.d.ts +0 -19
- package/dist/node_modules/simple-git/dist/src/lib/utils/argument-filters.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/src/lib/utils/exit-codes.d.ts +0 -10
- package/dist/node_modules/simple-git/dist/src/lib/utils/git-output-streams.d.ts +0 -7
- package/dist/node_modules/simple-git/dist/src/lib/utils/index.d.ts +0 -8
- package/dist/node_modules/simple-git/dist/src/lib/utils/line-parser.d.ts +0 -15
- package/dist/node_modules/simple-git/dist/src/lib/utils/simple-git-options.d.ts +0 -2
- package/dist/node_modules/simple-git/dist/src/lib/utils/task-options.d.ts +0 -13
- package/dist/node_modules/simple-git/dist/src/lib/utils/task-parser.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/src/lib/utils/util.d.ts +0 -47
- package/dist/node_modules/simple-git/dist/typings/errors.d.ts +0 -5
- package/dist/node_modules/simple-git/dist/typings/index.d.ts +0 -14
- package/dist/node_modules/simple-git/dist/typings/response.d.ts +0 -556
- package/dist/node_modules/simple-git/dist/typings/simple-git.d.ts +0 -1033
- package/dist/node_modules/simple-git/dist/typings/types.d.ts +0 -22
- package/dist/node_modules/simple-git/node_modules/debug/package.json +0 -64
- package/dist/node_modules/simple-git/node_modules/debug/src/browser.js +0 -272
- package/dist/node_modules/simple-git/node_modules/debug/src/common.js +0 -292
- package/dist/node_modules/simple-git/node_modules/debug/src/index.js +0 -10
- package/dist/node_modules/simple-git/node_modules/debug/src/node.js +0 -263
- package/dist/node_modules/simple-git/package.json +0 -1
- package/dist/node_modules/simple-git/promise.js +0 -17
|
@@ -1,492 +1,492 @@
|
|
|
1
|
-
import { spawn } from 'child_process';
|
|
2
|
-
import { existsSync, writeFileSync } from 'fs';
|
|
3
|
-
import { resolve, delimiter } from 'path';
|
|
4
|
-
import { tmpdir } from 'os';
|
|
5
|
-
import { FileManager, OutputFileInfo } from './FileManager';
|
|
6
|
-
import { CodeValidator } from './CodeValidator';
|
|
7
|
-
import {
|
|
8
|
-
ensureSandboxCapabilities,
|
|
9
|
-
getPythonGuardDir,
|
|
10
|
-
SandboxCapabilities,
|
|
11
|
-
SandboxIdentity,
|
|
12
|
-
SandboxNetworkMode,
|
|
13
|
-
} from './sandboxCapabilities';
|
|
14
|
-
|
|
15
|
-
const IS_WINDOWS = process.platform === 'win32';
|
|
16
|
-
|
|
17
|
-
/** stdout/stderr accumulation cap — matches the old exec() maxBuffer. */
|
|
18
|
-
const MAX_STDIO_BYTES = 10 * 1024 * 1024;
|
|
19
|
-
|
|
20
|
-
/** Only the head of stdout/stderr is ever returned to callers — don't retain more in memory. */
|
|
21
|
-
const MAX_STDOUT_CHARS = 5000;
|
|
22
|
-
const MAX_STDERR_CHARS = 2000;
|
|
23
|
-
|
|
24
|
-
/** Resolve the python executable name per platform (python3 on *nix, python on Windows). */
|
|
25
|
-
function pythonBinary() {
|
|
26
|
-
return process.env.SKILL_HUB_PYTHON_BIN || (IS_WINDOWS ? 'python' : 'python3');
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export interface ExecuteOptions {
|
|
30
|
-
language: 'node' | 'python';
|
|
31
|
-
code: string;
|
|
32
|
-
execId: string;
|
|
33
|
-
timeoutSeconds?: number;
|
|
34
|
-
maxOutputSizeMb?: number;
|
|
35
|
-
onProgress?: (progress: ProgressUpdate) => void;
|
|
36
|
-
/** AbortSignal — when aborted, the child process is killed */
|
|
37
|
-
signal?: { addEventListener(event: string, listener: () => void): void };
|
|
38
|
-
/** Package whitelist for import validation (from skillWorkerConfigs) */
|
|
39
|
-
packageWhitelist?: string[];
|
|
40
|
-
/** Optional installed/copied skill package root exposed to the runtime as SKILL_DIR. */
|
|
41
|
-
skillDir?: string;
|
|
42
|
-
/** Validated input exposed as a JSON file to avoid source-code interpolation. */
|
|
43
|
-
inputArgs?: Record<string, unknown>;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
export interface ProgressUpdate {
|
|
47
|
-
percent: number;
|
|
48
|
-
log: string;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
export interface ExecutionResult {
|
|
52
|
-
success: boolean;
|
|
53
|
-
stdout: string;
|
|
54
|
-
stderr: string;
|
|
55
|
-
files: OutputFileInfo[];
|
|
56
|
-
durationMs: number;
|
|
57
|
-
/** true if execution was canceled by user */
|
|
58
|
-
canceled?: boolean;
|
|
59
|
-
/** true if execution timed out */
|
|
60
|
-
timedOut?: boolean;
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
export interface UlimitOptions {
|
|
64
|
-
language: 'node' | 'python';
|
|
65
|
-
memLimitMb: number;
|
|
66
|
-
timeoutSeconds: number;
|
|
67
|
-
maxOutputSizeMb: number;
|
|
68
|
-
/** Only apply -u when the child runs under the dedicated sandbox uid. */
|
|
69
|
-
includeNproc: boolean;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/**
|
|
73
|
-
* Fixed ulimit prefix for the POSIX shell wrapper. Every number is computed
|
|
74
|
-
* server-side and validated as a finite positive integer before interpolation;
|
|
75
|
-
* no per-execution user data ever enters this string.
|
|
76
|
-
*/
|
|
77
|
-
export function buildUlimitPrefix(options: UlimitOptions): string {
|
|
78
|
-
const parts: string[] = [];
|
|
79
|
-
const add = (flag: string, value: number) => {
|
|
80
|
-
if (!Number.isFinite(value) || value <= 0) return;
|
|
81
|
-
parts.push(`ulimit ${flag} ${Math.floor(value)} 2>/dev/null;`);
|
|
82
|
-
};
|
|
83
|
-
if (options.language === 'python') {
|
|
84
|
-
// RLIMIT_AS would fatally crash modern Node at startup (V8 reserves a
|
|
85
|
-
// multi-GB virtual address space cage); Node memory is bounded by
|
|
86
|
-
// --max-old-space-size instead.
|
|
87
|
-
add('-v', options.memLimitMb * 1024); // KB
|
|
88
|
-
}
|
|
89
|
-
add('-t', options.timeoutSeconds + 5); // CPU-seconds safety net behind the wall-clock kill
|
|
90
|
-
add('-n', Number(process.env.SKILL_HUB_ULIMIT_NOFILE || 256));
|
|
91
|
-
add('-f', Math.ceil((options.maxOutputSizeMb * 1024 * 1024) / 512)); // POSIX 512-byte blocks, single file
|
|
92
|
-
if (options.includeNproc) {
|
|
93
|
-
// RLIMIT_NPROC is per real uid system-wide — only safe on the dedicated sandbox uid.
|
|
94
|
-
add('-u', Number(process.env.SKILL_HUB_ULIMIT_NPROC || 64));
|
|
95
|
-
}
|
|
96
|
-
return parts.join(' ');
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
export interface NodeArgsOptions {
|
|
100
|
-
memLimitMb: number;
|
|
101
|
-
scriptPath: string;
|
|
102
|
-
workDir: string;
|
|
103
|
-
outputDir: string;
|
|
104
|
-
skillDir?: string;
|
|
105
|
-
nodePathEntries: string[];
|
|
106
|
-
capabilities: SandboxCapabilities;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
export function buildNodeArgs(options: NodeArgsOptions): string[] {
|
|
110
|
-
const args = [`--max-old-space-size=${options.memLimitMb}`];
|
|
111
|
-
const permissionEnabled = process.env.SKILL_HUB_NODE_PERMISSION !== 'false';
|
|
112
|
-
if (permissionEnabled && options.capabilities.nodePermissionFlag) {
|
|
113
|
-
args.push(options.capabilities.nodePermissionFlag);
|
|
114
|
-
const readDirs = new Set(
|
|
115
|
-
[options.workDir, tmpdir(), options.skillDir || '', ...options.nodePathEntries].filter(Boolean),
|
|
116
|
-
);
|
|
117
|
-
for (const dir of readDirs) {
|
|
118
|
-
args.push(`--allow-fs-read=${dir}`);
|
|
119
|
-
}
|
|
120
|
-
for (const dir of new Set([options.workDir, options.outputDir, tmpdir()])) {
|
|
121
|
-
args.push(`--allow-fs-write=${dir}`);
|
|
122
|
-
}
|
|
123
|
-
if (options.capabilities.nodePermissionAllowAddons) {
|
|
124
|
-
args.push('--allow-addons');
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
// Independent of the permission model and version-stable — always on.
|
|
128
|
-
args.push('--disallow-code-generation-from-strings');
|
|
129
|
-
args.push(options.scriptPath);
|
|
130
|
-
return args;
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
export interface BwrapArgsOptions {
|
|
134
|
-
workDir: string;
|
|
135
|
-
skillDir?: string;
|
|
136
|
-
sandboxWorkspace: string;
|
|
137
|
-
/** Extra host dirs (global NODE_PATH/PYTHONPATH entries) to expose read-only. */
|
|
138
|
-
extraReadOnlyDirs: string[];
|
|
139
|
-
env: Record<string, string>;
|
|
140
|
-
network: SandboxNetworkMode;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
export function buildBwrapArgs(options: BwrapArgsOptions): string[] {
|
|
144
|
-
const args = ['--unshare-all', '--die-with-parent', '--new-session'];
|
|
145
|
-
const bound = new Set<string>();
|
|
146
|
-
const roBind = (path: string) => {
|
|
147
|
-
if (!path || bound.has(path) || !existsSync(path)) return;
|
|
148
|
-
bound.add(path);
|
|
149
|
-
args.push('--ro-bind', path, path);
|
|
150
|
-
};
|
|
151
|
-
// /bin and /lib are usually merged-usr symlinks on Debian; binding them
|
|
152
|
-
// explicitly keeps /bin/sh resolvable inside the mount namespace.
|
|
153
|
-
for (const path of ['/usr', '/bin', '/sbin', '/lib', '/lib64', '/etc/ssl', '/etc/alternatives']) {
|
|
154
|
-
roBind(path);
|
|
155
|
-
}
|
|
156
|
-
roBind(options.sandboxWorkspace); // node_modules, python_packages, py-guard
|
|
157
|
-
if (options.skillDir) roBind(options.skillDir);
|
|
158
|
-
for (const dir of options.extraReadOnlyDirs) roBind(dir);
|
|
159
|
-
if (options.network === 'inherit') {
|
|
160
|
-
args.push('--share-net');
|
|
161
|
-
for (const path of ['/etc/resolv.conf', '/etc/hosts', '/etc/nsswitch.conf']) {
|
|
162
|
-
roBind(path);
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
args.push('--bind', options.workDir, options.workDir); // covers workDir/output
|
|
166
|
-
args.push('--tmpfs', tmpdir());
|
|
167
|
-
args.push('--proc', '/proc');
|
|
168
|
-
args.push('--dev', '/dev');
|
|
169
|
-
args.push('--chdir', options.workDir);
|
|
170
|
-
args.push('--clearenv');
|
|
171
|
-
for (const [key, value] of Object.entries(options.env)) {
|
|
172
|
-
args.push('--setenv', key, value);
|
|
173
|
-
}
|
|
174
|
-
return args;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
export class SandboxRunner {
|
|
178
|
-
private validator = new CodeValidator();
|
|
179
|
-
|
|
180
|
-
private sandboxWorkspace: string;
|
|
181
|
-
|
|
182
|
-
constructor(
|
|
183
|
-
private fileManager: FileManager,
|
|
184
|
-
private logger: any,
|
|
185
|
-
private storagePath: string,
|
|
186
|
-
) {
|
|
187
|
-
this.sandboxWorkspace = resolve(storagePath, 'sandbox-workspace');
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
async execute(options: ExecuteOptions): Promise<ExecutionResult> {
|
|
191
|
-
const {
|
|
192
|
-
language,
|
|
193
|
-
code,
|
|
194
|
-
execId,
|
|
195
|
-
timeoutSeconds = 60,
|
|
196
|
-
maxOutputSizeMb = 50,
|
|
197
|
-
onProgress,
|
|
198
|
-
signal,
|
|
199
|
-
packageWhitelist,
|
|
200
|
-
skillDir,
|
|
201
|
-
inputArgs,
|
|
202
|
-
} = options;
|
|
203
|
-
|
|
204
|
-
// 1. Validate code against forbidden patterns
|
|
205
|
-
this.validator.validate(code, language);
|
|
206
|
-
|
|
207
|
-
// 1b. Validate imports against the allowlist (builtins + whitelist).
|
|
208
|
-
// Always runs: an empty whitelist restricts code to built-in modules only,
|
|
209
|
-
// which blocks stdlib-based network exfiltration (urllib/socket/etc.).
|
|
210
|
-
this.validator.validateImports(code, language, packageWhitelist || []);
|
|
211
|
-
|
|
212
|
-
// 2. Resolve worker capabilities (memoized after the first execution/boot).
|
|
213
|
-
const capabilities = await ensureSandboxCapabilities(this.logger, this.storagePath);
|
|
214
|
-
|
|
215
|
-
// 3. Prepare workspace
|
|
216
|
-
const workDir = this.fileManager.createExecDir(execId);
|
|
217
|
-
const outputDir = this.fileManager.getOutputDir(execId);
|
|
218
|
-
const inputFile = resolve(workDir, 'input.json');
|
|
219
|
-
writeFileSync(inputFile, JSON.stringify(inputArgs || {}, null, 2), 'utf-8');
|
|
220
|
-
|
|
221
|
-
const filename = language === 'node' ? 'script.js' : 'script.py';
|
|
222
|
-
const scriptPath = resolve(workDir, filename);
|
|
223
|
-
writeFileSync(scriptPath, code, 'utf-8');
|
|
224
|
-
|
|
225
|
-
// 3b. Privilege drop — only when the worker runs as root and the sandbox
|
|
226
|
-
// user resolved at init time. Hand the exec dir to that uid first.
|
|
227
|
-
let identity: SandboxIdentity | null =
|
|
228
|
-
!IS_WINDOWS && process.getuid?.() === 0 && capabilities.privilegeDropAvailable
|
|
229
|
-
? capabilities.sandboxIdentity
|
|
230
|
-
: null;
|
|
231
|
-
if (identity) {
|
|
232
|
-
try {
|
|
233
|
-
this.fileManager.chownExecDir(execId, identity.uid, identity.gid);
|
|
234
|
-
} catch (error) {
|
|
235
|
-
this.logger.warn(
|
|
236
|
-
`[skill-hub] chown of exec dir failed for ${execId}; running without privilege drop: ${
|
|
237
|
-
(error as Error).message
|
|
238
|
-
}`,
|
|
239
|
-
);
|
|
240
|
-
identity = null;
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
onProgress?.({ percent: 20, log: 'Code validated, executing...' });
|
|
245
|
-
|
|
246
|
-
// 4. Resolve Node Modules Path using the local sandbox workspace
|
|
247
|
-
const nodePath = resolve(this.sandboxWorkspace, 'node_modules');
|
|
248
|
-
const finalNodePath = process.env.NODE_PATH ? `${nodePath}${delimiter}${process.env.NODE_PATH}` : nodePath;
|
|
249
|
-
const nodePathEntries = finalNodePath.split(delimiter).filter(Boolean);
|
|
250
|
-
|
|
251
|
-
// 5. Sanitized environment — only expose what's necessary.
|
|
252
|
-
const pythonGuardDir = getPythonGuardDir(this.storagePath);
|
|
253
|
-
const execEnv: Record<string, string> = {
|
|
254
|
-
PATH: process.env.PATH || '',
|
|
255
|
-
HOME: tmpdir(),
|
|
256
|
-
TMPDIR: tmpdir(),
|
|
257
|
-
OUTPUT_DIR: outputDir,
|
|
258
|
-
LANG: 'en_US.UTF-8',
|
|
259
|
-
// Node.js
|
|
260
|
-
NODE_PATH: finalNodePath,
|
|
261
|
-
// Python — audit-hook guard dir first, then bundled packages (svg_to_pptx etc.)
|
|
262
|
-
PYTHONPATH: [
|
|
263
|
-
capabilities.pythonGuardActive ? pythonGuardDir : '',
|
|
264
|
-
skillDir ? resolve(skillDir, 'scripts') : '',
|
|
265
|
-
resolve(this.sandboxWorkspace, 'python_packages'),
|
|
266
|
-
process.env.PYTHONPATH || '',
|
|
267
|
-
]
|
|
268
|
-
.filter(Boolean)
|
|
269
|
-
.join(delimiter),
|
|
270
|
-
PYTHONIOENCODING: 'utf-8',
|
|
271
|
-
// Denied bytecode-cache writes are best-effort anyway; skip them entirely.
|
|
272
|
-
PYTHONDONTWRITEBYTECODE: '1',
|
|
273
|
-
// Consumed by the sitecustomize.py guard to scope file writes.
|
|
274
|
-
SKILL_HUB_WRITE_ROOTS: [workDir, outputDir, tmpdir()].join(delimiter),
|
|
275
|
-
SKILL_DIR: skillDir || '',
|
|
276
|
-
SKILL_INPUT_FILE: inputFile,
|
|
277
|
-
// DO NOT pass: DB credentials, API keys, APP_KEY, etc.
|
|
278
|
-
};
|
|
279
|
-
|
|
280
|
-
// 6. Build command + args — never interpolate per-execution values into a
|
|
281
|
-
// shell string; scriptPath/workDir travel as argv entries only.
|
|
282
|
-
const memLimitMb = Math.max(64, Number(process.env.SKILL_HUB_MEM_LIMIT_MB || 512));
|
|
283
|
-
const command = language === 'node' ? 'node' : pythonBinary();
|
|
284
|
-
const args =
|
|
285
|
-
language === 'node'
|
|
286
|
-
? buildNodeArgs({
|
|
287
|
-
memLimitMb,
|
|
288
|
-
scriptPath,
|
|
289
|
-
workDir,
|
|
290
|
-
outputDir,
|
|
291
|
-
skillDir,
|
|
292
|
-
nodePathEntries,
|
|
293
|
-
capabilities,
|
|
294
|
-
})
|
|
295
|
-
: [scriptPath];
|
|
296
|
-
|
|
297
|
-
let spawnCommand = command;
|
|
298
|
-
let spawnArgs = args;
|
|
299
|
-
if (!IS_WINDOWS) {
|
|
300
|
-
// Tiny shell wrapper exists only for the ulimit builtins. "$0"/"$@" pass
|
|
301
|
-
// command/args through as argv — nothing user-controlled is parsed as shell.
|
|
302
|
-
const ulimitPrefix = buildUlimitPrefix({
|
|
303
|
-
language,
|
|
304
|
-
memLimitMb,
|
|
305
|
-
timeoutSeconds,
|
|
306
|
-
maxOutputSizeMb,
|
|
307
|
-
includeNproc: identity !== null,
|
|
308
|
-
});
|
|
309
|
-
spawnCommand = '/bin/sh';
|
|
310
|
-
spawnArgs = ['-c', `${ulimitPrefix} exec "$0" "$@"`, command, ...args];
|
|
311
|
-
|
|
312
|
-
if (capabilities.isolationLevel === 'bwrap') {
|
|
313
|
-
const extraReadOnlyDirs = [
|
|
314
|
-
...nodePathEntries.filter((entry) => entry !== nodePath),
|
|
315
|
-
...(process.env.PYTHONPATH || '').split(delimiter),
|
|
316
|
-
].filter(Boolean);
|
|
317
|
-
spawnArgs = [
|
|
318
|
-
...buildBwrapArgs({
|
|
319
|
-
workDir,
|
|
320
|
-
skillDir,
|
|
321
|
-
sandboxWorkspace: this.sandboxWorkspace,
|
|
322
|
-
extraReadOnlyDirs,
|
|
323
|
-
env: execEnv,
|
|
324
|
-
network: capabilities.network,
|
|
325
|
-
}),
|
|
326
|
-
'--',
|
|
327
|
-
spawnCommand,
|
|
328
|
-
...spawnArgs,
|
|
329
|
-
];
|
|
330
|
-
spawnCommand = 'bwrap';
|
|
331
|
-
}
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
// 7. Execute via spawn (no shell around user data, group-kill support)
|
|
335
|
-
const startTime = Date.now();
|
|
336
|
-
let wasCanceled = false;
|
|
337
|
-
let wasTimedOut = false;
|
|
338
|
-
let outputExceeded = false;
|
|
339
|
-
|
|
340
|
-
const processResult = await new Promise<{
|
|
341
|
-
exitCode: number;
|
|
342
|
-
stdout: string;
|
|
343
|
-
stderr: string;
|
|
344
|
-
}>((_resolve) => {
|
|
345
|
-
let stdout = '';
|
|
346
|
-
let stderr = '';
|
|
347
|
-
let totalBytes = 0;
|
|
348
|
-
let settled = false;
|
|
349
|
-
let timeoutTimer: NodeJS.Timeout | null = null;
|
|
350
|
-
let forceKillTimer: NodeJS.Timeout | null = null;
|
|
351
|
-
|
|
352
|
-
const child = spawn(spawnCommand, spawnArgs, {
|
|
353
|
-
cwd: workDir,
|
|
354
|
-
env: execEnv,
|
|
355
|
-
// Process-group leader on POSIX so kill(-pid) reaches every descendant.
|
|
356
|
-
detached: !IS_WINDOWS,
|
|
357
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
358
|
-
uid: identity?.uid,
|
|
359
|
-
gid: identity?.gid,
|
|
360
|
-
});
|
|
361
|
-
|
|
362
|
-
const finish = (exitCode: number) => {
|
|
363
|
-
if (settled) return;
|
|
364
|
-
settled = true;
|
|
365
|
-
if (timeoutTimer) clearTimeout(timeoutTimer);
|
|
366
|
-
if (forceKillTimer) clearTimeout(forceKillTimer);
|
|
367
|
-
_resolve({
|
|
368
|
-
exitCode,
|
|
369
|
-
stdout: stdout.slice(0, MAX_STDOUT_CHARS),
|
|
370
|
-
stderr: stderr.slice(0, MAX_STDERR_CHARS),
|
|
371
|
-
});
|
|
372
|
-
};
|
|
373
|
-
|
|
374
|
-
const killTree = (killSignal: 'SIGTERM' | 'SIGKILL') => {
|
|
375
|
-
if (!child.pid) return;
|
|
376
|
-
if (IS_WINDOWS) {
|
|
377
|
-
// Best-effort whole-tree kill on Windows (dev-only platform).
|
|
378
|
-
try {
|
|
379
|
-
spawn('taskkill', ['/pid', String(child.pid), '/T', '/F'], { stdio: 'ignore' });
|
|
380
|
-
} catch {
|
|
381
|
-
child.kill(killSignal);
|
|
382
|
-
}
|
|
383
|
-
return;
|
|
384
|
-
}
|
|
385
|
-
try {
|
|
386
|
-
process.kill(-child.pid, killSignal);
|
|
387
|
-
} catch {
|
|
388
|
-
// ESRCH: group already gone. Fall back to the direct child just in case.
|
|
389
|
-
try {
|
|
390
|
-
child.kill(killSignal);
|
|
391
|
-
} catch {
|
|
392
|
-
// already exited
|
|
393
|
-
}
|
|
394
|
-
}
|
|
395
|
-
};
|
|
396
|
-
|
|
397
|
-
const terminate = (reason: string) => {
|
|
398
|
-
this.logger.info(`[skill-hub] Killing process tree for exec ${execId} (${reason})`);
|
|
399
|
-
killTree('SIGTERM');
|
|
400
|
-
if (!forceKillTimer) {
|
|
401
|
-
// Same 3-second grace window as before, applied to the whole group.
|
|
402
|
-
forceKillTimer = setTimeout(() => killTree('SIGKILL'), 3000);
|
|
403
|
-
}
|
|
404
|
-
};
|
|
405
|
-
|
|
406
|
-
timeoutTimer = setTimeout(() => {
|
|
407
|
-
wasTimedOut = true;
|
|
408
|
-
terminate('timeout');
|
|
409
|
-
}, timeoutSeconds * 1000);
|
|
410
|
-
|
|
411
|
-
const onData = (isStdout: boolean) => (chunk: Buffer) => {
|
|
412
|
-
totalBytes += chunk.length;
|
|
413
|
-
if (totalBytes > MAX_STDIO_BYTES) {
|
|
414
|
-
if (!outputExceeded) {
|
|
415
|
-
outputExceeded = true;
|
|
416
|
-
terminate('output exceeded limit');
|
|
417
|
-
}
|
|
418
|
-
return;
|
|
419
|
-
}
|
|
420
|
-
// Retain only the head that finish() returns; totalBytes keeps counting
|
|
421
|
-
// so the runaway-output kill above still triggers.
|
|
422
|
-
if (isStdout) {
|
|
423
|
-
if (stdout.length < MAX_STDOUT_CHARS) stdout += chunk.toString();
|
|
424
|
-
} else if (stderr.length < MAX_STDERR_CHARS) {
|
|
425
|
-
stderr += chunk.toString();
|
|
426
|
-
}
|
|
427
|
-
};
|
|
428
|
-
child.stdout?.on('data', onData(true));
|
|
429
|
-
child.stderr?.on('data', onData(false));
|
|
430
|
-
|
|
431
|
-
child.on('error', (error: NodeJS.ErrnoException) => {
|
|
432
|
-
// Spawn-time failures (missing binary, EPERM on uid/gid, ...)
|
|
433
|
-
stderr = `Failed to start sandbox process: ${error.message}\n${stderr}`;
|
|
434
|
-
finish(1);
|
|
435
|
-
});
|
|
436
|
-
|
|
437
|
-
child.on('close', (exitCode, exitSignal) => {
|
|
438
|
-
finish(exitSignal !== null || exitCode === null ? -1 : exitCode);
|
|
439
|
-
});
|
|
440
|
-
|
|
441
|
-
if (signal) {
|
|
442
|
-
signal.addEventListener('abort', () => {
|
|
443
|
-
wasCanceled = true;
|
|
444
|
-
terminate('user abort');
|
|
445
|
-
});
|
|
446
|
-
}
|
|
447
|
-
});
|
|
448
|
-
|
|
449
|
-
const durationMs = Date.now() - startTime;
|
|
450
|
-
|
|
451
|
-
onProgress?.({ percent: 80, log: wasCanceled ? 'Canceled' : 'Execution completed, collecting files...' });
|
|
452
|
-
|
|
453
|
-
// 8. Collect output files
|
|
454
|
-
const files = this.fileManager.listOutputFiles(execId);
|
|
455
|
-
|
|
456
|
-
// 9. Check output size limit
|
|
457
|
-
const totalSizeBytes = this.fileManager.getTotalOutputSize(execId);
|
|
458
|
-
const maxBytes = maxOutputSizeMb * 1024 * 1024;
|
|
459
|
-
if (totalSizeBytes > maxBytes) {
|
|
460
|
-
this.logger.warn(
|
|
461
|
-
`[skill-hub] Execution ${execId}: output size ${totalSizeBytes} bytes exceeds limit ${maxBytes}`,
|
|
462
|
-
);
|
|
463
|
-
}
|
|
464
|
-
|
|
465
|
-
onProgress?.({ percent: 100, log: 'Done' });
|
|
466
|
-
|
|
467
|
-
const timedOut = wasTimedOut && !wasCanceled;
|
|
468
|
-
if (timedOut) {
|
|
469
|
-
processResult.stderr = `Execution timed out after ${timeoutSeconds}s\n${processResult.stderr}`;
|
|
470
|
-
}
|
|
471
|
-
|
|
472
|
-
if (outputExceeded) {
|
|
473
|
-
processResult.stderr = `Execution stdout/stderr exceeded ${Math.floor(MAX_STDIO_BYTES / 1024 / 1024)}MB limit\n${
|
|
474
|
-
processResult.stderr
|
|
475
|
-
}`;
|
|
476
|
-
}
|
|
477
|
-
|
|
478
|
-
if (wasCanceled) {
|
|
479
|
-
processResult.stderr = `Execution canceled by user\n${processResult.stderr}`;
|
|
480
|
-
}
|
|
481
|
-
|
|
482
|
-
return {
|
|
483
|
-
success: !wasCanceled && !timedOut && !outputExceeded && processResult.exitCode === 0,
|
|
484
|
-
stdout: processResult.stdout,
|
|
485
|
-
stderr: processResult.stderr,
|
|
486
|
-
files,
|
|
487
|
-
durationMs,
|
|
488
|
-
canceled: wasCanceled,
|
|
489
|
-
timedOut,
|
|
490
|
-
};
|
|
491
|
-
}
|
|
492
|
-
}
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
import { existsSync, writeFileSync } from 'fs';
|
|
3
|
+
import { resolve, delimiter } from 'path';
|
|
4
|
+
import { tmpdir } from 'os';
|
|
5
|
+
import { FileManager, OutputFileInfo } from './FileManager';
|
|
6
|
+
import { CodeValidator } from './CodeValidator';
|
|
7
|
+
import {
|
|
8
|
+
ensureSandboxCapabilities,
|
|
9
|
+
getPythonGuardDir,
|
|
10
|
+
SandboxCapabilities,
|
|
11
|
+
SandboxIdentity,
|
|
12
|
+
SandboxNetworkMode,
|
|
13
|
+
} from './sandboxCapabilities';
|
|
14
|
+
|
|
15
|
+
const IS_WINDOWS = process.platform === 'win32';
|
|
16
|
+
|
|
17
|
+
/** stdout/stderr accumulation cap — matches the old exec() maxBuffer. */
|
|
18
|
+
const MAX_STDIO_BYTES = 10 * 1024 * 1024;
|
|
19
|
+
|
|
20
|
+
/** Only the head of stdout/stderr is ever returned to callers — don't retain more in memory. */
|
|
21
|
+
const MAX_STDOUT_CHARS = 5000;
|
|
22
|
+
const MAX_STDERR_CHARS = 2000;
|
|
23
|
+
|
|
24
|
+
/** Resolve the python executable name per platform (python3 on *nix, python on Windows). */
|
|
25
|
+
function pythonBinary() {
|
|
26
|
+
return process.env.SKILL_HUB_PYTHON_BIN || (IS_WINDOWS ? 'python' : 'python3');
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export interface ExecuteOptions {
|
|
30
|
+
language: 'node' | 'python';
|
|
31
|
+
code: string;
|
|
32
|
+
execId: string;
|
|
33
|
+
timeoutSeconds?: number;
|
|
34
|
+
maxOutputSizeMb?: number;
|
|
35
|
+
onProgress?: (progress: ProgressUpdate) => void;
|
|
36
|
+
/** AbortSignal — when aborted, the child process is killed */
|
|
37
|
+
signal?: { addEventListener(event: string, listener: () => void): void };
|
|
38
|
+
/** Package whitelist for import validation (from skillWorkerConfigs) */
|
|
39
|
+
packageWhitelist?: string[];
|
|
40
|
+
/** Optional installed/copied skill package root exposed to the runtime as SKILL_DIR. */
|
|
41
|
+
skillDir?: string;
|
|
42
|
+
/** Validated input exposed as a JSON file to avoid source-code interpolation. */
|
|
43
|
+
inputArgs?: Record<string, unknown>;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export interface ProgressUpdate {
|
|
47
|
+
percent: number;
|
|
48
|
+
log: string;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export interface ExecutionResult {
|
|
52
|
+
success: boolean;
|
|
53
|
+
stdout: string;
|
|
54
|
+
stderr: string;
|
|
55
|
+
files: OutputFileInfo[];
|
|
56
|
+
durationMs: number;
|
|
57
|
+
/** true if execution was canceled by user */
|
|
58
|
+
canceled?: boolean;
|
|
59
|
+
/** true if execution timed out */
|
|
60
|
+
timedOut?: boolean;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
export interface UlimitOptions {
|
|
64
|
+
language: 'node' | 'python';
|
|
65
|
+
memLimitMb: number;
|
|
66
|
+
timeoutSeconds: number;
|
|
67
|
+
maxOutputSizeMb: number;
|
|
68
|
+
/** Only apply -u when the child runs under the dedicated sandbox uid. */
|
|
69
|
+
includeNproc: boolean;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Fixed ulimit prefix for the POSIX shell wrapper. Every number is computed
|
|
74
|
+
* server-side and validated as a finite positive integer before interpolation;
|
|
75
|
+
* no per-execution user data ever enters this string.
|
|
76
|
+
*/
|
|
77
|
+
export function buildUlimitPrefix(options: UlimitOptions): string {
|
|
78
|
+
const parts: string[] = [];
|
|
79
|
+
const add = (flag: string, value: number) => {
|
|
80
|
+
if (!Number.isFinite(value) || value <= 0) return;
|
|
81
|
+
parts.push(`ulimit ${flag} ${Math.floor(value)} 2>/dev/null;`);
|
|
82
|
+
};
|
|
83
|
+
if (options.language === 'python') {
|
|
84
|
+
// RLIMIT_AS would fatally crash modern Node at startup (V8 reserves a
|
|
85
|
+
// multi-GB virtual address space cage); Node memory is bounded by
|
|
86
|
+
// --max-old-space-size instead.
|
|
87
|
+
add('-v', options.memLimitMb * 1024); // KB
|
|
88
|
+
}
|
|
89
|
+
add('-t', options.timeoutSeconds + 5); // CPU-seconds safety net behind the wall-clock kill
|
|
90
|
+
add('-n', Number(process.env.SKILL_HUB_ULIMIT_NOFILE || 256));
|
|
91
|
+
add('-f', Math.ceil((options.maxOutputSizeMb * 1024 * 1024) / 512)); // POSIX 512-byte blocks, single file
|
|
92
|
+
if (options.includeNproc) {
|
|
93
|
+
// RLIMIT_NPROC is per real uid system-wide — only safe on the dedicated sandbox uid.
|
|
94
|
+
add('-u', Number(process.env.SKILL_HUB_ULIMIT_NPROC || 64));
|
|
95
|
+
}
|
|
96
|
+
return parts.join(' ');
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
export interface NodeArgsOptions {
|
|
100
|
+
memLimitMb: number;
|
|
101
|
+
scriptPath: string;
|
|
102
|
+
workDir: string;
|
|
103
|
+
outputDir: string;
|
|
104
|
+
skillDir?: string;
|
|
105
|
+
nodePathEntries: string[];
|
|
106
|
+
capabilities: SandboxCapabilities;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
export function buildNodeArgs(options: NodeArgsOptions): string[] {
|
|
110
|
+
const args = [`--max-old-space-size=${options.memLimitMb}`];
|
|
111
|
+
const permissionEnabled = process.env.SKILL_HUB_NODE_PERMISSION !== 'false';
|
|
112
|
+
if (permissionEnabled && options.capabilities.nodePermissionFlag) {
|
|
113
|
+
args.push(options.capabilities.nodePermissionFlag);
|
|
114
|
+
const readDirs = new Set(
|
|
115
|
+
[options.workDir, tmpdir(), options.skillDir || '', ...options.nodePathEntries].filter(Boolean),
|
|
116
|
+
);
|
|
117
|
+
for (const dir of readDirs) {
|
|
118
|
+
args.push(`--allow-fs-read=${dir}`);
|
|
119
|
+
}
|
|
120
|
+
for (const dir of new Set([options.workDir, options.outputDir, tmpdir()])) {
|
|
121
|
+
args.push(`--allow-fs-write=${dir}`);
|
|
122
|
+
}
|
|
123
|
+
if (options.capabilities.nodePermissionAllowAddons) {
|
|
124
|
+
args.push('--allow-addons');
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
// Independent of the permission model and version-stable — always on.
|
|
128
|
+
args.push('--disallow-code-generation-from-strings');
|
|
129
|
+
args.push(options.scriptPath);
|
|
130
|
+
return args;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
export interface BwrapArgsOptions {
|
|
134
|
+
workDir: string;
|
|
135
|
+
skillDir?: string;
|
|
136
|
+
sandboxWorkspace: string;
|
|
137
|
+
/** Extra host dirs (global NODE_PATH/PYTHONPATH entries) to expose read-only. */
|
|
138
|
+
extraReadOnlyDirs: string[];
|
|
139
|
+
env: Record<string, string>;
|
|
140
|
+
network: SandboxNetworkMode;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
export function buildBwrapArgs(options: BwrapArgsOptions): string[] {
|
|
144
|
+
const args = ['--unshare-all', '--die-with-parent', '--new-session'];
|
|
145
|
+
const bound = new Set<string>();
|
|
146
|
+
const roBind = (path: string) => {
|
|
147
|
+
if (!path || bound.has(path) || !existsSync(path)) return;
|
|
148
|
+
bound.add(path);
|
|
149
|
+
args.push('--ro-bind', path, path);
|
|
150
|
+
};
|
|
151
|
+
// /bin and /lib are usually merged-usr symlinks on Debian; binding them
|
|
152
|
+
// explicitly keeps /bin/sh resolvable inside the mount namespace.
|
|
153
|
+
for (const path of ['/usr', '/bin', '/sbin', '/lib', '/lib64', '/etc/ssl', '/etc/alternatives']) {
|
|
154
|
+
roBind(path);
|
|
155
|
+
}
|
|
156
|
+
roBind(options.sandboxWorkspace); // node_modules, python_packages, py-guard
|
|
157
|
+
if (options.skillDir) roBind(options.skillDir);
|
|
158
|
+
for (const dir of options.extraReadOnlyDirs) roBind(dir);
|
|
159
|
+
if (options.network === 'inherit') {
|
|
160
|
+
args.push('--share-net');
|
|
161
|
+
for (const path of ['/etc/resolv.conf', '/etc/hosts', '/etc/nsswitch.conf']) {
|
|
162
|
+
roBind(path);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
args.push('--bind', options.workDir, options.workDir); // covers workDir/output
|
|
166
|
+
args.push('--tmpfs', tmpdir());
|
|
167
|
+
args.push('--proc', '/proc');
|
|
168
|
+
args.push('--dev', '/dev');
|
|
169
|
+
args.push('--chdir', options.workDir);
|
|
170
|
+
args.push('--clearenv');
|
|
171
|
+
for (const [key, value] of Object.entries(options.env)) {
|
|
172
|
+
args.push('--setenv', key, value);
|
|
173
|
+
}
|
|
174
|
+
return args;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
export class SandboxRunner {
|
|
178
|
+
private validator = new CodeValidator();
|
|
179
|
+
|
|
180
|
+
private sandboxWorkspace: string;
|
|
181
|
+
|
|
182
|
+
constructor(
|
|
183
|
+
private fileManager: FileManager,
|
|
184
|
+
private logger: any,
|
|
185
|
+
private storagePath: string,
|
|
186
|
+
) {
|
|
187
|
+
this.sandboxWorkspace = resolve(storagePath, 'sandbox-workspace');
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
async execute(options: ExecuteOptions): Promise<ExecutionResult> {
|
|
191
|
+
const {
|
|
192
|
+
language,
|
|
193
|
+
code,
|
|
194
|
+
execId,
|
|
195
|
+
timeoutSeconds = 60,
|
|
196
|
+
maxOutputSizeMb = 50,
|
|
197
|
+
onProgress,
|
|
198
|
+
signal,
|
|
199
|
+
packageWhitelist,
|
|
200
|
+
skillDir,
|
|
201
|
+
inputArgs,
|
|
202
|
+
} = options;
|
|
203
|
+
|
|
204
|
+
// 1. Validate code against forbidden patterns
|
|
205
|
+
this.validator.validate(code, language);
|
|
206
|
+
|
|
207
|
+
// 1b. Validate imports against the allowlist (builtins + whitelist).
|
|
208
|
+
// Always runs: an empty whitelist restricts code to built-in modules only,
|
|
209
|
+
// which blocks stdlib-based network exfiltration (urllib/socket/etc.).
|
|
210
|
+
this.validator.validateImports(code, language, packageWhitelist || []);
|
|
211
|
+
|
|
212
|
+
// 2. Resolve worker capabilities (memoized after the first execution/boot).
|
|
213
|
+
const capabilities = await ensureSandboxCapabilities(this.logger, this.storagePath);
|
|
214
|
+
|
|
215
|
+
// 3. Prepare workspace
|
|
216
|
+
const workDir = this.fileManager.createExecDir(execId);
|
|
217
|
+
const outputDir = this.fileManager.getOutputDir(execId);
|
|
218
|
+
const inputFile = resolve(workDir, 'input.json');
|
|
219
|
+
writeFileSync(inputFile, JSON.stringify(inputArgs || {}, null, 2), 'utf-8');
|
|
220
|
+
|
|
221
|
+
const filename = language === 'node' ? 'script.js' : 'script.py';
|
|
222
|
+
const scriptPath = resolve(workDir, filename);
|
|
223
|
+
writeFileSync(scriptPath, code, 'utf-8');
|
|
224
|
+
|
|
225
|
+
// 3b. Privilege drop — only when the worker runs as root and the sandbox
|
|
226
|
+
// user resolved at init time. Hand the exec dir to that uid first.
|
|
227
|
+
let identity: SandboxIdentity | null =
|
|
228
|
+
!IS_WINDOWS && process.getuid?.() === 0 && capabilities.privilegeDropAvailable
|
|
229
|
+
? capabilities.sandboxIdentity
|
|
230
|
+
: null;
|
|
231
|
+
if (identity) {
|
|
232
|
+
try {
|
|
233
|
+
this.fileManager.chownExecDir(execId, identity.uid, identity.gid);
|
|
234
|
+
} catch (error) {
|
|
235
|
+
this.logger.warn(
|
|
236
|
+
`[skill-hub] chown of exec dir failed for ${execId}; running without privilege drop: ${
|
|
237
|
+
(error as Error).message
|
|
238
|
+
}`,
|
|
239
|
+
);
|
|
240
|
+
identity = null;
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
onProgress?.({ percent: 20, log: 'Code validated, executing...' });
|
|
245
|
+
|
|
246
|
+
// 4. Resolve Node Modules Path using the local sandbox workspace
|
|
247
|
+
const nodePath = resolve(this.sandboxWorkspace, 'node_modules');
|
|
248
|
+
const finalNodePath = process.env.NODE_PATH ? `${nodePath}${delimiter}${process.env.NODE_PATH}` : nodePath;
|
|
249
|
+
const nodePathEntries = finalNodePath.split(delimiter).filter(Boolean);
|
|
250
|
+
|
|
251
|
+
// 5. Sanitized environment — only expose what's necessary.
|
|
252
|
+
const pythonGuardDir = getPythonGuardDir(this.storagePath);
|
|
253
|
+
const execEnv: Record<string, string> = {
|
|
254
|
+
PATH: process.env.PATH || '',
|
|
255
|
+
HOME: tmpdir(),
|
|
256
|
+
TMPDIR: tmpdir(),
|
|
257
|
+
OUTPUT_DIR: outputDir,
|
|
258
|
+
LANG: 'en_US.UTF-8',
|
|
259
|
+
// Node.js
|
|
260
|
+
NODE_PATH: finalNodePath,
|
|
261
|
+
// Python — audit-hook guard dir first, then bundled packages (svg_to_pptx etc.)
|
|
262
|
+
PYTHONPATH: [
|
|
263
|
+
capabilities.pythonGuardActive ? pythonGuardDir : '',
|
|
264
|
+
skillDir ? resolve(skillDir, 'scripts') : '',
|
|
265
|
+
resolve(this.sandboxWorkspace, 'python_packages'),
|
|
266
|
+
process.env.PYTHONPATH || '',
|
|
267
|
+
]
|
|
268
|
+
.filter(Boolean)
|
|
269
|
+
.join(delimiter),
|
|
270
|
+
PYTHONIOENCODING: 'utf-8',
|
|
271
|
+
// Denied bytecode-cache writes are best-effort anyway; skip them entirely.
|
|
272
|
+
PYTHONDONTWRITEBYTECODE: '1',
|
|
273
|
+
// Consumed by the sitecustomize.py guard to scope file writes.
|
|
274
|
+
SKILL_HUB_WRITE_ROOTS: [workDir, outputDir, tmpdir()].join(delimiter),
|
|
275
|
+
SKILL_DIR: skillDir || '',
|
|
276
|
+
SKILL_INPUT_FILE: inputFile,
|
|
277
|
+
// DO NOT pass: DB credentials, API keys, APP_KEY, etc.
|
|
278
|
+
};
|
|
279
|
+
|
|
280
|
+
// 6. Build command + args — never interpolate per-execution values into a
|
|
281
|
+
// shell string; scriptPath/workDir travel as argv entries only.
|
|
282
|
+
const memLimitMb = Math.max(64, Number(process.env.SKILL_HUB_MEM_LIMIT_MB || 512));
|
|
283
|
+
const command = language === 'node' ? 'node' : pythonBinary();
|
|
284
|
+
const args =
|
|
285
|
+
language === 'node'
|
|
286
|
+
? buildNodeArgs({
|
|
287
|
+
memLimitMb,
|
|
288
|
+
scriptPath,
|
|
289
|
+
workDir,
|
|
290
|
+
outputDir,
|
|
291
|
+
skillDir,
|
|
292
|
+
nodePathEntries,
|
|
293
|
+
capabilities,
|
|
294
|
+
})
|
|
295
|
+
: [scriptPath];
|
|
296
|
+
|
|
297
|
+
let spawnCommand = command;
|
|
298
|
+
let spawnArgs = args;
|
|
299
|
+
if (!IS_WINDOWS) {
|
|
300
|
+
// Tiny shell wrapper exists only for the ulimit builtins. "$0"/"$@" pass
|
|
301
|
+
// command/args through as argv — nothing user-controlled is parsed as shell.
|
|
302
|
+
const ulimitPrefix = buildUlimitPrefix({
|
|
303
|
+
language,
|
|
304
|
+
memLimitMb,
|
|
305
|
+
timeoutSeconds,
|
|
306
|
+
maxOutputSizeMb,
|
|
307
|
+
includeNproc: identity !== null,
|
|
308
|
+
});
|
|
309
|
+
spawnCommand = '/bin/sh';
|
|
310
|
+
spawnArgs = ['-c', `${ulimitPrefix} exec "$0" "$@"`, command, ...args];
|
|
311
|
+
|
|
312
|
+
if (capabilities.isolationLevel === 'bwrap') {
|
|
313
|
+
const extraReadOnlyDirs = [
|
|
314
|
+
...nodePathEntries.filter((entry) => entry !== nodePath),
|
|
315
|
+
...(process.env.PYTHONPATH || '').split(delimiter),
|
|
316
|
+
].filter(Boolean);
|
|
317
|
+
spawnArgs = [
|
|
318
|
+
...buildBwrapArgs({
|
|
319
|
+
workDir,
|
|
320
|
+
skillDir,
|
|
321
|
+
sandboxWorkspace: this.sandboxWorkspace,
|
|
322
|
+
extraReadOnlyDirs,
|
|
323
|
+
env: execEnv,
|
|
324
|
+
network: capabilities.network,
|
|
325
|
+
}),
|
|
326
|
+
'--',
|
|
327
|
+
spawnCommand,
|
|
328
|
+
...spawnArgs,
|
|
329
|
+
];
|
|
330
|
+
spawnCommand = 'bwrap';
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
// 7. Execute via spawn (no shell around user data, group-kill support)
|
|
335
|
+
const startTime = Date.now();
|
|
336
|
+
let wasCanceled = false;
|
|
337
|
+
let wasTimedOut = false;
|
|
338
|
+
let outputExceeded = false;
|
|
339
|
+
|
|
340
|
+
const processResult = await new Promise<{
|
|
341
|
+
exitCode: number;
|
|
342
|
+
stdout: string;
|
|
343
|
+
stderr: string;
|
|
344
|
+
}>((_resolve) => {
|
|
345
|
+
let stdout = '';
|
|
346
|
+
let stderr = '';
|
|
347
|
+
let totalBytes = 0;
|
|
348
|
+
let settled = false;
|
|
349
|
+
let timeoutTimer: NodeJS.Timeout | null = null;
|
|
350
|
+
let forceKillTimer: NodeJS.Timeout | null = null;
|
|
351
|
+
|
|
352
|
+
const child = spawn(spawnCommand, spawnArgs, {
|
|
353
|
+
cwd: workDir,
|
|
354
|
+
env: execEnv,
|
|
355
|
+
// Process-group leader on POSIX so kill(-pid) reaches every descendant.
|
|
356
|
+
detached: !IS_WINDOWS,
|
|
357
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
358
|
+
uid: identity?.uid,
|
|
359
|
+
gid: identity?.gid,
|
|
360
|
+
});
|
|
361
|
+
|
|
362
|
+
const finish = (exitCode: number) => {
|
|
363
|
+
if (settled) return;
|
|
364
|
+
settled = true;
|
|
365
|
+
if (timeoutTimer) clearTimeout(timeoutTimer);
|
|
366
|
+
if (forceKillTimer) clearTimeout(forceKillTimer);
|
|
367
|
+
_resolve({
|
|
368
|
+
exitCode,
|
|
369
|
+
stdout: stdout.slice(0, MAX_STDOUT_CHARS),
|
|
370
|
+
stderr: stderr.slice(0, MAX_STDERR_CHARS),
|
|
371
|
+
});
|
|
372
|
+
};
|
|
373
|
+
|
|
374
|
+
const killTree = (killSignal: 'SIGTERM' | 'SIGKILL') => {
|
|
375
|
+
if (!child.pid) return;
|
|
376
|
+
if (IS_WINDOWS) {
|
|
377
|
+
// Best-effort whole-tree kill on Windows (dev-only platform).
|
|
378
|
+
try {
|
|
379
|
+
spawn('taskkill', ['/pid', String(child.pid), '/T', '/F'], { stdio: 'ignore' });
|
|
380
|
+
} catch {
|
|
381
|
+
child.kill(killSignal);
|
|
382
|
+
}
|
|
383
|
+
return;
|
|
384
|
+
}
|
|
385
|
+
try {
|
|
386
|
+
process.kill(-child.pid, killSignal);
|
|
387
|
+
} catch {
|
|
388
|
+
// ESRCH: group already gone. Fall back to the direct child just in case.
|
|
389
|
+
try {
|
|
390
|
+
child.kill(killSignal);
|
|
391
|
+
} catch {
|
|
392
|
+
// already exited
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
};
|
|
396
|
+
|
|
397
|
+
const terminate = (reason: string) => {
|
|
398
|
+
this.logger.info(`[skill-hub] Killing process tree for exec ${execId} (${reason})`);
|
|
399
|
+
killTree('SIGTERM');
|
|
400
|
+
if (!forceKillTimer) {
|
|
401
|
+
// Same 3-second grace window as before, applied to the whole group.
|
|
402
|
+
forceKillTimer = setTimeout(() => killTree('SIGKILL'), 3000);
|
|
403
|
+
}
|
|
404
|
+
};
|
|
405
|
+
|
|
406
|
+
timeoutTimer = setTimeout(() => {
|
|
407
|
+
wasTimedOut = true;
|
|
408
|
+
terminate('timeout');
|
|
409
|
+
}, timeoutSeconds * 1000);
|
|
410
|
+
|
|
411
|
+
const onData = (isStdout: boolean) => (chunk: Buffer) => {
|
|
412
|
+
totalBytes += chunk.length;
|
|
413
|
+
if (totalBytes > MAX_STDIO_BYTES) {
|
|
414
|
+
if (!outputExceeded) {
|
|
415
|
+
outputExceeded = true;
|
|
416
|
+
terminate('output exceeded limit');
|
|
417
|
+
}
|
|
418
|
+
return;
|
|
419
|
+
}
|
|
420
|
+
// Retain only the head that finish() returns; totalBytes keeps counting
|
|
421
|
+
// so the runaway-output kill above still triggers.
|
|
422
|
+
if (isStdout) {
|
|
423
|
+
if (stdout.length < MAX_STDOUT_CHARS) stdout += chunk.toString();
|
|
424
|
+
} else if (stderr.length < MAX_STDERR_CHARS) {
|
|
425
|
+
stderr += chunk.toString();
|
|
426
|
+
}
|
|
427
|
+
};
|
|
428
|
+
child.stdout?.on('data', onData(true));
|
|
429
|
+
child.stderr?.on('data', onData(false));
|
|
430
|
+
|
|
431
|
+
child.on('error', (error: NodeJS.ErrnoException) => {
|
|
432
|
+
// Spawn-time failures (missing binary, EPERM on uid/gid, ...)
|
|
433
|
+
stderr = `Failed to start sandbox process: ${error.message}\n${stderr}`;
|
|
434
|
+
finish(1);
|
|
435
|
+
});
|
|
436
|
+
|
|
437
|
+
child.on('close', (exitCode, exitSignal) => {
|
|
438
|
+
finish(exitSignal !== null || exitCode === null ? -1 : exitCode);
|
|
439
|
+
});
|
|
440
|
+
|
|
441
|
+
if (signal) {
|
|
442
|
+
signal.addEventListener('abort', () => {
|
|
443
|
+
wasCanceled = true;
|
|
444
|
+
terminate('user abort');
|
|
445
|
+
});
|
|
446
|
+
}
|
|
447
|
+
});
|
|
448
|
+
|
|
449
|
+
const durationMs = Date.now() - startTime;
|
|
450
|
+
|
|
451
|
+
onProgress?.({ percent: 80, log: wasCanceled ? 'Canceled' : 'Execution completed, collecting files...' });
|
|
452
|
+
|
|
453
|
+
// 8. Collect output files
|
|
454
|
+
const files = this.fileManager.listOutputFiles(execId);
|
|
455
|
+
|
|
456
|
+
// 9. Check output size limit
|
|
457
|
+
const totalSizeBytes = this.fileManager.getTotalOutputSize(execId);
|
|
458
|
+
const maxBytes = maxOutputSizeMb * 1024 * 1024;
|
|
459
|
+
if (totalSizeBytes > maxBytes) {
|
|
460
|
+
this.logger.warn(
|
|
461
|
+
`[skill-hub] Execution ${execId}: output size ${totalSizeBytes} bytes exceeds limit ${maxBytes}`,
|
|
462
|
+
);
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
onProgress?.({ percent: 100, log: 'Done' });
|
|
466
|
+
|
|
467
|
+
const timedOut = wasTimedOut && !wasCanceled;
|
|
468
|
+
if (timedOut) {
|
|
469
|
+
processResult.stderr = `Execution timed out after ${timeoutSeconds}s\n${processResult.stderr}`;
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
if (outputExceeded) {
|
|
473
|
+
processResult.stderr = `Execution stdout/stderr exceeded ${Math.floor(MAX_STDIO_BYTES / 1024 / 1024)}MB limit\n${
|
|
474
|
+
processResult.stderr
|
|
475
|
+
}`;
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
if (wasCanceled) {
|
|
479
|
+
processResult.stderr = `Execution canceled by user\n${processResult.stderr}`;
|
|
480
|
+
}
|
|
481
|
+
|
|
482
|
+
return {
|
|
483
|
+
success: !wasCanceled && !timedOut && !outputExceeded && processResult.exitCode === 0,
|
|
484
|
+
stdout: processResult.stdout,
|
|
485
|
+
stderr: processResult.stderr,
|
|
486
|
+
files,
|
|
487
|
+
durationMs,
|
|
488
|
+
canceled: wasCanceled,
|
|
489
|
+
timedOut,
|
|
490
|
+
};
|
|
491
|
+
}
|
|
492
|
+
}
|