@cicctencent/agent-core 1.0.50 → 1.0.52
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/dist/cjs/agent/engine.js +1 -1
- package/dist/cjs/agent/engine.js.map +1 -1
- package/dist/cjs/agent/tool-section-builder.d.ts.map +1 -1
- package/dist/cjs/agent/tool-section-builder.js +1 -0
- package/dist/cjs/agent/tool-section-builder.js.map +1 -1
- package/dist/cjs/automation/node-task-types.d.ts +54 -94
- package/dist/cjs/automation/node-task-types.d.ts.map +1 -1
- package/dist/cjs/index.d.ts +4 -2
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +8 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/run-capability/artifact-dir.d.ts +17 -0
- package/dist/cjs/run-capability/artifact-dir.d.ts.map +1 -0
- package/dist/cjs/run-capability/artifact-dir.js +89 -0
- package/dist/cjs/run-capability/artifact-dir.js.map +1 -0
- package/dist/cjs/run-capability/index.d.ts +2 -1
- package/dist/cjs/run-capability/index.d.ts.map +1 -1
- package/dist/cjs/run-capability/index.js +5 -1
- package/dist/cjs/run-capability/index.js.map +1 -1
- package/dist/cjs/run-capability/script-package-runner.d.ts +6 -2
- package/dist/cjs/run-capability/script-package-runner.d.ts.map +1 -1
- package/dist/cjs/run-capability/script-package-runner.js +72 -17
- package/dist/cjs/run-capability/script-package-runner.js.map +1 -1
- package/dist/cjs/run-capability/skill-script-runner.d.ts +6 -2
- package/dist/cjs/run-capability/skill-script-runner.d.ts.map +1 -1
- package/dist/cjs/run-capability/skill-script-runner.js +25 -11
- package/dist/cjs/run-capability/skill-script-runner.js.map +1 -1
- package/dist/cjs/run-capability/types.d.ts +52 -0
- package/dist/cjs/run-capability/types.d.ts.map +1 -1
- package/dist/cjs/sandbox/code-sandbox.d.ts +21 -2
- package/dist/cjs/sandbox/code-sandbox.d.ts.map +1 -1
- package/dist/cjs/sandbox/code-sandbox.js.map +1 -1
- package/dist/cjs/sandbox/env-guard.d.ts +50 -0
- package/dist/cjs/sandbox/env-guard.d.ts.map +1 -0
- package/dist/cjs/sandbox/env-guard.js +106 -0
- package/dist/cjs/sandbox/env-guard.js.map +1 -0
- package/dist/cjs/sandbox/local-sandbox.d.ts.map +1 -1
- package/dist/cjs/sandbox/local-sandbox.js +6 -2
- package/dist/cjs/sandbox/local-sandbox.js.map +1 -1
- package/dist/cjs/sandbox/types.d.ts +8 -0
- package/dist/cjs/sandbox/types.d.ts.map +1 -1
- package/dist/cjs/sandbox/types.js.map +1 -1
- package/dist/cjs/tool/types.d.ts +12 -0
- package/dist/cjs/tool/types.d.ts.map +1 -1
- package/dist/esm/agent/engine.js +1 -1
- package/dist/esm/agent/engine.js.map +1 -1
- package/dist/esm/agent/tool-section-builder.d.ts.map +1 -1
- package/dist/esm/agent/tool-section-builder.js +1 -0
- package/dist/esm/agent/tool-section-builder.js.map +1 -1
- package/dist/esm/automation/node-task-types.d.ts +54 -94
- package/dist/esm/automation/node-task-types.d.ts.map +1 -1
- package/dist/esm/index.d.ts +4 -2
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/run-capability/artifact-dir.d.ts +17 -0
- package/dist/esm/run-capability/artifact-dir.d.ts.map +1 -0
- package/dist/esm/run-capability/artifact-dir.js +51 -0
- package/dist/esm/run-capability/artifact-dir.js.map +1 -0
- package/dist/esm/run-capability/index.d.ts +2 -1
- package/dist/esm/run-capability/index.d.ts.map +1 -1
- package/dist/esm/run-capability/index.js +1 -0
- package/dist/esm/run-capability/index.js.map +1 -1
- package/dist/esm/run-capability/script-package-runner.d.ts +6 -2
- package/dist/esm/run-capability/script-package-runner.d.ts.map +1 -1
- package/dist/esm/run-capability/script-package-runner.js +72 -17
- package/dist/esm/run-capability/script-package-runner.js.map +1 -1
- package/dist/esm/run-capability/skill-script-runner.d.ts +6 -2
- package/dist/esm/run-capability/skill-script-runner.d.ts.map +1 -1
- package/dist/esm/run-capability/skill-script-runner.js +25 -11
- package/dist/esm/run-capability/skill-script-runner.js.map +1 -1
- package/dist/esm/run-capability/types.d.ts +52 -0
- package/dist/esm/run-capability/types.d.ts.map +1 -1
- package/dist/esm/sandbox/code-sandbox.d.ts +21 -2
- package/dist/esm/sandbox/code-sandbox.d.ts.map +1 -1
- package/dist/esm/sandbox/code-sandbox.js.map +1 -1
- package/dist/esm/sandbox/env-guard.d.ts +50 -0
- package/dist/esm/sandbox/env-guard.d.ts.map +1 -0
- package/dist/esm/sandbox/env-guard.js +100 -0
- package/dist/esm/sandbox/env-guard.js.map +1 -0
- package/dist/esm/sandbox/local-sandbox.d.ts.map +1 -1
- package/dist/esm/sandbox/local-sandbox.js +6 -2
- package/dist/esm/sandbox/local-sandbox.js.map +1 -1
- package/dist/esm/sandbox/types.d.ts +8 -0
- package/dist/esm/sandbox/types.d.ts.map +1 -1
- package/dist/esm/sandbox/types.js.map +1 -1
- package/dist/esm/tool/types.d.ts +12 -0
- package/dist/esm/tool/types.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/cjs/index.js
CHANGED
|
@@ -19,9 +19,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
20
|
exports.InMemoryUsageTracker = exports.calculateCost = exports.registerPricing = exports.getPricing = exports.resolveHostIp = exports.extractHost = exports.fetchWithDiagnostics = exports.BUILTIN_PROVIDERS = exports.createLLMProvider = exports.OllamaProvider = exports.AnthropicProvider = exports.OpenAIProvider = exports.normalizeLLMError = exports.LLMCallError = exports.createBatchRequest = exports.serializeBatchRequests = exports.isFileProvider = exports.isBatchProvider = exports.loadAgentProfilesFromDir = exports.parseAgentProfile = exports.createAgentConfig = exports.filterSkills = exports.filterTools = exports.resolveDeniedTools = exports.validateSkillRequirements = exports.createAgentRuntime = exports.buildResourceScope = exports.AgentRuntimeBuilder = exports.RATE_LIMIT_CONFIG = exports.RateLimitManager = exports.rateLimitManager = exports.AgentToolExecutor = exports.LLMCaller = exports.HistoryManager = exports.wrapTaskWithWorkflowInstructions = exports.parseStructuredAgentOutput = exports.parseDebateOutput = exports.getWorkflowTemplate = exports.getWorkflowRoleStage = exports.formatWorkflowTemplateForPrompt = exports.formatStructuredAgentOutput = exports.formatDebateOutput = exports.extractWorkflowDecisionFromRun = exports.buildWorkflowDecisionMemory = exports.buildStructuredOutputInstruction = exports.buildDebateInstructions = exports.DEFAULT_COMPLEX_WORKFLOW_TEMPLATE = exports.AgentEngine = exports.isMultimodalContent = exports.extractTextFromContent = void 0;
|
|
21
21
|
exports.isInsidePath = exports.detectOutsideSandboxPath = exports.DEFAULT_SANDBOX_CONFIG = exports.SANDBOX_SAFE_ENV_KEYS = exports.SANDBOX_BLOCKED_COMMANDS = exports.InMemoryPermissionStore = exports.configurePermissionManager = exports.decidePermissionRequest = exports.findApprovedPermission = exports.listPermissionRequests = exports.createPermissionRequest = exports.setToolSecurityPolicyProvider = exports.clearRiskCache = exports.isLowRiskTool = exports.assessToolRisk = exports.SecurityGuard = exports.clearSystemProxyCache = exports.getWindowsSystemProxy = exports.getSystemProxyUrl = exports.DEFAULT_PROXY_SETTINGS = exports.createProxyDispatcher = exports.resolveProxyUrlForCategory = exports.resolveProxyAgentForCategory = exports.HttpMCPClient = exports.StdioMCPClient = exports.MCPClientBase = exports.registerTransport = exports.createMCPClient = exports.sanitizeForToolName = exports.buildMCPToolName = exports.MCP_TOOL_PREFIX = exports.registerMCPTools = exports.createToolDocTool = exports.createSkillLoaderTool = exports.createShellTools = exports.createFileSystemTools = exports.createBuiltinTools = exports.ASK_USER_TOOL_DEFINITION = exports.createAskUserTool = exports.createDelegateTool = exports.ToolRegistry = exports.InMemoryVectorIndex = exports.fmMap = exports.fmStringArray = exports.fmString = exports.parseFrontmatter = exports.SkillRouter = exports.SkillManager = exports.LocalEnvCollector = exports.ContextManager = void 0;
|
|
22
|
-
exports.
|
|
23
|
-
exports.
|
|
24
|
-
exports.TtlLruCache = exports.createRestA2ARemoteRunner = exports.RestA2AClient = exports.withHeartbeat = exports.DEFAULT_A2A_EVENT_MAPPERS = exports.mapAgentEventToA2AEvent = exports.extractTextFromMessage = exports.createA2ARemoteRunner = exports.createA2AMessage = exports.createA2AAgentCard = exports.buildAuthHeaders = exports.InMemoryA2ATaskStore = exports.A2AServerHandler = exports.A2AClient = void 0;
|
|
22
|
+
exports.JsonStore = exports.RunController = exports.defaultIdleReclaimMs = exports.defaultMaxRunDurationMs = exports.IDLE_RECLAIM_REASON = exports.InMemoryRunStateStore = exports.RunRegistry = exports.EnginePool = exports.observationToOtelAttributes = exports.traceToOtelAttributes = exports.W3C_TRACESTATE_HEADER = exports.W3C_TRACEPARENT_HEADER = exports.OBSERVABILITY_TRACE_HEADER = exports.parseFromW3C = exports.serializeToW3C = exports.injectIntoHeaders = exports.extractFromHeaders = exports.extractFromParams = exports.injectIntoParams = exports.parsePropagationContext = exports.serializePropagationContext = exports.ERROR_TYPE_LABELS = exports.classifyErrorType = exports.MODEL_PRICING = exports.computeCost = exports.DEFAULT_TTFT_BUCKETS_MS = exports.DEFAULT_DURATION_BUCKETS_MS = exports.MetricsRegistry = exports.createAlertingSink = exports.WebhookAlerter = exports.createObservabilityHooks = exports.ObservabilityMiddleware = exports.generateObservabilityId = exports.ObservabilityManager = exports.NoOpObservabilitySink = exports.InMemoryTracer = exports.setLogTransport = exports.logEvent = exports.SkillScriptPackageRunner = exports.DefaultScriptPackageRunner = exports.FLOW_RESULT_MARKER = exports.PYTHON_UNAVAILABLE_HINT = exports.resetPythonCommandCache = exports.resolvePythonCommandSync = exports.resolvePythonCommand = exports.createCodeExecutionTool = exports.setEnvScrubAuditSink = exports.splitEnvKeyWords = exports.isCredentialEnvKey = exports.scrubCredentialEnv = void 0;
|
|
23
|
+
exports.MAX_RECOMMENDATION_CHARS = exports.MAX_SUMMARY_CHARS = exports.MAX_TOTAL_CHARS = exports.MAX_ENTRY_CHARS = exports.MAX_SAVE_CHARS = exports.MAX_ITEM_CHARS = exports.containsDSML = exports.StreamingDSMLParser = exports.parseDSML = exports.interpolateValue = exports.interpolateHeaderValue = exports.resolveHeaderTemplates = exports.formatDate = exports.formatLocalDateTime = exports.mapAgentEventStream = exports.mapAgentEvent = exports.defaultResolveToolDisplayName = exports.createAgentEventCollectorState = exports.collectEngineOutput = exports.getProjectDataDir = exports.setProjectDataDir = exports.getAppName = exports.setAppName = exports.expandEnvVars = exports.ensureProjectDataDir = exports.ensureDataDir = exports.getProjectDataPath = exports.getDataPath = exports.MemoryPipeline = exports.formatRecallForPrompt = exports.MemoryRecallEngine = exports.resetMemoryCheckpoint = exports.getMemoryCheckpoint = exports.MemoryCheckpoint = exports.PersonaGenerator = exports.SceneAggregator = exports.MemoryExtractor = exports.InMemoryMemoryStore = exports.InMemoryInteractionStore = exports.InteractionService = exports.DEFAULT_INTERACTION_TIMEOUT_MS = exports.createRAGMiddleware = exports.InMemoryKnowledgeBase = exports.WorkspaceNotesMiddleware = exports.AuditLogMiddleware = exports.ToolGuardMiddleware = exports.TimingMiddleware = exports.JsonlHistoryPersistence = exports.FileToolResultStore = exports.JsonListStore = void 0;
|
|
24
|
+
exports.TtlLruCache = exports.createRestA2ARemoteRunner = exports.RestA2AClient = exports.withHeartbeat = exports.DEFAULT_A2A_EVENT_MAPPERS = exports.mapAgentEventToA2AEvent = exports.extractTextFromMessage = exports.createA2ARemoteRunner = exports.createA2AMessage = exports.createA2AAgentCard = exports.buildAuthHeaders = exports.InMemoryA2ATaskStore = exports.A2AServerHandler = exports.A2AClient = exports.buildAssistantContext = exports.truncateTail = exports.truncateHead = exports.truncateStr = void 0;
|
|
25
25
|
var types_ts_1 = require("./types.js");
|
|
26
26
|
Object.defineProperty(exports, "extractTextFromContent", { enumerable: true, get: function () { return types_ts_1.extractTextFromContent; } });
|
|
27
27
|
Object.defineProperty(exports, "isMultimodalContent", { enumerable: true, get: function () { return types_ts_1.isMultimodalContent; } });
|
|
@@ -169,6 +169,11 @@ Object.defineProperty(exports, "DEFAULT_SANDBOX_CONFIG", { enumerable: true, get
|
|
|
169
169
|
var path_guard_ts_1 = require("./sandbox/path-guard.js");
|
|
170
170
|
Object.defineProperty(exports, "detectOutsideSandboxPath", { enumerable: true, get: function () { return path_guard_ts_1.detectOutsideSandboxPath; } });
|
|
171
171
|
Object.defineProperty(exports, "isInsidePath", { enumerable: true, get: function () { return path_guard_ts_1.isInsidePath; } });
|
|
172
|
+
var env_guard_ts_1 = require("./sandbox/env-guard.js");
|
|
173
|
+
Object.defineProperty(exports, "scrubCredentialEnv", { enumerable: true, get: function () { return env_guard_ts_1.scrubCredentialEnv; } });
|
|
174
|
+
Object.defineProperty(exports, "isCredentialEnvKey", { enumerable: true, get: function () { return env_guard_ts_1.isCredentialEnvKey; } });
|
|
175
|
+
Object.defineProperty(exports, "splitEnvKeyWords", { enumerable: true, get: function () { return env_guard_ts_1.splitEnvKeyWords; } });
|
|
176
|
+
Object.defineProperty(exports, "setEnvScrubAuditSink", { enumerable: true, get: function () { return env_guard_ts_1.setEnvScrubAuditSink; } });
|
|
172
177
|
var code_sandbox_ts_1 = require("./sandbox/code-sandbox.js");
|
|
173
178
|
Object.defineProperty(exports, "createCodeExecutionTool", { enumerable: true, get: function () { return code_sandbox_ts_1.createCodeExecutionTool; } });
|
|
174
179
|
// ---- Python 命令解析(统一来源:跨环境兼容 python3 / python)----
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/** 产物目录名(相对沙箱根),与 SB_ARTIFACT_DIR 的既有取值一致 */
|
|
2
|
+
export declare const ARTIFACT_DIR_NAME = "_artifacts";
|
|
3
|
+
/**
|
|
4
|
+
* 解析产物目录绝对路径。
|
|
5
|
+
* 优先级:显式 req.artifactDir > <rootDir>/_artifacts。
|
|
6
|
+
* 解析结果 MUST 位于 rootDir 之内(防路径穿越),越界抛可诊断错误。
|
|
7
|
+
*/
|
|
8
|
+
export declare function resolveArtifactDir(rootDir: string, explicit?: string): string;
|
|
9
|
+
/**
|
|
10
|
+
* 创建产物目录(递归,已存在时无副作用)。
|
|
11
|
+
* Runner MUST 在 spawn 脚本子进程前调用,使脚本可直接写该目录而无需处理
|
|
12
|
+
* 「父目录不存在」(LocalSandbox.init() 只创建 rootDir 与 @work 软链,不建此目录)。
|
|
13
|
+
* 创建失败不阻塞执行(脚本侧回退逻辑兜底),但 MUST 输出告警:
|
|
14
|
+
* 静默吞错会让失败延迟到脚本写产物时才暴露,报错指向脚本而非根因。
|
|
15
|
+
*/
|
|
16
|
+
export declare function ensureArtifactDir(artifactDir: string): Promise<void>;
|
|
17
|
+
//# sourceMappingURL=artifact-dir.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifact-dir.d.ts","sourceRoot":"","sources":["../../../src/run-capability/artifact-dir.ts"],"names":[],"mappings":"AAqBA,6CAA6C;AAC7C,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAE9C;;;;GAIG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAClB,MAAM,CAUR;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ1E"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// ============================================================
|
|
3
|
+
// 产物目录(Artifact Directory)决议与就绪
|
|
4
|
+
// ============================================================
|
|
5
|
+
// 定位:Flow script stage 的产物落点统一到「本次运行的沙箱根」下,避免脚本用
|
|
6
|
+
// __dirname 上溯把产物写进脚本包目录(包目录是 require('./lib/...') 与包内相对
|
|
7
|
+
// 路径解析依赖的运行输入,不是产物区)。
|
|
8
|
+
//
|
|
9
|
+
// 目录名取 `_artifacts` 的依据:LocalSandbox 构造器已 injectEnv 注入
|
|
10
|
+
// SB_ARTIFACT_DIR = <rootDir>/_artifacts,该值被 Node sb.env().artifactDir、
|
|
11
|
+
// Python sb.env()、Shell sb_env 三语言对称读取,是沙箱内已确立的产物目录约定。
|
|
12
|
+
// 复用它可使 Flow 脚本与对话沙箱、automation 任务共享同一语义。
|
|
13
|
+
//
|
|
14
|
+
// 注意:Runner(宿主进程侧)MUST NOT 读取 process.env.SB_ARTIFACT_DIR 参与解析——
|
|
15
|
+
// 该变量仅对沙箱子进程有意义,宿主进程中的同名变量与本沙箱无关,读取它会指向
|
|
16
|
+
// 沙箱之外(如上一运行的目录或测试残留),并因越界校验误报失败。
|
|
17
|
+
// 沙箱注入值恒等于 <rootDir>/_artifacts,与兜底值一致,env 分支本就冗余。
|
|
18
|
+
// ============================================================
|
|
19
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
20
|
+
if (k2 === undefined) k2 = k;
|
|
21
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
22
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
23
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
24
|
+
}
|
|
25
|
+
Object.defineProperty(o, k2, desc);
|
|
26
|
+
}) : (function(o, m, k, k2) {
|
|
27
|
+
if (k2 === undefined) k2 = k;
|
|
28
|
+
o[k2] = m[k];
|
|
29
|
+
}));
|
|
30
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
31
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
32
|
+
}) : function(o, v) {
|
|
33
|
+
o["default"] = v;
|
|
34
|
+
});
|
|
35
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
36
|
+
var ownKeys = function(o) {
|
|
37
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
38
|
+
var ar = [];
|
|
39
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
40
|
+
return ar;
|
|
41
|
+
};
|
|
42
|
+
return ownKeys(o);
|
|
43
|
+
};
|
|
44
|
+
return function (mod) {
|
|
45
|
+
if (mod && mod.__esModule) return mod;
|
|
46
|
+
var result = {};
|
|
47
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
48
|
+
__setModuleDefault(result, mod);
|
|
49
|
+
return result;
|
|
50
|
+
};
|
|
51
|
+
})();
|
|
52
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
+
exports.ARTIFACT_DIR_NAME = void 0;
|
|
54
|
+
exports.resolveArtifactDir = resolveArtifactDir;
|
|
55
|
+
exports.ensureArtifactDir = ensureArtifactDir;
|
|
56
|
+
const fs = __importStar(require("fs/promises"));
|
|
57
|
+
const path = __importStar(require("path"));
|
|
58
|
+
/** 产物目录名(相对沙箱根),与 SB_ARTIFACT_DIR 的既有取值一致 */
|
|
59
|
+
exports.ARTIFACT_DIR_NAME = '_artifacts';
|
|
60
|
+
/**
|
|
61
|
+
* 解析产物目录绝对路径。
|
|
62
|
+
* 优先级:显式 req.artifactDir > <rootDir>/_artifacts。
|
|
63
|
+
* 解析结果 MUST 位于 rootDir 之内(防路径穿越),越界抛可诊断错误。
|
|
64
|
+
*/
|
|
65
|
+
function resolveArtifactDir(rootDir, explicit) {
|
|
66
|
+
const root = path.resolve(rootDir);
|
|
67
|
+
const candidate = explicit || path.join(root, exports.ARTIFACT_DIR_NAME);
|
|
68
|
+
const resolved = path.resolve(root, candidate);
|
|
69
|
+
if (resolved !== root && !resolved.startsWith(root + path.sep)) {
|
|
70
|
+
throw new Error(`产物目录越界:artifactDir="${candidate}" 解析为 ${resolved},不位于沙箱根 ${root} 之内`);
|
|
71
|
+
}
|
|
72
|
+
return resolved;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* 创建产物目录(递归,已存在时无副作用)。
|
|
76
|
+
* Runner MUST 在 spawn 脚本子进程前调用,使脚本可直接写该目录而无需处理
|
|
77
|
+
* 「父目录不存在」(LocalSandbox.init() 只创建 rootDir 与 @work 软链,不建此目录)。
|
|
78
|
+
* 创建失败不阻塞执行(脚本侧回退逻辑兜底),但 MUST 输出告警:
|
|
79
|
+
* 静默吞错会让失败延迟到脚本写产物时才暴露,报错指向脚本而非根因。
|
|
80
|
+
*/
|
|
81
|
+
async function ensureArtifactDir(artifactDir) {
|
|
82
|
+
try {
|
|
83
|
+
await fs.mkdir(artifactDir, { recursive: true });
|
|
84
|
+
}
|
|
85
|
+
catch (e) {
|
|
86
|
+
console.warn(`[artifact-dir] 产物目录创建失败(脚本将回退自有落点): ${artifactDir} — ${String(e)}`);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=artifact-dir.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifact-dir.js","sourceRoot":"","sources":["../../../src/run-capability/artifact-dir.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,gCAAgC;AAChC,+DAA+D;AAC/D,iDAAiD;AACjD,yDAAyD;AACzD,sBAAsB;AACtB,EAAE;AACF,uDAAuD;AACvD,wEAAwE;AACxE,uDAAuD;AACvD,0CAA0C;AAC1C,EAAE;AACF,iEAAiE;AACjE,wCAAwC;AACxC,kCAAkC;AAClC,mDAAmD;AACnD,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAa/D,gDAaC;AASD,8CAQC;AAzCD,gDAAkC;AAClC,2CAA6B;AAE7B,6CAA6C;AAChC,QAAA,iBAAiB,GAAG,YAAY,CAAC;AAE9C;;;;GAIG;AACH,SAAgB,kBAAkB,CAC9B,OAAe,EACf,QAAiB;IAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAiB,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CACX,uBAAuB,SAAS,SAAS,QAAQ,WAAW,IAAI,KAAK,CACxE,CAAC;IACN,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,iBAAiB,CAAC,WAAmB;IACvD,IAAI,CAAC;QACD,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,IAAI,CACR,uCAAuC,WAAW,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;IACN,CAAC;AACL,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export { FLOW_RESULT_MARKER, type ScriptRunRequest, type ScriptRunResult, type ScriptPackageRunner, } from './types.js';
|
|
1
|
+
export { FLOW_RESULT_MARKER, type ScriptRunRequest, type ScriptRunResult, type ScriptPackageRunner, type ScriptLogEntry, } from './types.js';
|
|
2
|
+
export { ARTIFACT_DIR_NAME, resolveArtifactDir, ensureArtifactDir, } from './artifact-dir.js';
|
|
2
3
|
export { DefaultScriptPackageRunner, type SandboxProvider, } from './script-package-runner.js';
|
|
3
4
|
export { SkillScriptPackageRunner } from './skill-script-runner.js';
|
|
4
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/run-capability/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/run-capability/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,cAAc,GACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EACH,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,GACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACH,0BAA0B,EAC1B,KAAK,eAAe,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SkillScriptPackageRunner = exports.DefaultScriptPackageRunner = exports.FLOW_RESULT_MARKER = void 0;
|
|
3
|
+
exports.SkillScriptPackageRunner = exports.DefaultScriptPackageRunner = exports.ensureArtifactDir = exports.resolveArtifactDir = exports.ARTIFACT_DIR_NAME = exports.FLOW_RESULT_MARKER = void 0;
|
|
4
4
|
var types_ts_1 = require("./types.js");
|
|
5
5
|
Object.defineProperty(exports, "FLOW_RESULT_MARKER", { enumerable: true, get: function () { return types_ts_1.FLOW_RESULT_MARKER; } });
|
|
6
|
+
var artifact_dir_ts_1 = require("./artifact-dir.js");
|
|
7
|
+
Object.defineProperty(exports, "ARTIFACT_DIR_NAME", { enumerable: true, get: function () { return artifact_dir_ts_1.ARTIFACT_DIR_NAME; } });
|
|
8
|
+
Object.defineProperty(exports, "resolveArtifactDir", { enumerable: true, get: function () { return artifact_dir_ts_1.resolveArtifactDir; } });
|
|
9
|
+
Object.defineProperty(exports, "ensureArtifactDir", { enumerable: true, get: function () { return artifact_dir_ts_1.ensureArtifactDir; } });
|
|
6
10
|
var script_package_runner_ts_1 = require("./script-package-runner.js");
|
|
7
11
|
Object.defineProperty(exports, "DefaultScriptPackageRunner", { enumerable: true, get: function () { return script_package_runner_ts_1.DefaultScriptPackageRunner; } });
|
|
8
12
|
var skill_script_runner_ts_1 = require("./skill-script-runner.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/run-capability/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/run-capability/index.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AALhB,8GAAA,kBAAkB,OAAA;AAMtB,qDAI2B;AAHvB,oHAAA,iBAAiB,OAAA;AACjB,qHAAA,kBAAkB,OAAA;AAClB,oHAAA,iBAAiB,OAAA;AAErB,uEAGoC;AAFhC,sIAAA,0BAA0B,OAAA;AAG9B,mEAAoE;AAA3D,kIAAA,wBAAwB,OAAA"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import type { CodeSandbox } from '../sandbox/code-sandbox.js';
|
|
2
2
|
import { type ScriptPackageRunner, type ScriptRunRequest, type ScriptRunResult } from './types.js';
|
|
3
|
-
/**
|
|
4
|
-
|
|
3
|
+
/**
|
|
4
|
+
* 沙箱供给(Sandbox Provider):同步实例或异步工厂。
|
|
5
|
+
* 工厂形式接收可选的运行标识(runId),使调用方可按运行复用同一沙箱
|
|
6
|
+
* (一次 Flow 运行 = 一个沙箱,续跑复用不新建);不接收时行为与旧版一致。
|
|
7
|
+
*/
|
|
8
|
+
export type SandboxProvider = CodeSandbox | ((runId?: string) => Promise<CodeSandbox>);
|
|
5
9
|
export declare class DefaultScriptPackageRunner implements ScriptPackageRunner {
|
|
6
10
|
private readonly sandboxProvider;
|
|
7
11
|
constructor(sandboxProvider: SandboxProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-package-runner.d.ts","sourceRoot":"","sources":["../../../src/run-capability/script-package-runner.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"script-package-runner.d.ts","sourceRoot":"","sources":["../../../src/run-capability/script-package-runner.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAuB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEnF,OAAO,EAGH,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACvB,MAAM,YAAY,CAAC;AAyDpB;;;;GAIG;AACH,MAAM,MAAM,eAAe,GACrB,WAAW,GACX,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAEjD,qBAAa,0BAA2B,YAAW,mBAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,EAAE,eAAe;YAE/C,cAAc;IAKtB,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAsH1D;;;;;;;;;;;;;;;OAeG;YACW,eAAe;IAwH7B;;;;;OAKG;YACW,gBAAgB;IA2C9B,iCAAiC;YACnB,cAAc;IAc5B;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAwCtB,8CAA8C;IAC9C,OAAO,CAAC,WAAW;CA0BtB"}
|
|
@@ -49,17 +49,55 @@ const fs = __importStar(require("fs/promises"));
|
|
|
49
49
|
const os = __importStar(require("os"));
|
|
50
50
|
const path = __importStar(require("path"));
|
|
51
51
|
const types_ts_1 = require("./types.js");
|
|
52
|
+
const artifact_dir_ts_1 = require("./artifact-dir.js");
|
|
53
|
+
/**
|
|
54
|
+
* 把 req.onLog 转换成沙箱流式入口所需的 handlers。
|
|
55
|
+
* 未提供 onLog 时返回 undefined(沙箱走原路径,零额外开销);
|
|
56
|
+
* 回调内部抛错被吞,避免日志消费方异常中断脚本执行。
|
|
57
|
+
*/
|
|
58
|
+
function buildStreamHandlers(onLog) {
|
|
59
|
+
if (!onLog)
|
|
60
|
+
return undefined;
|
|
61
|
+
const emit = (stream) => (text) => {
|
|
62
|
+
try {
|
|
63
|
+
onLog({ stream, text, ts: Date.now() });
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
/* 日志消费方异常不影响脚本执行 */
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
return { onStdoutLine: emit('stdout'), onStderrChunk: emit('stderr') };
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* 调用沙箱的 executeFile,并在沙箱支持时透传流式日志 callbacks。
|
|
73
|
+
* CodeSandbox 契约的 opts 未声明 callbacks,故以 duck-typing 探测;
|
|
74
|
+
* 沙箱未实现时退化为普通 executeFile,调用方无感。
|
|
75
|
+
*/
|
|
76
|
+
async function executeFileWithStream(sandbox, filePath, lang, opts, onLog) {
|
|
77
|
+
const handlers = buildStreamHandlers(onLog);
|
|
78
|
+
const streamable = sandbox;
|
|
79
|
+
if (handlers && typeof streamable.executeFile === 'function') {
|
|
80
|
+
return streamable.executeFile(filePath, lang, { ...opts, callbacks: handlers });
|
|
81
|
+
}
|
|
82
|
+
return sandbox.executeFile(filePath, lang, opts);
|
|
83
|
+
}
|
|
52
84
|
class DefaultScriptPackageRunner {
|
|
53
85
|
sandboxProvider;
|
|
54
86
|
constructor(sandboxProvider) {
|
|
55
87
|
this.sandboxProvider = sandboxProvider;
|
|
56
88
|
}
|
|
57
|
-
async resolveSandbox() {
|
|
89
|
+
async resolveSandbox(runId) {
|
|
58
90
|
const p = this.sandboxProvider;
|
|
59
|
-
return typeof p === 'function' ? await p() : p;
|
|
91
|
+
return typeof p === 'function' ? await p(runId) : p;
|
|
60
92
|
}
|
|
61
93
|
async run(req) {
|
|
62
|
-
const sandbox = await this.resolveSandbox();
|
|
94
|
+
const sandbox = await this.resolveSandbox(req.runId);
|
|
95
|
+
// 业务 env 注入:CodeSandbox 接口未声明 injectEnv(agent-server 的 LocalSandbox 提供),
|
|
96
|
+
// duck-typing 安全调用;未实现该方法的自定义沙箱实现静默跳过。
|
|
97
|
+
const injectable = sandbox;
|
|
98
|
+
if (req.env && Object.keys(req.env).length && typeof injectable.injectEnv === 'function') {
|
|
99
|
+
injectable.injectEnv(req.env);
|
|
100
|
+
}
|
|
63
101
|
// 本地脚本包模式(flow 自带 scripts):entryFile 相对 bundleDir 解析,
|
|
64
102
|
// 并把入口所在目录树整体复制到沙箱、物化入口(注入 sb + 复制 sb.py),
|
|
65
103
|
// 再用 executeFile 直接运行该文件 —— 与 skill 整包模式等价,
|
|
@@ -81,6 +119,10 @@ class DefaultScriptPackageRunner {
|
|
|
81
119
|
}
|
|
82
120
|
// 2. artifact 挂载:复制到沙箱工作目录,构建 名称→文件名 映射
|
|
83
121
|
const artifactMap = await this.mountArtifacts(sandbox, req.artifactMounts || {});
|
|
122
|
+
// 2.5 产物目录就绪:spawn 前创建 <rootDir>/_artifacts,使脚本可经
|
|
123
|
+
// SB_ARTIFACT_DIR 直接写该目录,无需把产物写进脚本包目录。
|
|
124
|
+
const artifactDir = (0, artifact_dir_ts_1.resolveArtifactDir)(sandbox.rootDir, req.artifactDir);
|
|
125
|
+
await (0, artifact_dir_ts_1.ensureArtifactDir)(artifactDir);
|
|
84
126
|
// 3. shell 模式:将用户代码写入独立文件再 source,避免 prelude 干扰
|
|
85
127
|
let shellUserCodeFile = null;
|
|
86
128
|
if (req.language === 'shell') {
|
|
@@ -90,7 +132,15 @@ class DefaultScriptPackageRunner {
|
|
|
90
132
|
// 4. 注入 prelude(语言适配)
|
|
91
133
|
const finalCode = this.buildFinalCode(req.language, code, req.inputs || {}, artifactMap, shellUserCodeFile);
|
|
92
134
|
// 5. 执行
|
|
93
|
-
|
|
135
|
+
// 需要实时日志且沙箱实现了 executeStream 时走流式入口(等价 execute,多传 handlers);
|
|
136
|
+
// 否则回退 execute,行为与引入流式日志前完全一致。
|
|
137
|
+
// 回退路径同样透传 abortSignal(duck-typing 可选第 4 参:实现该参数的沙箱
|
|
138
|
+
// 会终止子进程,旧实现忽略多余实参、行为不变),避免无日志订阅时停止信号丢失。
|
|
139
|
+
const handlers = buildStreamHandlers(req.onLog);
|
|
140
|
+
const streamable = sandbox;
|
|
141
|
+
const result = handlers && typeof streamable.executeStream === 'function'
|
|
142
|
+
? await streamable.executeStream(finalCode, req.language, req.timeoutMs, handlers, req.abortSignal)
|
|
143
|
+
: await sandbox.execute(finalCode, req.language, req.timeoutMs, req.abortSignal);
|
|
94
144
|
// 6. 解析哨兵
|
|
95
145
|
const parsed = this.parseResult(result.stdout);
|
|
96
146
|
return {
|
|
@@ -101,6 +151,7 @@ class DefaultScriptPackageRunner {
|
|
|
101
151
|
exitCode: result.exitCode,
|
|
102
152
|
files: result.files,
|
|
103
153
|
duration: result.duration,
|
|
154
|
+
artifactDir,
|
|
104
155
|
error: result.exitCode !== 0
|
|
105
156
|
? result.stderr || `exit code ${result.exitCode}`
|
|
106
157
|
: parsed.parseError,
|
|
@@ -125,14 +176,14 @@ class DefaultScriptPackageRunner {
|
|
|
125
176
|
async runBundledEntry(req, sandbox) {
|
|
126
177
|
const rootDir = sandbox.rootDir;
|
|
127
178
|
const argv = Array.isArray(req.argv) ? req.argv : [];
|
|
128
|
-
const lang =
|
|
129
|
-
req.entryFile.endsWith('.py')
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
179
|
+
const lang = req.language ||
|
|
180
|
+
(req.entryFile.endsWith('.py')
|
|
181
|
+
? 'python'
|
|
182
|
+
: (req.entryFile.endsWith('.js') || req.entryFile.endsWith('.cjs'))
|
|
183
|
+
? 'nodejs'
|
|
184
|
+
: req.entryFile.endsWith('.sh')
|
|
185
|
+
? 'shell'
|
|
186
|
+
: 'python');
|
|
136
187
|
let preparedEntry;
|
|
137
188
|
try {
|
|
138
189
|
// 解析 bundleDir:优先磁盘,否则从 bundleFiles 清单在临时目录重建。
|
|
@@ -140,6 +191,10 @@ class DefaultScriptPackageRunner {
|
|
|
140
191
|
// 复制整个 bundleDir 目录树到沙箱根,保留 skills/<skill>/scripts 结构,
|
|
141
192
|
// 使脚本内 SKILLS_DIR / SKILL_DIR / WORKSPACE 回溯与 from lib import 成立。
|
|
142
193
|
await copyDirRecursive(bundleDir, rootDir);
|
|
194
|
+
// 产物目录就绪:spawn 前创建 <rootDir>/_artifacts,使脚本经 SB_ARTIFACT_DIR
|
|
195
|
+
// 写产物时落在沙箱根,而非脚本包目录内(包目录属运行输入)。
|
|
196
|
+
const artifactDir = (0, artifact_dir_ts_1.resolveArtifactDir)(rootDir, req.artifactDir);
|
|
197
|
+
await (0, artifact_dir_ts_1.ensureArtifactDir)(artifactDir);
|
|
143
198
|
// 入口文件在沙箱中的路径(复制后),确保 runDir 在 rootDir 内,
|
|
144
199
|
// 满足 prepareScriptInPackage 的安全校验(runDir 必须在 packageDir 内)。
|
|
145
200
|
const entryInSandbox = path.join(rootDir, req.entryFile);
|
|
@@ -157,11 +212,10 @@ class DefaultScriptPackageRunner {
|
|
|
157
212
|
// 物化入口:注入 sb preamble;运行时依赖不复制到入口目录,
|
|
158
213
|
// 由 executeFile 注入的 NODE_PATH/PYTHONPATH 指向沙箱唯一 _scripts 解析
|
|
159
214
|
preparedEntry = await sandbox.prepareScriptInPackage(lang, finalCode, path.dirname(entryInSandbox), rootDir);
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
});
|
|
215
|
+
// 流式日志透传:CodeSandbox.executeFile 的 opts 契约未声明 callbacks
|
|
216
|
+
// (agent-server 的 ProcessCodeSandbox 实际支持),故按需 duck-typing 调用,
|
|
217
|
+
// 保持公共接口不变——这也是「沙箱无流式能力时静默退化」的实现基础。
|
|
218
|
+
const result = await executeFileWithStream(sandbox, preparedEntry, lang, { timeout: req.timeoutMs, cwd: rootDir, args: argv, abortSignal: req.abortSignal }, req.onLog);
|
|
165
219
|
const parsed = this.parseResult(result.stdout);
|
|
166
220
|
return {
|
|
167
221
|
ok: result.exitCode === 0 && !parsed.parseError,
|
|
@@ -171,6 +225,7 @@ class DefaultScriptPackageRunner {
|
|
|
171
225
|
exitCode: result.exitCode,
|
|
172
226
|
files: result.files,
|
|
173
227
|
duration: result.duration,
|
|
228
|
+
artifactDir,
|
|
174
229
|
error: result.exitCode !== 0
|
|
175
230
|
? result.stderr || `exit code ${result.exitCode}`
|
|
176
231
|
: parsed.parseError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-package-runner.js","sourceRoot":"","sources":["../../../src/run-capability/script-package-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"script-package-runner.js","sourceRoot":"","sources":["../../../src/run-capability/script-package-runner.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,sDAAsD;AACtD,+DAA+D;AAC/D,0CAA0C;AAC1C,6BAA6B;AAC7B,iCAAiC;AACjC,iDAAiD;AACjD,gCAAgC;AAChC,qCAAqC;AACrC,qCAAqC;AACrC,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/D,gDAAkC;AAClC,uCAAyB;AACzB,2CAA6B;AAG7B,yCAMoB;AACpB,uDAA0E;AAE1E;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,KAAuC;IAGhE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,IAAI,GAAG,CAAC,MAA2B,EAAE,EAAE,CAAC,CAAC,IAAY,EAAE,EAAE;QAC3D,IAAI,CAAC;YACD,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACL,oBAAoB;QACxB,CAAC;IACL,CAAC,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,qBAAqB,CAChC,OAAoB,EACpB,QAAgB,EAChB,IAAoB,EACpB,IAAoF,EACpF,KAAuC;IAEvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,OAelB,CAAC;IACF,IAAI,QAAQ,IAAI,OAAO,UAAU,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;QAC3D,OAAO,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAWD,MAAa,0BAA0B;IACN;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEzD,KAAK,CAAC,cAAc,CAAC,KAAc;QACvC,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,OAAO,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAqB;QAC3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,yEAAyE;QACzE,uCAAuC;QACvC,MAAM,UAAU,GAAG,OAElB,CAAC;QACF,IAAI,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YACvF,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;QAED,sDAAsD;QACtD,2CAA2C;QAC3C,4CAA4C;QAC5C,uDAAuD;QACvD,8CAA8C;QAC9C,0DAA0D;QAC1D,IACI,GAAG,CAAC,SAAS;YACb,CAAC,GAAG,CAAC,IAAI;YACT,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAChE,CAAC;YACC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QAED,SAAS;QACT,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACpB,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACnE,CAAC;YACD,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;QAED,wCAAwC;QACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CACzC,OAAO,EACP,GAAG,CAAC,cAAc,IAAI,EAAE,CAC3B,CAAC;QAEF,kDAAkD;QAClD,2CAA2C;QAC3C,MAAM,WAAW,GAAG,IAAA,oCAAkB,EAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,IAAA,mCAAiB,EAAC,WAAW,CAAC,CAAC;QAErC,gDAAgD;QAChD,IAAI,iBAAiB,GAAkB,IAAI,CAAC;QAC5C,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC3B,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACzB,OAAO,CAAC,OAAO,EACf,eAAe,IAAI,CAAC,GAAG,EAAE,KAAK,CACjC,CAAC;YACF,MAAM,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QAED,sBAAsB;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CACjC,GAAG,CAAC,QAAQ,EACZ,IAAI,EACJ,GAAG,CAAC,MAAM,IAAI,EAAE,EAChB,WAAW,EACX,iBAAiB,CACpB,CAAC;QAEF,QAAQ;QACR,6DAA6D;QAC7D,+BAA+B;QAC/B,oDAAoD;QACpD,yCAAyC;QACzC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,OAWlB,CAAC;QACF,MAAM,MAAM,GACR,QAAQ,IAAI,OAAO,UAAU,CAAC,aAAa,KAAK,UAAU;YACtD,CAAC,CAAC,MAAM,UAAU,CAAC,aAAa,CAC1B,SAAS,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,QAAQ,EACR,GAAG,CAAC,WAAW,CAClB;YACH,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CACjB,SAAS,EACT,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,WAAW,CAClB,CAAC;QAEZ,UAAU;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE/C,OAAO;YACH,EAAE,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU;YAC/C,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,WAAW;YACX,KAAK,EACD,MAAM,CAAC,QAAQ,KAAK,CAAC;gBACjB,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,aAAa,MAAM,CAAC,QAAQ,EAAE;gBACjD,CAAC,CAAC,MAAM,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACK,KAAK,CAAC,eAAe,CACzB,GAAqB,EACrB,OAAoB;QAEpB,MAAM,OAAO,GAAI,OAA0C,CAAC,OAAO,CAAC;QACpE,MAAM,IAAI,GAAa,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAmB,GAAG,CAAC,QAAQ;YACrC,CAAC,GAAG,CAAC,SAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC3B,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,CAAC,GAAG,CAAC,SAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAE,GAAG,CAAC,SAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACjE,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,GAAG,CAAC,SAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;wBAC9B,CAAC,CAAC,OAAO;wBACT,CAAC,CAAC,QAAQ,CAAC,CAAC;QAExB,IAAI,aAAiC,CAAC;QACtC,IAAI,CAAC;YACD,+CAA+C;YAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAEnD,uDAAuD;YACvD,kEAAkE;YAClE,MAAM,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAE3C,6DAA6D;YAC7D,gCAAgC;YAChC,MAAM,WAAW,GAAG,IAAA,oCAAkB,EAAC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YACjE,MAAM,IAAA,mCAAiB,EAAC,WAAW,CAAC,CAAC;YAErC,0CAA0C;YAC1C,4DAA4D;YAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,SAAU,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAE5D,gBAAgB;YAChB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CACzC,OAAO,EACP,GAAG,CAAC,cAAc,IAAI,EAAE,CAC3B,CAAC;YAEF,6CAA6C;YAC7C,IAAI,iBAAiB,GAAkB,IAAI,CAAC;YAC5C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnB,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACzB,OAAO,EACP,eAAe,IAAI,CAAC,GAAG,EAAE,KAAK,CACjC,CAAC;gBACF,MAAM,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7D,CAAC;YAED,4CAA4C;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CACjC,IAAI,EACJ,QAAQ,EACR,GAAG,CAAC,MAAM,IAAI,EAAE,EAChB,WAAW,EACX,iBAAiB,CACpB,CAAC;YAEF,qCAAqC;YACrC,4DAA4D;YAC5D,aAAa,GAAG,MACZ,OAQH,CAAC,sBAAsB,CACpB,IAAI,EACJ,SAAS,EACT,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,OAAO,CACV,CAAC;YAEF,wDAAwD;YACxD,+DAA+D;YAC/D,oCAAoC;YACpC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACtC,OAAO,EACP,aAAa,EACb,IAAI,EACJ,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,EAClF,GAAG,CAAC,KAAK,CACZ,CAAC;YAEF,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/C,OAAO;gBACH,EAAE,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU;gBAC/C,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,WAAW;gBAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW;gBACX,KAAK,EACD,MAAM,CAAC,QAAQ,KAAK,CAAC;oBACjB,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,aAAa,MAAM,CAAC,QAAQ,EAAE;oBACjD,CAAC,CAAC,MAAM,CAAC,UAAU;aAC9B,CAAC;QACN,CAAC;gBAAS,CAAC;YACP,WAAW;YACX,IAAI,aAAa,EAAE,CAAC;gBAChB,MAAM,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACnD,CAAC;YACD,6BAA6B;YAC7B,IAAK,GAAmC,CAAC,cAAc,EAAE,CAAC;gBACtD,MAAM,EAAE;qBACH,EAAE,CAAE,GAAmC,CAAC,cAAe,EAAE;oBACtD,SAAS,EAAE,IAAI;oBACf,KAAK,EAAE,IAAI;iBACd,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,gBAAgB,CAAC,GAAqB;QAChD,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAChB,IAAI,CAAC;gBACD,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC/B,OAAO,GAAG,CAAC,SAAS,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACL,2BAA2B;YAC/B,CAAC;QACL,CAAC;QACD,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CACjB,EAAE,CAAC,MAAM,EAAE,EACX,eAAe,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CACrE,CAAC;YACF,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;gBAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxC,6BAA6B;gBAC7B,IACI,YAAY,KAAK,WAAW;oBAC5B,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,EAClD,CAAC;oBACC,MAAM,IAAI,KAAK,CACX,2CAA2C,CAAC,CAAC,OAAO,EAAE,CACzD,CAAC;gBACN,CAAC;gBACD,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxD,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;oBACzB,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACJ,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;gBACvD,CAAC;YACL,CAAC;YACA,GAAmC,CAAC,cAAc,GAAG,GAAG,CAAC;YAC1D,OAAO,GAAG,CAAC;QACf,CAAC;QACD,MAAM,IAAI,KAAK,CACX,oEAAoE,CACvE,CAAC;IACN,CAAC;IAED,iCAAiC;IACzB,KAAK,CAAC,cAAc,CACxB,OAAoB,EACpB,MAA8B;QAE9B,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACzB,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;;;OAIG;IACK,cAAc,CAClB,QAAwB,EACxB,IAAY,EACZ,MAA+B,EAC/B,SAAiC,EACjC,iBAAiC;QAEjC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxB,OAAO;gBACH,8BAA8B;gBAC9B,oCAAoC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG;gBACjE,uCAAuC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG;gBACvE,EAAE;gBACF,IAAI;aACP,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxB,OAAO;gBACH,sBAAsB,UAAU,GAAG;gBACnC,yBAAyB,aAAa,GAAG;gBACzC,EAAE;gBACF,IAAI;aACP,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;QACD,kDAAkD;QAClD,MAAM,OAAO,GAAG;YACZ,sBAAsB,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG;YAC1D,yBAAyB,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG;SACnE,CAAC;QACF,IAAI,iBAAiB,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC1D,OAAO,CAAC,IAAI,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,8CAA8C;IACtC,WAAW,CAAC,MAAc;QAK9B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,MAAe,CAAC;QACpB,IAAI,UAA8B,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAC;YAC7C,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBACV,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChB,SAAS;YACb,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,6BAAkB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACpE,IAAI,CAAC;gBACD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,UAAU,GAAG,WAAW,6BAAkB,UACtC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAC7C,EAAE,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IAChE,CAAC;CACJ;AA9YD,gEA8YC;AAED,iDAAiD;AACjD,KAAK,UAAU,gBAAgB,CAAC,GAAW,EAAE,IAAY;IACrD,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;YAAE,SAAS;QAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACtB,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACJ,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import type { CodeSandbox } from '../sandbox/code-sandbox.js';
|
|
2
2
|
import { type ScriptPackageRunner, type ScriptRunRequest, type ScriptRunResult } from './types.js';
|
|
3
|
-
/**
|
|
4
|
-
|
|
3
|
+
/**
|
|
4
|
+
* 沙箱供给(Sandbox Provider):同步实例或异步工厂。
|
|
5
|
+
* 工厂形式接收可选的运行标识(runId),使调用方可按运行复用同一沙箱
|
|
6
|
+
* (一次 Flow 运行 = 一个沙箱,续跑复用不新建);不接收时行为与旧版一致。
|
|
7
|
+
*/
|
|
8
|
+
export type SandboxProvider = CodeSandbox | ((runId?: string) => Promise<CodeSandbox>);
|
|
5
9
|
export declare class SkillScriptPackageRunner implements ScriptPackageRunner {
|
|
6
10
|
private readonly skillsRoot;
|
|
7
11
|
private readonly sandboxProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-script-runner.d.ts","sourceRoot":"","sources":["../../../src/run-capability/skill-script-runner.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAEH,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACvB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-script-runner.d.ts","sourceRoot":"","sources":["../../../src/run-capability/skill-script-runner.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAEH,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACvB,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,eAAe,GACrB,WAAW,GACX,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAuBjD,qBAAa,wBAAyB,YAAW,mBAAmB;IAO5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR7B;;;;OAIG;gBAEkB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,mBAAmB;YAGpC,cAAc;IAKtB,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAS1D;;;;;;;;OAQG;YACW,oBAAoB;YA6EpB,eAAe;CA0HhC"}
|
|
@@ -57,6 +57,7 @@ const fs = __importStar(require("fs/promises"));
|
|
|
57
57
|
const os = __importStar(require("os"));
|
|
58
58
|
const path = __importStar(require("path"));
|
|
59
59
|
const types_ts_1 = require("./types.js");
|
|
60
|
+
const artifact_dir_ts_1 = require("./artifact-dir.js");
|
|
60
61
|
/** 递归复制目录树(保留相对结构) */
|
|
61
62
|
async function copyDirRecursive(src, dest) {
|
|
62
63
|
await fs.mkdir(dest, { recursive: true });
|
|
@@ -89,9 +90,9 @@ class SkillScriptPackageRunner {
|
|
|
89
90
|
this.sandboxProvider = sandboxProvider;
|
|
90
91
|
this.fallback = fallback;
|
|
91
92
|
}
|
|
92
|
-
async resolveSandbox() {
|
|
93
|
+
async resolveSandbox(runId) {
|
|
93
94
|
const p = this.sandboxProvider;
|
|
94
|
-
return typeof p === 'function' ? await p() : p;
|
|
95
|
+
return typeof p === 'function' ? await p(runId) : p;
|
|
95
96
|
}
|
|
96
97
|
async run(req) {
|
|
97
98
|
// 整包模式:skillPath 存在时走 skill 整包执行
|
|
@@ -161,15 +162,25 @@ class SkillScriptPackageRunner {
|
|
|
161
162
|
return { kind: 'skillsRoot', src: pkgSrc };
|
|
162
163
|
}
|
|
163
164
|
async runSkillPackage(req) {
|
|
164
|
-
const sandbox = await this.resolveSandbox();
|
|
165
|
+
const sandbox = await this.resolveSandbox(req.runId);
|
|
166
|
+
// 业务 env 注入(与 DefaultScriptPackageRunner 同策略:duck-typing injectEnv)
|
|
167
|
+
const injectable = sandbox;
|
|
168
|
+
if (req.env && Object.keys(req.env).length && typeof injectable.injectEnv === 'function') {
|
|
169
|
+
injectable.injectEnv(req.env);
|
|
170
|
+
}
|
|
165
171
|
const rootDir = sandbox.rootDir;
|
|
166
172
|
// 1. 解析整包源(优先级:DB bundleFiles > 磁盘 bundleDir > skillsRoot,
|
|
167
173
|
// 含存在性校验与可诊断错误),把整个包目录树复制到沙箱 rootDir
|
|
168
174
|
const pkgSource = await this.resolvePackageSource(req);
|
|
175
|
+
// 产物目录就绪:spawn 前创建 <rootDir>/_artifacts,使脚本经 SB_ARTIFACT_DIR
|
|
176
|
+
// 写产物时落在沙箱根,而非脚本包目录内(包目录属运行输入)。
|
|
177
|
+
// 决议放在 try 之外,使结果与越界错误均能覆盖到调用方。
|
|
178
|
+
const artifactDir = (0, artifact_dir_ts_1.resolveArtifactDir)(rootDir, req.artifactDir);
|
|
169
179
|
let preparedEntry;
|
|
170
180
|
let result;
|
|
171
181
|
try {
|
|
172
182
|
await copyDirRecursive(pkgSource.src, rootDir);
|
|
183
|
+
await (0, artifact_dir_ts_1.ensureArtifactDir)(artifactDir);
|
|
173
184
|
if (pkgSource.fullBundle) {
|
|
174
185
|
console.log(`[fullBundle] 物化整个 bundleDir 到 ${rootDir}(skillPath=${req.skillPath},entry=${req.entry})`);
|
|
175
186
|
}
|
|
@@ -198,14 +209,14 @@ class SkillScriptPackageRunner {
|
|
|
198
209
|
}
|
|
199
210
|
const argv = Array.isArray(req.argv) ? req.argv : [];
|
|
200
211
|
const entrySrc = await fs.readFile(entryAbs, 'utf-8');
|
|
201
|
-
const lang =
|
|
202
|
-
req.entry.endsWith('.py')
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
212
|
+
const lang = req.language ||
|
|
213
|
+
(req.entry.endsWith('.py')
|
|
214
|
+
? 'python'
|
|
215
|
+
: req.entry.endsWith('.js')
|
|
216
|
+
? 'nodejs'
|
|
217
|
+
: req.entry.endsWith('.sh')
|
|
218
|
+
? 'shell'
|
|
219
|
+
: 'python');
|
|
209
220
|
preparedEntry = await sandbox.prepareScriptInPackage(lang, entrySrc, path.dirname(entryAbs), rootDir);
|
|
210
221
|
// 3. 执行已物化的入口文件(直接 spawn,cwd=rootDir,argv 透传)
|
|
211
222
|
// 注意:不能用 sandbox.execute(code, lang),因为 preparedEntry 是文件路径
|
|
@@ -215,6 +226,8 @@ class SkillScriptPackageRunner {
|
|
|
215
226
|
timeout: req.timeoutMs,
|
|
216
227
|
cwd: rootDir,
|
|
217
228
|
args: argv,
|
|
229
|
+
// 可选中止能力:不支持 abortSignal 的沙箱实现会忽略该字段
|
|
230
|
+
abortSignal: req.abortSignal,
|
|
218
231
|
});
|
|
219
232
|
}
|
|
220
233
|
finally {
|
|
@@ -234,6 +247,7 @@ class SkillScriptPackageRunner {
|
|
|
234
247
|
exitCode: result.exitCode,
|
|
235
248
|
files: result.files,
|
|
236
249
|
duration: result.duration,
|
|
250
|
+
artifactDir,
|
|
237
251
|
error: result.exitCode !== 0
|
|
238
252
|
? result.stderr || `exit code ${result.exitCode}`
|
|
239
253
|
: parsed.parseError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-script-runner.js","sourceRoot":"","sources":["../../../src/run-capability/skill-script-runner.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,oEAAoE;AACpE,+DAA+D;AAC/D,iDAAiD;AACjD,6DAA6D;AAC7D,2DAA2D;AAC3D,iEAAiE;AACjE,iEAAiE;AACjE,EAAE;AACF,uBAAuB;AACvB,sDAAsD;AACtD,wEAAwE;AACxE,6DAA6D;AAC7D,8CAA8C;AAC9C,gDAAgD;AAChD,EAAE;AACF,4DAA4D;AAC5D,UAAU;AACV,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/D,gDAAkC;AAClC,uCAAyB;AACzB,2CAA6B;AAG7B,yCAKoB;
|
|
1
|
+
{"version":3,"file":"skill-script-runner.js","sourceRoot":"","sources":["../../../src/run-capability/skill-script-runner.ts"],"names":[],"mappings":"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"}
|