feihong-code 0.5.1 → 0.6.1

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.
Files changed (74) hide show
  1. package/CHANGELOG.md +486 -405
  2. package/README.md +59 -0
  3. package/dist/agent/code-writer.js +6 -3
  4. package/dist/agent/code-writer.js.map +1 -1
  5. package/dist/agent/experience.js +105 -70
  6. package/dist/agent/experience.js.map +1 -1
  7. package/dist/agent/orchestrator.js +103 -21
  8. package/dist/agent/orchestrator.js.map +1 -1
  9. package/dist/agent/parallel-orchestrator.js +6 -3
  10. package/dist/agent/parallel-orchestrator.js.map +1 -1
  11. package/dist/agent/planner.js +30 -7
  12. package/dist/agent/planner.js.map +1 -1
  13. package/dist/agent/prompts.js +27 -8
  14. package/dist/agent/prompts.js.map +1 -1
  15. package/dist/agent/self-heal.js +43 -13
  16. package/dist/agent/self-heal.js.map +1 -1
  17. package/dist/cli/repl.js +10 -9
  18. package/dist/cli/repl.js.map +1 -1
  19. package/dist/cli/run.js +39 -37
  20. package/dist/cli/run.js.map +1 -1
  21. package/dist/cli/version.js +1 -1
  22. package/dist/enterprise/audit.js +70 -11
  23. package/dist/enterprise/audit.js.map +1 -1
  24. package/dist/models/model-router.js +83 -23
  25. package/dist/models/model-router.js.map +1 -1
  26. package/dist/models/model.dto.js +25 -3
  27. package/dist/models/model.dto.js.map +1 -1
  28. package/dist/models/providers/ollama.provider.js +12 -0
  29. package/dist/models/providers/ollama.provider.js.map +1 -1
  30. package/dist/models/providers/openai-compatible.provider.js +14 -1
  31. package/dist/models/providers/openai-compatible.provider.js.map +1 -1
  32. package/dist/self-evolve/hook.js +2 -2
  33. package/dist/self-evolve/hook.js.map +1 -1
  34. package/dist/self-evolve/hook.ts +80 -0
  35. package/dist/self-evolve/manager.d.ts +8 -0
  36. package/dist/self-evolve/manager.js +401 -0
  37. package/dist/shared/concurrency.js +80 -0
  38. package/dist/shared/concurrency.js.map +1 -0
  39. package/dist/shared/errors.js +6 -2
  40. package/dist/shared/errors.js.map +1 -1
  41. package/dist/shared/secure-store.js +117 -0
  42. package/dist/shared/secure-store.js.map +1 -0
  43. package/dist/tools/mcp/mcp-client.js +35 -13
  44. package/dist/tools/mcp/mcp-client.js.map +1 -1
  45. package/dist/tools/shell/exec.js +47 -3
  46. package/dist/tools/shell/exec.js.map +1 -1
  47. package/dist/tools/shell/run-shell.tool.js +33 -6
  48. package/dist/tools/shell/run-shell.tool.js.map +1 -1
  49. package/dist/tools/tool.registry.js +32 -0
  50. package/dist/tools/tool.registry.js.map +1 -1
  51. package/dist/web/auth.js +143 -7
  52. package/dist/web/auth.js.map +1 -1
  53. package/dist/web/public/css/style.css +1546 -0
  54. package/dist/web/public/index.html +806 -3253
  55. package/dist/web/public/js/api.js +309 -0
  56. package/dist/web/public/js/app.js +1483 -0
  57. package/dist/web/public/js/ui.js +764 -0
  58. package/dist/web/public/js/utils.js +214 -0
  59. package/dist/web/server.js +224 -77
  60. package/dist/web/server.js.map +1 -1
  61. package/dist/web/task-queue.js +140 -14
  62. package/dist/web/task-queue.js.map +1 -1
  63. package/docs/App/344/275/277/347/224/250/350/257/264/346/230/216/344/271/246.md +299 -0
  64. package/docs/App/346/212/200/346/234/257/350/257/264/346/230/216/344/271/246.md +554 -0
  65. package/docs/SELF-EVOLVE-GUIDE.md +313 -0
  66. package/docs/error-codes.md +198 -0
  67. package/docs/screenshots/cli-demo.png +0 -0
  68. package/docs/screenshots/feature-comparison.png +0 -0
  69. package/docs/screenshots/web-console.png +0 -0
  70. package/docs//351/241/265/351/235/242/345/212/237/350/203/275/345/244/215/347/233/230/344/270/216/345/206/222/347/203/237/346/265/213/350/257/225/346/212/245/345/221/212.html +117 -0
  71. package/package.json +9 -15
  72. package/tool-schema.json +198 -127
  73. package/dist/web/public/index.html.tmp +0 -3117
  74. package/dist/web/public/index_new.html +0 -3196
