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,936 +1,936 @@
|
|
|
1
|
-
import type { Context } from '@nocobase/actions';
|
|
2
|
-
|
|
3
|
-
import { stringifyJsonText, parseJsonLike, parseSkillMarkdown } from '../utils/json-fields';
|
|
4
|
-
import { assertSkillToolNameAvailable, buildSkillToolName } from '../../utils/skill-tool-name';
|
|
5
|
-
|
|
6
|
-
type SkillManifestEntry = Record<string, unknown> & {
|
|
7
|
-
folder?: string;
|
|
8
|
-
name?: string;
|
|
9
|
-
title?: string;
|
|
10
|
-
description?: string;
|
|
11
|
-
language?: string;
|
|
12
|
-
storageType?: string;
|
|
13
|
-
pluginSource?: string;
|
|
14
|
-
codeTemplate?: string;
|
|
15
|
-
codeFile?: string;
|
|
16
|
-
timeoutSeconds?: unknown;
|
|
17
|
-
maxOutputSizeMb?: unknown;
|
|
18
|
-
toolScope?: string;
|
|
19
|
-
enabled?: unknown;
|
|
20
|
-
autoCall?: unknown;
|
|
21
|
-
packages?: unknown;
|
|
22
|
-
inputSchema?: unknown;
|
|
23
|
-
interactionSchema?: unknown;
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
type SkillDefinitionValues = Record<string, unknown> & {
|
|
27
|
-
name: string;
|
|
28
|
-
toolName?: string;
|
|
29
|
-
title: string;
|
|
30
|
-
description: string;
|
|
31
|
-
language: string;
|
|
32
|
-
storageType: string;
|
|
33
|
-
storageUrl: string;
|
|
34
|
-
timeoutSeconds: number;
|
|
35
|
-
maxOutputSizeMb: number;
|
|
36
|
-
toolScope: string;
|
|
37
|
-
enabled: boolean;
|
|
38
|
-
autoCall: boolean;
|
|
39
|
-
packages: string;
|
|
40
|
-
};
|
|
41
|
-
|
|
42
|
-
type SkillManifest = {
|
|
43
|
-
name?: string;
|
|
44
|
-
description?: string;
|
|
45
|
-
skills?: SkillManifestEntry[];
|
|
46
|
-
initializedAt?: string;
|
|
47
|
-
};
|
|
48
|
-
|
|
49
|
-
type GitManagerAccessContext = {
|
|
50
|
-
kind: 'user';
|
|
51
|
-
roles: string[];
|
|
52
|
-
};
|
|
53
|
-
|
|
54
|
-
type GitTreeEntry = {
|
|
55
|
-
type: 'blob' | 'tree';
|
|
56
|
-
path: string;
|
|
57
|
-
size: number;
|
|
58
|
-
};
|
|
59
|
-
|
|
60
|
-
interface GitManagerContentService {
|
|
61
|
-
contractVersion?: number;
|
|
62
|
-
capabilities?: readonly string[];
|
|
63
|
-
resolveCommit(repositoryId: string | number, ref: string, access: GitManagerAccessContext): Promise<string>;
|
|
64
|
-
listTree(
|
|
65
|
-
input: {
|
|
66
|
-
repositoryId: string | number;
|
|
67
|
-
commitSha: string;
|
|
68
|
-
rootPath: string;
|
|
69
|
-
recursive: boolean;
|
|
70
|
-
},
|
|
71
|
-
access: GitManagerAccessContext,
|
|
72
|
-
): Promise<GitTreeEntry[]>;
|
|
73
|
-
readFile(
|
|
74
|
-
input: {
|
|
75
|
-
repositoryId: string | number;
|
|
76
|
-
commitSha: string;
|
|
77
|
-
filePath: string;
|
|
78
|
-
maxBytes?: number;
|
|
79
|
-
},
|
|
80
|
-
access: GitManagerAccessContext,
|
|
81
|
-
): Promise<Buffer>;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
type GitManagerPlugin = {
|
|
85
|
-
skillHubContentService?: unknown;
|
|
86
|
-
};
|
|
87
|
-
|
|
88
|
-
type GitManagerPluginManager = {
|
|
89
|
-
get(name: string): unknown;
|
|
90
|
-
};
|
|
91
|
-
|
|
92
|
-
type GitImportErrorCode =
|
|
93
|
-
| 'GIT_MANAGER_CONTENT_UNAVAILABLE'
|
|
94
|
-
| 'SKILL_HUB_REPOSITORY_ACCESS_DENIED'
|
|
95
|
-
| 'SKILL_HUB_SKILL_NOT_LISTED'
|
|
96
|
-
| 'REGISTRY_CONTENT_LIMIT_EXCEEDED'
|
|
97
|
-
| 'REGISTRY_GIT_FILE_NOT_FOUND';
|
|
98
|
-
|
|
99
|
-
type GitImportTranslation = {
|
|
100
|
-
key: string;
|
|
101
|
-
values?: Record<string, string | number>;
|
|
102
|
-
};
|
|
103
|
-
|
|
104
|
-
class GitImportError extends Error {
|
|
105
|
-
constructor(
|
|
106
|
-
readonly code: GitImportErrorCode,
|
|
107
|
-
readonly status: number,
|
|
108
|
-
message: string,
|
|
109
|
-
readonly translation?: GitImportTranslation,
|
|
110
|
-
) {
|
|
111
|
-
super(message);
|
|
112
|
-
this.name = 'GitImportError';
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
const GIT_MANAGER_CONTENT_CAPABILITY = 'skill-hub-content-with-actor';
|
|
117
|
-
const GIT_MANAGER_CONTENT_CONTRACT_VERSION = 2;
|
|
118
|
-
const MISSING_GIT_FILE_CODE = 'REGISTRY_GIT_FILE_NOT_FOUND';
|
|
119
|
-
const ACCESS_DENIED_CODE = 'SKILL_HUB_REPOSITORY_ACCESS_DENIED';
|
|
120
|
-
const CONTENT_LIMIT_CODE = 'REGISTRY_CONTENT_LIMIT_EXCEEDED';
|
|
121
|
-
const GIT_IMPORT_NAMESPACE = 'plugin-agent-orchestrator';
|
|
122
|
-
|
|
123
|
-
const CODE_FILES = [
|
|
124
|
-
['index.py', 'python'],
|
|
125
|
-
['index.js', 'node'],
|
|
126
|
-
['main.py', 'python'],
|
|
127
|
-
] as const;
|
|
128
|
-
|
|
129
|
-
export const GIT_SKILL_MARKDOWN_LIMITS = Object.freeze({
|
|
130
|
-
maxFiles: 64,
|
|
131
|
-
maxBytes: 2 * 1024 * 1024,
|
|
132
|
-
});
|
|
133
|
-
|
|
134
|
-
/**
|
|
135
|
-
* Git integration actions for skill-hub.
|
|
136
|
-
*
|
|
137
|
-
* All repository reads go through Git Manager's actor-aware content service.
|
|
138
|
-
* This keeps the repository-level scope used by Git Manager HTTP actions in
|
|
139
|
-
* force for Skill Hub imports; Skill Hub must never read a Git Manager clone
|
|
140
|
-
* directly from disk.
|
|
141
|
-
*
|
|
142
|
-
* Supported manifest shape:
|
|
143
|
-
* {
|
|
144
|
-
* "skills": [
|
|
145
|
-
* { "folder": "my-skill", "name": "my-skill", "language": "python" },
|
|
146
|
-
* { "name": "pptx-advanced-export", "storageType": "plugin", "pluginSource": "pptx-advanced-export" }
|
|
147
|
-
* ]
|
|
148
|
-
* }
|
|
149
|
-
*/
|
|
150
|
-
export async function gitListSkills(ctx: Context, next: () => Promise<void>) {
|
|
151
|
-
const { repositoryId, ref = 'HEAD', prefix = '' } = ctx.action.params;
|
|
152
|
-
const rootFolder = normalizeRootFolder(ctx.action.params.rootFolder);
|
|
153
|
-
|
|
154
|
-
if (!repositoryId) {
|
|
155
|
-
ctx.throw(400, translateGitImportMessage(ctx, 'repositoryId and rootFolder are required'));
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
try {
|
|
159
|
-
const service = getGitManagerContentService(ctx);
|
|
160
|
-
const access = accessFromContext(ctx);
|
|
161
|
-
const commitSha = await service.resolveCommit(repositoryId, ref, access);
|
|
162
|
-
const configPath = joinGitPath(rootFolder, 'skills.json');
|
|
163
|
-
const skillsRoot = await resolveSkillsRoot(service, repositoryId, commitSha, access, rootFolder);
|
|
164
|
-
const loaded = await loadSkillsManifest(service, repositoryId, commitSha, access, configPath);
|
|
165
|
-
const config = loaded.exists
|
|
166
|
-
? loaded.config
|
|
167
|
-
: createSkillsManifest(
|
|
168
|
-
rootFolder,
|
|
169
|
-
await discoverSkills(service, repositoryId, commitSha, access, rootFolder, skillsRoot),
|
|
170
|
-
);
|
|
171
|
-
|
|
172
|
-
const manifestSkills = Array.isArray(config.skills) ? config.skills.filter((skill) => getSkillKey(skill)) : [];
|
|
173
|
-
const enriched = manifestSkills.map((skill) => enrichListedSkill(skill, prefix));
|
|
174
|
-
|
|
175
|
-
const existingSkills = enriched.length
|
|
176
|
-
? await ctx.db.getRepository('skillDefinitions').find({
|
|
177
|
-
filter: { name: { $in: enriched.map((skill) => skill.name) } },
|
|
178
|
-
fields: ['name'],
|
|
179
|
-
})
|
|
180
|
-
: [];
|
|
181
|
-
const existingNames = new Set(
|
|
182
|
-
existingSkills.map((skill: { get(attribute: string): unknown }) => skill.get('name')),
|
|
183
|
-
);
|
|
184
|
-
|
|
185
|
-
ctx.body = {
|
|
186
|
-
data: enriched.map((skill) => ({
|
|
187
|
-
...skill,
|
|
188
|
-
existsInDb: existingNames.has(skill.name),
|
|
189
|
-
})),
|
|
190
|
-
config: {
|
|
191
|
-
name: config.name || rootFolder || 'skills',
|
|
192
|
-
description: config.description || '',
|
|
193
|
-
rootFolder,
|
|
194
|
-
path: configPath,
|
|
195
|
-
// An absent manifest is intentionally virtual. Writing a new file to
|
|
196
|
-
// Git Manager's checkout would reintroduce a cross-plugin disk bypass.
|
|
197
|
-
initializedSkillsJson: false,
|
|
198
|
-
},
|
|
199
|
-
};
|
|
200
|
-
await next();
|
|
201
|
-
} catch (error) {
|
|
202
|
-
throwGitImportError(ctx, error);
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
/**
|
|
207
|
-
* Sync selected skills from git into skillDefinitions.
|
|
208
|
-
*
|
|
209
|
-
* Code is optional. Regular git skills may provide code via codeTemplate,
|
|
210
|
-
* codeFile, or conventional files under skills/<folder>. Plugin skills only
|
|
211
|
-
* need storageType=plugin and pluginSource.
|
|
212
|
-
*/
|
|
213
|
-
export async function gitSyncSkills(ctx: Context, next: () => Promise<void>) {
|
|
214
|
-
const { repositoryId, ref = 'HEAD' } = ctx.action.params;
|
|
215
|
-
const rootFolder = normalizeRootFolder(ctx.action.params.rootFolder);
|
|
216
|
-
const { skills: selectedKeys, overwrite = false, prefix = '' } = ctx.action.params.values || ctx.action.params;
|
|
217
|
-
|
|
218
|
-
if (!repositoryId || !Array.isArray(selectedKeys) || selectedKeys.length === 0) {
|
|
219
|
-
ctx.throw(400, translateGitImportMessage(ctx, 'repositoryId, rootFolder and skills[] are required'));
|
|
220
|
-
}
|
|
221
|
-
const selectedSkillKeys = selectedKeys.filter(
|
|
222
|
-
(key): key is string => typeof key === 'string' && key.trim().length > 0,
|
|
223
|
-
);
|
|
224
|
-
if (selectedSkillKeys.length !== selectedKeys.length) {
|
|
225
|
-
ctx.throw(400, translateGitImportMessage(ctx, 'skills[] must contain non-empty string keys'));
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
try {
|
|
229
|
-
const service = getGitManagerContentService(ctx);
|
|
230
|
-
const access = accessFromContext(ctx);
|
|
231
|
-
const commitSha = await service.resolveCommit(repositoryId, ref, access);
|
|
232
|
-
const configPath = joinGitPath(rootFolder, 'skills.json');
|
|
233
|
-
const skillsRoot = await resolveSkillsRoot(service, repositoryId, commitSha, access, rootFolder);
|
|
234
|
-
const loaded = await loadSkillsManifest(service, repositoryId, commitSha, access, configPath);
|
|
235
|
-
const config = loaded.exists
|
|
236
|
-
? loaded.config
|
|
237
|
-
: createSkillsManifest(
|
|
238
|
-
rootFolder,
|
|
239
|
-
await discoverSkills(service, repositoryId, commitSha, access, rootFolder, skillsRoot),
|
|
240
|
-
);
|
|
241
|
-
|
|
242
|
-
const manifest = new Map<string, SkillManifestEntry>();
|
|
243
|
-
for (const entry of config.skills || []) {
|
|
244
|
-
const key = getSkillKey(entry);
|
|
245
|
-
if (key) {
|
|
246
|
-
manifest.set(key, entry);
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
if (loaded.exists) {
|
|
250
|
-
const unlistedKeys = selectedSkillKeys.filter((key) => !manifest.has(key));
|
|
251
|
-
if (unlistedKeys.length > 0) {
|
|
252
|
-
const skills = unlistedKeys.join(', ');
|
|
253
|
-
throw new GitImportError(
|
|
254
|
-
'SKILL_HUB_SKILL_NOT_LISTED',
|
|
255
|
-
400,
|
|
256
|
-
`Selected skills are not listed in the explicit skills.json manifest: ${skills}`,
|
|
257
|
-
{
|
|
258
|
-
key: 'Selected skills are not listed in the explicit skills.json manifest: {{skills}}',
|
|
259
|
-
values: { skills },
|
|
260
|
-
},
|
|
261
|
-
);
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
const results: Array<Record<string, unknown>> = [];
|
|
266
|
-
const skillRepo = ctx.db.getRepository('skillDefinitions');
|
|
267
|
-
|
|
268
|
-
for (const key of selectedSkillKeys) {
|
|
269
|
-
const meta: SkillManifestEntry = manifest.get(key) || { folder: key, name: key };
|
|
270
|
-
const isPluginSkill = isPluginStorage(meta);
|
|
271
|
-
const rawName = meta.name || meta.pluginSource || meta.folder || key;
|
|
272
|
-
const skillName = `${prefix}${rawName}`;
|
|
273
|
-
const skillsSubDir = meta.folder ? joinGitPath(skillsRoot.path, meta.folder) : '';
|
|
274
|
-
const skillBaseDir = skillsSubDir || rootFolder;
|
|
275
|
-
|
|
276
|
-
try {
|
|
277
|
-
let frontmatter: SkillManifestEntry = {};
|
|
278
|
-
let instructions = '';
|
|
279
|
-
|
|
280
|
-
if (skillBaseDir || !meta.folder) {
|
|
281
|
-
const skillMarkdown = await readOptionalGitFile(
|
|
282
|
-
service,
|
|
283
|
-
repositoryId,
|
|
284
|
-
commitSha,
|
|
285
|
-
access,
|
|
286
|
-
joinGitPath(skillBaseDir, 'SKILL.md'),
|
|
287
|
-
);
|
|
288
|
-
if (skillMarkdown) {
|
|
289
|
-
try {
|
|
290
|
-
const parsed = parseSkillMarkdown(skillMarkdown);
|
|
291
|
-
frontmatter = parsed.metadata;
|
|
292
|
-
instructions = parsed.body;
|
|
293
|
-
|
|
294
|
-
const otherMarkdown = await fetchAllMarkdownInFolder(
|
|
295
|
-
service,
|
|
296
|
-
repositoryId,
|
|
297
|
-
commitSha,
|
|
298
|
-
access,
|
|
299
|
-
skillBaseDir,
|
|
300
|
-
);
|
|
301
|
-
if (otherMarkdown) instructions += otherMarkdown;
|
|
302
|
-
} catch (error) {
|
|
303
|
-
if (isFatalGitContentError(error)) {
|
|
304
|
-
throw error;
|
|
305
|
-
}
|
|
306
|
-
// SKILL.md is optional; malformed optional metadata must not
|
|
307
|
-
// prevent a manifest-defined skill from being imported.
|
|
308
|
-
}
|
|
309
|
-
}
|
|
310
|
-
}
|
|
311
|
-
|
|
312
|
-
const storageType = normalizeStorageType(
|
|
313
|
-
frontmatter.storageType || meta.storageType || (isPluginSkill ? 'plugin' : 'git'),
|
|
314
|
-
);
|
|
315
|
-
const pluginSource =
|
|
316
|
-
frontmatter.pluginSource || meta.pluginSource || (storageType === 'plugin' ? rawName : undefined);
|
|
317
|
-
|
|
318
|
-
let detectedLanguage = frontmatter.language || meta.language || 'python';
|
|
319
|
-
let codeTemplate = frontmatter.codeTemplate || meta.codeTemplate || '';
|
|
320
|
-
|
|
321
|
-
if (!codeTemplate && meta.codeFile) {
|
|
322
|
-
codeTemplate = await readOptionalGitFile(
|
|
323
|
-
service,
|
|
324
|
-
repositoryId,
|
|
325
|
-
commitSha,
|
|
326
|
-
access,
|
|
327
|
-
joinGitPath(skillBaseDir, meta.codeFile),
|
|
328
|
-
);
|
|
329
|
-
}
|
|
330
|
-
|
|
331
|
-
if (!codeTemplate && storageType !== 'plugin') {
|
|
332
|
-
const codeFile = await readConventionalCodeFile(service, repositoryId, commitSha, access, skillBaseDir);
|
|
333
|
-
if (codeFile) {
|
|
334
|
-
codeTemplate = codeFile.content;
|
|
335
|
-
detectedLanguage = codeFile.language;
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
|
-
|
|
339
|
-
const toolName = buildSkillToolName(skillName);
|
|
340
|
-
const merged: SkillDefinitionValues = {
|
|
341
|
-
name: skillName,
|
|
342
|
-
toolName,
|
|
343
|
-
title: frontmatter.title || meta.title || rawName,
|
|
344
|
-
description: frontmatter.description || meta.description || '',
|
|
345
|
-
language: detectedLanguage,
|
|
346
|
-
storageType,
|
|
347
|
-
storageUrl:
|
|
348
|
-
storageType === 'plugin'
|
|
349
|
-
? `git://${repositoryId}/${rootFolder || ''}@${commitSha}#${pluginSource || rawName}`
|
|
350
|
-
: `git://${repositoryId}/${skillsSubDir || rootFolder || ''}@${commitSha}`,
|
|
351
|
-
timeoutSeconds: parseInteger(frontmatter.timeoutSeconds ?? meta.timeoutSeconds, 60),
|
|
352
|
-
maxOutputSizeMb: parseInteger(frontmatter.maxOutputSizeMb ?? meta.maxOutputSizeMb, 50),
|
|
353
|
-
toolScope: frontmatter.toolScope || meta.toolScope || 'CUSTOM',
|
|
354
|
-
enabled: parseBoolean(frontmatter.enabled ?? meta.enabled, true),
|
|
355
|
-
autoCall: parseBoolean(frontmatter.autoCall ?? meta.autoCall, false),
|
|
356
|
-
packages: stringifyJsonText(parseJsonLike(meta.packages ?? frontmatter.packages, []), []),
|
|
357
|
-
};
|
|
358
|
-
|
|
359
|
-
if (codeTemplate) {
|
|
360
|
-
merged.codeTemplate = codeTemplate;
|
|
361
|
-
}
|
|
362
|
-
if (pluginSource) {
|
|
363
|
-
merged.pluginSource = pluginSource;
|
|
364
|
-
}
|
|
365
|
-
if (instructions) {
|
|
366
|
-
merged.instructions = instructions.trim();
|
|
367
|
-
}
|
|
368
|
-
|
|
369
|
-
const inputSchema = parseJsonLike(frontmatter.inputSchema ?? meta.inputSchema, null);
|
|
370
|
-
if (inputSchema) {
|
|
371
|
-
merged.inputSchema = stringifyJsonText(inputSchema);
|
|
372
|
-
}
|
|
373
|
-
|
|
374
|
-
const interactionSchema = parseJsonLike(frontmatter.interactionSchema ?? meta.interactionSchema, null);
|
|
375
|
-
if (interactionSchema) {
|
|
376
|
-
merged.interactionSchema = stringifyJsonText(interactionSchema);
|
|
377
|
-
}
|
|
378
|
-
|
|
379
|
-
const existing = await skillRepo.findOne({ filter: { name: skillName } });
|
|
380
|
-
if (existing && !overwrite) {
|
|
381
|
-
results.push({ folder: key, name: skillName, status: 'skipped', reason: 'Already exists' });
|
|
382
|
-
continue;
|
|
383
|
-
}
|
|
384
|
-
|
|
385
|
-
if (existing) {
|
|
386
|
-
delete merged.toolName;
|
|
387
|
-
await skillRepo.update({ filterByTk: existing.get('id'), values: merged });
|
|
388
|
-
results.push({ folder: key, name: skillName, status: 'updated' });
|
|
389
|
-
} else {
|
|
390
|
-
await assertSkillToolNameAvailable(ctx.db, toolName);
|
|
391
|
-
await skillRepo.create({ values: merged });
|
|
392
|
-
results.push({ folder: key, name: skillName, status: 'created' });
|
|
393
|
-
}
|
|
394
|
-
} catch (error) {
|
|
395
|
-
if (isFatalGitContentError(error)) {
|
|
396
|
-
throw error;
|
|
397
|
-
}
|
|
398
|
-
results.push({ folder: key, name: skillName, status: 'error', reason: errorMessage(error) });
|
|
399
|
-
}
|
|
400
|
-
}
|
|
401
|
-
|
|
402
|
-
ctx.body = { data: results };
|
|
403
|
-
await next();
|
|
404
|
-
} catch (error) {
|
|
405
|
-
throwGitImportError(ctx, error);
|
|
406
|
-
}
|
|
407
|
-
}
|
|
408
|
-
|
|
409
|
-
function getGitManagerContentService(ctx: Context): GitManagerContentService {
|
|
410
|
-
const pluginManager = (ctx.app as unknown as { pm?: GitManagerPluginManager }).pm;
|
|
411
|
-
const plugin = pluginManager?.get('plugin-git-manager');
|
|
412
|
-
if (!plugin || typeof plugin !== 'object') {
|
|
413
|
-
throw new GitImportError(
|
|
414
|
-
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
415
|
-
424,
|
|
416
|
-
'Git Manager is not enabled for Skill Hub imports.',
|
|
417
|
-
{ key: 'Git Manager is not enabled for Skill Hub imports.' },
|
|
418
|
-
);
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
const service = (plugin as GitManagerPlugin).skillHubContentService;
|
|
422
|
-
if (!service || typeof service !== 'object') {
|
|
423
|
-
throw new GitImportError(
|
|
424
|
-
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
425
|
-
424,
|
|
426
|
-
'Git Manager must support actor-aware content reads for Skill Hub imports.',
|
|
427
|
-
{ key: 'Git Manager must support actor-aware content reads for Skill Hub imports.' },
|
|
428
|
-
);
|
|
429
|
-
}
|
|
430
|
-
|
|
431
|
-
const candidate = service as Partial<GitManagerContentService>;
|
|
432
|
-
const contractVersion = candidate.contractVersion;
|
|
433
|
-
const capabilities = candidate.capabilities;
|
|
434
|
-
const hasCompatibleContract =
|
|
435
|
-
typeof contractVersion === 'number' &&
|
|
436
|
-
Number.isSafeInteger(contractVersion) &&
|
|
437
|
-
contractVersion >= GIT_MANAGER_CONTENT_CONTRACT_VERSION;
|
|
438
|
-
if (
|
|
439
|
-
!hasCompatibleContract ||
|
|
440
|
-
!Array.isArray(capabilities) ||
|
|
441
|
-
!capabilities.includes(GIT_MANAGER_CONTENT_CAPABILITY) ||
|
|
442
|
-
typeof candidate.resolveCommit !== 'function' ||
|
|
443
|
-
typeof candidate.listTree !== 'function' ||
|
|
444
|
-
typeof candidate.readFile !== 'function'
|
|
445
|
-
) {
|
|
446
|
-
throw new GitImportError(
|
|
447
|
-
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
448
|
-
424,
|
|
449
|
-
'Git Manager must support actor-aware content reads for Skill Hub imports.',
|
|
450
|
-
{ key: 'Git Manager must support actor-aware content reads for Skill Hub imports.' },
|
|
451
|
-
);
|
|
452
|
-
}
|
|
453
|
-
return service as GitManagerContentService;
|
|
454
|
-
}
|
|
455
|
-
|
|
456
|
-
function accessFromContext(ctx: Context): GitManagerAccessContext {
|
|
457
|
-
const currentRoles = (ctx.state as unknown as { currentRoles?: unknown } | undefined)?.currentRoles;
|
|
458
|
-
if (!Array.isArray(currentRoles) || !currentRoles.every((role): role is string => typeof role === 'string')) {
|
|
459
|
-
throw new GitImportError(
|
|
460
|
-
'SKILL_HUB_REPOSITORY_ACCESS_DENIED',
|
|
461
|
-
403,
|
|
462
|
-
'A valid user role context is required to import skills from Git Manager.',
|
|
463
|
-
{ key: 'A valid user role context is required to import skills from Git Manager.' },
|
|
464
|
-
);
|
|
465
|
-
}
|
|
466
|
-
return { kind: 'user', roles: currentRoles };
|
|
467
|
-
}
|
|
468
|
-
|
|
469
|
-
function errorCode(error: unknown): string | undefined {
|
|
470
|
-
if (!error || typeof error !== 'object') return undefined;
|
|
471
|
-
const code = (error as { code?: unknown }).code;
|
|
472
|
-
return typeof code === 'string' ? code : undefined;
|
|
473
|
-
}
|
|
474
|
-
|
|
475
|
-
function errorMessage(error: unknown): string {
|
|
476
|
-
return error instanceof Error ? error.message : String(error);
|
|
477
|
-
}
|
|
478
|
-
|
|
479
|
-
function isMissingGitFile(error: unknown): boolean {
|
|
480
|
-
return errorCode(error) === MISSING_GIT_FILE_CODE;
|
|
481
|
-
}
|
|
482
|
-
|
|
483
|
-
function isFatalGitContentError(error: unknown): boolean {
|
|
484
|
-
if (error instanceof GitImportError) return true;
|
|
485
|
-
const code = errorCode(error);
|
|
486
|
-
return code === ACCESS_DENIED_CODE || code === CONTENT_LIMIT_CODE;
|
|
487
|
-
}
|
|
488
|
-
|
|
489
|
-
function throwGitImportError(ctx: Context, error: unknown): never {
|
|
490
|
-
if (error instanceof GitImportError) {
|
|
491
|
-
return throwHttpError(ctx, error.status, error.message, error.translation);
|
|
492
|
-
}
|
|
493
|
-
|
|
494
|
-
switch (errorCode(error)) {
|
|
495
|
-
case ACCESS_DENIED_CODE:
|
|
496
|
-
return throwHttpError(ctx, 403, errorMessage(error));
|
|
497
|
-
case CONTENT_LIMIT_CODE:
|
|
498
|
-
return throwHttpError(ctx, 422, errorMessage(error));
|
|
499
|
-
case MISSING_GIT_FILE_CODE:
|
|
500
|
-
return throwHttpError(ctx, 404, errorMessage(error));
|
|
501
|
-
default:
|
|
502
|
-
return throwHttpError(ctx, 502, 'Git Manager could not read the requested repository content.', {
|
|
503
|
-
key: 'Git Manager could not read the requested repository content.',
|
|
504
|
-
});
|
|
505
|
-
}
|
|
506
|
-
}
|
|
507
|
-
|
|
508
|
-
function translateGitImportMessage(
|
|
509
|
-
ctx: Context,
|
|
510
|
-
key: string,
|
|
511
|
-
values?: Record<string, string | number>,
|
|
512
|
-
fallback = key,
|
|
513
|
-
): string {
|
|
514
|
-
const translate = (ctx as unknown as { t?: unknown }).t;
|
|
515
|
-
if (typeof translate !== 'function') {
|
|
516
|
-
return fallback;
|
|
517
|
-
}
|
|
518
|
-
const translated = translate(key, { ns: GIT_IMPORT_NAMESPACE, ...values });
|
|
519
|
-
return typeof translated === 'string' ? translated : fallback;
|
|
520
|
-
}
|
|
521
|
-
|
|
522
|
-
function throwHttpError(ctx: Context, status: number, message: string, translation?: GitImportTranslation): never {
|
|
523
|
-
const localizedMessage = translation
|
|
524
|
-
? translateGitImportMessage(ctx, translation.key, translation.values, message)
|
|
525
|
-
: message;
|
|
526
|
-
return (ctx as unknown as { throw(status: number, message: string): never }).throw(status, localizedMessage);
|
|
527
|
-
}
|
|
528
|
-
|
|
529
|
-
async function loadSkillsManifest(
|
|
530
|
-
service: GitManagerContentService,
|
|
531
|
-
repositoryId: string | number,
|
|
532
|
-
commitSha: string,
|
|
533
|
-
access: GitManagerAccessContext,
|
|
534
|
-
configPath: string,
|
|
535
|
-
): Promise<{ exists: boolean; config: SkillManifest }> {
|
|
536
|
-
let raw: string;
|
|
537
|
-
try {
|
|
538
|
-
raw = (await service.readFile({ repositoryId, commitSha, filePath: configPath }, access)).toString('utf8');
|
|
539
|
-
} catch (error) {
|
|
540
|
-
if (isMissingGitFile(error)) {
|
|
541
|
-
return { exists: false, config: {} };
|
|
542
|
-
}
|
|
543
|
-
throw error;
|
|
544
|
-
}
|
|
545
|
-
|
|
546
|
-
try {
|
|
547
|
-
return { exists: true, config: JSON.parse(raw) as SkillManifest };
|
|
548
|
-
} catch (error) {
|
|
549
|
-
throw new Error(`Invalid ${configPath}: ${errorMessage(error)}`);
|
|
550
|
-
}
|
|
551
|
-
}
|
|
552
|
-
|
|
553
|
-
async function discoverSkills(
|
|
554
|
-
service: GitManagerContentService,
|
|
555
|
-
repositoryId: string | number,
|
|
556
|
-
commitSha: string,
|
|
557
|
-
access: GitManagerAccessContext,
|
|
558
|
-
rootFolder: string,
|
|
559
|
-
skillsRoot: ResolvedSkillsRoot,
|
|
560
|
-
): Promise<SkillManifestEntry[]> {
|
|
561
|
-
if (skillsRoot.folders.length > 0) {
|
|
562
|
-
return skillsRoot.folders;
|
|
563
|
-
}
|
|
564
|
-
|
|
565
|
-
const pluginSkill = await discoverPluginSkill(service, repositoryId, commitSha, access, rootFolder);
|
|
566
|
-
return pluginSkill ? [pluginSkill] : [];
|
|
567
|
-
}
|
|
568
|
-
|
|
569
|
-
type ResolvedSkillsRoot = {
|
|
570
|
-
path: string;
|
|
571
|
-
folders: SkillManifestEntry[];
|
|
572
|
-
};
|
|
573
|
-
|
|
574
|
-
async function resolveSkillsRoot(
|
|
575
|
-
service: GitManagerContentService,
|
|
576
|
-
repositoryId: string | number,
|
|
577
|
-
commitSha: string,
|
|
578
|
-
access: GitManagerAccessContext,
|
|
579
|
-
rootFolder: string,
|
|
580
|
-
): Promise<ResolvedSkillsRoot> {
|
|
581
|
-
const configuredRoot = normalizeRootFolder(rootFolder);
|
|
582
|
-
const rootEntries = await service.listTree(
|
|
583
|
-
{ repositoryId, commitSha, rootPath: configuredRoot, recursive: false },
|
|
584
|
-
access,
|
|
585
|
-
);
|
|
586
|
-
const configuredRootIsSkillsDirectory = configuredRoot === 'skills' || configuredRoot.endsWith('/skills');
|
|
587
|
-
const directFolders = await discoverSkillFoldersAtRoot(
|
|
588
|
-
service,
|
|
589
|
-
repositoryId,
|
|
590
|
-
commitSha,
|
|
591
|
-
access,
|
|
592
|
-
configuredRoot,
|
|
593
|
-
rootEntries,
|
|
594
|
-
);
|
|
595
|
-
if (directFolders.length > 0 || configuredRootIsSkillsDirectory) {
|
|
596
|
-
return { path: configuredRoot, folders: directFolders };
|
|
597
|
-
}
|
|
598
|
-
|
|
599
|
-
const hasSkillsSubfolder = rootEntries.some((entry) => entry.type === 'tree' && entry.path === 'skills');
|
|
600
|
-
if (!hasSkillsSubfolder) {
|
|
601
|
-
return { path: configuredRoot, folders: directFolders };
|
|
602
|
-
}
|
|
603
|
-
|
|
604
|
-
const fallbackRoot = joinGitPath(configuredRoot, 'skills');
|
|
605
|
-
return {
|
|
606
|
-
path: fallbackRoot,
|
|
607
|
-
folders: await discoverSkillFoldersAtRoot(service, repositoryId, commitSha, access, fallbackRoot),
|
|
608
|
-
};
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
async function discoverSkillFoldersAtRoot(
|
|
612
|
-
service: GitManagerContentService,
|
|
613
|
-
repositoryId: string | number,
|
|
614
|
-
commitSha: string,
|
|
615
|
-
access: GitManagerAccessContext,
|
|
616
|
-
baseDir: string,
|
|
617
|
-
rootEntries?: GitTreeEntry[],
|
|
618
|
-
): Promise<SkillManifestEntry[]> {
|
|
619
|
-
try {
|
|
620
|
-
const entries =
|
|
621
|
-
rootEntries || (await service.listTree({ repositoryId, commitSha, rootPath: baseDir, recursive: false }, access));
|
|
622
|
-
const folders = entries.filter((entry) => entry.type === 'tree').map((entry) => entry.path);
|
|
623
|
-
const discovered: SkillManifestEntry[] = [];
|
|
624
|
-
const batchSize = 16;
|
|
625
|
-
for (let offset = 0; offset < folders.length; offset += batchSize) {
|
|
626
|
-
const batch = folders.slice(offset, offset + batchSize);
|
|
627
|
-
const results = await Promise.all(
|
|
628
|
-
batch.map(async (folder) => {
|
|
629
|
-
const folderEntries = await service.listTree(
|
|
630
|
-
{ repositoryId, commitSha, rootPath: joinGitPath(baseDir, folder), recursive: false },
|
|
631
|
-
access,
|
|
632
|
-
);
|
|
633
|
-
return folderEntries.some((entry) => entry.type === 'blob' && entry.path === 'SKILL.md') ? folder : null;
|
|
634
|
-
}),
|
|
635
|
-
);
|
|
636
|
-
for (const folder of results) {
|
|
637
|
-
if (folder) {
|
|
638
|
-
discovered.push({ folder, name: folder, title: folder, storageType: 'git' });
|
|
639
|
-
}
|
|
640
|
-
}
|
|
641
|
-
}
|
|
642
|
-
return discovered;
|
|
643
|
-
} catch (error) {
|
|
644
|
-
if (isMissingGitFile(error)) {
|
|
645
|
-
return [];
|
|
646
|
-
}
|
|
647
|
-
throw error;
|
|
648
|
-
}
|
|
649
|
-
}
|
|
650
|
-
|
|
651
|
-
async function discoverPluginSkill(
|
|
652
|
-
service: GitManagerContentService,
|
|
653
|
-
repositoryId: string | number,
|
|
654
|
-
commitSha: string,
|
|
655
|
-
access: GitManagerAccessContext,
|
|
656
|
-
rootFolder: string,
|
|
657
|
-
): Promise<SkillManifestEntry | null> {
|
|
658
|
-
const packageJsonPath = joinGitPath(rootFolder, 'package.json');
|
|
659
|
-
const rawPackageJson = await readOptionalGitFile(service, repositoryId, commitSha, access, packageJsonPath);
|
|
660
|
-
if (!rawPackageJson) {
|
|
661
|
-
return null;
|
|
662
|
-
}
|
|
663
|
-
|
|
664
|
-
let packageJson: Record<string, unknown>;
|
|
665
|
-
try {
|
|
666
|
-
const parsed: unknown = JSON.parse(rawPackageJson);
|
|
667
|
-
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
668
|
-
return null;
|
|
669
|
-
}
|
|
670
|
-
packageJson = parsed as Record<string, unknown>;
|
|
671
|
-
} catch {
|
|
672
|
-
return null;
|
|
673
|
-
}
|
|
674
|
-
|
|
675
|
-
const definition =
|
|
676
|
-
(await readOptionalGitFile(
|
|
677
|
-
service,
|
|
678
|
-
repositoryId,
|
|
679
|
-
commitSha,
|
|
680
|
-
access,
|
|
681
|
-
joinGitPath(rootFolder, 'src/server/skill-definition.ts'),
|
|
682
|
-
)) ||
|
|
683
|
-
(await readOptionalGitFile(
|
|
684
|
-
service,
|
|
685
|
-
repositoryId,
|
|
686
|
-
commitSha,
|
|
687
|
-
access,
|
|
688
|
-
joinGitPath(rootFolder, 'src/server/skill-definition.js'),
|
|
689
|
-
));
|
|
690
|
-
const templateName = definition ? extractStringProperty(definition, 'name') : null;
|
|
691
|
-
const title = definition ? extractStringProperty(definition, 'title') : null;
|
|
692
|
-
const language = definition ? extractStringProperty(definition, 'language') : null;
|
|
693
|
-
|
|
694
|
-
const packageName = stringValue(packageJson.name);
|
|
695
|
-
const pluginSource = templateName || packageName;
|
|
696
|
-
if (!pluginSource) {
|
|
697
|
-
return null;
|
|
698
|
-
}
|
|
699
|
-
|
|
700
|
-
return {
|
|
701
|
-
name: pluginSource,
|
|
702
|
-
title: title || stringValue(packageJson.displayName) || packageName || pluginSource,
|
|
703
|
-
description: stringValue(packageJson.description) || '',
|
|
704
|
-
language: language || 'python',
|
|
705
|
-
storageType: 'plugin',
|
|
706
|
-
pluginSource,
|
|
707
|
-
};
|
|
708
|
-
}
|
|
709
|
-
|
|
710
|
-
function createSkillsManifest(rootFolder: string, skills: SkillManifestEntry[]): SkillManifest {
|
|
711
|
-
return {
|
|
712
|
-
name: rootFolder || 'skills',
|
|
713
|
-
description: '',
|
|
714
|
-
initializedAt: new Date().toISOString(),
|
|
715
|
-
skills,
|
|
716
|
-
};
|
|
717
|
-
}
|
|
718
|
-
|
|
719
|
-
async function readConventionalCodeFile(
|
|
720
|
-
service: GitManagerContentService,
|
|
721
|
-
repositoryId: string | number,
|
|
722
|
-
commitSha: string,
|
|
723
|
-
access: GitManagerAccessContext,
|
|
724
|
-
skillsSubDir: string,
|
|
725
|
-
) {
|
|
726
|
-
for (const [file, language] of CODE_FILES) {
|
|
727
|
-
const content = await readOptionalGitFile(
|
|
728
|
-
service,
|
|
729
|
-
repositoryId,
|
|
730
|
-
commitSha,
|
|
731
|
-
access,
|
|
732
|
-
joinGitPath(skillsSubDir, file),
|
|
733
|
-
);
|
|
734
|
-
if (content) {
|
|
735
|
-
return { content, language };
|
|
736
|
-
}
|
|
737
|
-
}
|
|
738
|
-
return null;
|
|
739
|
-
}
|
|
740
|
-
|
|
741
|
-
async function readOptionalGitFile(
|
|
742
|
-
service: GitManagerContentService,
|
|
743
|
-
repositoryId: string | number,
|
|
744
|
-
commitSha: string,
|
|
745
|
-
access: GitManagerAccessContext,
|
|
746
|
-
filePath: string,
|
|
747
|
-
maxBytes?: number,
|
|
748
|
-
): Promise<string> {
|
|
749
|
-
try {
|
|
750
|
-
const input =
|
|
751
|
-
maxBytes === undefined ? { repositoryId, commitSha, filePath } : { repositoryId, commitSha, filePath, maxBytes };
|
|
752
|
-
return (await service.readFile(input, access)).toString('utf8');
|
|
753
|
-
} catch (error) {
|
|
754
|
-
if (isMissingGitFile(error)) {
|
|
755
|
-
return '';
|
|
756
|
-
}
|
|
757
|
-
throw error;
|
|
758
|
-
}
|
|
759
|
-
}
|
|
760
|
-
|
|
761
|
-
function enrichListedSkill(skill: SkillManifestEntry, prefix: string) {
|
|
762
|
-
const rawName = skill.name || skill.pluginSource || skill.folder || '';
|
|
763
|
-
const finalName = `${prefix}${rawName}`;
|
|
764
|
-
|
|
765
|
-
return {
|
|
766
|
-
folder: getSkillKey(skill),
|
|
767
|
-
name: finalName,
|
|
768
|
-
title: skill.title || rawName,
|
|
769
|
-
description: skill.description || '',
|
|
770
|
-
language: skill.language || 'python',
|
|
771
|
-
storageType: normalizeStorageType(skill.storageType || (skill.pluginSource ? 'plugin' : 'git')),
|
|
772
|
-
pluginSource: skill.pluginSource,
|
|
773
|
-
...(skill.timeoutSeconds ? { timeoutSeconds: skill.timeoutSeconds } : {}),
|
|
774
|
-
...(skill.maxOutputSizeMb ? { maxOutputSizeMb: skill.maxOutputSizeMb } : {}),
|
|
775
|
-
...(skill.packages ? { packages: skill.packages } : {}),
|
|
776
|
-
...(skill.inputSchema ? { inputSchema: skill.inputSchema } : {}),
|
|
777
|
-
...(skill.toolScope ? { toolScope: skill.toolScope } : {}),
|
|
778
|
-
};
|
|
779
|
-
}
|
|
780
|
-
|
|
781
|
-
function getSkillKey(skill: SkillManifestEntry) {
|
|
782
|
-
return String(skill.folder || skill.name || skill.pluginSource || '').trim();
|
|
783
|
-
}
|
|
784
|
-
|
|
785
|
-
function isPluginStorage(skill: SkillManifestEntry) {
|
|
786
|
-
return normalizeStorageType(skill.storageType) === 'plugin' || !!skill.pluginSource;
|
|
787
|
-
}
|
|
788
|
-
|
|
789
|
-
function normalizeStorageType(storageType: unknown) {
|
|
790
|
-
const value = typeof storageType === 'string' ? storageType.toLowerCase() : '';
|
|
791
|
-
if (value === 'plugin') return 'plugin';
|
|
792
|
-
if (value === 'local') return 'local';
|
|
793
|
-
if (value === 'database') return 'database';
|
|
794
|
-
return 'git';
|
|
795
|
-
}
|
|
796
|
-
|
|
797
|
-
function parseInteger(value: unknown, fallback: number) {
|
|
798
|
-
const parsed = Number.parseInt(String(value), 10);
|
|
799
|
-
return Number.isFinite(parsed) ? parsed : fallback;
|
|
800
|
-
}
|
|
801
|
-
|
|
802
|
-
function parseBoolean(value: unknown, fallback: boolean) {
|
|
803
|
-
if (value === undefined || value === null || value === '') return fallback;
|
|
804
|
-
if (typeof value === 'boolean') return value;
|
|
805
|
-
if (typeof value === 'string') return !['false', '0', 'no'].includes(value.toLowerCase());
|
|
806
|
-
return Boolean(value);
|
|
807
|
-
}
|
|
808
|
-
|
|
809
|
-
function extractStringProperty(source: string, property: string) {
|
|
810
|
-
const match = source.match(new RegExp(property + '\\s*:\\s*([\'"\\x60])([\\s\\S]*?)\\1'));
|
|
811
|
-
return match ? match[2] : null;
|
|
812
|
-
}
|
|
813
|
-
|
|
814
|
-
function normalizeRootFolder(rootFolder: unknown) {
|
|
815
|
-
if (rootFolder === undefined || rootFolder === null) {
|
|
816
|
-
throw new Error('repositoryId and rootFolder are required');
|
|
817
|
-
}
|
|
818
|
-
|
|
819
|
-
const normalized = String(rootFolder)
|
|
820
|
-
.replace(/\\/g, '/')
|
|
821
|
-
.replace(/^\/+|\/+$/g, '');
|
|
822
|
-
if (normalized.includes('..') || normalized.includes('\0')) {
|
|
823
|
-
throw new Error('Invalid rootFolder');
|
|
824
|
-
}
|
|
825
|
-
return normalized;
|
|
826
|
-
}
|
|
827
|
-
|
|
828
|
-
function stringValue(value: unknown): string | undefined {
|
|
829
|
-
return typeof value === 'string' && value.trim() ? value.trim() : undefined;
|
|
830
|
-
}
|
|
831
|
-
|
|
832
|
-
function joinGitPath(...parts: Array<string | undefined>) {
|
|
833
|
-
return parts
|
|
834
|
-
.filter((part) => part !== undefined && part !== '')
|
|
835
|
-
.join('/')
|
|
836
|
-
.replace(/\/+/g, '/');
|
|
837
|
-
}
|
|
838
|
-
|
|
839
|
-
function markdownContentHeader(path: string): string {
|
|
840
|
-
return `\n\n--- Content from ${path} ---\n\n`;
|
|
841
|
-
}
|
|
842
|
-
|
|
843
|
-
function markdownContentLimitError(message: string, translation?: GitImportTranslation): GitImportError {
|
|
844
|
-
return new GitImportError('REGISTRY_CONTENT_LIMIT_EXCEEDED', 422, message, translation);
|
|
845
|
-
}
|
|
846
|
-
|
|
847
|
-
async function fetchAllMarkdownInFolder(
|
|
848
|
-
service: GitManagerContentService,
|
|
849
|
-
repositoryId: string | number,
|
|
850
|
-
commitSha: string,
|
|
851
|
-
access: GitManagerAccessContext,
|
|
852
|
-
folderPath: string,
|
|
853
|
-
): Promise<string> {
|
|
854
|
-
try {
|
|
855
|
-
const entries = await service.listTree({ repositoryId, commitSha, rootPath: folderPath, recursive: true }, access);
|
|
856
|
-
const markdownEntries = entries
|
|
857
|
-
.filter(
|
|
858
|
-
(entry) =>
|
|
859
|
-
entry.type === 'blob' && entry.path.toLowerCase().endsWith('.md') && entry.path.toUpperCase() !== 'SKILL.MD',
|
|
860
|
-
)
|
|
861
|
-
.sort((left, right) => left.path.localeCompare(right.path));
|
|
862
|
-
if (markdownEntries.length > GIT_SKILL_MARKDOWN_LIMITS.maxFiles) {
|
|
863
|
-
throw markdownContentLimitError(
|
|
864
|
-
`Git skill contains more than ${GIT_SKILL_MARKDOWN_LIMITS.maxFiles} supplemental Markdown files.`,
|
|
865
|
-
{
|
|
866
|
-
key: 'Git skill contains more than {{count}} supplemental Markdown files.',
|
|
867
|
-
values: { count: GIT_SKILL_MARKDOWN_LIMITS.maxFiles },
|
|
868
|
-
},
|
|
869
|
-
);
|
|
870
|
-
}
|
|
871
|
-
|
|
872
|
-
let declaredBytes = 0;
|
|
873
|
-
for (const entry of markdownEntries) {
|
|
874
|
-
if (!Number.isSafeInteger(entry.size) || entry.size < 0) {
|
|
875
|
-
throw markdownContentLimitError('Git skill contains a supplemental Markdown file with an invalid size.', {
|
|
876
|
-
key: 'Git skill contains a supplemental Markdown file with an invalid size.',
|
|
877
|
-
});
|
|
878
|
-
}
|
|
879
|
-
declaredBytes += Buffer.byteLength(markdownContentHeader(entry.path), 'utf8') + entry.size;
|
|
880
|
-
if (declaredBytes > GIT_SKILL_MARKDOWN_LIMITS.maxBytes) {
|
|
881
|
-
throw markdownContentLimitError(
|
|
882
|
-
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
883
|
-
{
|
|
884
|
-
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
885
|
-
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
886
|
-
},
|
|
887
|
-
);
|
|
888
|
-
}
|
|
889
|
-
}
|
|
890
|
-
|
|
891
|
-
let combined = '';
|
|
892
|
-
let combinedBytes = 0;
|
|
893
|
-
for (const entry of markdownEntries) {
|
|
894
|
-
const header = markdownContentHeader(entry.path);
|
|
895
|
-
const remainingContentBytes =
|
|
896
|
-
GIT_SKILL_MARKDOWN_LIMITS.maxBytes - combinedBytes - Buffer.byteLength(header, 'utf8');
|
|
897
|
-
if (remainingContentBytes <= 0) {
|
|
898
|
-
throw markdownContentLimitError(
|
|
899
|
-
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
900
|
-
{
|
|
901
|
-
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
902
|
-
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
903
|
-
},
|
|
904
|
-
);
|
|
905
|
-
}
|
|
906
|
-
const content = await readOptionalGitFile(
|
|
907
|
-
service,
|
|
908
|
-
repositoryId,
|
|
909
|
-
commitSha,
|
|
910
|
-
access,
|
|
911
|
-
joinGitPath(folderPath, entry.path),
|
|
912
|
-
remainingContentBytes,
|
|
913
|
-
);
|
|
914
|
-
if (content) {
|
|
915
|
-
const contentBytes = Buffer.byteLength(content, 'utf8');
|
|
916
|
-
if (contentBytes > remainingContentBytes) {
|
|
917
|
-
throw markdownContentLimitError(
|
|
918
|
-
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
919
|
-
{
|
|
920
|
-
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
921
|
-
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
922
|
-
},
|
|
923
|
-
);
|
|
924
|
-
}
|
|
925
|
-
combined += header + content;
|
|
926
|
-
combinedBytes += Buffer.byteLength(header, 'utf8') + contentBytes;
|
|
927
|
-
}
|
|
928
|
-
}
|
|
929
|
-
return combined;
|
|
930
|
-
} catch (error) {
|
|
931
|
-
if (isMissingGitFile(error)) {
|
|
932
|
-
return '';
|
|
933
|
-
}
|
|
934
|
-
throw error;
|
|
935
|
-
}
|
|
936
|
-
}
|
|
1
|
+
import type { Context } from '@nocobase/actions';
|
|
2
|
+
|
|
3
|
+
import { stringifyJsonText, parseJsonLike, parseSkillMarkdown } from '../utils/json-fields';
|
|
4
|
+
import { assertSkillToolNameAvailable, buildSkillToolName } from '../../utils/skill-tool-name';
|
|
5
|
+
|
|
6
|
+
type SkillManifestEntry = Record<string, unknown> & {
|
|
7
|
+
folder?: string;
|
|
8
|
+
name?: string;
|
|
9
|
+
title?: string;
|
|
10
|
+
description?: string;
|
|
11
|
+
language?: string;
|
|
12
|
+
storageType?: string;
|
|
13
|
+
pluginSource?: string;
|
|
14
|
+
codeTemplate?: string;
|
|
15
|
+
codeFile?: string;
|
|
16
|
+
timeoutSeconds?: unknown;
|
|
17
|
+
maxOutputSizeMb?: unknown;
|
|
18
|
+
toolScope?: string;
|
|
19
|
+
enabled?: unknown;
|
|
20
|
+
autoCall?: unknown;
|
|
21
|
+
packages?: unknown;
|
|
22
|
+
inputSchema?: unknown;
|
|
23
|
+
interactionSchema?: unknown;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
type SkillDefinitionValues = Record<string, unknown> & {
|
|
27
|
+
name: string;
|
|
28
|
+
toolName?: string;
|
|
29
|
+
title: string;
|
|
30
|
+
description: string;
|
|
31
|
+
language: string;
|
|
32
|
+
storageType: string;
|
|
33
|
+
storageUrl: string;
|
|
34
|
+
timeoutSeconds: number;
|
|
35
|
+
maxOutputSizeMb: number;
|
|
36
|
+
toolScope: string;
|
|
37
|
+
enabled: boolean;
|
|
38
|
+
autoCall: boolean;
|
|
39
|
+
packages: string;
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
type SkillManifest = {
|
|
43
|
+
name?: string;
|
|
44
|
+
description?: string;
|
|
45
|
+
skills?: SkillManifestEntry[];
|
|
46
|
+
initializedAt?: string;
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
type GitManagerAccessContext = {
|
|
50
|
+
kind: 'user';
|
|
51
|
+
roles: string[];
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
type GitTreeEntry = {
|
|
55
|
+
type: 'blob' | 'tree';
|
|
56
|
+
path: string;
|
|
57
|
+
size: number;
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
interface GitManagerContentService {
|
|
61
|
+
contractVersion?: number;
|
|
62
|
+
capabilities?: readonly string[];
|
|
63
|
+
resolveCommit(repositoryId: string | number, ref: string, access: GitManagerAccessContext): Promise<string>;
|
|
64
|
+
listTree(
|
|
65
|
+
input: {
|
|
66
|
+
repositoryId: string | number;
|
|
67
|
+
commitSha: string;
|
|
68
|
+
rootPath: string;
|
|
69
|
+
recursive: boolean;
|
|
70
|
+
},
|
|
71
|
+
access: GitManagerAccessContext,
|
|
72
|
+
): Promise<GitTreeEntry[]>;
|
|
73
|
+
readFile(
|
|
74
|
+
input: {
|
|
75
|
+
repositoryId: string | number;
|
|
76
|
+
commitSha: string;
|
|
77
|
+
filePath: string;
|
|
78
|
+
maxBytes?: number;
|
|
79
|
+
},
|
|
80
|
+
access: GitManagerAccessContext,
|
|
81
|
+
): Promise<Buffer>;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
type GitManagerPlugin = {
|
|
85
|
+
skillHubContentService?: unknown;
|
|
86
|
+
};
|
|
87
|
+
|
|
88
|
+
type GitManagerPluginManager = {
|
|
89
|
+
get(name: string): unknown;
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
type GitImportErrorCode =
|
|
93
|
+
| 'GIT_MANAGER_CONTENT_UNAVAILABLE'
|
|
94
|
+
| 'SKILL_HUB_REPOSITORY_ACCESS_DENIED'
|
|
95
|
+
| 'SKILL_HUB_SKILL_NOT_LISTED'
|
|
96
|
+
| 'REGISTRY_CONTENT_LIMIT_EXCEEDED'
|
|
97
|
+
| 'REGISTRY_GIT_FILE_NOT_FOUND';
|
|
98
|
+
|
|
99
|
+
type GitImportTranslation = {
|
|
100
|
+
key: string;
|
|
101
|
+
values?: Record<string, string | number>;
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
class GitImportError extends Error {
|
|
105
|
+
constructor(
|
|
106
|
+
readonly code: GitImportErrorCode,
|
|
107
|
+
readonly status: number,
|
|
108
|
+
message: string,
|
|
109
|
+
readonly translation?: GitImportTranslation,
|
|
110
|
+
) {
|
|
111
|
+
super(message);
|
|
112
|
+
this.name = 'GitImportError';
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
const GIT_MANAGER_CONTENT_CAPABILITY = 'skill-hub-content-with-actor';
|
|
117
|
+
const GIT_MANAGER_CONTENT_CONTRACT_VERSION = 2;
|
|
118
|
+
const MISSING_GIT_FILE_CODE = 'REGISTRY_GIT_FILE_NOT_FOUND';
|
|
119
|
+
const ACCESS_DENIED_CODE = 'SKILL_HUB_REPOSITORY_ACCESS_DENIED';
|
|
120
|
+
const CONTENT_LIMIT_CODE = 'REGISTRY_CONTENT_LIMIT_EXCEEDED';
|
|
121
|
+
const GIT_IMPORT_NAMESPACE = 'plugin-agent-orchestrator';
|
|
122
|
+
|
|
123
|
+
const CODE_FILES = [
|
|
124
|
+
['index.py', 'python'],
|
|
125
|
+
['index.js', 'node'],
|
|
126
|
+
['main.py', 'python'],
|
|
127
|
+
] as const;
|
|
128
|
+
|
|
129
|
+
export const GIT_SKILL_MARKDOWN_LIMITS = Object.freeze({
|
|
130
|
+
maxFiles: 64,
|
|
131
|
+
maxBytes: 2 * 1024 * 1024,
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Git integration actions for skill-hub.
|
|
136
|
+
*
|
|
137
|
+
* All repository reads go through Git Manager's actor-aware content service.
|
|
138
|
+
* This keeps the repository-level scope used by Git Manager HTTP actions in
|
|
139
|
+
* force for Skill Hub imports; Skill Hub must never read a Git Manager clone
|
|
140
|
+
* directly from disk.
|
|
141
|
+
*
|
|
142
|
+
* Supported manifest shape:
|
|
143
|
+
* {
|
|
144
|
+
* "skills": [
|
|
145
|
+
* { "folder": "my-skill", "name": "my-skill", "language": "python" },
|
|
146
|
+
* { "name": "pptx-advanced-export", "storageType": "plugin", "pluginSource": "pptx-advanced-export" }
|
|
147
|
+
* ]
|
|
148
|
+
* }
|
|
149
|
+
*/
|
|
150
|
+
export async function gitListSkills(ctx: Context, next: () => Promise<void>) {
|
|
151
|
+
const { repositoryId, ref = 'HEAD', prefix = '' } = ctx.action.params;
|
|
152
|
+
const rootFolder = normalizeRootFolder(ctx.action.params.rootFolder);
|
|
153
|
+
|
|
154
|
+
if (!repositoryId) {
|
|
155
|
+
ctx.throw(400, translateGitImportMessage(ctx, 'repositoryId and rootFolder are required'));
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
try {
|
|
159
|
+
const service = getGitManagerContentService(ctx);
|
|
160
|
+
const access = accessFromContext(ctx);
|
|
161
|
+
const commitSha = await service.resolveCommit(repositoryId, ref, access);
|
|
162
|
+
const configPath = joinGitPath(rootFolder, 'skills.json');
|
|
163
|
+
const skillsRoot = await resolveSkillsRoot(service, repositoryId, commitSha, access, rootFolder);
|
|
164
|
+
const loaded = await loadSkillsManifest(service, repositoryId, commitSha, access, configPath);
|
|
165
|
+
const config = loaded.exists
|
|
166
|
+
? loaded.config
|
|
167
|
+
: createSkillsManifest(
|
|
168
|
+
rootFolder,
|
|
169
|
+
await discoverSkills(service, repositoryId, commitSha, access, rootFolder, skillsRoot),
|
|
170
|
+
);
|
|
171
|
+
|
|
172
|
+
const manifestSkills = Array.isArray(config.skills) ? config.skills.filter((skill) => getSkillKey(skill)) : [];
|
|
173
|
+
const enriched = manifestSkills.map((skill) => enrichListedSkill(skill, prefix));
|
|
174
|
+
|
|
175
|
+
const existingSkills = enriched.length
|
|
176
|
+
? await ctx.db.getRepository('skillDefinitions').find({
|
|
177
|
+
filter: { name: { $in: enriched.map((skill) => skill.name) } },
|
|
178
|
+
fields: ['name'],
|
|
179
|
+
})
|
|
180
|
+
: [];
|
|
181
|
+
const existingNames = new Set(
|
|
182
|
+
existingSkills.map((skill: { get(attribute: string): unknown }) => skill.get('name')),
|
|
183
|
+
);
|
|
184
|
+
|
|
185
|
+
ctx.body = {
|
|
186
|
+
data: enriched.map((skill) => ({
|
|
187
|
+
...skill,
|
|
188
|
+
existsInDb: existingNames.has(skill.name),
|
|
189
|
+
})),
|
|
190
|
+
config: {
|
|
191
|
+
name: config.name || rootFolder || 'skills',
|
|
192
|
+
description: config.description || '',
|
|
193
|
+
rootFolder,
|
|
194
|
+
path: configPath,
|
|
195
|
+
// An absent manifest is intentionally virtual. Writing a new file to
|
|
196
|
+
// Git Manager's checkout would reintroduce a cross-plugin disk bypass.
|
|
197
|
+
initializedSkillsJson: false,
|
|
198
|
+
},
|
|
199
|
+
};
|
|
200
|
+
await next();
|
|
201
|
+
} catch (error) {
|
|
202
|
+
throwGitImportError(ctx, error);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Sync selected skills from git into skillDefinitions.
|
|
208
|
+
*
|
|
209
|
+
* Code is optional. Regular git skills may provide code via codeTemplate,
|
|
210
|
+
* codeFile, or conventional files under skills/<folder>. Plugin skills only
|
|
211
|
+
* need storageType=plugin and pluginSource.
|
|
212
|
+
*/
|
|
213
|
+
export async function gitSyncSkills(ctx: Context, next: () => Promise<void>) {
|
|
214
|
+
const { repositoryId, ref = 'HEAD' } = ctx.action.params;
|
|
215
|
+
const rootFolder = normalizeRootFolder(ctx.action.params.rootFolder);
|
|
216
|
+
const { skills: selectedKeys, overwrite = false, prefix = '' } = ctx.action.params.values || ctx.action.params;
|
|
217
|
+
|
|
218
|
+
if (!repositoryId || !Array.isArray(selectedKeys) || selectedKeys.length === 0) {
|
|
219
|
+
ctx.throw(400, translateGitImportMessage(ctx, 'repositoryId, rootFolder and skills[] are required'));
|
|
220
|
+
}
|
|
221
|
+
const selectedSkillKeys = selectedKeys.filter(
|
|
222
|
+
(key): key is string => typeof key === 'string' && key.trim().length > 0,
|
|
223
|
+
);
|
|
224
|
+
if (selectedSkillKeys.length !== selectedKeys.length) {
|
|
225
|
+
ctx.throw(400, translateGitImportMessage(ctx, 'skills[] must contain non-empty string keys'));
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
try {
|
|
229
|
+
const service = getGitManagerContentService(ctx);
|
|
230
|
+
const access = accessFromContext(ctx);
|
|
231
|
+
const commitSha = await service.resolveCommit(repositoryId, ref, access);
|
|
232
|
+
const configPath = joinGitPath(rootFolder, 'skills.json');
|
|
233
|
+
const skillsRoot = await resolveSkillsRoot(service, repositoryId, commitSha, access, rootFolder);
|
|
234
|
+
const loaded = await loadSkillsManifest(service, repositoryId, commitSha, access, configPath);
|
|
235
|
+
const config = loaded.exists
|
|
236
|
+
? loaded.config
|
|
237
|
+
: createSkillsManifest(
|
|
238
|
+
rootFolder,
|
|
239
|
+
await discoverSkills(service, repositoryId, commitSha, access, rootFolder, skillsRoot),
|
|
240
|
+
);
|
|
241
|
+
|
|
242
|
+
const manifest = new Map<string, SkillManifestEntry>();
|
|
243
|
+
for (const entry of config.skills || []) {
|
|
244
|
+
const key = getSkillKey(entry);
|
|
245
|
+
if (key) {
|
|
246
|
+
manifest.set(key, entry);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
if (loaded.exists) {
|
|
250
|
+
const unlistedKeys = selectedSkillKeys.filter((key) => !manifest.has(key));
|
|
251
|
+
if (unlistedKeys.length > 0) {
|
|
252
|
+
const skills = unlistedKeys.join(', ');
|
|
253
|
+
throw new GitImportError(
|
|
254
|
+
'SKILL_HUB_SKILL_NOT_LISTED',
|
|
255
|
+
400,
|
|
256
|
+
`Selected skills are not listed in the explicit skills.json manifest: ${skills}`,
|
|
257
|
+
{
|
|
258
|
+
key: 'Selected skills are not listed in the explicit skills.json manifest: {{skills}}',
|
|
259
|
+
values: { skills },
|
|
260
|
+
},
|
|
261
|
+
);
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
const results: Array<Record<string, unknown>> = [];
|
|
266
|
+
const skillRepo = ctx.db.getRepository('skillDefinitions');
|
|
267
|
+
|
|
268
|
+
for (const key of selectedSkillKeys) {
|
|
269
|
+
const meta: SkillManifestEntry = manifest.get(key) || { folder: key, name: key };
|
|
270
|
+
const isPluginSkill = isPluginStorage(meta);
|
|
271
|
+
const rawName = meta.name || meta.pluginSource || meta.folder || key;
|
|
272
|
+
const skillName = `${prefix}${rawName}`;
|
|
273
|
+
const skillsSubDir = meta.folder ? joinGitPath(skillsRoot.path, meta.folder) : '';
|
|
274
|
+
const skillBaseDir = skillsSubDir || rootFolder;
|
|
275
|
+
|
|
276
|
+
try {
|
|
277
|
+
let frontmatter: SkillManifestEntry = {};
|
|
278
|
+
let instructions = '';
|
|
279
|
+
|
|
280
|
+
if (skillBaseDir || !meta.folder) {
|
|
281
|
+
const skillMarkdown = await readOptionalGitFile(
|
|
282
|
+
service,
|
|
283
|
+
repositoryId,
|
|
284
|
+
commitSha,
|
|
285
|
+
access,
|
|
286
|
+
joinGitPath(skillBaseDir, 'SKILL.md'),
|
|
287
|
+
);
|
|
288
|
+
if (skillMarkdown) {
|
|
289
|
+
try {
|
|
290
|
+
const parsed = parseSkillMarkdown(skillMarkdown);
|
|
291
|
+
frontmatter = parsed.metadata;
|
|
292
|
+
instructions = parsed.body;
|
|
293
|
+
|
|
294
|
+
const otherMarkdown = await fetchAllMarkdownInFolder(
|
|
295
|
+
service,
|
|
296
|
+
repositoryId,
|
|
297
|
+
commitSha,
|
|
298
|
+
access,
|
|
299
|
+
skillBaseDir,
|
|
300
|
+
);
|
|
301
|
+
if (otherMarkdown) instructions += otherMarkdown;
|
|
302
|
+
} catch (error) {
|
|
303
|
+
if (isFatalGitContentError(error)) {
|
|
304
|
+
throw error;
|
|
305
|
+
}
|
|
306
|
+
// SKILL.md is optional; malformed optional metadata must not
|
|
307
|
+
// prevent a manifest-defined skill from being imported.
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
const storageType = normalizeStorageType(
|
|
313
|
+
frontmatter.storageType || meta.storageType || (isPluginSkill ? 'plugin' : 'git'),
|
|
314
|
+
);
|
|
315
|
+
const pluginSource =
|
|
316
|
+
frontmatter.pluginSource || meta.pluginSource || (storageType === 'plugin' ? rawName : undefined);
|
|
317
|
+
|
|
318
|
+
let detectedLanguage = frontmatter.language || meta.language || 'python';
|
|
319
|
+
let codeTemplate = frontmatter.codeTemplate || meta.codeTemplate || '';
|
|
320
|
+
|
|
321
|
+
if (!codeTemplate && meta.codeFile) {
|
|
322
|
+
codeTemplate = await readOptionalGitFile(
|
|
323
|
+
service,
|
|
324
|
+
repositoryId,
|
|
325
|
+
commitSha,
|
|
326
|
+
access,
|
|
327
|
+
joinGitPath(skillBaseDir, meta.codeFile),
|
|
328
|
+
);
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
if (!codeTemplate && storageType !== 'plugin') {
|
|
332
|
+
const codeFile = await readConventionalCodeFile(service, repositoryId, commitSha, access, skillBaseDir);
|
|
333
|
+
if (codeFile) {
|
|
334
|
+
codeTemplate = codeFile.content;
|
|
335
|
+
detectedLanguage = codeFile.language;
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
const toolName = buildSkillToolName(skillName);
|
|
340
|
+
const merged: SkillDefinitionValues = {
|
|
341
|
+
name: skillName,
|
|
342
|
+
toolName,
|
|
343
|
+
title: frontmatter.title || meta.title || rawName,
|
|
344
|
+
description: frontmatter.description || meta.description || '',
|
|
345
|
+
language: detectedLanguage,
|
|
346
|
+
storageType,
|
|
347
|
+
storageUrl:
|
|
348
|
+
storageType === 'plugin'
|
|
349
|
+
? `git://${repositoryId}/${rootFolder || ''}@${commitSha}#${pluginSource || rawName}`
|
|
350
|
+
: `git://${repositoryId}/${skillsSubDir || rootFolder || ''}@${commitSha}`,
|
|
351
|
+
timeoutSeconds: parseInteger(frontmatter.timeoutSeconds ?? meta.timeoutSeconds, 60),
|
|
352
|
+
maxOutputSizeMb: parseInteger(frontmatter.maxOutputSizeMb ?? meta.maxOutputSizeMb, 50),
|
|
353
|
+
toolScope: frontmatter.toolScope || meta.toolScope || 'CUSTOM',
|
|
354
|
+
enabled: parseBoolean(frontmatter.enabled ?? meta.enabled, true),
|
|
355
|
+
autoCall: parseBoolean(frontmatter.autoCall ?? meta.autoCall, false),
|
|
356
|
+
packages: stringifyJsonText(parseJsonLike(meta.packages ?? frontmatter.packages, []), []),
|
|
357
|
+
};
|
|
358
|
+
|
|
359
|
+
if (codeTemplate) {
|
|
360
|
+
merged.codeTemplate = codeTemplate;
|
|
361
|
+
}
|
|
362
|
+
if (pluginSource) {
|
|
363
|
+
merged.pluginSource = pluginSource;
|
|
364
|
+
}
|
|
365
|
+
if (instructions) {
|
|
366
|
+
merged.instructions = instructions.trim();
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
const inputSchema = parseJsonLike(frontmatter.inputSchema ?? meta.inputSchema, null);
|
|
370
|
+
if (inputSchema) {
|
|
371
|
+
merged.inputSchema = stringifyJsonText(inputSchema);
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
const interactionSchema = parseJsonLike(frontmatter.interactionSchema ?? meta.interactionSchema, null);
|
|
375
|
+
if (interactionSchema) {
|
|
376
|
+
merged.interactionSchema = stringifyJsonText(interactionSchema);
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
const existing = await skillRepo.findOne({ filter: { name: skillName } });
|
|
380
|
+
if (existing && !overwrite) {
|
|
381
|
+
results.push({ folder: key, name: skillName, status: 'skipped', reason: 'Already exists' });
|
|
382
|
+
continue;
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
if (existing) {
|
|
386
|
+
delete merged.toolName;
|
|
387
|
+
await skillRepo.update({ filterByTk: existing.get('id'), values: merged });
|
|
388
|
+
results.push({ folder: key, name: skillName, status: 'updated' });
|
|
389
|
+
} else {
|
|
390
|
+
await assertSkillToolNameAvailable(ctx.db, toolName);
|
|
391
|
+
await skillRepo.create({ values: merged });
|
|
392
|
+
results.push({ folder: key, name: skillName, status: 'created' });
|
|
393
|
+
}
|
|
394
|
+
} catch (error) {
|
|
395
|
+
if (isFatalGitContentError(error)) {
|
|
396
|
+
throw error;
|
|
397
|
+
}
|
|
398
|
+
results.push({ folder: key, name: skillName, status: 'error', reason: errorMessage(error) });
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
ctx.body = { data: results };
|
|
403
|
+
await next();
|
|
404
|
+
} catch (error) {
|
|
405
|
+
throwGitImportError(ctx, error);
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
function getGitManagerContentService(ctx: Context): GitManagerContentService {
|
|
410
|
+
const pluginManager = (ctx.app as unknown as { pm?: GitManagerPluginManager }).pm;
|
|
411
|
+
const plugin = pluginManager?.get('plugin-git-manager');
|
|
412
|
+
if (!plugin || typeof plugin !== 'object') {
|
|
413
|
+
throw new GitImportError(
|
|
414
|
+
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
415
|
+
424,
|
|
416
|
+
'Git Manager is not enabled for Skill Hub imports.',
|
|
417
|
+
{ key: 'Git Manager is not enabled for Skill Hub imports.' },
|
|
418
|
+
);
|
|
419
|
+
}
|
|
420
|
+
|
|
421
|
+
const service = (plugin as GitManagerPlugin).skillHubContentService;
|
|
422
|
+
if (!service || typeof service !== 'object') {
|
|
423
|
+
throw new GitImportError(
|
|
424
|
+
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
425
|
+
424,
|
|
426
|
+
'Git Manager must support actor-aware content reads for Skill Hub imports.',
|
|
427
|
+
{ key: 'Git Manager must support actor-aware content reads for Skill Hub imports.' },
|
|
428
|
+
);
|
|
429
|
+
}
|
|
430
|
+
|
|
431
|
+
const candidate = service as Partial<GitManagerContentService>;
|
|
432
|
+
const contractVersion = candidate.contractVersion;
|
|
433
|
+
const capabilities = candidate.capabilities;
|
|
434
|
+
const hasCompatibleContract =
|
|
435
|
+
typeof contractVersion === 'number' &&
|
|
436
|
+
Number.isSafeInteger(contractVersion) &&
|
|
437
|
+
contractVersion >= GIT_MANAGER_CONTENT_CONTRACT_VERSION;
|
|
438
|
+
if (
|
|
439
|
+
!hasCompatibleContract ||
|
|
440
|
+
!Array.isArray(capabilities) ||
|
|
441
|
+
!capabilities.includes(GIT_MANAGER_CONTENT_CAPABILITY) ||
|
|
442
|
+
typeof candidate.resolveCommit !== 'function' ||
|
|
443
|
+
typeof candidate.listTree !== 'function' ||
|
|
444
|
+
typeof candidate.readFile !== 'function'
|
|
445
|
+
) {
|
|
446
|
+
throw new GitImportError(
|
|
447
|
+
'GIT_MANAGER_CONTENT_UNAVAILABLE',
|
|
448
|
+
424,
|
|
449
|
+
'Git Manager must support actor-aware content reads for Skill Hub imports.',
|
|
450
|
+
{ key: 'Git Manager must support actor-aware content reads for Skill Hub imports.' },
|
|
451
|
+
);
|
|
452
|
+
}
|
|
453
|
+
return service as GitManagerContentService;
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
function accessFromContext(ctx: Context): GitManagerAccessContext {
|
|
457
|
+
const currentRoles = (ctx.state as unknown as { currentRoles?: unknown } | undefined)?.currentRoles;
|
|
458
|
+
if (!Array.isArray(currentRoles) || !currentRoles.every((role): role is string => typeof role === 'string')) {
|
|
459
|
+
throw new GitImportError(
|
|
460
|
+
'SKILL_HUB_REPOSITORY_ACCESS_DENIED',
|
|
461
|
+
403,
|
|
462
|
+
'A valid user role context is required to import skills from Git Manager.',
|
|
463
|
+
{ key: 'A valid user role context is required to import skills from Git Manager.' },
|
|
464
|
+
);
|
|
465
|
+
}
|
|
466
|
+
return { kind: 'user', roles: currentRoles };
|
|
467
|
+
}
|
|
468
|
+
|
|
469
|
+
function errorCode(error: unknown): string | undefined {
|
|
470
|
+
if (!error || typeof error !== 'object') return undefined;
|
|
471
|
+
const code = (error as { code?: unknown }).code;
|
|
472
|
+
return typeof code === 'string' ? code : undefined;
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
function errorMessage(error: unknown): string {
|
|
476
|
+
return error instanceof Error ? error.message : String(error);
|
|
477
|
+
}
|
|
478
|
+
|
|
479
|
+
function isMissingGitFile(error: unknown): boolean {
|
|
480
|
+
return errorCode(error) === MISSING_GIT_FILE_CODE;
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
function isFatalGitContentError(error: unknown): boolean {
|
|
484
|
+
if (error instanceof GitImportError) return true;
|
|
485
|
+
const code = errorCode(error);
|
|
486
|
+
return code === ACCESS_DENIED_CODE || code === CONTENT_LIMIT_CODE;
|
|
487
|
+
}
|
|
488
|
+
|
|
489
|
+
function throwGitImportError(ctx: Context, error: unknown): never {
|
|
490
|
+
if (error instanceof GitImportError) {
|
|
491
|
+
return throwHttpError(ctx, error.status, error.message, error.translation);
|
|
492
|
+
}
|
|
493
|
+
|
|
494
|
+
switch (errorCode(error)) {
|
|
495
|
+
case ACCESS_DENIED_CODE:
|
|
496
|
+
return throwHttpError(ctx, 403, errorMessage(error));
|
|
497
|
+
case CONTENT_LIMIT_CODE:
|
|
498
|
+
return throwHttpError(ctx, 422, errorMessage(error));
|
|
499
|
+
case MISSING_GIT_FILE_CODE:
|
|
500
|
+
return throwHttpError(ctx, 404, errorMessage(error));
|
|
501
|
+
default:
|
|
502
|
+
return throwHttpError(ctx, 502, 'Git Manager could not read the requested repository content.', {
|
|
503
|
+
key: 'Git Manager could not read the requested repository content.',
|
|
504
|
+
});
|
|
505
|
+
}
|
|
506
|
+
}
|
|
507
|
+
|
|
508
|
+
function translateGitImportMessage(
|
|
509
|
+
ctx: Context,
|
|
510
|
+
key: string,
|
|
511
|
+
values?: Record<string, string | number>,
|
|
512
|
+
fallback = key,
|
|
513
|
+
): string {
|
|
514
|
+
const translate = (ctx as unknown as { t?: unknown }).t;
|
|
515
|
+
if (typeof translate !== 'function') {
|
|
516
|
+
return fallback;
|
|
517
|
+
}
|
|
518
|
+
const translated = translate(key, { ns: GIT_IMPORT_NAMESPACE, ...values });
|
|
519
|
+
return typeof translated === 'string' ? translated : fallback;
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
function throwHttpError(ctx: Context, status: number, message: string, translation?: GitImportTranslation): never {
|
|
523
|
+
const localizedMessage = translation
|
|
524
|
+
? translateGitImportMessage(ctx, translation.key, translation.values, message)
|
|
525
|
+
: message;
|
|
526
|
+
return (ctx as unknown as { throw(status: number, message: string): never }).throw(status, localizedMessage);
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
async function loadSkillsManifest(
|
|
530
|
+
service: GitManagerContentService,
|
|
531
|
+
repositoryId: string | number,
|
|
532
|
+
commitSha: string,
|
|
533
|
+
access: GitManagerAccessContext,
|
|
534
|
+
configPath: string,
|
|
535
|
+
): Promise<{ exists: boolean; config: SkillManifest }> {
|
|
536
|
+
let raw: string;
|
|
537
|
+
try {
|
|
538
|
+
raw = (await service.readFile({ repositoryId, commitSha, filePath: configPath }, access)).toString('utf8');
|
|
539
|
+
} catch (error) {
|
|
540
|
+
if (isMissingGitFile(error)) {
|
|
541
|
+
return { exists: false, config: {} };
|
|
542
|
+
}
|
|
543
|
+
throw error;
|
|
544
|
+
}
|
|
545
|
+
|
|
546
|
+
try {
|
|
547
|
+
return { exists: true, config: JSON.parse(raw) as SkillManifest };
|
|
548
|
+
} catch (error) {
|
|
549
|
+
throw new Error(`Invalid ${configPath}: ${errorMessage(error)}`);
|
|
550
|
+
}
|
|
551
|
+
}
|
|
552
|
+
|
|
553
|
+
async function discoverSkills(
|
|
554
|
+
service: GitManagerContentService,
|
|
555
|
+
repositoryId: string | number,
|
|
556
|
+
commitSha: string,
|
|
557
|
+
access: GitManagerAccessContext,
|
|
558
|
+
rootFolder: string,
|
|
559
|
+
skillsRoot: ResolvedSkillsRoot,
|
|
560
|
+
): Promise<SkillManifestEntry[]> {
|
|
561
|
+
if (skillsRoot.folders.length > 0) {
|
|
562
|
+
return skillsRoot.folders;
|
|
563
|
+
}
|
|
564
|
+
|
|
565
|
+
const pluginSkill = await discoverPluginSkill(service, repositoryId, commitSha, access, rootFolder);
|
|
566
|
+
return pluginSkill ? [pluginSkill] : [];
|
|
567
|
+
}
|
|
568
|
+
|
|
569
|
+
type ResolvedSkillsRoot = {
|
|
570
|
+
path: string;
|
|
571
|
+
folders: SkillManifestEntry[];
|
|
572
|
+
};
|
|
573
|
+
|
|
574
|
+
async function resolveSkillsRoot(
|
|
575
|
+
service: GitManagerContentService,
|
|
576
|
+
repositoryId: string | number,
|
|
577
|
+
commitSha: string,
|
|
578
|
+
access: GitManagerAccessContext,
|
|
579
|
+
rootFolder: string,
|
|
580
|
+
): Promise<ResolvedSkillsRoot> {
|
|
581
|
+
const configuredRoot = normalizeRootFolder(rootFolder);
|
|
582
|
+
const rootEntries = await service.listTree(
|
|
583
|
+
{ repositoryId, commitSha, rootPath: configuredRoot, recursive: false },
|
|
584
|
+
access,
|
|
585
|
+
);
|
|
586
|
+
const configuredRootIsSkillsDirectory = configuredRoot === 'skills' || configuredRoot.endsWith('/skills');
|
|
587
|
+
const directFolders = await discoverSkillFoldersAtRoot(
|
|
588
|
+
service,
|
|
589
|
+
repositoryId,
|
|
590
|
+
commitSha,
|
|
591
|
+
access,
|
|
592
|
+
configuredRoot,
|
|
593
|
+
rootEntries,
|
|
594
|
+
);
|
|
595
|
+
if (directFolders.length > 0 || configuredRootIsSkillsDirectory) {
|
|
596
|
+
return { path: configuredRoot, folders: directFolders };
|
|
597
|
+
}
|
|
598
|
+
|
|
599
|
+
const hasSkillsSubfolder = rootEntries.some((entry) => entry.type === 'tree' && entry.path === 'skills');
|
|
600
|
+
if (!hasSkillsSubfolder) {
|
|
601
|
+
return { path: configuredRoot, folders: directFolders };
|
|
602
|
+
}
|
|
603
|
+
|
|
604
|
+
const fallbackRoot = joinGitPath(configuredRoot, 'skills');
|
|
605
|
+
return {
|
|
606
|
+
path: fallbackRoot,
|
|
607
|
+
folders: await discoverSkillFoldersAtRoot(service, repositoryId, commitSha, access, fallbackRoot),
|
|
608
|
+
};
|
|
609
|
+
}
|
|
610
|
+
|
|
611
|
+
async function discoverSkillFoldersAtRoot(
|
|
612
|
+
service: GitManagerContentService,
|
|
613
|
+
repositoryId: string | number,
|
|
614
|
+
commitSha: string,
|
|
615
|
+
access: GitManagerAccessContext,
|
|
616
|
+
baseDir: string,
|
|
617
|
+
rootEntries?: GitTreeEntry[],
|
|
618
|
+
): Promise<SkillManifestEntry[]> {
|
|
619
|
+
try {
|
|
620
|
+
const entries =
|
|
621
|
+
rootEntries || (await service.listTree({ repositoryId, commitSha, rootPath: baseDir, recursive: false }, access));
|
|
622
|
+
const folders = entries.filter((entry) => entry.type === 'tree').map((entry) => entry.path);
|
|
623
|
+
const discovered: SkillManifestEntry[] = [];
|
|
624
|
+
const batchSize = 16;
|
|
625
|
+
for (let offset = 0; offset < folders.length; offset += batchSize) {
|
|
626
|
+
const batch = folders.slice(offset, offset + batchSize);
|
|
627
|
+
const results = await Promise.all(
|
|
628
|
+
batch.map(async (folder) => {
|
|
629
|
+
const folderEntries = await service.listTree(
|
|
630
|
+
{ repositoryId, commitSha, rootPath: joinGitPath(baseDir, folder), recursive: false },
|
|
631
|
+
access,
|
|
632
|
+
);
|
|
633
|
+
return folderEntries.some((entry) => entry.type === 'blob' && entry.path === 'SKILL.md') ? folder : null;
|
|
634
|
+
}),
|
|
635
|
+
);
|
|
636
|
+
for (const folder of results) {
|
|
637
|
+
if (folder) {
|
|
638
|
+
discovered.push({ folder, name: folder, title: folder, storageType: 'git' });
|
|
639
|
+
}
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
return discovered;
|
|
643
|
+
} catch (error) {
|
|
644
|
+
if (isMissingGitFile(error)) {
|
|
645
|
+
return [];
|
|
646
|
+
}
|
|
647
|
+
throw error;
|
|
648
|
+
}
|
|
649
|
+
}
|
|
650
|
+
|
|
651
|
+
async function discoverPluginSkill(
|
|
652
|
+
service: GitManagerContentService,
|
|
653
|
+
repositoryId: string | number,
|
|
654
|
+
commitSha: string,
|
|
655
|
+
access: GitManagerAccessContext,
|
|
656
|
+
rootFolder: string,
|
|
657
|
+
): Promise<SkillManifestEntry | null> {
|
|
658
|
+
const packageJsonPath = joinGitPath(rootFolder, 'package.json');
|
|
659
|
+
const rawPackageJson = await readOptionalGitFile(service, repositoryId, commitSha, access, packageJsonPath);
|
|
660
|
+
if (!rawPackageJson) {
|
|
661
|
+
return null;
|
|
662
|
+
}
|
|
663
|
+
|
|
664
|
+
let packageJson: Record<string, unknown>;
|
|
665
|
+
try {
|
|
666
|
+
const parsed: unknown = JSON.parse(rawPackageJson);
|
|
667
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
668
|
+
return null;
|
|
669
|
+
}
|
|
670
|
+
packageJson = parsed as Record<string, unknown>;
|
|
671
|
+
} catch {
|
|
672
|
+
return null;
|
|
673
|
+
}
|
|
674
|
+
|
|
675
|
+
const definition =
|
|
676
|
+
(await readOptionalGitFile(
|
|
677
|
+
service,
|
|
678
|
+
repositoryId,
|
|
679
|
+
commitSha,
|
|
680
|
+
access,
|
|
681
|
+
joinGitPath(rootFolder, 'src/server/skill-definition.ts'),
|
|
682
|
+
)) ||
|
|
683
|
+
(await readOptionalGitFile(
|
|
684
|
+
service,
|
|
685
|
+
repositoryId,
|
|
686
|
+
commitSha,
|
|
687
|
+
access,
|
|
688
|
+
joinGitPath(rootFolder, 'src/server/skill-definition.js'),
|
|
689
|
+
));
|
|
690
|
+
const templateName = definition ? extractStringProperty(definition, 'name') : null;
|
|
691
|
+
const title = definition ? extractStringProperty(definition, 'title') : null;
|
|
692
|
+
const language = definition ? extractStringProperty(definition, 'language') : null;
|
|
693
|
+
|
|
694
|
+
const packageName = stringValue(packageJson.name);
|
|
695
|
+
const pluginSource = templateName || packageName;
|
|
696
|
+
if (!pluginSource) {
|
|
697
|
+
return null;
|
|
698
|
+
}
|
|
699
|
+
|
|
700
|
+
return {
|
|
701
|
+
name: pluginSource,
|
|
702
|
+
title: title || stringValue(packageJson.displayName) || packageName || pluginSource,
|
|
703
|
+
description: stringValue(packageJson.description) || '',
|
|
704
|
+
language: language || 'python',
|
|
705
|
+
storageType: 'plugin',
|
|
706
|
+
pluginSource,
|
|
707
|
+
};
|
|
708
|
+
}
|
|
709
|
+
|
|
710
|
+
function createSkillsManifest(rootFolder: string, skills: SkillManifestEntry[]): SkillManifest {
|
|
711
|
+
return {
|
|
712
|
+
name: rootFolder || 'skills',
|
|
713
|
+
description: '',
|
|
714
|
+
initializedAt: new Date().toISOString(),
|
|
715
|
+
skills,
|
|
716
|
+
};
|
|
717
|
+
}
|
|
718
|
+
|
|
719
|
+
async function readConventionalCodeFile(
|
|
720
|
+
service: GitManagerContentService,
|
|
721
|
+
repositoryId: string | number,
|
|
722
|
+
commitSha: string,
|
|
723
|
+
access: GitManagerAccessContext,
|
|
724
|
+
skillsSubDir: string,
|
|
725
|
+
) {
|
|
726
|
+
for (const [file, language] of CODE_FILES) {
|
|
727
|
+
const content = await readOptionalGitFile(
|
|
728
|
+
service,
|
|
729
|
+
repositoryId,
|
|
730
|
+
commitSha,
|
|
731
|
+
access,
|
|
732
|
+
joinGitPath(skillsSubDir, file),
|
|
733
|
+
);
|
|
734
|
+
if (content) {
|
|
735
|
+
return { content, language };
|
|
736
|
+
}
|
|
737
|
+
}
|
|
738
|
+
return null;
|
|
739
|
+
}
|
|
740
|
+
|
|
741
|
+
async function readOptionalGitFile(
|
|
742
|
+
service: GitManagerContentService,
|
|
743
|
+
repositoryId: string | number,
|
|
744
|
+
commitSha: string,
|
|
745
|
+
access: GitManagerAccessContext,
|
|
746
|
+
filePath: string,
|
|
747
|
+
maxBytes?: number,
|
|
748
|
+
): Promise<string> {
|
|
749
|
+
try {
|
|
750
|
+
const input =
|
|
751
|
+
maxBytes === undefined ? { repositoryId, commitSha, filePath } : { repositoryId, commitSha, filePath, maxBytes };
|
|
752
|
+
return (await service.readFile(input, access)).toString('utf8');
|
|
753
|
+
} catch (error) {
|
|
754
|
+
if (isMissingGitFile(error)) {
|
|
755
|
+
return '';
|
|
756
|
+
}
|
|
757
|
+
throw error;
|
|
758
|
+
}
|
|
759
|
+
}
|
|
760
|
+
|
|
761
|
+
function enrichListedSkill(skill: SkillManifestEntry, prefix: string) {
|
|
762
|
+
const rawName = skill.name || skill.pluginSource || skill.folder || '';
|
|
763
|
+
const finalName = `${prefix}${rawName}`;
|
|
764
|
+
|
|
765
|
+
return {
|
|
766
|
+
folder: getSkillKey(skill),
|
|
767
|
+
name: finalName,
|
|
768
|
+
title: skill.title || rawName,
|
|
769
|
+
description: skill.description || '',
|
|
770
|
+
language: skill.language || 'python',
|
|
771
|
+
storageType: normalizeStorageType(skill.storageType || (skill.pluginSource ? 'plugin' : 'git')),
|
|
772
|
+
pluginSource: skill.pluginSource,
|
|
773
|
+
...(skill.timeoutSeconds ? { timeoutSeconds: skill.timeoutSeconds } : {}),
|
|
774
|
+
...(skill.maxOutputSizeMb ? { maxOutputSizeMb: skill.maxOutputSizeMb } : {}),
|
|
775
|
+
...(skill.packages ? { packages: skill.packages } : {}),
|
|
776
|
+
...(skill.inputSchema ? { inputSchema: skill.inputSchema } : {}),
|
|
777
|
+
...(skill.toolScope ? { toolScope: skill.toolScope } : {}),
|
|
778
|
+
};
|
|
779
|
+
}
|
|
780
|
+
|
|
781
|
+
function getSkillKey(skill: SkillManifestEntry) {
|
|
782
|
+
return String(skill.folder || skill.name || skill.pluginSource || '').trim();
|
|
783
|
+
}
|
|
784
|
+
|
|
785
|
+
function isPluginStorage(skill: SkillManifestEntry) {
|
|
786
|
+
return normalizeStorageType(skill.storageType) === 'plugin' || !!skill.pluginSource;
|
|
787
|
+
}
|
|
788
|
+
|
|
789
|
+
function normalizeStorageType(storageType: unknown) {
|
|
790
|
+
const value = typeof storageType === 'string' ? storageType.toLowerCase() : '';
|
|
791
|
+
if (value === 'plugin') return 'plugin';
|
|
792
|
+
if (value === 'local') return 'local';
|
|
793
|
+
if (value === 'database') return 'database';
|
|
794
|
+
return 'git';
|
|
795
|
+
}
|
|
796
|
+
|
|
797
|
+
function parseInteger(value: unknown, fallback: number) {
|
|
798
|
+
const parsed = Number.parseInt(String(value), 10);
|
|
799
|
+
return Number.isFinite(parsed) ? parsed : fallback;
|
|
800
|
+
}
|
|
801
|
+
|
|
802
|
+
function parseBoolean(value: unknown, fallback: boolean) {
|
|
803
|
+
if (value === undefined || value === null || value === '') return fallback;
|
|
804
|
+
if (typeof value === 'boolean') return value;
|
|
805
|
+
if (typeof value === 'string') return !['false', '0', 'no'].includes(value.toLowerCase());
|
|
806
|
+
return Boolean(value);
|
|
807
|
+
}
|
|
808
|
+
|
|
809
|
+
function extractStringProperty(source: string, property: string) {
|
|
810
|
+
const match = source.match(new RegExp(property + '\\s*:\\s*([\'"\\x60])([\\s\\S]*?)\\1'));
|
|
811
|
+
return match ? match[2] : null;
|
|
812
|
+
}
|
|
813
|
+
|
|
814
|
+
function normalizeRootFolder(rootFolder: unknown) {
|
|
815
|
+
if (rootFolder === undefined || rootFolder === null) {
|
|
816
|
+
throw new Error('repositoryId and rootFolder are required');
|
|
817
|
+
}
|
|
818
|
+
|
|
819
|
+
const normalized = String(rootFolder)
|
|
820
|
+
.replace(/\\/g, '/')
|
|
821
|
+
.replace(/^\/+|\/+$/g, '');
|
|
822
|
+
if (normalized.includes('..') || normalized.includes('\0')) {
|
|
823
|
+
throw new Error('Invalid rootFolder');
|
|
824
|
+
}
|
|
825
|
+
return normalized;
|
|
826
|
+
}
|
|
827
|
+
|
|
828
|
+
function stringValue(value: unknown): string | undefined {
|
|
829
|
+
return typeof value === 'string' && value.trim() ? value.trim() : undefined;
|
|
830
|
+
}
|
|
831
|
+
|
|
832
|
+
function joinGitPath(...parts: Array<string | undefined>) {
|
|
833
|
+
return parts
|
|
834
|
+
.filter((part) => part !== undefined && part !== '')
|
|
835
|
+
.join('/')
|
|
836
|
+
.replace(/\/+/g, '/');
|
|
837
|
+
}
|
|
838
|
+
|
|
839
|
+
function markdownContentHeader(path: string): string {
|
|
840
|
+
return `\n\n--- Content from ${path} ---\n\n`;
|
|
841
|
+
}
|
|
842
|
+
|
|
843
|
+
function markdownContentLimitError(message: string, translation?: GitImportTranslation): GitImportError {
|
|
844
|
+
return new GitImportError('REGISTRY_CONTENT_LIMIT_EXCEEDED', 422, message, translation);
|
|
845
|
+
}
|
|
846
|
+
|
|
847
|
+
async function fetchAllMarkdownInFolder(
|
|
848
|
+
service: GitManagerContentService,
|
|
849
|
+
repositoryId: string | number,
|
|
850
|
+
commitSha: string,
|
|
851
|
+
access: GitManagerAccessContext,
|
|
852
|
+
folderPath: string,
|
|
853
|
+
): Promise<string> {
|
|
854
|
+
try {
|
|
855
|
+
const entries = await service.listTree({ repositoryId, commitSha, rootPath: folderPath, recursive: true }, access);
|
|
856
|
+
const markdownEntries = entries
|
|
857
|
+
.filter(
|
|
858
|
+
(entry) =>
|
|
859
|
+
entry.type === 'blob' && entry.path.toLowerCase().endsWith('.md') && entry.path.toUpperCase() !== 'SKILL.MD',
|
|
860
|
+
)
|
|
861
|
+
.sort((left, right) => left.path.localeCompare(right.path));
|
|
862
|
+
if (markdownEntries.length > GIT_SKILL_MARKDOWN_LIMITS.maxFiles) {
|
|
863
|
+
throw markdownContentLimitError(
|
|
864
|
+
`Git skill contains more than ${GIT_SKILL_MARKDOWN_LIMITS.maxFiles} supplemental Markdown files.`,
|
|
865
|
+
{
|
|
866
|
+
key: 'Git skill contains more than {{count}} supplemental Markdown files.',
|
|
867
|
+
values: { count: GIT_SKILL_MARKDOWN_LIMITS.maxFiles },
|
|
868
|
+
},
|
|
869
|
+
);
|
|
870
|
+
}
|
|
871
|
+
|
|
872
|
+
let declaredBytes = 0;
|
|
873
|
+
for (const entry of markdownEntries) {
|
|
874
|
+
if (!Number.isSafeInteger(entry.size) || entry.size < 0) {
|
|
875
|
+
throw markdownContentLimitError('Git skill contains a supplemental Markdown file with an invalid size.', {
|
|
876
|
+
key: 'Git skill contains a supplemental Markdown file with an invalid size.',
|
|
877
|
+
});
|
|
878
|
+
}
|
|
879
|
+
declaredBytes += Buffer.byteLength(markdownContentHeader(entry.path), 'utf8') + entry.size;
|
|
880
|
+
if (declaredBytes > GIT_SKILL_MARKDOWN_LIMITS.maxBytes) {
|
|
881
|
+
throw markdownContentLimitError(
|
|
882
|
+
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
883
|
+
{
|
|
884
|
+
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
885
|
+
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
886
|
+
},
|
|
887
|
+
);
|
|
888
|
+
}
|
|
889
|
+
}
|
|
890
|
+
|
|
891
|
+
let combined = '';
|
|
892
|
+
let combinedBytes = 0;
|
|
893
|
+
for (const entry of markdownEntries) {
|
|
894
|
+
const header = markdownContentHeader(entry.path);
|
|
895
|
+
const remainingContentBytes =
|
|
896
|
+
GIT_SKILL_MARKDOWN_LIMITS.maxBytes - combinedBytes - Buffer.byteLength(header, 'utf8');
|
|
897
|
+
if (remainingContentBytes <= 0) {
|
|
898
|
+
throw markdownContentLimitError(
|
|
899
|
+
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
900
|
+
{
|
|
901
|
+
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
902
|
+
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
903
|
+
},
|
|
904
|
+
);
|
|
905
|
+
}
|
|
906
|
+
const content = await readOptionalGitFile(
|
|
907
|
+
service,
|
|
908
|
+
repositoryId,
|
|
909
|
+
commitSha,
|
|
910
|
+
access,
|
|
911
|
+
joinGitPath(folderPath, entry.path),
|
|
912
|
+
remainingContentBytes,
|
|
913
|
+
);
|
|
914
|
+
if (content) {
|
|
915
|
+
const contentBytes = Buffer.byteLength(content, 'utf8');
|
|
916
|
+
if (contentBytes > remainingContentBytes) {
|
|
917
|
+
throw markdownContentLimitError(
|
|
918
|
+
`Git skill supplemental Markdown exceeds ${GIT_SKILL_MARKDOWN_LIMITS.maxBytes} bytes.`,
|
|
919
|
+
{
|
|
920
|
+
key: 'Git skill supplemental Markdown exceeds {{maxBytes}} bytes.',
|
|
921
|
+
values: { maxBytes: GIT_SKILL_MARKDOWN_LIMITS.maxBytes },
|
|
922
|
+
},
|
|
923
|
+
);
|
|
924
|
+
}
|
|
925
|
+
combined += header + content;
|
|
926
|
+
combinedBytes += Buffer.byteLength(header, 'utf8') + contentBytes;
|
|
927
|
+
}
|
|
928
|
+
}
|
|
929
|
+
return combined;
|
|
930
|
+
} catch (error) {
|
|
931
|
+
if (isMissingGitFile(error)) {
|
|
932
|
+
return '';
|
|
933
|
+
}
|
|
934
|
+
throw error;
|
|
935
|
+
}
|
|
936
|
+
}
|