openhorse 0.1.11 → 0.1.12
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/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +3 -2
- package/dist/commands/index.js.map +1 -1
- package/dist/core/agent.d.ts +25 -7
- package/dist/core/agent.d.ts.map +1 -1
- package/dist/core/agent.js +6 -3
- package/dist/core/agent.js.map +1 -1
- package/dist/core/brain.d.ts +11 -3
- package/dist/core/brain.d.ts.map +1 -1
- package/dist/core/brain.js +4 -2
- package/dist/core/brain.js.map +1 -1
- package/dist/framework/query.d.ts +3 -2
- package/dist/framework/query.d.ts.map +1 -1
- package/dist/framework/query.js +4 -4
- package/dist/framework/query.js.map +1 -1
- package/dist/framework/tool.d.ts +3 -1
- package/dist/framework/tool.d.ts.map +1 -1
- package/dist/framework/tool.js.map +1 -1
- package/dist/harness/harness.d.ts.map +1 -1
- package/dist/harness/harness.js +20 -16
- package/dist/harness/harness.js.map +1 -1
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +18 -14
- package/dist/init.js.map +1 -1
- package/dist/memory/storage.d.ts +5 -0
- package/dist/memory/storage.d.ts.map +1 -1
- package/dist/memory/storage.js +29 -0
- package/dist/memory/storage.js.map +1 -1
- package/dist/tools/_validate.d.ts +11 -0
- package/dist/tools/_validate.d.ts.map +1 -0
- package/dist/tools/_validate.js +55 -0
- package/dist/tools/_validate.js.map +1 -0
- package/dist/tools/index.d.ts +2 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +37 -8
- package/dist/tools/index.js.map +1 -1
- package/package.json +1 -1
package/dist/harness/harness.js
CHANGED
|
@@ -61,27 +61,31 @@ class HarnessEngine extends eventemitter3_1.EventEmitter {
|
|
|
61
61
|
// 2. 检查被禁止的操作
|
|
62
62
|
if (this.config.blockedActions.length > 0 && task.params?.actions) {
|
|
63
63
|
const actions = task.params.actions;
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
64
|
+
if (Array.isArray(actions) && actions.every(a => typeof a === 'string')) {
|
|
65
|
+
const blocked = actions.filter(a => this.config.blockedActions.includes(a));
|
|
66
|
+
if (blocked.length > 0) {
|
|
67
|
+
return {
|
|
68
|
+
passed: false,
|
|
69
|
+
stage: 'pre-exec',
|
|
70
|
+
reason: `Blocked actions detected: ${blocked.join(', ')}`,
|
|
71
|
+
suggestion: 'Remove blocked actions or update harness policy.',
|
|
72
|
+
};
|
|
73
|
+
}
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
76
|
// 3. 白名单检查
|
|
75
77
|
if (this.config.allowedActions[0] !== '*' && task.params?.actions) {
|
|
76
78
|
const actions = task.params.actions;
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
79
|
+
if (Array.isArray(actions) && actions.every(a => typeof a === 'string')) {
|
|
80
|
+
const disallowed = actions.filter(a => !this.config.allowedActions.includes(a));
|
|
81
|
+
if (disallowed.length > 0) {
|
|
82
|
+
return {
|
|
83
|
+
passed: false,
|
|
84
|
+
stage: 'pre-exec',
|
|
85
|
+
reason: `Actions not in whitelist: ${disallowed.join(', ')}`,
|
|
86
|
+
suggestion: 'Add actions to allowed list or use wildcard "*".',
|
|
87
|
+
};
|
|
88
|
+
}
|
|
85
89
|
}
|
|
86
90
|
}
|
|
87
91
|
// 4. 目标约束检查
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harness.js","sourceRoot":"","sources":["../../src/harness/harness.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,iDAA6C;AAE7C,qCAAuD;AAoEvD,+EAA+E;AAC/E,OAAO;AACP,+EAA+E;AAE/E,MAAM,cAAc,GAAkB;IACpC,cAAc,EAAE,IAAI;IACpB,QAAQ,EAAE,EAAE;IACZ,aAAa,EAAE,IAAI;IACnB,cAAc,EAAE,CAAC,GAAG,CAAC;IACrB,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC;IAC5C,gBAAgB,EAAE,IAAI;IACtB,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,+EAA+E;AAC/E,6BAA6B;AAC7B,+EAA+E;AAE/E,MAAa,aAAc,SAAQ,4BAAY;IAI7C,YAAY,MAA+B;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO;YACtC,CAAC,CAAC,IAAI,sBAAa,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAED,2EAA2E;IAC3E,SAAS;IACT,2EAA2E;IAE3E;;OAEG;IACH,QAAQ,CAAC,IAAU;QACjB,YAAY;QACZ,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;gBACjD,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI;gBACvB,MAAM,EAAE,IAAI,CAAC,WAAW;aACzB,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,UAAU,EAAE,MAAM,CAAC,UAAU;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,cAAc;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YAClE,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"harness.js","sourceRoot":"","sources":["../../src/harness/harness.ts"],"names":[],"mappings":"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"}
|
package/dist/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAe,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAqB,MAAM,gBAAgB,CAAC;AAMhE,qBAAqB;AACrB,MAAM,WAAW,eAAe;IAC9B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,MAAM,CAAC;IAC5C,WAAW;IACX,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAC9C,mBAAmB;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,oBAAoB;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,gBAAgB;IAChB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAa;IAC5B,eAAe;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe;IACf,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAoB;AACpB,MAAM,WAAW,YAAY;IAC3B,aAAa;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe;IACf,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC;IACnC,gBAAgB;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,aAAa;AACb,MAAM,WAAW,YAAY;IAC3B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW;IACX,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAChC;AAED,iBAAiB;AACjB,MAAM,WAAW,kBAAkB;IACjC,eAAe;IACf,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAClC,eAAe;IACf,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B;AAMD,mBAAmB;AACnB,MAAM,WAAW,cAAc;IAC7B,WAAW;IACX,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW;IACX,KAAK,EAAE,UAAU,GAAG,WAAW,CAAC;IAChC,SAAS;IACT,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,0CAA0C;AAC1C,qBAAa,OAAQ,SAAQ,YAAY;IACvC,OAAO,CAAC,MAAM,CAAgB;gBAElB,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM;IAe/C,2BAA2B;IAC3B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAe,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAqB,MAAM,gBAAgB,CAAC;AAMhE,qBAAqB;AACrB,MAAM,WAAW,eAAe;IAC9B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,MAAM,CAAC;IAC5C,WAAW;IACX,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAC9C,mBAAmB;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,oBAAoB;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,gBAAgB;IAChB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAa;IAC5B,eAAe;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe;IACf,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAoB;AACpB,MAAM,WAAW,YAAY;IAC3B,aAAa;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe;IACf,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC;IACnC,gBAAgB;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,aAAa;AACb,MAAM,WAAW,YAAY;IAC3B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW;IACX,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAChC;AAED,iBAAiB;AACjB,MAAM,WAAW,kBAAkB;IACjC,eAAe;IACf,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAClC,eAAe;IACf,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B;AAMD,mBAAmB;AACnB,MAAM,WAAW,cAAc;IAC7B,WAAW;IACX,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW;IACX,KAAK,EAAE,UAAU,GAAG,WAAW,CAAC;IAChC,SAAS;IACT,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,0CAA0C;AAC1C,qBAAa,OAAQ,SAAQ,YAAY;IACvC,OAAO,CAAC,MAAM,CAAgB;gBAElB,MAAM,GAAE,OAAO,CAAC,aAAa,CAAM;IAe/C,2BAA2B;IAC3B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc;IAqCpC,2BAA2B;IAC3B,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,GAAG,cAAc;IAiB5D,sBAAsB;IACtB,SAAS,IAAI,aAAa;CAG3B;AAMD,WAAW;AACX,MAAM,WAAW,WAAW;IAC1B,WAAW;IACX,EAAE,EAAE,MAAM,CAAC;IACX,SAAS;IACT,OAAO,EAAE,GAAG,CAAC;IACb,WAAW;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS;IACT,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,WAAW;AACX,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAEhE,2BAA2B;AAC3B,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,cAAc,CAAuC;IAC7D,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,GAAE,OAAO,CAAC,YAAY,CAAM;IAU9C,oBAAoB;IACpB,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW;IAiB1D,aAAa;IACb,WAAW,IAAI,WAAW,EAAE;IAK5B,aAAa;IACb,YAAY,IAAI,IAAI;IAQpB,aAAa;IACb,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW;IAO5D,aAAa;IACb,aAAa,IAAI,WAAW,EAAE;IAK9B,aAAa;IACb,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW;IAO3D,cAAc;IACd,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IASjD,gBAAgB;IAChB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,WAAW,EAAE;IAqBvD,eAAe;IACf,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;IAUvC,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,YAAY;CAMrB;AA8CD,YAAY;AACZ,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,mBAAmB;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,uBAAuB;IACvB,MAAM,EAAE,YAAY,CAAC;IACrB,yBAAyB;IACzB,MAAM,EAAE,aAAa,CAAC;IACtB,8BAA8B;IAC9B,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW;IACX,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW;IACX,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW;IACX,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,IAAI,CAAC,UAAU,GAAE,OAAO,CAAC,eAAe,CAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA+E/F;AAsKD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChG,YAAY,EAAE,WAAW,IAAI,gBAAgB,EAAE,UAAU,IAAI,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC"}
|
package/dist/init.js
CHANGED
|
@@ -36,26 +36,30 @@ class Harness extends eventemitter3_1.EventEmitter {
|
|
|
36
36
|
// 检查被禁止的操作
|
|
37
37
|
if (this.config.blockedActions.length > 0 && task.params?.actions) {
|
|
38
38
|
const actions = task.params.actions;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
if (Array.isArray(actions) && actions.every(a => typeof a === 'string')) {
|
|
40
|
+
const blocked = actions.filter(a => this.config.blockedActions.includes(a));
|
|
41
|
+
if (blocked.length > 0) {
|
|
42
|
+
return {
|
|
43
|
+
passed: false,
|
|
44
|
+
stage: 'pre-exec',
|
|
45
|
+
reason: `Blocked actions detected: ${blocked.join(', ')}`,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
// 检查 allowedActions 白名单
|
|
49
51
|
if (this.config.allowedActions[0] !== '*' &&
|
|
50
52
|
task.params?.actions) {
|
|
51
53
|
const actions = task.params.actions;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
54
|
+
if (Array.isArray(actions) && actions.every(a => typeof a === 'string')) {
|
|
55
|
+
const disallowed = actions.filter(a => !this.config.allowedActions.includes(a));
|
|
56
|
+
if (disallowed.length > 0) {
|
|
57
|
+
return {
|
|
58
|
+
passed: false,
|
|
59
|
+
stage: 'pre-exec',
|
|
60
|
+
reason: `Actions not in whitelist: ${disallowed.join(', ')}`,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
return { passed: true, stage: 'pre-exec' };
|
package/dist/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAsaH,oBA+EC;AAnfD,iDAA6C;AAC7C,+BAAoC;AAEpC,wCAAkD;AAClD,4CAA8C;AAC9C,0CAA4C;AAC5C,6CAA+D;AAC/D,0CAAgE;AAwFhE,0CAA0C;AAC1C,MAAa,OAAQ,SAAQ,4BAAY;IAGvC,YAAY,SAAiC,EAAE;QAC7C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG;YACZ,cAAc,EAAE,IAAI;YACpB,QAAQ,EAAE,EAAE;YACZ,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,CAAC,GAAG,CAAC;YACrB,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC;YAC5C,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,KAAK;YACd,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;IAED,2BAA2B;IAC3B,QAAQ,CAAC,IAAU;QACjB,WAAW;QACX,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YAClE,MAAM,OAAO,GAAa,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,6BAA6B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAC1D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,IACE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG;YACrC,IAAI,CAAC,MAAM,EAAE,OAAO,EACpB,CAAC;YACD,MAAM,OAAO,GAAa,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,OAAO;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,UAAU;oBACjB,MAAM,EAAE,6BAA6B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAC7D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAC7C,CAAC;IAED,2BAA2B;IAC3B,YAAY,CAAC,MAAkB,EAAE,IAAU;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAClC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QAC9C,CAAC;QAED,OAAO;QACP,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7D,OAAO;gBACL,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,WAAW;gBAClB,MAAM,EAAE,+BAA+B,MAAM,CAAC,QAAQ,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI;aACtF,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC9C,CAAC;IAED,sBAAsB;IACtB,SAAS;QACP,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;CACF;AA1ED,0BA0EC;AAyBD,2BAA2B;AAC3B,MAAa,YAAa,SAAQ,4BAAY;IAM5C,YAAY,SAAgC,EAAE;QAC5C,KAAK,EAAE,CAAC;QANF,kBAAa,GAAkB,EAAE,CAAC;QAClC,oBAAe,GAAkB,EAAE,CAAC;QACpC,mBAAc,GAA6B,IAAI,GAAG,EAAE,CAAC;QAK3D,IAAI,CAAC,MAAM,GAAG;YACZ,eAAe,EAAE,EAAE;YACnB,iBAAiB,EAAE,GAAG;YACtB,eAAe,EAAE,QAAQ;YACzB,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;IAED,oBAAoB;IACpB,cAAc,CAAC,OAAY,EAAE,IAAe;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE/B,SAAS;QACT,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YAC3C,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa;IACb,WAAW;QACT,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,aAAa;IACb,YAAY;QACV,gBAAgB;QAChB,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;QACrE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,aAAa;IACb,gBAAgB,CAAC,OAAY,EAAE,IAAe;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa;IACb,aAAa;QACX,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAED,aAAa;IACb,eAAe,CAAC,OAAY,EAAE,IAAe;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc;IACd,YAAY,CAAC,EAAU;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAClC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,gBAAgB;IAChB,MAAM,CAAC,KAAa,EAAE,IAAiB;QACrC,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAEvC,MAAM,UAAU,GAAG,CAAC,OAAsB,EAAE,EAAE;YAC5C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;gBACxD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACpD,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,SAAS;YAAE,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,YAAY;YAAE,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,WAAW;YAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAExF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,eAAe;IACf,SAAS;QACP,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;YAClC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM;YACzC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI;SACtC,CAAC;IACJ,CAAC;IAED,qBAAqB;IAEb,WAAW,CAAC,OAAY,EAAE,IAAe;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO;YACL,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO;YACP,SAAS,EAAE,GAAG;YACd,cAAc,EAAE,GAAG;YACnB,WAAW,EAAE,CAAC;YACd,IAAI;SACL,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,KAAkB;QACvC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAChE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC7C,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC7C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,OAAsB;QACzC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAClB,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,CAAC,CAAC,WAAW,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAjJD,oCAiJC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,MAAM,cAAc,GAAoB;IACtC,IAAI,EAAE,WAAW;IACjB,IAAI,EAAG,OAAO,CAAC,GAAG,CAAC,cAA0C,IAAI,aAAa;IAC9E,QAAQ,EAAG,OAAO,CAAC,GAAG,CAAC,mBAAmD,IAAI,MAAM;IACpF,KAAK,EAAE;QACL,QAAQ,EAAE,UAAU;QACpB,aAAa,EAAE,CAAC;KACjB;IACD,OAAO,EAAE;QACP,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE,EAAE;QACZ,aAAa,EAAE,IAAI;QACnB,cAAc,EAAE,CAAC,GAAG,CAAC;QACrB,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC;QAC5C,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN,eAAe,EAAE,EAAE;QACnB,iBAAiB,EAAE,GAAG;QACtB,eAAe,EAAE,QAAQ;KAC1B;IACD,MAAM,EAAE;QACN,OAAO,EAAE,IAAI;QACb,MAAM,EAAE;YACN,WAAW,EAAE,KAAK;YAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SACxC;KACF;IACD,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClB,EAAE,IAAI,EAAE,OAAO,EAAE;KAClB;CACF,CAAC;AA4BF;;;;;;;;;;GAUG;AACI,KAAK,UAAU,IAAI,CAAC,aAAuC,EAAE;IAClE,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAC,CAAC;IAE5E,uBAAuB;IACvB,MAAM,MAAM,GAAoB,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAExE,kCAAkC;IAClC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE5C,iCAAiC;IACjC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE/C,oCAAoC;IACpC,MAAM,MAAM,GAAG,IAAI,sBAAa,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExD,oCAAoC;IACpC,MAAM,KAAK,GAAG,IAAI,mBAAW,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe;QAC9C,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB;KACnD,CAAC,CAAC;IAEH,gCAAgC;IAChC,MAAM,KAAK,GAAG,IAAI,aAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtC,2BAA2B;IAC3B,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnF,yBAAyB;IACzB,MAAM,CAAC,cAAc,CAAC;QACpB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,UAAU,EAAE,MAAM,CAAC,MAAM;KAC1B,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAE1B,gBAAgB;IAChB,MAAM,OAAO,GAAqB;QAChC,KAAK;QACL,OAAO;QACP,MAAM;QACN,MAAM;QACN,KAAK;QACL,MAAM;QACN,MAAM;QAEN,KAAK,CAAC,KAAK;YACT,MAAM,CAAC,cAAc,CAAC;gBACpB,KAAK,EAAE,gBAAgB;gBACvB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEf,kBAAkB;YAClB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;oBAC1C,MAAM,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,IAAI,eAAe,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;oBAClF,MAAM,CAAC,gBAAgB,CAAC;wBACtB,KAAK,EAAE,aAAa;wBACpB,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,KAAK;qBACN,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,QAAQ;YACZ,aAAa;YACb,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAEtC,eAAe;YACf,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7C,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC9B,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;KACF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,YAAY;AACZ,SAAS,YAAY,CAAC,KAAkC;IACtD,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAE9B,OAAO;QACL,KAAK,CAAC,GAAW,IAAI,IAAI,OAAO,IAAI,MAAM,CAAC,KAAK;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAW,IAAK,IAAI,OAAO,IAAI,MAAM,CAAC,IAAI;YAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,GAAW,IAAK,IAAI,OAAO,IAAI,MAAM,CAAC,IAAI;YAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACtE,KAAK,CAAC,GAAW,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,aAAa;AACb,SAAS,WAAW,CAAC,QAAyB,EAAE,QAAkC;IAChF,MAAM,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC7D,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC7D,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS;QAAE,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAEzE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;IAChE,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oBAAoB;AACpB,MAAM,aAAa,GAAiE;IAClF,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,oBAAW,CAAC,GAAG,CAAC;IACrC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,kBAAU,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,KAAK,UAAU,cAAc,CAC3B,KAAY,EACZ,OAA6B,EAC7B,OAAgB,EAChB,MAAoB,EACpB,MAAuC;IAEvC,MAAM,MAAM,GAAgB,EAAE,CAAC;IAE/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,mCAAmC,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC;YACxE,SAAS;QACX,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEpC,oBAAoB;QACpB,KAAK,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAU,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,CAAC,IAAI,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;gBAClF,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,KAAK,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAsC,EAAE,EAAE;YAClF,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,IAAI,CAAC,IAAI,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7F,CAAC;YACD,YAAY;YACZ,MAAM,CAAC,gBAAgB,CAAC;gBACtB,KAAK,EAAE,gBAAgB;gBACvB,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,KAAK,EAAE,KAAK,CAAC,IAAI;gBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,YAAY;AACZ,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC;QACzB,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IAEH,OAAO;IACP,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QAC/B,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IAEtB,SAAS;IACT,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAElE,SAAS;IACT,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACrD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;QACvB,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;AACL,CAAC;AAED,mCAAmC;AACnC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,OAAO;AACP,+EAA+E;AAE/E,2CAAiD;AAAxC,uGAAA,aAAa,OAAA;AACtB,wCAA6C;AAApC,oGAAA,WAAW,OAAA"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
|
package/dist/memory/storage.d.ts
CHANGED
|
@@ -76,4 +76,9 @@ export declare function searchMemories(query: string, projectPath?: string): Mem
|
|
|
76
76
|
* Get memories by type from a project.
|
|
77
77
|
*/
|
|
78
78
|
export declare function getMemoriesByType(type: MemoryType, projectPath?: string): MemoryEntry[];
|
|
79
|
+
/**
|
|
80
|
+
* Async search using VectorStore index (faster for large memory sets).
|
|
81
|
+
* Falls back to synchronous search if VectorStore not initialized.
|
|
82
|
+
*/
|
|
83
|
+
export declare function searchMemoriesAsync(query: string, projectPath?: string, limit?: number): Promise<MemoryEntry[]>;
|
|
79
84
|
//# sourceMappingURL=storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/memory/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/memory/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMvD,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,eAAe,aAAa,CAAC;AAC1C,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,oBAAoB,QAAQ,CAAC;AAM1C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE1D;AAMD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CASzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAM5D;AAMD,yCAAyC;AACzC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CA4B1E;AAED,2CAA2C;AAC3C,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAQpE;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,CA0BnE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAI5D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAkBjF;AAMD;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAczE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAarE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAmC5D;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,CAYjF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,CAGvF;AAGD;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,MAAW,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAoBzH"}
|
package/dist/memory/storage.js
CHANGED
|
@@ -24,11 +24,13 @@ exports.deleteMemory = deleteMemory;
|
|
|
24
24
|
exports.updateMemoryIndex = updateMemoryIndex;
|
|
25
25
|
exports.searchMemories = searchMemories;
|
|
26
26
|
exports.getMemoriesByType = getMemoriesByType;
|
|
27
|
+
exports.searchMemoriesAsync = searchMemoriesAsync;
|
|
27
28
|
const fs_1 = require("fs");
|
|
28
29
|
const path_1 = require("path");
|
|
29
30
|
const crypto_1 = require("crypto");
|
|
30
31
|
const config_dir_1 = require("../services/config-dir");
|
|
31
32
|
const atomic_write_1 = require("../services/atomic-write");
|
|
33
|
+
const vector_store_1 = require("./vector-store"); // Issue #32 #3.8
|
|
32
34
|
// ============================================================================
|
|
33
35
|
// Constants
|
|
34
36
|
// ============================================================================
|
|
@@ -283,4 +285,31 @@ function getMemoriesByType(type, projectPath) {
|
|
|
283
285
|
const memories = loadAllMemories(projectPath);
|
|
284
286
|
return memories.filter(mem => mem.type === type);
|
|
285
287
|
}
|
|
288
|
+
// Issue #32 #3.8: 异步搜索版本，利用 VectorStore 索引
|
|
289
|
+
/**
|
|
290
|
+
* Async search using VectorStore index (faster for large memory sets).
|
|
291
|
+
* Falls back to synchronous search if VectorStore not initialized.
|
|
292
|
+
*/
|
|
293
|
+
async function searchMemoriesAsync(query, projectPath, limit = 50) {
|
|
294
|
+
try {
|
|
295
|
+
const store = (0, vector_store_1.getVectorStore)();
|
|
296
|
+
if (store.isVectorSearchAvailable()) {
|
|
297
|
+
const results = await store.search(query, limit, projectPath);
|
|
298
|
+
// Convert SearchResult to MemoryEntry
|
|
299
|
+
return results.map(r => ({
|
|
300
|
+
name: r.name,
|
|
301
|
+
description: r.description || '',
|
|
302
|
+
type: r.type,
|
|
303
|
+
content: r.content,
|
|
304
|
+
createdAt: r.createdAt || 0,
|
|
305
|
+
updatedAt: r.createdAt || 0,
|
|
306
|
+
}));
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
catch {
|
|
310
|
+
// VectorStore not available, fall back
|
|
311
|
+
}
|
|
312
|
+
// Fallback: synchronous search
|
|
313
|
+
return searchMemories(query, projectPath);
|
|
314
|
+
}
|
|
286
315
|
//# sourceMappingURL=storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/memory/storage.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/memory/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Issue #32 #4.4: 通用参数校验
|
|
3
|
+
*/
|
|
4
|
+
export declare class ToolArgError extends Error {
|
|
5
|
+
constructor(tool: string, key: string, reason: string);
|
|
6
|
+
}
|
|
7
|
+
export declare function requireString(args: Record<string, unknown>, key: string, tool: string): string;
|
|
8
|
+
export declare function requireNumber(args: Record<string, unknown>, key: string, tool: string, min?: number, max?: number): number;
|
|
9
|
+
export declare function optionalString(args: Record<string, unknown>, key: string): string | undefined;
|
|
10
|
+
export declare function optionalNumber(args: Record<string, unknown>, key: string): number | undefined;
|
|
11
|
+
//# sourceMappingURL=_validate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_validate.d.ts","sourceRoot":"","sources":["../../src/tools/_validate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAItD;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GACX,MAAM,CAMR;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,CAYR;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAKpB"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Issue #32 #4.4: 通用参数校验
|
|
4
|
+
*/
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ToolArgError = void 0;
|
|
7
|
+
exports.requireString = requireString;
|
|
8
|
+
exports.requireNumber = requireNumber;
|
|
9
|
+
exports.optionalString = optionalString;
|
|
10
|
+
exports.optionalNumber = optionalNumber;
|
|
11
|
+
class ToolArgError extends Error {
|
|
12
|
+
constructor(tool, key, reason) {
|
|
13
|
+
super(`${tool}: parameter "${key}" ${reason}`);
|
|
14
|
+
this.name = 'ToolArgError';
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.ToolArgError = ToolArgError;
|
|
18
|
+
function requireString(args, key, tool) {
|
|
19
|
+
const v = args[key];
|
|
20
|
+
if (typeof v !== 'string' || !v) {
|
|
21
|
+
throw new ToolArgError(tool, key, 'must be a non-empty string');
|
|
22
|
+
}
|
|
23
|
+
return v;
|
|
24
|
+
}
|
|
25
|
+
function requireNumber(args, key, tool, min, max) {
|
|
26
|
+
const v = args[key];
|
|
27
|
+
if (typeof v !== 'number') {
|
|
28
|
+
throw new ToolArgError(tool, key, 'must be a number');
|
|
29
|
+
}
|
|
30
|
+
if (min !== undefined && v < min) {
|
|
31
|
+
throw new ToolArgError(tool, key, `must be >= ${min}`);
|
|
32
|
+
}
|
|
33
|
+
if (max !== undefined && v > max) {
|
|
34
|
+
throw new ToolArgError(tool, key, `must be <= ${max}`);
|
|
35
|
+
}
|
|
36
|
+
return v;
|
|
37
|
+
}
|
|
38
|
+
function optionalString(args, key) {
|
|
39
|
+
const v = args[key];
|
|
40
|
+
if (v === undefined || v === null)
|
|
41
|
+
return undefined;
|
|
42
|
+
if (typeof v !== 'string') {
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
return v;
|
|
46
|
+
}
|
|
47
|
+
function optionalNumber(args, key) {
|
|
48
|
+
const v = args[key];
|
|
49
|
+
if (v === undefined || v === null)
|
|
50
|
+
return undefined;
|
|
51
|
+
if (typeof v !== 'number')
|
|
52
|
+
return undefined;
|
|
53
|
+
return v;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=_validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_validate.js","sourceRoot":"","sources":["../../src/tools/_validate.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AASH,sCAUC;AAED,sCAkBC;AAED,wCAUC;AAED,wCAQC;AA3DD,MAAa,YAAa,SAAQ,KAAK;IACrC,YAAY,IAAY,EAAE,GAAW,EAAE,MAAc;QACnD,KAAK,CAAC,GAAG,IAAI,gBAAgB,GAAG,KAAK,MAAM,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF;AALD,oCAKC;AAED,SAAgB,aAAa,CAC3B,IAA6B,EAC7B,GAAW,EACX,IAAY;IAEZ,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,4BAA4B,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAgB,aAAa,CAC3B,IAA6B,EAC7B,GAAW,EACX,IAAY,EACZ,GAAY,EACZ,GAAY;IAEZ,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAgB,cAAc,CAC5B,IAA6B,EAC7B,GAAW;IAEX,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACpD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAgB,cAAc,CAC5B,IAA6B,EAC7B,GAAW;IAEX,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACpD,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC5C,OAAO,CAAC,CAAC;AACX,CAAC"}
|
package/dist/tools/index.d.ts
CHANGED
|
@@ -13,8 +13,9 @@ import { type OpenHorseTool } from '../framework/tool';
|
|
|
13
13
|
export declare const TOOLS: OpenHorseTool[];
|
|
14
14
|
/**
|
|
15
15
|
* 执行一个工具调用，返回结构化结果字符串
|
|
16
|
+
* Issue #32 #3.2: 支持 abortSignal
|
|
16
17
|
*/
|
|
17
|
-
export declare function executeTool(name: string, args: Record<string, unknown
|
|
18
|
+
export declare function executeTool(name: string, args: Record<string, unknown>, abortSignal?: AbortSignal): Promise<string>;
|
|
18
19
|
/**
|
|
19
20
|
* 获取可用工具名称列表
|
|
20
21
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAAa,KAAK,aAAa,EAAqC,MAAM,mBAAmB,CAAC;AA+BrG,eAAO,MAAM,KAAK,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAAa,KAAK,aAAa,EAAqC,MAAM,mBAAmB,CAAC;AA+BrG,eAAO,MAAM,KAAK,EAAE,aAAa,EAqlBhC,CAAC;AAidF;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAgCzH;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAGD,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gCAAgC,EAChC,iBAAiB,EACjB,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,cAAc,EACd,KAAK,cAAc,EACnB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC"}
|
package/dist/tools/index.js
CHANGED
|
@@ -164,13 +164,14 @@ exports.TOOLS = [
|
|
|
164
164
|
},
|
|
165
165
|
required: ['command'],
|
|
166
166
|
},
|
|
167
|
-
execute: async (args) => {
|
|
167
|
+
execute: async (args, context) => {
|
|
168
168
|
// Ensure command is a valid string
|
|
169
169
|
const command = args.command;
|
|
170
170
|
if (!command || typeof command !== 'string') {
|
|
171
171
|
return { success: false, output: '', error: 'exec_command requires a command parameter' };
|
|
172
172
|
}
|
|
173
|
-
|
|
173
|
+
// Issue #32 #3.2: 传递 abortSignal
|
|
174
|
+
return execCommand_(command, args.cwd, args.timeout, args.maxOutput, context.abortSignal);
|
|
174
175
|
},
|
|
175
176
|
isDestructive: (args) => {
|
|
176
177
|
const cmd = args.command || '';
|
|
@@ -674,7 +675,8 @@ async function listFiles_(path, maxDepth) {
|
|
|
674
675
|
walk(resolved, 1, '');
|
|
675
676
|
return { success: true, output: results.join('\n') };
|
|
676
677
|
}
|
|
677
|
-
|
|
678
|
+
// Issue #32 #3.2: execCommand_ 支持 abortSignal
|
|
679
|
+
async function execCommand_(command, cwd, timeout, maxOutput, abortSignal) {
|
|
678
680
|
return new Promise((resolve) => {
|
|
679
681
|
const workdir = cwd ? safePath(cwd) : process.cwd();
|
|
680
682
|
const timeoutMs = timeout ?? 30000;
|
|
@@ -690,14 +692,32 @@ async function execCommand_(command, cwd, timeout, maxOutput) {
|
|
|
690
692
|
// Issue #32 修复：使用独立计数器
|
|
691
693
|
let stdoutBytes = 0;
|
|
692
694
|
let stderrBytes = 0;
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
695
|
+
let aborted = false;
|
|
696
|
+
// Issue #32 #3.2: AbortSignal 处理
|
|
697
|
+
const abortHandler = () => {
|
|
698
|
+
aborted = true;
|
|
699
|
+
if (child.pid) {
|
|
700
|
+
child.kill('SIGTERM');
|
|
701
|
+
}
|
|
696
702
|
resolve({
|
|
697
703
|
success: false,
|
|
698
704
|
output: stdoutData.slice(0, maxBytes),
|
|
699
|
-
error:
|
|
705
|
+
error: 'Command aborted by user',
|
|
700
706
|
});
|
|
707
|
+
};
|
|
708
|
+
if (abortSignal) {
|
|
709
|
+
abortSignal.addEventListener('abort', abortHandler);
|
|
710
|
+
}
|
|
711
|
+
// Timeout handling
|
|
712
|
+
const timeoutId = setTimeout(() => {
|
|
713
|
+
if (!aborted) {
|
|
714
|
+
child.kill();
|
|
715
|
+
resolve({
|
|
716
|
+
success: false,
|
|
717
|
+
output: stdoutData.slice(0, maxBytes),
|
|
718
|
+
error: `Command timed out after ${timeoutMs}ms`,
|
|
719
|
+
});
|
|
720
|
+
}
|
|
701
721
|
}, timeoutMs);
|
|
702
722
|
// Stream stdout with truncation
|
|
703
723
|
child.stdout.on('data', (data) => {
|
|
@@ -729,6 +749,13 @@ async function execCommand_(command, cwd, timeout, maxOutput) {
|
|
|
729
749
|
});
|
|
730
750
|
child.on('close', (code) => {
|
|
731
751
|
clearTimeout(timeoutId);
|
|
752
|
+
// Issue #32 #3.2: 清理 abortSignal 监听器
|
|
753
|
+
if (abortSignal) {
|
|
754
|
+
abortSignal.removeEventListener('abort', abortHandler);
|
|
755
|
+
}
|
|
756
|
+
// 如果已被 abort，不再处理结果
|
|
757
|
+
if (aborted)
|
|
758
|
+
return;
|
|
732
759
|
const output = stdoutData.trim();
|
|
733
760
|
const errOutput = stderrData.trim();
|
|
734
761
|
// Add truncation notice if output was truncated
|
|
@@ -985,8 +1012,9 @@ async function grep_(pattern, basePath, globPattern, contextLines) {
|
|
|
985
1012
|
// ============================================================================
|
|
986
1013
|
/**
|
|
987
1014
|
* 执行一个工具调用，返回结构化结果字符串
|
|
1015
|
+
* Issue #32 #3.2: 支持 abortSignal
|
|
988
1016
|
*/
|
|
989
|
-
async function executeTool(name, args) {
|
|
1017
|
+
async function executeTool(name, args, abortSignal) {
|
|
990
1018
|
const tool = exports.TOOLS.find(t => t.name === name);
|
|
991
1019
|
if (!tool) {
|
|
992
1020
|
return JSON.stringify({
|
|
@@ -1000,6 +1028,7 @@ async function executeTool(name, args) {
|
|
|
1000
1028
|
name: 'openhorse',
|
|
1001
1029
|
mode: 'development',
|
|
1002
1030
|
},
|
|
1031
|
+
abortSignal, // Issue #32 #3.2: 透传 abortSignal
|
|
1003
1032
|
};
|
|
1004
1033
|
const result = await tool.execute(args, context);
|
|
1005
1034
|
if (!result.success) {
|