@@ -0,0 +1,80 @@
1
+ "use strict";
2
+ /**
3
+ * 飞虹 Code (Muse Code 参照复刻)
4
+ * 晋江市飞虹智科技企业管理有限公司 · 飞扬企源研发中心 · 负责人:吴赐虹
5
+ *
6
+ * 并发控制工具:限制异步任务的最大并发数,防止 API 限流和资源耗尽。
7
+ */
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ exports.asyncPool = asyncPool;
10
+ exports.runWithConcurrency = runWithConcurrency;
11
+ exports.runWithConcurrencySettled = runWithConcurrencySettled;
12
+ /**
13
+ * 异步任务池:限制最大并发数。
14
+ * 类似 p-limit,但零依赖,适用于需要控制模型调用、文件IO等并发场景。
15
+ *
16
+ * @example
17
+ * const limit = asyncPool(3);
18
+ * const results = await Promise.all(tasks.map(t => limit(() => fetch(t))));
19
+ */
20
+ function asyncPool(concurrency) {
21
+ const max = Math.max(1, concurrency);
22
+ let active = 0;
23
+ const queue = [];
24
+ const next = () => {
25
+ if (active < max && queue.length > 0) {
26
+ const resolve = queue.shift();
27
+ active++;
28
+ resolve();
29
+ }
30
+ };
31
+ const acquire = () => {
32
+ if (active < max) {
33
+ active++;
34
+ return Promise.resolve();
35
+ }
36
+ return new Promise((resolve) => queue.push(resolve));
37
+ };
38
+ const release = () => {
39
+ active--;
40
+ next();
41
+ };
42
+ return (fn) => acquire().then(() => fn().then((result) => {
43
+ release();
44
+ return result;
45
+ }, (error) => {
46
+ release();
47
+ throw error;
48
+ }));
49
+ }
50
+ /**
51
+ * 批量执行异步任务,限制最大并发数。
52
+ * 自动保留原始顺序,所有任务完成后返回结果数组。
53
+ *
54
+ * @param tasks 任务工厂函数数组
55
+ * @param concurrency 最大并发数(默认 3)
56
+ * @returns 按原始顺序排列的结果数组
57
+ *
58
+ * @example
59
+ * const results = await runWithConcurrency(
60
+ * urls.map(url => () => fetch(url)),
61
+ * 3
62
+ * );
63
+ */
64
+ async function runWithConcurrency(tasks, concurrency = 3) {
65
+ const limit = asyncPool(concurrency);
66
+ return Promise.all(tasks.map((task) => limit(task)));
67
+ }
68
+ /**
69
+ * 批量执行异步任务,限制最大并发数,允许部分失败。
70
+ * 类似 Promise.allSettled,但有并发限制。
71
+ *
72
+ * @param tasks 任务工厂函数数组
73
+ * @param concurrency 最大并发数(默认 3)
74
+ * @returns PromiseSettledResult 数组
75
+ */
76
+ async function runWithConcurrencySettled(tasks, concurrency = 3) {
77
+ const limit = asyncPool(concurrency);
78
+ return Promise.allSettled(tasks.map((task) => limit(task)));
79
+ }
80
+ //# sourceMappingURL=concurrency.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"concurrency.js","sourceRoot":"","sources":["../../src/shared/concurrency.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,8BAuCC;AAgBD,gDAMC;AAUD,8DAMC;AArFD;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,WAAmB;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,IAAI,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;YAC/B,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,GAAkB,EAAE;QAClC,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;YACjB,MAAM,EAAE,CAAC;YACT,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;IAEF,OAAO,CAAI,EAAoB,EAAc,EAAE,CAC7C,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAClB,EAAE,EAAE,CAAC,IAAI,CACP,CAAC,MAAM,EAAE,EAAE;QACT,OAAO,EAAE,CAAC;QACV,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;QACR,OAAO,EAAE,CAAC;QACV,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CACF,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;GAaG;AACI,KAAK,UAAU,kBAAkB,CACtC,KAA8B,EAC9B,cAAsB,CAAC;IAEvB,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,yBAAyB,CAC7C,KAA8B,EAC9B,cAAsB,CAAC;IAEvB,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC"}
@@ -32,9 +32,13 @@ exports.ConfigError = ConfigError;
32
32
  /** 模型调用失败 */
