@cicctencent/agent-core 1.0.29 → 1.0.30
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/index.d.ts +1 -0
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +9 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/run-capability/script-package-runner.d.ts +24 -0
- package/dist/cjs/run-capability/script-package-runner.d.ts.map +1 -1
- package/dist/cjs/run-capability/script-package-runner.js +155 -0
- package/dist/cjs/run-capability/script-package-runner.js.map +1 -1
- package/dist/cjs/run-capability/skill-script-runner.d.ts.map +1 -1
- package/dist/cjs/run-capability/skill-script-runner.js +40 -20
- package/dist/cjs/run-capability/skill-script-runner.js.map +1 -1
- package/dist/cjs/run-capability/types.d.ts +23 -1
- package/dist/cjs/run-capability/types.d.ts.map +1 -1
- package/dist/cjs/sandbox/code-sandbox.d.ts +16 -0
- 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/local-sandbox.d.ts.map +1 -1
- package/dist/cjs/sandbox/local-sandbox.js +4 -1
- package/dist/cjs/sandbox/local-sandbox.js.map +1 -1
- package/dist/cjs/utils/python-command.d.ts +27 -0
- package/dist/cjs/utils/python-command.d.ts.map +1 -0
- package/dist/cjs/utils/python-command.js +88 -0
- package/dist/cjs/utils/python-command.js.map +1 -0
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/run-capability/script-package-runner.d.ts +24 -0
- package/dist/esm/run-capability/script-package-runner.d.ts.map +1 -1
- package/dist/esm/run-capability/script-package-runner.js +155 -0
- package/dist/esm/run-capability/script-package-runner.js.map +1 -1
- package/dist/esm/run-capability/skill-script-runner.d.ts.map +1 -1
- package/dist/esm/run-capability/skill-script-runner.js +40 -20
- package/dist/esm/run-capability/skill-script-runner.js.map +1 -1
- package/dist/esm/run-capability/types.d.ts +23 -1
- package/dist/esm/run-capability/types.d.ts.map +1 -1
- package/dist/esm/sandbox/code-sandbox.d.ts +16 -0
- 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/local-sandbox.d.ts.map +1 -1
- package/dist/esm/sandbox/local-sandbox.js +4 -1
- package/dist/esm/sandbox/local-sandbox.js.map +1 -1
- package/dist/esm/utils/python-command.d.ts +27 -0
- package/dist/esm/utils/python-command.d.ts.map +1 -0
- package/dist/esm/utils/python-command.js +83 -0
- package/dist/esm/utils/python-command.js.map +1 -0
- package/package.json +1 -1
|
@@ -65,29 +65,49 @@ export class SkillScriptPackageRunner {
|
|
|
65
65
|
async runSkillPackage(req) {
|
|
66
66
|
const sandbox = await this.resolveSandbox();
|
|
67
67
|
const rootDir = sandbox.rootDir;
|
|
68
|
-
// 1. 整包物化:把 <skillsRoot>/<skillPath>
|
|
69
|
-
|
|
68
|
+
// 1. 整包物化:把 <skillsRoot>/<skillPath> 或 <bundleDir>/<skillPath>
|
|
69
|
+
// 整个目录树复制到沙箱 rootDir(bundleDir 优先,用于 flow 自带 scripts 场景)
|
|
70
|
+
const pkgSrc = req.bundleDir
|
|
71
|
+
? path.resolve(req.bundleDir, req.skillPath)
|
|
72
|
+
: path.join(this.skillsRoot, req.skillPath);
|
|
70
73
|
await copyDirRecursive(pkgSrc, rootDir);
|
|
71
|
-
// 2.
|
|
72
|
-
//
|
|
74
|
+
// 2. 物化入口脚本并注入运行时依赖(与自动化代码沙箱行为对齐):
|
|
75
|
+
// - prepareScriptInPackage 会把 sb 绑定(sb.py / _prelude.cjs 等)复制到包目录,
|
|
76
|
+
// 并给入口注入 `from sb import sb` / `require('./_prelude')` preamble,
|
|
77
|
+
// 使脚本内 `from sb import sb`、`from lib import` 以及子目录数据
|
|
78
|
+
// (cwd=rootDir)都能正确解析,等价于自动化 runner 的 prepareSandbox。
|
|
79
|
+
// - 不用 launcher 子进程,避免 sb 注入只对 launcher 生效、entry 子进程拿不到 sb。
|
|
80
|
+
// - argv 通过 executeFile 的 args 参数直接传给 spawn,由解释器设置
|
|
81
|
+
// sys.argv / process.argv,无需源码层注入。
|
|
73
82
|
const entryAbs = path.join(rootDir, req.entry);
|
|
74
83
|
const argv = Array.isArray(req.argv) ? req.argv : [];
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
//
|
|
89
|
-
|
|
90
|
-
|
|
84
|
+
const entrySrc = await fs.readFile(entryAbs, 'utf-8');
|
|
85
|
+
const lang = (req.language ||
|
|
86
|
+
req.entry.endsWith('.py')
|
|
87
|
+
? 'python'
|
|
88
|
+
: req.entry.endsWith('.js')
|
|
89
|
+
? 'nodejs'
|
|
90
|
+
: req.entry.endsWith('.sh')
|
|
91
|
+
? 'shell'
|
|
92
|
+
: 'python');
|
|
93
|
+
const preparedEntry = await sandbox.prepareScriptInPackage(lang, entrySrc, path.dirname(entryAbs), rootDir);
|
|
94
|
+
// 3. 执行已物化的入口文件(直接 spawn,cwd=rootDir,argv 透传)
|
|
95
|
+
// 注意:不能用 sandbox.execute(code, lang),因为 preparedEntry 是文件路径
|
|
96
|
+
// 而非代码内容;executeFile 直接 spawn 该文件,脚本所在目录在 sys.path 中,
|
|
97
|
+
// 使 `from lib import` / `from config import` 等包内依赖正确解析。
|
|
98
|
+
let result;
|
|
99
|
+
try {
|
|
100
|
+
result = await sandbox.executeFile(preparedEntry, lang, {
|
|
101
|
+
timeout: req.timeoutMs,
|
|
102
|
+
cwd: rootDir,
|
|
103
|
+
args: argv,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
finally {
|
|
107
|
+
// 清理临时物化入口文件(sb.py 等运行时依赖由沙箱生命周期管理)
|
|
108
|
+
await fs.unlink(preparedEntry).catch(() => { });
|
|
109
|
+
}
|
|
110
|
+
// 4. 解析哨兵(stdout 内 __FLOW_RESULT__ 行)
|
|
91
111
|
const parsed = parseResultMarker(result.stdout);
|
|
92
112
|
return {
|
|
93
113
|
ok: result.exitCode === 0 && !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,gEAAgE;AAChE,8CAA8C;AAC9C,gDAAgD;AAChD,EAAE;AACF,4DAA4D;AAC5D,UAAU;AACV,+DAA+D;AAE/D,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,EACH,kBAAkB,GAIrB,MAAM,YAAY,CAAC;AAKpB,sBAAsB;AACtB,KAAK,UAAU,gBAAgB,CAC3B,GAAW,EACX,IAAY;IAEZ,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,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,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7D,SAAS,CAAC,YAAY;YAC1B,CAAC;YACD,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACxB,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;AACL,CAAC;AAED,MAAM,OAAO,wBAAwB;IAOZ;IACA;IACA;IARrB;;;;OAIG;IACH,YACqB,UAAkB,EAClB,eAAgC,EAChC,QAA6B;QAF7B,eAAU,GAAV,UAAU,CAAQ;QAClB,oBAAe,GAAf,eAAe,CAAiB;QAChC,aAAQ,GAAR,QAAQ,CAAqB;IAC/C,CAAC;IAEI,KAAK,CAAC,cAAc;QACxB,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,OAAO,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAqB;QAC3B,iCAAiC;QACjC,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,iCAAiC;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,eAAe,CACzB,GAAqB;QAErB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAI,OAA0C,CAAC,OAAO,CAAC;QAEpE,
|
|
1
|
+
{"version":3,"file":"skill-script-runner.js","sourceRoot":"","sources":["../../../src/run-capability/skill-script-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,10 @@ export interface ScriptRunRequest {
|
|
|
10
10
|
/**
|
|
11
11
|
* 方式三(skill 整包):运行时已物化在 <skillsRoot>/<skillPath> 的 skill 包。
|
|
12
12
|
* Runner 会把整个包目录树复制到沙箱(保留结构,使顶层 lib.py/config.py 等
|
|
13
|
-
* 同包依赖可被 import
|
|
13
|
+
* 同包依赖可被 import),并物化 <entry> 为注入 sb 依赖的入口后通过 executeFile
|
|
14
|
+
* 直接执行(cwd=rootDir,脚本所在目录在 sys.path 中)。
|
|
15
|
+
* 与自动化代码沙箱行为对齐:脚本内 `from sb import sb` / `from lib import` 及
|
|
16
|
+
* 子目录数据均可解析;argv 通过 spawn 命令行参数透传,使 CLI 参数解析生效。
|
|
14
17
|
* 与 entryFile/code 互斥;当 skillPath 存在时优先采用整包模式。
|
|
15
18
|
*/
|
|
16
19
|
skillPath?: string;
|
|
@@ -18,6 +21,25 @@ export interface ScriptRunRequest {
|
|
|
18
21
|
entry?: string;
|
|
19
22
|
/** 整包模式下传给入口脚本的命令行参数(CLI 范式,如 ["--preflight"]) */
|
|
20
23
|
argv?: string[];
|
|
24
|
+
/**
|
|
25
|
+
* 本地脚本包根目录(绝对路径)。用于 flow 自带 scripts 场景:
|
|
26
|
+
* - skillPath 相对该目录解析(替代 skillsRoot),使整包可直接放在 flow 包内
|
|
27
|
+
* - entryFile 相对该目录解析,且会用该目录下的同名子目录整体物化进沙箱,
|
|
28
|
+
* 使 `from lib import` / `from config import` 等共享库依赖正确解析
|
|
29
|
+
* - 缺省时 skillPath 仍走 skillsRoot、entryFile 按绝对路径处理
|
|
30
|
+
*/
|
|
31
|
+
bundleDir?: string;
|
|
32
|
+
/**
|
|
33
|
+
* DB 物化模式的脚本文件清单(当磁盘 bundleDir 不存在时使用)。
|
|
34
|
+
* 每个文件含相对 bundleDir 的 relPath 与文本内容(二进制用 binary/base64)。
|
|
35
|
+
* 运行时据此在临时目录重建 bundleDir 并物化进沙箱,使 flow 可完全 DB 化、跨环境独立运行。
|
|
36
|
+
*/
|
|
37
|
+
bundleFiles?: Array<{
|
|
38
|
+
relPath: string;
|
|
39
|
+
content?: string | null;
|
|
40
|
+
isBinary?: boolean;
|
|
41
|
+
binary?: string | null;
|
|
42
|
+
}>;
|
|
21
43
|
/** 脚本语言 */
|
|
22
44
|
language: ScriptLanguage;
|
|
23
45
|
/** 注入脚本的输入(前置 JSON 注入) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/run-capability/types.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,4BAA4B;AAC5B,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,aAAa;AACb,MAAM,WAAW,gBAAgB;IAC7B,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/run-capability/types.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,4BAA4B;AAC5B,eAAO,MAAM,kBAAkB,oBAAoB,CAAC;AAEpD,aAAa;AACb,MAAM,WAAW,gBAAgB;IAC7B,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,CAAC,CAAC;IACH,WAAW;IACX,QAAQ,EAAE,cAAc,CAAC;IACzB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,gBAAgB;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,gBAAgB;AAChB,MAAM,WAAW,eAAe;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,mDAAmD;IACnD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,yBAAyB;AACzB,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACxD"}
|
|
@@ -29,6 +29,22 @@ export interface CodeSandbox extends Sandbox {
|
|
|
29
29
|
* @param timeout 执行超时 (ms)
|
|
30
30
|
*/
|
|
31
31
|
execute(code: string, lang: ScriptLanguage, timeout?: number): Promise<CodeExecutionResult>;
|
|
32
|
+
/**
|
|
33
|
+
* 执行已物化的脚本文件(已注入 sb preamble,无需再次 prepareScript)。
|
|
34
|
+
*
|
|
35
|
+
* 用于 skill 整包执行:prepareScriptInPackage 物化入口后直接运行该文件,
|
|
36
|
+
* cwd 设为包根目录,使 `from lib import` / `from config import` 等包内依赖
|
|
37
|
+
* 正确解析(Python 会将脚本所在目录加入 sys.path)。
|
|
38
|
+
*
|
|
39
|
+
* @param filePath 已物化的脚本文件绝对路径
|
|
40
|
+
* @param lang 脚本语言
|
|
41
|
+
* @param opts { timeout?, cwd?, args? }
|
|
42
|
+
*/
|
|
43
|
+
executeFile(filePath: string, lang: ScriptLanguage, opts?: {
|
|
44
|
+
timeout?: number;
|
|
45
|
+
cwd?: string;
|
|
46
|
+
args?: string[];
|
|
47
|
+
}): Promise<CodeExecutionResult>;
|
|
32
48
|
}
|
|
33
49
|
/**
|
|
34
50
|
* 创建代码执行工具(RegisteredTool 格式)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-sandbox.d.ts","sourceRoot":"","sources":["../../../src/sandbox/code-sandbox.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvE,gBAAgB;AAChB,MAAM,WAAW,mBAAmB;IAClC,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID;;;;;GAKG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"code-sandbox.d.ts","sourceRoot":"","sources":["../../../src/sandbox/code-sandbox.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvE,gBAAgB;AAChB,MAAM,WAAW,mBAAmB;IAClC,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID;;;;;GAKG;AACH,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAE5F;;;;;;;;;;OAUG;IACH,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,cAAc,EACpB,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACzD,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjC;AAID;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc,CA0C5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-sandbox.js","sourceRoot":"","sources":["../../../src/sandbox/code-sandbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,mCAAmC;AACnC,+DAA+D;
|
|
1
|
+
{"version":3,"file":"code-sandbox.js","sourceRoot":"","sources":["../../../src/sandbox/code-sandbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,mCAAmC;AACnC,+DAA+D;AA0D/D,oCAAoC;AAEpC;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAoB;IAC1D,OAAO;QACL,UAAU,EAAE;YACV,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACR,IAAI,EAAE,cAAc;gBACpB,WAAW,EACT,4HAA4H;gBAC9H,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,wBAAwB,EAAE;wBAC/D,QAAQ,EAAE;4BACR,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,iBAAiB;4BAC9B,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;yBACpC;wBACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mCAAmC,EAAE;qBAC9E;oBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;iBAC/B;aACF;SACF;QACD,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,IAAI;gBAAE,OAAO,8CAA8C,CAAC;YACjE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAoB,CAAC;YAClE,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3D,OAAO,6CAA6C,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAExE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC1D,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO,iCAAiC,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;YAC5D,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,SAAS;QACnB,UAAU,EAAE,KAAK;KAClB,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-sandbox.d.ts","sourceRoot":"","sources":["../../../src/sandbox/local-sandbox.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"local-sandbox.d.ts","sourceRoot":"","sources":["../../../src/sandbox/local-sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { existsSync } from 'fs';
|
|
|
10
10
|
import { getProjectDataPath } from "../utils/data-dir.js";
|
|
11
11
|
import { SecurityGuard } from "../security/guard.js";
|
|
12
12
|
import { DEFAULT_SANDBOX_CONFIG, SANDBOX_BLOCKED_COMMANDS, SANDBOX_SAFE_ENV_KEYS } from "./types.js";
|
|
13
|
+
import { resolvePythonCommand } from "../utils/python-command.js";
|
|
13
14
|
function filterEnv(env) {
|
|
14
15
|
const filtered = {};
|
|
15
16
|
for (const key of SANDBOX_SAFE_ENV_KEYS)
|
|
@@ -204,7 +205,9 @@ export class LocalSandbox {
|
|
|
204
205
|
const spec = LANGUAGE_MAP[language];
|
|
205
206
|
const filename = `script_${Date.now()}_${crypto.randomBytes(4).toString('hex')}${spec.ext}`;
|
|
206
207
|
await this.fsExecutor.writeFile(filename, code);
|
|
207
|
-
|
|
208
|
+
// Python 命令名(python3 / python)跨环境不一致,运行时探测可用的那一个
|
|
209
|
+
const command = language === 'python' ? await resolvePythonCommand() : spec.command;
|
|
210
|
+
return this.shellExecutor.exec(`${command} ${filename}`, timeout);
|
|
208
211
|
}
|
|
209
212
|
async destroy() {
|
|
210
213
|
if (this.cleanupOnDestroy && existsSync(this.rootDir))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-sandbox.js","sourceRoot":"","sources":["../../../src/sandbox/local-sandbox.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"local-sandbox.js","sourceRoot":"","sources":["../../../src/sandbox/local-sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file python-command.ts — 统一解析可用的 Python 可执行命令
|
|
3
|
+
* @description
|
|
4
|
+
* 不同机器/系统下 Python 命令名不一致:多数 Linux/macOS 仅提供 `python3`,
|
|
5
|
+
* 而部分 Windows 发行版(以及本机场景)只注册了 `python`(指向 Python 3.x),
|
|
6
|
+
* 没有 `python3`。此前该命令名散落在多处硬编码(local-sandbox、skill-resources、
|
|
7
|
+
* mcp-config.helper 等),导致「本机只有 python 没有 python3」时部分入口直接 ENOENT 失败。
|
|
8
|
+
*
|
|
9
|
+
* 本模块把「探测可用 Python 命令」内聚到唯一来源:
|
|
10
|
+
* - 优先尝试 `python3`,回退 `python`;
|
|
11
|
+
* - 探测结果进程内缓存,避免每次 spawn 重复探测;
|
|
12
|
+
* - 跨平台兼容(Windows 用 where,POSIX 用 command -v);
|
|
13
|
+
* - 若两者都不可用,返回默认 `python3` 并让上层 spawn 时暴露明确 ENOENT 错误。
|
|
14
|
+
*/
|
|
15
|
+
/**
|
|
16
|
+
* 解析当前环境可用的 Python 可执行命令名(带缓存)。
|
|
17
|
+
* 优先 `python3`,回退 `python`,两者皆不可用时回退默认 `python3`。
|
|
18
|
+
*/
|
|
19
|
+
export declare function resolvePythonCommand(): Promise<string>;
|
|
20
|
+
/** 重置缓存(主要用于测试或多环境切换场景) */
|
|
21
|
+
export declare function resetPythonCommandCache(): void;
|
|
22
|
+
/**
|
|
23
|
+
* 同步解析当前环境可用的 Python 可执行命令名(带缓存,复用 resolvePythonCommand 结果)。
|
|
24
|
+
* 用于无法 await 的同步上下文(如 buildMCPConfig)。
|
|
25
|
+
*/
|
|
26
|
+
export declare function resolvePythonCommandSync(): string;
|
|
27
|
+
//# sourceMappingURL=python-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"python-command.d.ts","sourceRoot":"","sources":["../../../src/utils/python-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAqCH;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAa5D;AAED,2BAA2B;AAC3B,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAUjD"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file python-command.ts — 统一解析可用的 Python 可执行命令
|
|
3
|
+
* @description
|
|
4
|
+
* 不同机器/系统下 Python 命令名不一致:多数 Linux/macOS 仅提供 `python3`,
|
|
5
|
+
* 而部分 Windows 发行版(以及本机场景)只注册了 `python`(指向 Python 3.x),
|
|
6
|
+
* 没有 `python3`。此前该命令名散落在多处硬编码(local-sandbox、skill-resources、
|
|
7
|
+
* mcp-config.helper 等),导致「本机只有 python 没有 python3」时部分入口直接 ENOENT 失败。
|
|
8
|
+
*
|
|
9
|
+
* 本模块把「探测可用 Python 命令」内聚到唯一来源:
|
|
10
|
+
* - 优先尝试 `python3`,回退 `python`;
|
|
11
|
+
* - 探测结果进程内缓存,避免每次 spawn 重复探测;
|
|
12
|
+
* - 跨平台兼容(Windows 用 where,POSIX 用 command -v);
|
|
13
|
+
* - 若两者都不可用,返回默认 `python3` 并让上层 spawn 时暴露明确 ENOENT 错误。
|
|
14
|
+
*/
|
|
15
|
+
import { spawn, spawnSync } from 'child_process';
|
|
16
|
+
/** 候选命令的优先级顺序(越靠前越优先) */
|
|
17
|
+
const PYTHON_CANDIDATES = ['python3', 'python'];
|
|
18
|
+
/** 探测时使用的最小命令:仅检查命令是否在 PATH 中可解析,能解析即视为可用 */
|
|
19
|
+
function probeCommand(candidate) {
|
|
20
|
+
return new Promise((resolve) => {
|
|
21
|
+
const detacher = process.platform === 'win32'
|
|
22
|
+
? spawn('cmd', ['/c', 'where', candidate], { windowsHide: true })
|
|
23
|
+
: spawn('sh', ['-c', `command -v ${candidate} 2>/dev/null`], { timeout: 5000 });
|
|
24
|
+
let found = false;
|
|
25
|
+
detacher.stdout?.on('data', (d) => {
|
|
26
|
+
if (d.toString().trim().length > 0)
|
|
27
|
+
found = true;
|
|
28
|
+
});
|
|
29
|
+
detacher.on('error', () => resolve(false));
|
|
30
|
+
detacher.on('close', (code) => resolve(code === 0 && found));
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
/** 同步探测版本(供无法使用 await 的同步上下文,如 buildMCPConfig 复用同一缓存与候选顺序) */
|
|
34
|
+
function probeCommandSync(candidate) {
|
|
35
|
+
try {
|
|
36
|
+
const result = process.platform === 'win32'
|
|
37
|
+
? spawnSync('cmd', ['/c', 'where', candidate], { windowsHide: true })
|
|
38
|
+
: spawnSync('sh', ['-c', `command -v ${candidate} 2>/dev/null`], { timeout: 5000 });
|
|
39
|
+
return result.status === 0 && (result.stdout?.toString().trim().length ?? 0) > 0;
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
let cachedCommand = null;
|
|
46
|
+
/**
|
|
47
|
+
* 解析当前环境可用的 Python 可执行命令名(带缓存)。
|
|
48
|
+
* 优先 `python3`,回退 `python`,两者皆不可用时回退默认 `python3`。
|
|
49
|
+
*/
|
|
50
|
+
export async function resolvePythonCommand() {
|
|
51
|
+
if (cachedCommand)
|
|
52
|
+
return cachedCommand;
|
|
53
|
+
for (const candidate of PYTHON_CANDIDATES) {
|
|
54
|
+
if (await probeCommand(candidate)) {
|
|
55
|
+
cachedCommand = candidate;
|
|
56
|
+
return cachedCommand;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// 都不存在:返回常用默认名,由上层 spawn 暴露明确的「命令未找到」错误
|
|
60
|
+
cachedCommand = 'python3';
|
|
61
|
+
return cachedCommand;
|
|
62
|
+
}
|
|
63
|
+
/** 重置缓存(主要用于测试或多环境切换场景) */
|
|
64
|
+
export function resetPythonCommandCache() {
|
|
65
|
+
cachedCommand = null;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* 同步解析当前环境可用的 Python 可执行命令名(带缓存,复用 resolvePythonCommand 结果)。
|
|
69
|
+
* 用于无法 await 的同步上下文(如 buildMCPConfig)。
|
|
70
|
+
*/
|
|
71
|
+
export function resolvePythonCommandSync() {
|
|
72
|
+
if (cachedCommand)
|
|
73
|
+
return cachedCommand;
|
|
74
|
+
for (const candidate of PYTHON_CANDIDATES) {
|
|
75
|
+
if (probeCommandSync(candidate)) {
|
|
76
|
+
cachedCommand = candidate;
|
|
77
|
+
return cachedCommand;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
cachedCommand = 'python3';
|
|
81
|
+
return cachedCommand;
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=python-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"python-command.js","sourceRoot":"","sources":["../../../src/utils/python-command.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cicctencent/agent-core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.30",
|
|
4
4
|
"description": "Core engine for AI agent — LLM orchestration, tool execution, MCP, skill routing, security, and memory pipeline.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/cjs/index.js",
|