@xgjktech/xg_cwork_im 1.18.3 → 1.18.5
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/index.d.ts.map +1 -1
- package/dist/index.js +12 -7
- package/dist/index.js.map +1 -1
- package/dist/src/per-message-model-pending.d.ts +8 -1
- package/dist/src/per-message-model-pending.d.ts.map +1 -1
- package/dist/src/per-message-model-pending.js +17 -1
- package/dist/src/per-message-model-pending.js.map +1 -1
- package/dist/src/register-per-message-model-hook.d.ts +4 -1
- package/dist/src/register-per-message-model-hook.d.ts.map +1 -1
- package/dist/src/register-per-message-model-hook.js +18 -6
- package/dist/src/register-per-message-model-hook.js.map +1 -1
- package/dist/src/register-per-message-model-hook.test.d.ts +2 -0
- package/dist/src/register-per-message-model-hook.test.d.ts.map +1 -0
- package/dist/src/register-per-message-model-hook.test.js +91 -0
- package/dist/src/register-per-message-model-hook.test.js.map +1 -0
- package/package.json +2 -2
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2CH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAoD7F,QAAA,MAAM,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2CH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAoD7F,QAAA,MAAM,MAAM,EAAE,qBAoQb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -175,19 +175,24 @@ const plugin = {
|
|
|
175
175
|
}).catch(() => { });
|
|
176
176
|
// OpenClaw 8.1 将 sessions_spawn visible:true 路由到 dashboard 会话（sessions.create），
|
|
177
177
|
// 不发射 subagent_spawned，导致 IM 端收不到 SUBAGENT_STAT。这里强制关掉 visible，
|
|
178
|
-
// 让 spawn 落回 subagent 管线（SUBAGENT_STAT
|
|
179
|
-
//
|
|
178
|
+
// 让 spawn 落回 subagent 管线（SUBAGENT_STAT 恢复）。
|
|
179
|
+
// 注意：8.x 对 before_tool_call 返回的 {params} 只做“值覆盖”，键删除不生效
|
|
180
|
+
// （历史实现 delete group 被忽略，导致 visible:false 与 group 残留并存，触发
|
|
181
|
+
// "Parameters require visible=true" 校验错误）。因此改为把仅 visible 会话支持的
|
|
182
|
+
// 参数置空：null 经 readToolStringParam/normalizeOptionalString 归一化为
|
|
183
|
+
// undefined，等同未提供，校验不再报错。
|
|
180
184
|
if (event.toolName === "sessions_spawn" &&
|
|
181
185
|
event.params !== null &&
|
|
182
|
-
typeof event.params === "object"
|
|
183
|
-
event.params.visible === true) {
|
|
186
|
+
typeof event.params === "object") {
|
|
184
187
|
const params = {
|
|
185
188
|
...event.params,
|
|
186
189
|
visible: false,
|
|
190
|
+
category: null,
|
|
191
|
+
group: null,
|
|
192
|
+
worktree: false,
|
|
193
|
+
worktreeName: null,
|
|
194
|
+
worktreeBaseRef: null,
|
|
187
195
|
};
|
|
188
|
-
for (const key of ["category", "group", "worktree", "worktreeName", "worktreeBaseRef"]) {
|
|
189
|
-
delete params[key];
|
|
190
|
-
}
|
|
191
196
|
return { params };
|
|
192
197
|
}
|
|
193
198
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EACH,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,4BAA4B,EAC5B,mBAAmB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,mBAAmB,GACtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACH,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,GACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACvG,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEhF,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAsB7F;;;;;GAKG;AACH,SAAS,gBAAgB;IACrB,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,+CAA+C;IAC/C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,OAAO,IAAI,CAAC,CAAC,gCAAgC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;AAEvC,4DAA4D;AAC5D,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,OAAO,CAAC,GAAG,CACP,gDAAgD,YAAY,QAAQ,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG;IAC9H,iBAAiB,cAAc,EAAE,CACpC,CAAC;AAEF,MAAM,MAAM,GAA0B;IAClC,EAAE,EAAE,aAAa;IACjB,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,2CAA2C;IACxD,YAAY,EAAE,uBAAuB,EAAE;IACvC,QAAQ,CAAC,GAAsB;QAC3B,4CAA4C;QAC5C,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;QACtC,qBAAqB,EAAE,CAAC;QACxB,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CACP,+CAA+C,YAAY,gBAAgB,WAAW,GAAG;YACzF,WAAW,kBAAkB,EAAE,YAAY,OAAO,CAAC,KAAK,IAAI,QAAQ,GAAG;YACvE,iBAAiB,cAAc,GAAG;YAClC,mBAAoB,GAAG,CAAC,OAAgC,CAAC,OAAO,IAAI,WAAW,EAAE,CACpF,CAAC;QACF,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACjC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzB,6BAA6B,CAAC,GAAG,CAAC,CAAC;QACnC,GAAG,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAExD,8DAA8D;QAC9D,kEAAkE;QAClE,kEAAkE;QAClE,gEAAgE;QAEhE,uCAAuC;QACvC,iEAAiE;QACjE,+DAA+D;QAC/D,4DAA4D;QAC5D,yDAAyD;QACzD,yEAAyE;QACzE,yBAAyB;QACzB,GAAG,CAAC,SAAS,CAAC,wBAAwB,CAAC;YACnC,EAAE,EAAE,qBAAqB;YACzB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACnB,MAAM,MAAM,GAAI,GAAuC,EAAE,MAAM,IAAI,QAAQ,CAAC;gBAC5E,OAAO,CAAC,GAAG,CACP,8CAA8C,YAAY,gBAAgB,WAAW,GAAG;oBACxF,UAAU,MAAM,QAAQ,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CACpF,CAAC;gBACF,MAAM,mBAAmB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;YAClF,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACtB,2DAA2D;YAC3D,mCAAmC;YACnC,OAAO,CAAC,IAAI,CACR,4CAA4C,OAAO,CAAC,KAAK,IAAI,WAAW,UAAU,CACrF,CAAC;YACF,OAAO;QACX,CAAC;QAED,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;YAC9B,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBAC7B,OAAO,CAAC,mDAAmD;YAC/D,CAAC;YACD,OAAO,CAAC,GAAG,CACP,mEAAmE,YAAY,EAAE,CACpF,CAAC;YACF,MAAM,mBAAmB,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvC,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC;YAClD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,OAAO,CAAC,KAAK,CACT,gDAAgD,4BAA4B,EAAE,oBAAoB,KAAK,CAAC,eAAe,UAAU,KAAK,CAAC,KAAK,GAAG;gBAC/I,oBAAoB,gBAAgB,IAAI,QAAQ,YAAY,OAAO,IAAI,QAAQ,YAAY,OAAO,IAAI,QAAQ,EAAE,CACnH,CAAC;YACF,IAAI,gBAAgB,KAAK,aAAa;gBAAE,OAAO;YAC/C,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;gBAAE,OAAO;YACjC,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,CAAC,KAAK,CACT,sDAAsD,4BAA4B,EAAE,oBAAoB,KAAK,CAAC,eAAe,GAAG;gBAChI,WAAW,OAAO,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAC3F,CAAC;YACF,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnB,gBAAgB,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9D,CAAC;YACD,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAClD,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAEtD,YAAY,CAAC;gBACT,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,OAAO;gBACP,OAAO;gBACP,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,KAAK,EAAE;oBACH,eAAe,EAAE,KAAK,CAAC,eAAe;oBACtC,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;iBACrB;aACJ,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,CAAC,KAAK,CACT,8CAA8C,4BAA4B,EAAE,qBAAqB,KAAK,CAAC,gBAAgB,UAAU,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,CAC7J,CAAC;YACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;YACD,qBAAqB,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,UAAU;gBAAE,OAAM;YAC3B,MAAM,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC9C,IAAI,CAAC,EAAE;gBAAE,OAAM;YACf,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC1C,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,KAAK,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YACvD,IAAI,KAAK,EAAE,CAAC;gBACR,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;YACpD,CAAC;YAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;YAEnE,MAAM,CAAC,cAAc,CAAC;gBAClB,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,YAAY,EAAE,EAAE,CAAC,YAAY;gBAC7B,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,QAAQ,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM;gBAC5D,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;YAEnB,gFAAgF;YAChF,gEAAgE;YAChE,4CAA4C;YAC5C,wDAAwD;YACxD,0DAA0D;YAC1D,+DAA+D;YAC/D,+DAA+D;YAC/D,0BAA0B;YAC1B,IACI,KAAK,CAAC,QAAQ,KAAK,gBAAgB;gBACnC,KAAK,CAAC,MAAM,KAAK,IAAI;gBACrB,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAClC,CAAC;gBACC,MAAM,MAAM,GAA4B;oBACpC,GAAI,KAAK,CAAC,MAAkC;oBAC5C,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,IAAI;oBACX,QAAQ,EAAE,KAAK;oBACf,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;iBACxB,CAAC;gBACF,OAAO,EAAE,MAAM,EAAE,CAAC;YACtB,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,UAAU;gBAAE,OAAM;YAC3B,MAAM,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC9C,IAAI,CAAC,EAAE;gBAAE,OAAM;YACf,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC1C,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,KAAK,GAAG,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YACvD,IAAI,KAAK,EAAE,CAAC;gBACR,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;YACpD,CAAC;YAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAE/C,MAAM,CAAC,cAAc,CAAC;gBAClB,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,YAAY,EAAE,EAAE,CAAC,YAAY;gBAC7B,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,KAAK,CAAC,KAAK;oBACpB,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,SAAS;oBACtC,CAAC,CAAC,IAAI,KAAK,QAAQ;aAC1B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC;YACD,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YACrD,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YACvD,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;YAC/D,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,gDAAgD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,uEAAuE;QACvE,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,iBAAiB,GAAG,CAAC,GAA0B,EAAE,EAAE,CACrD,sBAAsB,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;gBACjG,QAAQ,CAAC;YAEb,MAAM,YAAY,GAAG,CAAC,GAA0B,EAAE,EAAE,CAAC,CAAC;gBAClD,gBAAgB,EAAE,GAAG,CAAC,cAAc,IAAI,SAAS;gBACjD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,SAAS;aACxD,CAAC,CAAC;YAEH,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,qBAAqB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EACpE,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YACF,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,yBAAyB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EACxE,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YACF,GAAG,CAAC,YAAY,CACZ,CAAC,GAA0B,EAAE,EAAE,CAC3B,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;gBACtC,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,SAAS;gBAC3C,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,SAAS;gBACjC,gBAAgB,EAAE,GAAG,CAAC,cAAc,IAAI,SAAS;gBACjD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,IAAI,SAAS;gBACrD,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,SAAS;aACpD,CAAC,EACN,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;YAEF,IAAI,CAAC;gBACD,GAAG,CAAC,iCAAiC,CACjC,8BAA8B,CAAC;oBAC3B,WAAW;oBACX,YAAY;oBACZ,aAAa;oBACb,kBAAkB;iBACrB,CAAC,EACF,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CACtC,CAAC;YACN,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,kEAAkE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClG,CAAC;YAED,IAAI,CAAC;gBACD,6BAA6B,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,8DAA8D,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9F,CAAC;YAED,IAAI,CAAC;gBACD,kCAAkC,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,mEAAmE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnG,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;CACJ,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 单轮模型覆盖：在 dispatch 前登记，由 before_model_resolve 消费。
|
|
3
|
-
*
|
|
3
|
+
* 仅当当前候选与用户点名模型一致时生效；主候选被跳过进入 fallback 时不得覆盖回原模型。
|
|
4
|
+
* 主通道仍以 replyOptions.modelOverride 为准，本机制只在候选一致时补一次显式覆盖。
|
|
4
5
|
*/
|
|
5
6
|
export interface PendingPerMessageModel {
|
|
6
7
|
/** 原始 model ref，如 xgjk-newapi/MiniMax-M2.7-Cloud */
|
|
@@ -11,6 +12,12 @@ export interface PendingPerMessageModel {
|
|
|
11
12
|
export declare function normalizeModelRefRaw(raw: string): string;
|
|
12
13
|
/** 将 provider/model 或别名拆成 hook 可用的字段 */
|
|
13
14
|
export declare function splitModelRef(raw: string): PendingPerMessageModel | undefined;
|
|
15
|
+
/**
|
|
16
|
+
* 单轮覆盖只在「当前候选 == 用户点名的目标模型」时生效。
|
|
17
|
+
* 主模型被冷却/额度跳过进入 fallback 后，当前候选已不是目标模型，
|
|
18
|
+
* 钩子不得再把 fallback 候选改回目标模型。目标未带 provider 时仅比对 model。
|
|
19
|
+
*/
|
|
20
|
+
export declare function matchesPendingCandidate(ctxProvider: string | undefined, ctxModel: string | undefined, pending: PendingPerMessageModel): boolean;
|
|
14
21
|
export declare function setPendingPerMessageModel(sessionKey: string, raw: string): PendingPerMessageModel | undefined;
|
|
15
22
|
export declare function takePendingPerMessageModel(sessionKey: string | undefined): PendingPerMessageModel | undefined;
|
|
16
23
|
export declare function clearPendingPerMessageModel(sessionKey: string | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-message-model-pending.d.ts","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"per-message-model-pending.d.ts","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,WAAW,sBAAsB;IACnC,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACjB;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAW7E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,EAAE,sBAAsB,GAChC,OAAO,CAST;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAK7G;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,sBAAsB,GAAG,SAAS,CAM7G;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAGhF;AAED,8BAA8B;AAC9B,wBAAgB,8BAA8B,IAAI,IAAI,CAErD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 单轮模型覆盖：在 dispatch 前登记，由 before_model_resolve 消费。
|
|
3
|
-
*
|
|
3
|
+
* 仅当当前候选与用户点名模型一致时生效；主候选被跳过进入 fallback 时不得覆盖回原模型。
|
|
4
|
+
* 主通道仍以 replyOptions.modelOverride 为准，本机制只在候选一致时补一次显式覆盖。
|
|
4
5
|
*/
|
|
5
6
|
import { getSharedMap } from "./process-shared-store.js";
|
|
6
7
|
const pendingBySessionKey = getSharedMap("pending-per-message-model");
|
|
@@ -22,6 +23,21 @@ export function splitModelRef(raw) {
|
|
|
22
23
|
}
|
|
23
24
|
return { raw: normalized, model: normalized };
|
|
24
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* 单轮覆盖只在「当前候选 == 用户点名的目标模型」时生效。
|
|
28
|
+
* 主模型被冷却/额度跳过进入 fallback 后，当前候选已不是目标模型，
|
|
29
|
+
* 钩子不得再把 fallback 候选改回目标模型。目标未带 provider 时仅比对 model。
|
|
30
|
+
*/
|
|
31
|
+
export function matchesPendingCandidate(ctxProvider, ctxModel, pending) {
|
|
32
|
+
const candidateProvider = (ctxProvider ?? "").trim().toLowerCase();
|
|
33
|
+
const candidateModel = (ctxModel ?? "").trim();
|
|
34
|
+
const targetProvider = (pending.provider ?? "").trim().toLowerCase();
|
|
35
|
+
const targetModel = pending.model.trim();
|
|
36
|
+
if (candidateModel !== targetModel) {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
return targetProvider === "" || candidateProvider === targetProvider;
|
|
40
|
+
}
|
|
25
41
|
export function setPendingPerMessageModel(sessionKey, raw) {
|
|
26
42
|
const parsed = splitModelRef(raw);
|
|
27
43
|
if (!parsed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-message-model-pending.js","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"per-message-model-pending.js","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* before_model_resolve：消费 IM ext.ai_model
|
|
2
|
+
* before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
|
|
3
|
+
* 守卫语义：仅当「当前正在解析的候选 == 用户点名的目标模型」时才应用覆盖。
|
|
4
|
+
* 初选候选因冷却/额度在外层被跳过进入 fallback 后，当前候选已不是目标模型，
|
|
5
|
+
* 覆盖必须静默放弃，否则会把降级候选（如 newapi-xgjk/back-model）改回冷却中的主模型。
|
|
3
6
|
*/
|
|
4
7
|
import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
|
|
5
8
|
export declare function registerPerMessageModelHook(api: OpenClawPluginApi): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAmCxE"}
|
|
@@ -1,21 +1,33 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* before_model_resolve：消费 IM ext.ai_model
|
|
2
|
+
* before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
|
|
3
|
+
* 守卫语义：仅当「当前正在解析的候选 == 用户点名的目标模型」时才应用覆盖。
|
|
4
|
+
* 初选候选因冷却/额度在外层被跳过进入 fallback 后，当前候选已不是目标模型，
|
|
5
|
+
* 覆盖必须静默放弃，否则会把降级候选（如 newapi-xgjk/back-model）改回冷却中的主模型。
|
|
3
6
|
*/
|
|
4
|
-
import { takePendingPerMessageModel } from "./per-message-model-pending.js";
|
|
7
|
+
import { matchesPendingCandidate, takePendingPerMessageModel } from "./per-message-model-pending.js";
|
|
5
8
|
export function registerPerMessageModelHook(api) {
|
|
6
9
|
api.on("before_model_resolve", async (_event, ctx) => {
|
|
10
|
+
// 取后即删：无论命中与否，首个候选钩子就消费本次单轮覆盖，
|
|
11
|
+
// 避免残留到下一个 fallback 候选或下一轮消息。
|
|
7
12
|
const pending = takePendingPerMessageModel(ctx.sessionKey);
|
|
8
|
-
if (!pending)
|
|
13
|
+
if (!pending) {
|
|
9
14
|
return;
|
|
15
|
+
}
|
|
16
|
+
const ctxProvider = ctx.modelProviderId?.trim() ?? "";
|
|
17
|
+
const ctxModel = ctx.modelId?.trim() ?? "";
|
|
18
|
+
if (!matchesPendingCandidate(ctxProvider, ctxModel, pending)) {
|
|
19
|
+
api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=skip session=${ctx.sessionKey} ` +
|
|
20
|
+
`candidate=${ctxProvider}/${ctxModel} pending=${pending.raw}`);
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=apply session=${ctx.sessionKey} ` +
|
|
24
|
+
`provider=${pending.provider ?? ""} model=${pending.model}`);
|
|
10
25
|
if (pending.provider) {
|
|
11
|
-
api.logger.info(`[xg_cwork_im] [model] before_model_resolve session=${ctx.sessionKey} ` +
|
|
12
|
-
`provider=${pending.provider} model=${pending.model}`);
|
|
13
26
|
return {
|
|
14
27
|
providerOverride: pending.provider,
|
|
15
28
|
modelOverride: pending.model,
|
|
16
29
|
};
|
|
17
30
|
}
|
|
18
|
-
api.logger.info(`[xg_cwork_im] [model] before_model_resolve session=${ctx.sessionKey} model=${pending.raw}`);
|
|
19
31
|
return { modelOverride: pending.raw };
|
|
20
32
|
}, { priority: 100 });
|
|
21
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAErG,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CACF,sBAAsB,EACtB,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAClB,+BAA+B;QAC/B,8BAA8B;QAC9B,MAAM,OAAO,GAAG,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,wEAAwE,GAAG,CAAC,UAAU,GAAG;gBACrF,aAAa,WAAW,IAAI,QAAQ,YAAY,OAAO,CAAC,GAAG,EAAE,CACpE,CAAC;YACF,OAAO;QACX,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,yEAAyE,GAAG,CAAC,UAAU,GAAG;YACtF,YAAY,OAAO,CAAC,QAAQ,IAAI,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE,CAClE,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;gBACH,gBAAgB,EAAE,OAAO,CAAC,QAAQ;gBAClC,aAAa,EAAE,OAAO,CAAC,KAAK;aAC/B,CAAC;QACN,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1C,CAAC,EACD,EAAE,QAAQ,EAAE,GAAG,EAAE,CACpB,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.test.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
|
+
import { clearAllPendingPerMessageModel, matchesPendingCandidate, setPendingPerMessageModel, takePendingPerMessageModel, } from "./per-message-model-pending.js";
|
|
4
|
+
import { registerPerMessageModelHook } from "./register-per-message-model-hook.js";
|
|
5
|
+
function fakeApi() {
|
|
6
|
+
const captured = [];
|
|
7
|
+
const logs = [];
|
|
8
|
+
const api = {
|
|
9
|
+
on: (name, handler, opts) => {
|
|
10
|
+
captured.push({ name, handler, opts });
|
|
11
|
+
},
|
|
12
|
+
logger: {
|
|
13
|
+
info: (...args) => {
|
|
14
|
+
logs.push(args.join(" "));
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
return { api, captured, logs };
|
|
19
|
+
}
|
|
20
|
+
describe("matchesPendingCandidate", () => {
|
|
21
|
+
it("matches exact provider/model", () => {
|
|
22
|
+
const pending = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
23
|
+
assert.ok(matchesPendingCandidate("openai", "gpt-5.6-sol", pending));
|
|
24
|
+
clearAllPendingPerMessageModel();
|
|
25
|
+
});
|
|
26
|
+
it("matches model only when pending has no provider", () => {
|
|
27
|
+
const pending = setPendingPerMessageModel("s1", "gpt-5.6-sol");
|
|
28
|
+
assert.equal(pending.provider, undefined);
|
|
29
|
+
assert.ok(matchesPendingCandidate("openai", "gpt-5.6-sol", pending));
|
|
30
|
+
assert.ok(matchesPendingCandidate("newapi-xgjk", "gpt-5.6-sol", pending));
|
|
31
|
+
clearAllPendingPerMessageModel();
|
|
32
|
+
});
|
|
33
|
+
it("rejects candidate that is a fallback, not the requested model", () => {
|
|
34
|
+
const pending = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
35
|
+
assert.equal(matchesPendingCandidate("newapi-xgjk", "back-model", pending), false);
|
|
36
|
+
clearAllPendingPerMessageModel();
|
|
37
|
+
});
|
|
38
|
+
it("normalizes whitespace and provider case", () => {
|
|
39
|
+
const pending = setPendingPerMessageModel("s1", " openai/gpt-5.6-sol ");
|
|
40
|
+
assert.ok(matchesPendingCandidate(" OpenAI ", " gpt-5.6-sol ", pending));
|
|
41
|
+
assert.equal(matchesPendingCandidate("newapi-xgjk", "gpt-5.6-sol", pending), false);
|
|
42
|
+
clearAllPendingPerMessageModel();
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
describe("registerPerMessageModelHook", () => {
|
|
46
|
+
it("registers before_model_resolve with priority 100", () => {
|
|
47
|
+
const { api, captured } = fakeApi();
|
|
48
|
+
registerPerMessageModelHook(api);
|
|
49
|
+
assert.equal(captured.length, 1);
|
|
50
|
+
assert.equal(captured[0].name, "before_model_resolve");
|
|
51
|
+
assert.deepEqual(captured[0].opts, { priority: 100 });
|
|
52
|
+
});
|
|
53
|
+
it("applies override when current candidate matches requested model", async () => {
|
|
54
|
+
const { api, captured, logs } = fakeApi();
|
|
55
|
+
registerPerMessageModelHook(api);
|
|
56
|
+
setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
57
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
58
|
+
assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-5.6-sol" });
|
|
59
|
+
assert.match(logs.join(" "), /hookDecision=apply/);
|
|
60
|
+
assert.equal(takePendingPerMessageModel("s1"), undefined);
|
|
61
|
+
clearAllPendingPerMessageModel();
|
|
62
|
+
});
|
|
63
|
+
it("does not override a fallback candidate back to the requested model", async () => {
|
|
64
|
+
const { api, captured, logs } = fakeApi();
|
|
65
|
+
registerPerMessageModelHook(api);
|
|
66
|
+
setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
67
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", modelProviderId: "newapi-xgjk", modelId: "back-model" });
|
|
68
|
+
assert.equal(result, undefined);
|
|
69
|
+
assert.match(logs.join(" "), /hookDecision=skip/);
|
|
70
|
+
assert.equal(takePendingPerMessageModel("s1"), undefined);
|
|
71
|
+
clearAllPendingPerMessageModel();
|
|
72
|
+
});
|
|
73
|
+
it("does not consume another session's pending model", async () => {
|
|
74
|
+
const { api, captured } = fakeApi();
|
|
75
|
+
registerPerMessageModelHook(api);
|
|
76
|
+
setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
|
|
77
|
+
await captured[0].handler({}, { sessionKey: "s2", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
78
|
+
assert.equal(takePendingPerMessageModel("s2"), undefined);
|
|
79
|
+
const pendingForS1 = takePendingPerMessageModel("s1");
|
|
80
|
+
assert.equal(pendingForS1?.model, "gpt-5.6-sol");
|
|
81
|
+
clearAllPendingPerMessageModel();
|
|
82
|
+
});
|
|
83
|
+
it("does nothing when no pending model is registered", async () => {
|
|
84
|
+
const { api, captured } = fakeApi();
|
|
85
|
+
registerPerMessageModelHook(api);
|
|
86
|
+
clearAllPendingPerMessageModel();
|
|
87
|
+
const result = await captured[0].handler({}, { sessionKey: "s1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
|
|
88
|
+
assert.equal(result, undefined);
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=register-per-message-model-hook.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-per-message-model-hook.test.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xgjktech/xg_cwork_im",
|
|
3
|
-
"version": "1.18.
|
|
3
|
+
"version": "1.18.5",
|
|
4
4
|
"description": "XG CWork IM channel plugin for OpenClaw",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"bot",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"build": "tsc -p tsconfig.json",
|
|
26
26
|
"type-check": "tsc -p tsconfig.json --noEmit",
|
|
27
27
|
"lint": "tsc -p tsconfig.json --noEmit",
|
|
28
|
-
"test": "npm run build && node --test dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/plan-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/turn-end-controller.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js dist/src/connection.test.js dist/src/reply-dispatch-driver.test.js",
|
|
28
|
+
"test": "npm run build && node --test dist/src/account-reconciler.test.js dist/src/inbound-terminal-state.test.js dist/src/user-facing-errors.test.js dist/src/deliver-text.test.js dist/src/agent-context-types.test.js dist/src/build-project-prompt.test.js dist/src/nas-volumes.test.js dist/src/workspace-event.test.js dist/src/workspace-event-scheduler.test.js dist/src/connection-workspace-event.test.js dist/src/block-streaming-config.test.js dist/src/channel-disabled-account.test.js dist/src/per-message-fallback-notice.test.js dist/src/register-per-message-model-hook.test.js dist/src/thinking-ws-progress.test.js dist/src/resource-file.test.js dist/src/turn-deliver-buffer.test.js dist/src/run-usage.test.js dist/src/ws-run-event-unmapped.test.js dist/src/item-event-guard.test.js dist/src/inbound-model.test.js dist/src/auto-model-router.test.js dist/src/channel-config.test.js dist/src/send-service.test.js dist/src/send-file-tool.test.js dist/src/plan-tool-result.test.js dist/src/plan-blocked-notice.test.js dist/src/plan-store-access.test.js dist/src/plan-tool-middleware.test.js dist/src/plan-event-subscription.test.js dist/src/plan-ws-registry.test.js dist/src/plan-stat-event.test.js dist/src/active-round-registry.test.js dist/src/interrupt-round.test.js dist/src/subagent-monitor.test.js dist/src/turn-end-controller.test.js dist/src/session-env-store.test.js dist/src/register-exec-env-hook.test.js dist/src/cron-appkey-binding-store.test.js dist/src/ws-inbound-schema.test.js dist/src/connection.test.js dist/src/reply-dispatch-driver.test.js",
|
|
29
29
|
"install:prod": "npm install --omit=dev",
|
|
30
30
|
"prepublishOnly": "npm run build"
|
|
31
31
|
},
|