33
33
  class ModelError extends AppError {
34
34
  provider;
35
- constructor(message, provider) {
36
- super(`模型调用失败[${provider}]: ${message}`, 'MODEL_ERROR', 502);
35
+ statusCode;
36
+ constructor(message, provider,
37
+ /** 上游 HTTP 状态码(如 429/500/401/400),供路由层按状态码决定轮换/重试策略 */
38
+ statusCode) {
39
+ super(`模型调用失败[${provider}]: ${message}`, 'MODEL_ERROR', statusCode ?? 502);
37
40
  this.provider = provider;
41
+ this.statusCode = statusCode;
38
42
  }
39
43
  }
40
44
  exports.ModelError = ModelError;
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/shared/errors.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAmDH,gCAEC;AAnDD,iBAAiB;AACjB,MAAa,QAAS,SAAQ,KAAK;IAGf;IACA;IACA;IAJlB,YACE,OAAe,EACC,IAAY,EACZ,MAAc,EACd,gBAAgB,IAAI;QAEpC,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAO;QAGpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACpC,CAAC;CACF;AAVD,4BAUC;AAED,4BAA4B;AAC5B,MAAa,WAAY,SAAQ,QAAQ;IACvC,YAAY,GAAW;QACrB,KAAK,CAAC,aAAa,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;CACF;AAJD,kCAIC;AAED,aAAa;AACb,MAAa,UAAW,SAAQ,QAAQ;IACO;IAA7C,YAAY,OAAe,EAAkB,QAAgB;QAC3D,KAAK,CAAC,UAAU,QAAQ,MAAM,OAAO,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QADlB,aAAQ,GAAR,QAAQ,CAAQ;IAE7D,CAAC;CACF;AAJD,gCAIC;AAED,aAAa;AACb,MAAa,SAAU,SAAQ,QAAQ;IACrC,YAAY,IAAY,EAAE,OAAe;QACvC,KAAK,CAAC,MAAM,IAAI,UAAU,OAAO,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,8BAIC;AAED,aAAa;AACb,MAAa,qBAAsB,SAAQ,QAAQ;IACjD,YAAY,MAAc;QACxB,KAAK,CAAC,UAAU,MAAM,EAAE,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;CACF;AAJD,sDAIC;AAED,sBAAsB;AACtB,MAAa,aAAc,SAAQ,QAAQ;IACzC,YAAY,OAAe;QACzB,KAAK,CAAC,SAAS,OAAO,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,sCAIC;AAED,yBAAyB;AACzB,SAAgB,UAAU,CAAC,CAAU;IACnC,OAAO,CAAC,YAAY,QAAQ,CAAC;AAC/B,CAAC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/shared/errors.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAwDH,gCAEC;AAxDD,iBAAiB;AACjB,MAAa,QAAS,SAAQ,KAAK;IAGf;IACA;IACA;IAJlB,YACE,OAAe,EACC,IAAY,EACZ,MAAc,EACd,gBAAgB,IAAI;QAEpC,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAO;QAGpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACpC,CAAC;CACF;AAVD,4BAUC;AAED,4BAA4B;AAC5B,MAAa,WAAY,SAAQ,QAAQ;IACvC,YAAY,GAAW;QACrB,KAAK,CAAC,aAAa,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;CACF;AAJD,kCAIC;AAED,aAAa;AACb,MAAa,UAAW,SAAQ,QAAQ;IAGpB;IAEA;IAJlB,YACE,OAAe,EACC,QAAgB;IAChC,uDAAuD;IACvC,UAAmB;QAEnC,KAAK,CAAC,UAAU,QAAQ,MAAM,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,IAAI,GAAG,CAAC,CAAC;QAJ3D,aAAQ,GAAR,QAAQ,CAAQ;QAEhB,eAAU,GAAV,UAAU,CAAS;IAGrC,CAAC;CACF;AATD,gCASC;AAED,aAAa;AACb,MAAa,SAAU,SAAQ,QAAQ;IACrC,YAAY,IAAY,EAAE,OAAe;QACvC,KAAK,CAAC,MAAM,IAAI,UAAU,OAAO,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,8BAIC;AAED,aAAa;AACb,MAAa,qBAAsB,SAAQ,QAAQ;IACjD,YAAY,MAAc;QACxB,KAAK,CAAC,UAAU,MAAM,EAAE,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;CACF;AAJD,sDAIC;AAED,sBAAsB;AACtB,MAAa,aAAc,SAAQ,QAAQ;IACzC,YAAY,OAAe;QACzB,KAAK,CAAC,SAAS,OAAO,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,sCAIC;AAED,yBAAyB;AACzB,SAAgB,UAAU,CAAC,CAAU;IACnC,OAAO,CAAC,YAAY,QAAQ,CAAC;AAC/B,CAAC"}
@@ -0,0 +1,117 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getMasterKey = getMasterKey;
4
+ exports.encryptText = encryptText;
5
+ exports.decryptText = decryptText;
6
+ exports.isEncrypted = isEncrypted;
7
+ exports.getRsaKeys = getRsaKeys;
8
+ exports.rsaEncrypt = rsaEncrypt;
9
+ exports.rsaDecrypt = rsaDecrypt;
10
+ /**
11
+ * 飞虹 Code - 安全存储与通信加密工具
12
+ * 晋江市飞虹智科技企业管理有限公司 · 飞扬企源研发中心 · 负责人:吴赐虹
13
+ *
14
+ * 三重加密体系支撑模块:
15
+ * - AES-256-GCM:敏感数据落盘加密(模型 API Key、会话令牌)【存储层】
16
+ * - RSA-2048:敏感参数端到端加密传输(App 公钥加密 → 服务器私钥解密)【通信层】
17
+ * - 密钥管理:主密钥优先取环境变量 FH_SECRET,否则首次生成持久化 $FH_HOME/.secret
18
+ * (RSA 私钥持久化 $FH_HOME/rsa_private.pem,公钥经 API 提供给客户端)
19
+ */
20
+ const crypto_1 = require("crypto");
21
+ const fs_1 = require("fs");
22
+ const path_1 = require("path");
23
+ /** 主密钥:优先环境变量 FH_SECRET(>=16 字符),否则首次生成并持久化 $FH_HOME/.secret */
24
+ function getMasterKey(homeDir) {
25
+ const env = process.env.FH_SECRET;
26
+ if (env && env.length >= 16)
27
+ return (0, crypto_1.createHash)('sha256').update(env).digest();
28
+ const file = (0, path_1.join)(homeDir, '.secret');
29
+ if ((0, fs_1.existsSync)(file)) {
30
+ const hex = (0, fs_1.readFileSync)(file, 'utf8').trim();
31
+ if (hex.length === 64)
32
+ return Buffer.from(hex, 'hex');
33
+ }
34
+ try {
35
+ (0, fs_1.mkdirSync)(homeDir, { recursive: true });
36
+ const key = (0, crypto_1.randomBytes)(32);
37
+ (0, fs_1.writeFileSync)(file, key.toString('hex'), 'utf8');
38
+ return key;
39
+ }
40
+ catch {
41
+ // 极端情况(目录不可写):退回进程内随机密钥(重启失效,仅兜底)
42
+ return (0, crypto_1.randomBytes)(32);
43
+ }
44
+ }
45
+ /** AES-256-GCM 加密,输出格式 v1:iv:cipher:tag(全部 base64) */
46
+ function encryptText(plain, key) {
47
+ const iv = (0, crypto_1.randomBytes)(12);
48
+ const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
49
+ const enc = Buffer.concat([cipher.update(String(plain), 'utf8'), cipher.final()]);
50
+ const tag = cipher.getAuthTag();
51
+ return `v1:${iv.toString('base64')}:${enc.toString('base64')}:${tag.toString('base64')}`;
52
+ }
53
+ /** AES-256-GCM 解密;格式错误/密钥错误返回空串(调用方按空处理) */
54
+ function decryptText(payload, key) {
55
+ try {
56
+ const parts = String(payload).split(':');
57
+ if (parts.length !== 4 || parts[0] !== 'v1')
58
+ return '';
59
+ const iv = Buffer.from(parts[1], 'base64');
60
+ const enc = Buffer.from(parts[2], 'base64');
61
+ const tag = Buffer.from(parts[3], 'base64');
62
+ const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
63
+ decipher.setAuthTag(tag);
64
+ return Buffer.concat([decipher.update(enc), decipher.final()]).toString('utf8');
65
+ }
66
+ catch {
67
+ return '';
68
+ }
69
+ }
70
+ /** 是否已是加密格式 */
71
+ function isEncrypted(s) {
72
+ return typeof s === 'string' && s.startsWith('v1:');
73
+ }
74
+ /** RSA-2048 密钥对:首次生成并持久化,后续复用 */
75
+ function getRsaKeys(homeDir) {
76
+ const pubFile = (0, path_1.join)(homeDir, 'rsa_public.pem');
77
+ const prvFile = (0, path_1.join)(homeDir, 'rsa_private.pem');
78
+ if ((0, fs_1.existsSync)(pubFile) && (0, fs_1.existsSync)(prvFile)) {
79
+ return {
80
+ publicKey: (0, fs_1.readFileSync)(pubFile, 'utf8'),
81
+ privateKey: (0, fs_1.readFileSync)(prvFile, 'utf8'),
82
+ };
83
+ }
84
+ try {
85
+ (0, fs_1.mkdirSync)(homeDir, { recursive: true });
86
+ const { publicKey, privateKey } = (0, crypto_1.generateKeyPairSync)('rsa', {
87
+ modulusLength: 2048,
88
+ publicKeyEncoding: { type: 'spki', format: 'pem' },
89
+ privateKeyEncoding: { type: 'pkcs8', format: 'pem' },
90
+ });
91
+ (0, fs_1.writeFileSync)(pubFile, publicKey, 'utf8');
92
+ (0, fs_1.writeFileSync)(prvFile, privateKey, 'utf8');
93
+ return { publicKey, privateKey };
94
+ }
95
+ catch {
96
+ const { publicKey, privateKey } = (0, crypto_1.generateKeyPairSync)('rsa', {
97
+ modulusLength: 2048,
98
+ publicKeyEncoding: { type: 'spki', format: 'pem' },
99
+ privateKeyEncoding: { type: 'pkcs8', format: 'pem' },
100
+ });
101
+ return { publicKey, privateKey };
102
+ }
103
+ }
104
+ /** RSA 公钥加密(OAEP-SHA256),返回 base64 */
105
+ function rsaEncrypt(plain, publicKeyPem) {
106
+ return (0, crypto_1.publicEncrypt)({ key: publicKeyPem, padding: crypto_1.constants.RSA_PKCS1_OAEP_PADDING, oaepHash: 'sha256' }, Buffer.from(String(plain), 'utf8')).toString('base64');
107
+ }
108
+ /** RSA 私钥解密(OAEP-SHA256);失败返回空串 */
109
+ function rsaDecrypt(cipherB64, privateKeyPem) {
110
+ try {
111
+ return (0, crypto_1.privateDecrypt)({ key: privateKeyPem, padding: crypto_1.constants.RSA_PKCS1_OAEP_PADDING, oaepHash: 'sha256' }, Buffer.from(String(cipherB64), 'base64')).toString('utf8');
112
+ }
113
+ catch {
114
+ return '';
115
+ }
116
+ }
117
+ //# sourceMappingURL=secure-store.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"secure-store.js","sourceRoot":"","sources":["../../src/shared/secure-store.ts"],"names":[],"mappings":"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"}
@@ -79,21 +79,43 @@ class McpClient {
79
79
  const tools = resp.result.tools ?? [];
80
80
  return tools;
81
81
  }
82
- /** 调用服务器工具(参数自动序列化,文本结果拼接返回) */
82
+ /** 调用服务器工具(参数自动序列化,文本结果拼接返回),含瞬态错误指数退避重试 */
83
83
  async callTool(toolName, args) {
84
- const resp = await this.request('tools/call', { name: toolName, arguments: args }, this.cfg.callTimeoutMs ?? 120000);
85
- if (!resp.result) {
86
- return { ok: false, output: '', error: `tools/call 失败: ${resp.error?.message ?? '无响应'}` };
84
+ const maxRetries = 3;
85
+ let lastErr;
86
+ for (let attempt = 0; attempt <= maxRetries; attempt++) {
87
+ try {
88
+ const resp = await this.request('tools/call', { name: toolName, arguments: args }, this.cfg.callTimeoutMs ?? 120000);
89
+ if (!resp.result) {
90
+ return { ok: false, output: '', error: `tools/call 失败: ${resp.error?.message ?? '无响应'}` };
91
+ }
92
+ const result = resp.result;
93
+ const text = (result.content ?? [])
94
+ .map((c) => c.text ?? '')
95
+ .join('\n');
96
+ return {
97
+ ok: !result.isError,
98
+ output: text,
99
+ error: result.isError ? text.slice(0, 500) : undefined,
100
+ };
101
+ }
102
+ catch (e) {
103
+ lastErr = e instanceof Error ? e : new Error(String(e));
104
+ const msg = lastErr.message;
105
+ // 进程退出/连接断开是终结性错误,直接抛出;仅对瞬态超时/网络错误重试
106
+ if (/MCP 进程退出|MCP 进程启动失败|MCP 请求未运行/i.test(msg)) {
107
+ throw lastErr;
108
+ }
109
+ const transient = /MCP 请求超时|ECONNRESET|ECONNREFUSED|ETIMEDOUT|network/i.test(msg);
110
+ if (!transient || attempt === maxRetries)
111
+ break;
112
+ logger_1.logger.warn(`MCP callTool 瞬态错误,指数退避重试 ${attempt + 1}/${maxRetries}`, {
113
+ tool: toolName, error: msg,
114
+ });
115
+ await new Promise((r) => setTimeout(r, 500 * Math.pow(2, attempt)));
116
+ }
87
117
  }
88
- const result = resp.result;
89
- const text = (result.content ?? [])
90
- .map((c) => c.text ?? '')
91
- .join('\n');
92
- return {
93
- ok: !result.isError,
94
- output: text,
95
- error: result.isError ? text.slice(0, 500) : undefined,
96
- };
118
+ return { ok: false, output: '', error: lastErr?.message ?? 'tools/call 失败' };
97
119
  }
98
120
  /** 关闭连接(结束子进程) */
99
121
  async close() {
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-client.js","sourceRoot":"","sources":["../../../src/tools/mcp/mcp-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcp-client.js","sourceRoot":"","sources":["../../../src/tools/mcp/mcp-client.ts"],"names":[],"mappings":"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"}
@@ -37,17 +37,61 @@ function runCommandInContainer(cmd, cwd, timeoutMs = 120000) {
37
37
  }
38
38
  function runCommand(cmd, cwd, timeoutMs = 120000) {
39
39
  return new Promise((resolve) => {
40
- const child = (0, child_process_1.spawn)(cmd, { cwd, shell: true, timeout: timeoutMs });
40
+ // 不用内置 timeout 选项:它只杀 shell 进程,不杀 shell 启动的子进程(如 npm/node)。
41
+ // 手动实现超时:先 SIGTERM,宽限期后 SIGKILL,并尝试杀整个进程组。
42
+ const child = (0, child_process_1.spawn)(cmd, { cwd, shell: true });
41
43
  let stdout = '';
42
44
  let stderr = '';
45
+ let settled = false;
46
+ const finish = (result) => {
47
+ if (settled)
48
+ return;
49
+ settled = true;
50
+ clearTimeout(timer);
51
+ clearTimeout(killTimer);
52
+ resolve(result);
53
+ };
43
54
  child.stdout?.on('data', (d) => (stdout += d.toString()));
44
55
  child.stderr?.on('data', (d) => (stderr += d.toString()));
45
56
  // spawn 启动失败时只会触发 error 且不再触发 close,必须在此 resolve,否则调用方 await 永久挂起
46
57
  child.on('error', (e) => {
47
58
  stderr += e.message;
48
- resolve({ code: 1, stdout, stderr });
59
+ finish({ code: 1, stdout, stderr });
49
60
  });
50
- child.on('close', (code) => resolve({ code: code ?? 1, stdout, stderr }));
61
+ child.on('close', (code) => finish({ code: code ?? 1, stdout, stderr }));
62
+ // 超时处理:先 SIGTERM,5 秒后 SIGKILL
63
+ const isWindows = process.platform === 'win32';
64
+ const killTimer = setTimeout(() => {
65
+ if (settled)
66
+ return;
67
+ try {
68
+ if (!isWindows && child.pid) {
69
+ // Unix: 杀整个进程组(负 pid),确保子进程也被杀
70
+ try {
71
+ process.kill(-child.pid, 'SIGKILL');
72
+ }
73
+ catch { /* 进程组不存在则退化为杀单进程 */ }
74
+ }
75
+ child.kill('SIGKILL');
76
+ }
77
+ catch { /* 忽略 kill 失败 */ }
78
+ }, 5000);
79
+ const timer = setTimeout(() => {
80
+ if (settled)
81
+ return;
82
+ stderr += `\n[超时] 命令执行超过 ${timeoutMs}ms,正在终止…`;
83
+ try {
84
+ if (!isWindows && child.pid) {
85
+ try {
86
+ process.kill(-child.pid, 'SIGTERM');
87
+ }
88
+ catch { /* 退化为杀单进程 */ }
89
+ }
90
+ child.kill('SIGTERM');
91
+ }
92
+ catch { /* 忽略 */ }
93
+ // killTimer 会在 5 秒后发 SIGKILL
94
+ }, timeoutMs);
51
95
  });
52
96
  }
53
97
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/tools/shell/exec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/tools/shell/exec.ts"],"names":[],"mappings":"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"}
@@ -9,8 +9,35 @@ exports.runShellTool = void 0;
9
9
  */
10
10
  const zod_1 = require("zod");
11
11
  const exec_1 = require("./exec");
12
- /** Shell 注入元字符 — 命中则需额外审批 */
13
- const SHELL_INJECTION_RE = /[;&|`$(){}<>!]|&&|\|\||\b(alias|eval|exec|source)\b/;
12
+ /**
13
+ * 真正危险的 shell 模式(命令注入/任意代码执行/破坏性操作/提权)。
14
+ * 只拦截这些高风险模式,允许正常的管道(|)、命令链(&&/||)、变量($VAR)、
15
+ * 重定向(>)、子shell等常用语法。命中任意一条即拦截。
16
+ */
17
+ const DANGEROUS_SHELL_PATTERNS = [
18
+ /\$\(/, // 命令替换 $(...) — 可执行任意命令
19
+ /`/, // 反引号命令替换
20
+ /\|\s*(sh|bash|zsh|fish|dash)\b/i, // 管道直接喂给 shell 解释器
21
+ /(curl|wget)\b[^\n]*\|\s*(sh|bash)/i, // 网络下载后管道执行(典型 RCE)
22
+ /\b(sudo|su)\b/, // 权限提升
23
+ /\b(eval|exec)\b/, // 代码动态执行 / 进程替换
24
+ /\brm\s+-rf\b/i, // 递归强制删除
25
+ /\b(mkfs|dd\s+if=|mkswap)\b/i, // 破坏性磁盘操作
26
+ /\b(nc|netcat|telnet|ncat)\b/i, // 反向 shell / 网络工具
27
+ />\s*\/dev\/(sd|hd|nvme)/i, // 直接写块设备
28
+ ];
29
+ function isDangerousShellCommand(cmd) {
30
+ return DANGEROUS_SHELL_PATTERNS.some((re) => re.test(cmd));
31
+ }
32
+ /** 智能截断:保留头部和尾部,中间用省略标记替换(错误信息通常在末尾) */
33
+ function smartTruncate(text, maxLen = 6000, headLen = 2000, tailLen = 3000) {
34
+ if (text.length <= maxLen)
35
+ return text;
36
+ const head = text.slice(0, headLen);
37
+ const tail = text.slice(-tailLen);
38
+ const omitted = text.length - headLen - tailLen;
39
+ return `${head}\n…[已省略中间 ${omitted} 字符]…\n${tail}`;
40
+ }
14
41
  exports.runShellTool = {
15
42
  name: 'run_shell',
16
43
  description: '执行 shell 命令(受白名单约束,需审批时会被拦截)',
@@ -29,9 +56,9 @@ exports.runShellTool = {
29
56
  return { ok: false, output: '', error: `命令不在白名单: ${head}` };
30
57
  }
31
58
  }
32
- // 注入元字符校验独立于白名单,始终执行(防止白名单关闭后命令注入逃逸)
33
- if (SHELL_INJECTION_RE.test(command)) {
34
- return { ok: false, output: '', error: `命令含 shell 注入风险,已被拦截: ${command.slice(0, 100)}` };
59
+ // 危险模式检测:只拦截真正危险的注入/破坏性操作,允许正常管道/命令链/变量
60
+ if (isDangerousShellCommand(command)) {
61
+ return { ok: false, output: '', error: `命令含高风险操作,已被拦截: ${command.slice(0, 100)}。如需执行请确认安全性后手动运行。` };
35
62
  }
36
63
  if (ctx.security.requireApproval) {
37
64
  const approved = ctx.approve ? await ctx.approve(`run_shell: ${command}`) : false;
@@ -44,7 +71,7 @@ exports.runShellTool = {
44
71
  : await (0, exec_1.runCommand)(command, ctx.cwd);
45
72
  return {
46
73
  ok: res.code === 0,
47
- output: `${res.stdout}${res.stderr}`.slice(0, 4000),
74
+ output: smartTruncate(`${res.stdout}${res.stderr}`),
48
75
  error: res.code === 0 ? undefined : `exit code ${res.code}`,
49
76
  };
50
77
  },
@@ -1 +1 @@
1
- {"version":3,"file":"run-shell.tool.js","sourceRoot":"","sources":["../../../src/tools/shell/run-shell.tool.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6BAAwB;AAExB,iCAAwE;AAExE,6BAA6B;AAC7B,MAAM,kBAAkB,GAAG,qDAAqD,CAAC;AAEpE,QAAA,YAAY,GAAS;IAChC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,8BAA8B;IAC3C,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;QACpE,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAgB;QAClC,MAAM,EAAE,OAAO,EAAE,GAAG,IAA2B,CAAC;QAChD,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;QAClC,uBAAuB;QACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,IAAI,EAAE,EAAE,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,qCAAqC;QACrC,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,wBAAwB,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QAC3F,CAAC;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAClF,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACvE,CAAC;QACD,8CAA8C;QAC9C,MAAM,GAAG,GACP,GAAG,CAAC,QAAQ,CAAC,WAAW,KAAK,WAAW;YACtC,CAAC,CAAC,MAAM,IAAA,4BAAqB,EAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC;YAC/C,CAAC,CAAC,MAAM,IAAA,iBAAU,EAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,IAAI,KAAK,CAAC;YAClB,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;YACnD,KAAK,EAAE,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,IAAI,EAAE;SAC5D,CAAC;IACJ,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"run-shell.tool.js","sourceRoot":"","sources":["../../../src/tools/shell/run-shell.tool.ts"],"names":[],"mappings":"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"}
@@ -43,6 +43,30 @@ class ToolRegistry {
43
43
  return { ok: false, output: '', error: `参数校验失败: ${parsed.error.message}` };
44
44
  }
45
45
  const args = parsed.data;
46
+ // 处理 parseToolArgs 返回的解析错误(模型返回了完全无法解析的参数)
47
+ if (rawArgs && typeof rawArgs === 'object' && '__parse_error__' in rawArgs) {
48
+ const rawText = String(rawArgs.__parse_error__).slice(0, 300);
49
+ logger_1.logger.warn('tool args parse error', { tool: name, raw: rawText });
50
+ return {
51
+ ok: false,
52
+ output: '',
53
+ error: `工具参数解析失败:你返回的 arguments 不是合法 JSON。原始内容: ${rawText}。请返回合法的 JSON 对象作为工具参数。`,
54
+ };
55
+ }
56
+ // 检测并警告被 zod 静默丢弃的未知参数(模型常把 A 工具的参数传给 B 工具)
57
+ const rawKeys = rawArgs && typeof rawArgs === 'object' ? Object.keys(rawArgs) : [];
58
+ const knownKeys = Object.keys(args);
59
+ const droppedKeys = rawKeys.filter((k) => !knownKeys.includes(k));
60
+ if (droppedKeys.length > 0) {
61
+ const validHint = tool.jsonSchema && typeof tool.jsonSchema === 'object' && tool.jsonSchema.properties
62
+ ? ',该工具仅接受参数: ' + Object.keys(tool.jsonSchema.properties).join(', ')
63
+ : '';
64
+ logger_1.logger.warn('tool args dropped unknown keys', { tool: name, dropped: droppedKeys });
65
+ // 不阻止执行,但在输出中注入警告,让模型知道参数传错了
66
+ const warning = `[参数警告] 以下参数被忽略(不属于工具 ${name}): ${droppedKeys.join(', ')}${validHint}。请检查工具名称与参数是否匹配。\n`;
67
+ // 延迟到执行后拼接,这里先存到 ctx 上
68
+ ctx._argWarning = warning;
69
+ }
46
70
  // P0-2:沙箱技术边界(先于 RBAC 守卫执行 —— 沙箱是"能否做"的硬边界,
47
71
  // 审批/策略都无权放行被沙箱拦截的动作)
48
72
  if (ctx.security.sandboxMode) {
@@ -96,6 +120,14 @@ class ToolRegistry {
96
120
  logger_1.logger.error('tool execution failed', { tool: name, error: msg });
97
121
  return { ok: false, output: '', error: msg };
98
122
  }
123
+ // 如果有参数警告,注入到输出开头(让模型知道自己参数传错了)
124
+ const argWarning = ctx._argWarning;
125
+ if (argWarning) {
126
+ result = {
127
+ ...result,
128
+ output: argWarning + (result.output || ''),
129
+ };
130
+ }
99
131
  // P2-1:PostToolUse / PostEdit hook(记录结果;编辑成功时对文件触发)
100
132
  if (ctx.security.hooks?.length) {
101
133
  const postCtx = { ...hookCtx, ok: result.ok };
@@ -1 +1 @@
1
- {"version":3,"file":"tool.registry.js","sourceRoot":"","sources":["../../src/tools/tool.registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool.registry.js","sourceRoot":"","sources":["../../src/tools/tool.registry.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6CAA0C;AAE1C,qDAAgD;AAChD,uCAA8E;AAC9E,4CAA4C;AAG5C,MAAa,YAAY;IACN,KAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IAEjD,QAAQ,CAAC,IAAU;QACjB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,eAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI;QACF,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,kBAAkB;IAClB,WAAW;QACT,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,6BAAY,CAAC,CAAC;IACvC,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,OAAgB,EAAE,GAAgB;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,EAAE,CAAC;QAC3D,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC7E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAA+B,CAAC;QAEpD,2CAA2C;QAC3C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,iBAAiB,IAAK,OAAmC,EAAE,CAAC;YACxG,MAAM,OAAO,GAAG,MAAM,CAAE,OAAmC,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAC3F,eAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YACnE,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,2CAA2C,OAAO,wBAAwB;aAClF,CAAC;QACJ,CAAC;QAED,4CAA4C;QAC5C,MAAM,OAAO,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAkC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9G,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU;gBACpG,CAAC,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAqC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/F,CAAC,CAAC,EAAE,CAAC;YACP,eAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YACpF,6BAA6B;YAC7B,MAAM,OAAO,GAAG,wBAAwB,IAAI,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,oBAAoB,CAAC;YACzG,uBAAuB;YACtB,GAA8C,CAAC,WAAW,GAAG,OAAO,CAAC;QACxE,CAAC;QAED,4CAA4C;QAC5C,sBAAsB;QACtB,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAiB,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC/F,MAAM,QAAQ,GAAG,IAAA,sBAAY,EAAC,GAAG,CAAC,QAAQ,CAAC,WAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1F,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,eAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;gBAClF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACvE,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SACxG,CAAC;QACF,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,MAAM,IAAA,gBAAQ,EAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;YACtE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChB,eAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;gBACzE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACrE,CAAC;QACH,CAAC;QAED,2CAA2C;QAC3C,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,OAAO,CAAC;YACZ,IAAI,CAAC;gBACH,OAAO,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,6BAA6B;gBAC7B,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvD,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC3D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,EAAE,EAAE,CAAC;YAClE,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrB,eAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;gBACjE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1D,CAAC;YACD,gCAAgC;YAChC,sCAAsC;YACtC,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,CAAC;QAC7E,CAAC;QAED,IAAI,MAAkB,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,eAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QAC/C,CAAC;QAED,gCAAgC;QAChC,MAAM,UAAU,GAAI,GAA8C,CAAC,WAAW,CAAC;QAC/E,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,GAAG;gBACP,GAAG,MAAM;gBACT,MAAM,EAAE,UAAU,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;aAC3C,CAAC;QACJ,CAAC;QAED,oDAAoD;QACpD,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,IAAA,gBAAQ,EAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YAC3D,IAAI,MAAM,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC9B,MAAM,IAAA,gBAAQ,EAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA5ID,oCA4IC"}