@xgjktech/xg_cwork_im 1.17.55 → 1.18.0

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 (38) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.js +5 -1
  3. package/dist/index.js.map +1 -1
  4. package/dist/src/channel-config.d.ts +13 -0
  5. package/dist/src/channel-config.d.ts.map +1 -1
  6. package/dist/src/channel-config.js +3 -0
  7. package/dist/src/channel-config.js.map +1 -1
  8. package/dist/src/connection.d.ts +24 -0
  9. package/dist/src/connection.d.ts.map +1 -1
  10. package/dist/src/connection.js +123 -78
  11. package/dist/src/connection.js.map +1 -1
  12. package/dist/src/connection.test.d.ts +2 -0
  13. package/dist/src/connection.test.d.ts.map +1 -0
  14. package/dist/src/connection.test.js +110 -0
  15. package/dist/src/connection.test.js.map +1 -0
  16. package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
  17. package/dist/src/dispatch-mentioned-reply.js +22 -1
  18. package/dist/src/dispatch-mentioned-reply.js.map +1 -1
  19. package/dist/src/reply-dispatch-driver.d.ts +60 -0
  20. package/dist/src/reply-dispatch-driver.d.ts.map +1 -0
  21. package/dist/src/reply-dispatch-driver.js +138 -0
  22. package/dist/src/reply-dispatch-driver.js.map +1 -0
  23. package/dist/src/reply-dispatch-driver.test.d.ts +2 -0
  24. package/dist/src/reply-dispatch-driver.test.d.ts.map +1 -0
  25. package/dist/src/reply-dispatch-driver.test.js +180 -0
  26. package/dist/src/reply-dispatch-driver.test.js.map +1 -0
  27. package/dist/src/turn-end-controller.d.ts +0 -1
  28. package/dist/src/turn-end-controller.d.ts.map +1 -1
  29. package/dist/src/turn-end-controller.js +12 -13
  30. package/dist/src/turn-end-controller.js.map +1 -1
  31. package/dist/src/turn-end-controller.test.js +9 -3
  32. package/dist/src/turn-end-controller.test.js.map +1 -1
  33. package/dist/src/types.d.ts +9 -0
  34. package/dist/src/types.d.ts.map +1 -1
  35. package/dist/src/types.js.map +1 -1
  36. package/dist/src/workspace-event.d.ts +1 -1
  37. package/dist/src/workspace-event.d.ts.map +1 -1
  38. package/package.json +2 -2
@@ -0,0 +1,180 @@
1
+ import assert from "node:assert/strict";
2
+ import { describe, it } from "node:test";
3
+ import { dispatchXgImInboundReply, resolveDispatchDriver, supportsOfficialAssembledTurn, } from "./reply-dispatch-driver.js";
4
+ const baseCfg = { session: { store: { type: "sqlite" } } };
5
+ function makeLegacyRt() {
6
+ const calls = [];
7
+ return {
8
+ calls,
9
+ rt: {
10
+ channel: {
11
+ reply: {
12
+ dispatchReplyWithBufferedBlockDispatcher: async (args) => {
13
+ calls.push(args);
14
+ return { beforeAgentRunBlocked: false };
15
+ },
16
+ },
17
+ },
18
+ },
19
+ };
20
+ }
21
+ function makeOfficialRt() {
22
+ const calls = [];
23
+ return {
24
+ calls,
25
+ rt: {
26
+ channel: {
27
+ reply: {
28
+ dispatchReplyWithBufferedBlockDispatcher: async (args) => {
29
+ calls.push(["buffered", args]);
30
+ return { buffered: true };
31
+ },
32
+ },
33
+ inbound: {
34
+ dispatchReply: async (args) => {
35
+ calls.push(["turn", args]);
36
+ return {
37
+ admission: { kind: "dispatch" },
38
+ dispatched: true,
39
+ dispatchResult: { beforeAgentRunBlocked: false },
40
+ };
41
+ },
42
+ },
43
+ },
44
+ },
45
+ };
46
+ }
47
+ const baseParams = {
48
+ ctx: { SessionKey: "agent:main:xg_cwork_im:g-1" },
49
+ cfg: baseCfg,
50
+ channel: "xg_cwork_im",
51
+ accountId: "default",
52
+ agentId: "main",
53
+ routeSessionKey: "agent:main:xg_cwork_im:g-1",
54
+ storePath: "sessions.json",
55
+ replyOptions: { onAgentRunStart: () => { } },
56
+ dispatcherOptions: {
57
+ responsePrefix: "",
58
+ onSkip: () => { },
59
+ onError: () => { },
60
+ deliver: async () => { },
61
+ },
62
+ logPrefix: "[default:main]",
63
+ };
64
+ describe("reply-dispatch-driver selection", () => {
65
+ it("runtime 暴露 channel.inbound.dispatchReply 时 auto 选 official", () => {
66
+ const { rt } = makeOfficialRt();
67
+ const r = resolveDispatchDriver(rt, "auto");
68
+ assert.equal(r.driver, "official");
69
+ assert.equal(r.officialSupported, true);
70
+ assert.equal(r.source, "auto");
71
+ });
72
+ it("runtime 未暴露时 auto 回退 legacy", () => {
73
+ const { rt } = makeLegacyRt();
74
+ const r = resolveDispatchDriver(rt, "auto");
75
+ assert.equal(r.driver, "legacy");
76
+ assert.equal(r.officialSupported, false);
77
+ });
78
+ it("显式 legacy 强制 legacy(回退开关)", () => {
79
+ const { rt } = makeOfficialRt();
80
+ const r = resolveDispatchDriver(rt, "legacy");
81
+ assert.equal(r.driver, "legacy");
82
+ assert.equal(r.source, "forced");
83
+ });
84
+ it("显式 official 即使 runtime 缺入口也标记 forced official(分发时再兜底 legacy)", () => {
85
+ const { rt } = makeLegacyRt();
86
+ const r = resolveDispatchDriver(rt, "official");
87
+ assert.equal(r.driver, "official");
88
+ assert.equal(r.officialSupported, false);
89
+ });
90
+ it("supportsOfficialAssembledTurn 识别入口", () => {
91
+ assert.equal(supportsOfficialAssembledTurn(makeOfficialRt().rt), true);
92
+ assert.equal(supportsOfficialAssembledTurn(makeLegacyRt().rt), false);
93
+ assert.equal(supportsOfficialAssembledTurn({}), false);
94
+ });
95
+ });
96
+ describe("dispatchXgImInboundReply branches", () => {
97
+ it("legacy 驱动直接调 dispatchReplyWithBufferedBlockDispatcher(行为不变)", async () => {
98
+ const { rt, calls } = makeLegacyRt();
99
+ const result = await dispatchXgImInboundReply({
100
+ ...baseParams,
101
+ rt,
102
+ driver: "legacy",
103
+ });
104
+ assert.deepEqual(result, { beforeAgentRunBlocked: false });
105
+ assert.equal(calls.length, 1);
106
+ const args = calls[0];
107
+ assert.equal(args.ctx, baseParams.ctx);
108
+ assert.equal(args.cfg, baseParams.cfg);
109
+ assert.equal(args.replyOptions, baseParams.replyOptions);
110
+ assert.equal(args.dispatcherOptions, baseParams.dispatcherOptions);
111
+ });
112
+ it("official 驱动走 assembled turn,把 deliver/onError 移入 delivery,去掉 dispatcherOptions 的 deliver/onError", async () => {
113
+ const { rt, calls } = makeOfficialRt();
114
+ const result = await dispatchXgImInboundReply({
115
+ ...baseParams,
116
+ rt,
117
+ driver: "official",
118
+ });
119
+ assert.deepEqual(result, { beforeAgentRunBlocked: false });
120
+ assert.equal(calls.length, 1);
121
+ const [kind, args] = calls[0];
122
+ assert.equal(kind, "turn");
123
+ assert.equal(args.cfg, baseParams.cfg);
124
+ assert.equal(args.channel, "xg_cwork_im");
125
+ assert.equal(args.routeSessionKey, baseParams.routeSessionKey);
126
+ assert.equal(args.storePath, "sessions.json");
127
+ assert.equal(args.ctxPayload, baseParams.ctx);
128
+ assert.equal(args.replyOptions, baseParams.replyOptions);
129
+ const delivery = args.delivery;
130
+ assert.equal(delivery.deliver, baseParams.dispatcherOptions.deliver);
131
+ assert.equal(delivery.onError, baseParams.dispatcherOptions.onError);
132
+ const dispatcher = args.dispatcherOptions;
133
+ assert.equal("deliver" in dispatcher, false, "deliver 应移入 delivery");
134
+ assert.equal("onError" in dispatcher, false, "onError 应移入 delivery");
135
+ assert.equal(dispatcher.onSkip, baseParams.dispatcherOptions.onSkip);
136
+ // record 仍由插件在 turn 外完成(noop 占位,不传参)
137
+ assert.equal(typeof args.recordInboundSession, "function");
138
+ });
139
+ it("official 驱动 dispatchReply 返回非 dispatch 结果(drop/observeOnly)时归一为 undefined", async () => {
140
+ const calls = [];
141
+ const rt = {
142
+ channel: {
143
+ reply: {
144
+ dispatchReplyWithBufferedBlockDispatcher: async () => ({}),
145
+ },
146
+ inbound: {
147
+ dispatchReply: async (args) => {
148
+ calls.push(args);
149
+ return { admission: { kind: "drop" }, dispatched: false };
150
+ },
151
+ },
152
+ },
153
+ };
154
+ const result = await dispatchXgImInboundReply({
155
+ ...baseParams,
156
+ rt,
157
+ driver: "official",
158
+ });
159
+ assert.equal(result, undefined);
160
+ assert.equal(calls.length, 1);
161
+ });
162
+ it("official 驱动在 runtime 缺 assembled turn 时兜底 legacy 并告警", async () => {
163
+ const { rt, calls } = makeLegacyRt();
164
+ const result = await dispatchXgImInboundReply({
165
+ ...baseParams,
166
+ rt,
167
+ driver: "official",
168
+ });
169
+ assert.deepEqual(result, { beforeAgentRunBlocked: false });
170
+ assert.equal(calls.length, 1);
171
+ });
172
+ it("两个驱动都缺时抛错", async () => {
173
+ await assert.rejects(dispatchXgImInboundReply({
174
+ ...baseParams,
175
+ rt: {},
176
+ driver: "legacy",
177
+ }), /dispatchReplyWithBufferedBlockDispatcher missing/);
178
+ });
179
+ });
180
+ //# sourceMappingURL=reply-dispatch-driver.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reply-dispatch-driver.test.js","sourceRoot":"","sources":["../../src/reply-dispatch-driver.test.ts"],"names":[],"mappings":"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"}
@@ -56,7 +56,6 @@ export declare function __resetTurnEndControllerForTests(): void;
56
56
  /** 单测辅助:缩短各计时窗口,避免真实等待。 */
57
57
  export declare function __configureTurnEndForTests(overrides: {
58
58
  nonYieldDebounceMs?: number;
59
- resumeWaitFallbackMs?: number;
60
59
  noLifecycleFallbackMs?: number;
61
60
  }): void;
62
61
  //# sourceMappingURL=turn-end-controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"turn-end-controller.d.ts","sourceRoot":"","sources":["../../src/turn-end-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAyGD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQ1E;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUvE;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQzE;AAED,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAWtE;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,uBAAuB,GAC9B,IAAI,CAYN;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUlE;AAED,qDAAqD;AACrD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAiBnE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAM9D;AAED,qBAAqB;AACrB,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C;AAED,YAAY;AACZ,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD;AAED,2BAA2B;AAC3B,wBAAgB,0BAA0B,CAAC,SAAS,EAAE;IAClD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC,GAAG,IAAI,CAIP"}
1
+ {"version":3,"file":"turn-end-controller.d.ts","sourceRoot":"","sources":["../../src/turn-end-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AA2GD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQ1E;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUvE;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQzE;AAED,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAWtE;AAED,mDAAmD;AACnD,wBAAgB,gBAAgB,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,uBAAuB,GAC9B,IAAI,CAYN;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAUlE;AAED,qDAAqD;AACrD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAiBnE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2BAA2B;AAC3B,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAM9D;AAED,qBAAqB;AACrB,wBAAgB,wBAAwB,IAAI,IAAI,CAK/C;AAED,YAAY;AACZ,wBAAgB,gCAAgC,IAAI,IAAI,CAEvD;AAED,2BAA2B;AAC3B,wBAAgB,0BAA0B,CAAC,SAAS,EAAE;IAClD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC,GAAG,IAAI,CAGP"}
@@ -22,8 +22,6 @@
22
22
  import { getSharedMap } from "./process-shared-store.js";
23
23
  /** 非 yield 终态到达后、置可收尾前的防抖(吞掉与 resume 的竞态)。 */
24
24
  let NON_YIELD_DEBOUNCE_MS = 1_500;
25
- /** 子任务全完成但父会话暂未 resume/无 lifecycle 时的静默兜底窗口。 */
26
- let RESUME_WAIT_FALLBACK_MS = 20_000;
27
25
  /** 完全没有 lifecycle 事件(订阅不可用)时的兜底窗口。 */
28
26
  let NO_LIFECYCLE_FALLBACK_MS = 30_000;
29
27
  const states = getSharedMap("turn-end-states");
@@ -87,17 +85,20 @@ function reevaluate(roundKey, s) {
87
85
  s.eligible = false;
88
86
  return;
89
87
  }
90
- if (s.lifecycleSeen && s.lastEnd && s.lastEnd.yielded !== true) {
91
- // 主会话 finish:最新一段父 run 是非 yield 终态 → 不会再 resume → 防抖后收尾。
92
- setEligible(roundKey, s.gen, s, "non-yield-end");
93
- }
94
- else if (s.lifecycleSeen && s.lastEnd) {
95
- // 最新一段以 yield 结束 主会话仍可能被 resume;等 runStart/新活动取消,
96
- // 否则静默窗口后收尾(覆盖子任务完成但主会话无法被唤醒的 handoff 路径)。
97
- armTimer(roundKey, s, RESUME_WAIT_FALLBACK_MS, "yield-end-wait-resume");
88
+ if (s.lifecycleSeen && s.lastEnd) {
89
+ if (s.lastEnd.yielded !== true) {
90
+ // 主会话 finish:最新一段父 run 是非 yield 终态 → 不会再 resume → 防抖后收尾。
91
+ setEligible(roundKey, s.gen, s, "non-yield-end");
92
+ }
93
+ // 段以 yield 结束:父会话因派发子任务被挂起,等待 core 把子任务完成结果 announce
94
+ // 回父会话(resume)。该投递时延不受控(实测可到分钟级、与子任务时长无关),
95
+ // 绝不能靠“N 秒没 resume 就收尾”的死窗口提前 FINISHED——那会拆除 round,使同轮
96
+ // 之后新派发的子任务对不上 round、丢 SUBAGENT_STAT。这里不做任何事:
97
+ // - resume 到来 → turnOnSegmentStart 取消旧状态并重新按新段终态评估;
98
+ // - 父会话确实永不被唤醒的极端场景 → 由 dispatch wrapper 的 30 分钟上限兜底。
98
99
  }
99
100
  else {
100
- // 完全没见到 lifecycle(订阅不可用等):纯兜底窗口收尾。
101
+ // 完全没见到 lifecycle(订阅不可用等):纯兜底窗口收尾,防悬挂。
101
102
  armTimer(roundKey, s, NO_LIFECYCLE_FALLBACK_MS, "no-lifecycle-seen");
102
103
  }
103
104
  }
@@ -232,8 +233,6 @@ export function __resetTurnEndControllerForTests() {
232
233
  export function __configureTurnEndForTests(overrides) {
233
234
  if (overrides.nonYieldDebounceMs !== undefined)
234
235
  NON_YIELD_DEBOUNCE_MS = overrides.nonYieldDebounceMs;
235
- if (overrides.resumeWaitFallbackMs !== undefined)
236
- RESUME_WAIT_FALLBACK_MS = overrides.resumeWaitFallbackMs;
237
236
  if (overrides.noLifecycleFallbackMs !== undefined)
238
237
  NO_LIFECYCLE_FALLBACK_MS = overrides.noLifecycleFallbackMs;
239
238
  }
@@ -1 +1 @@
1
- {"version":3,"file":"turn-end-controller.js","sourceRoot":"","sources":["../../src/turn-end-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"turn-end-controller.js","sourceRoot":"","sources":["../../src/turn-end-controller.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,6 @@ describe("turn-end-controller(OpenClaw 7.1+/8.x 子任务整轮收尾)", ()
7
7
  __resetTurnEndControllerForTests();
8
8
  __configureTurnEndForTests({
9
9
  nonYieldDebounceMs: 20,
10
- resumeWaitFallbackMs: 40,
11
10
  noLifecycleFallbackMs: 40,
12
11
  });
13
12
  });
@@ -36,7 +35,7 @@ describe("turn-end-controller(OpenClaw 7.1+/8.x 子任务整轮收尾)", ()
36
35
  await sleep(60);
37
36
  assert.equal(turnIsEligible(rk, gen), true, "非 yield 终态 → 防抖后收尾");
38
37
  });
39
- test("子任务完成但父会话无法被唤醒(handoff)→ 静默兜底后收尾", async () => {
38
+ test("子任务完成但父会话 resume 迟于旧兜底假设到达(慢 announce)→ 不提前收尾", async () => {
40
39
  const rk = "acc:g2";
41
40
  const gen = 1;
42
41
  turnEnsureRound(rk, gen);
@@ -46,8 +45,15 @@ describe("turn-end-controller(OpenClaw 7.1+/8.x 子任务整轮收尾)", ()
46
45
  turnOnSegmentEnd(rk, gen, { phase: "end", yielded: true });
47
46
  turnOnSubagentEnded(rk, gen);
48
47
  assert.equal(turnIsEligible(rk, gen), false);
48
+ // 父会话 resume 的 announce 投递时延不受控(与子任务时长无关),即便超过旧的
49
+ // “20s 兜底”假设也不得提前收尾——提前会拆 round,使后续同轮子任务丢 SUBAGENT_STAT。
49
50
  await sleep(80);
50
- assert.equal(turnIsEligible(rk, gen), true, "resume 未到来 → 兜底窗口后收尾");
51
+ assert.equal(turnIsEligible(rk, gen), false, " announce 期间不能提前收尾");
52
+ // resume 终于到达:父会话新段产出最终答复并以非 yield 终态结束
53
+ turnOnSegmentStart(rk, gen);
54
+ turnOnSegmentEnd(rk, gen, { phase: "end", yielded: false });
55
+ await sleep(60);
56
+ assert.equal(turnIsEligible(rk, gen), true);
51
57
  });
52
58
  test("组内活动心跳可延续等待(父会话还在工作时不误收尾)", async () => {
53
59
  const rk = "acc:g3";
@@ -1 +1 @@
1
- {"version":3,"file":"turn-end-controller.test.js","sourceRoot":"","sources":["../../src/turn-end-controller.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"turn-end-controller.test.js","sourceRoot":"","sources":["../../src/turn-end-controller.test.ts"],"names":[],"mappings":"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"}
@@ -92,6 +92,8 @@ export interface XgImAccountConfig {
92
92
  deliverPartialSnapshot?: boolean;
93
93
  /** Auto Model Routing(模型 + 推理等级自动路由);默认关闭。 */
94
94
  autoModelRouting?: AutoModelRoutingConfig;
95
+ /** 见 {@link XgImConfig.dispatchDriver} */
96
+ dispatchDriver?: "auto" | "official" | "legacy";
95
97
  }
96
98
  /** OpenClaw block reply 合并阈值(可选;IM 默认不配) */
97
99
  export interface BlockStreamingCoalesceConfig {
@@ -212,6 +214,13 @@ export interface XgImConfig extends OpenClawConfig {
212
214
  deliverPartialSnapshot?: boolean;
213
215
  /** Auto Model Routing(模型 + 推理等级自动路由);默认关闭。 */
214
216
  autoModelRouting?: AutoModelRoutingConfig;
217
+ /**
218
+ * dispatch 内核驱动:`auto`(默认)= 宿主支持时用官方 assembled turn
219
+ * (runtime.channel.inbound.dispatchReply),否则回退 legacy;
220
+ * `official` 强制官方;`legacy` 强制旧路径(回退开关)。
221
+ * 也可用环境变量 `XG_CWORK_IM_DISPATCH_DRIVER=official|legacy` 覆盖。
222
+ */
223
+ dispatchDriver?: "auto" | "official" | "legacy";
215
224
  }
216
225
  /** GET /user/login/appkey 的响应 */
217
226
  export interface GetTokenResponse {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAgTH,2DAA2D;AAC3D,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IACzD,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAA2B;QAChC,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,WAAW;QAChB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,oBAAoB;QACzB,IAAI,EAAE,yEAAyE;QAC/E,GAAG,EAAE,+BAA+B;QACpC,IAAI,EAAE,2EAA2E;QACjF,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,mEAAmE;QACzE,GAAG,EAAE,YAAY;QACjB,EAAE,EAAE,eAAe;QACnB,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,YAAY;QACjB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,WAAW;KACnB,CAAC;IACF,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAyTH,2DAA2D;AAC3D,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IACzD,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAA2B;QAChC,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,YAAY;QACjB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,WAAW;QAChB,IAAI,EAAE,YAAY;QAClB,GAAG,EAAE,oBAAoB;QACzB,IAAI,EAAE,yEAAyE;QAC/E,GAAG,EAAE,+BAA+B;QACpC,IAAI,EAAE,2EAA2E;QACjF,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,mEAAmE;QACzE,GAAG,EAAE,YAAY;QACjB,EAAE,EAAE,eAAe;QACnB,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,iBAAiB;QACtB,GAAG,EAAE,YAAY;QACjB,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,WAAW;KACnB,CAAC;IACF,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
@@ -5,7 +5,7 @@
5
5
  * LOCAL 工作区以 IM 计算的 localRoot 为授权根;NAS 工作区只访问 nasVolumes 明确授权的
6
6
  * dockerDir,并通过当前机器 nasVolumeRootMappings 映射到宿主目录。
7
7
  */
8
- import type { OpenClawConfig } from "openclaw/plugin-sdk";
8
+ import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
9
9
  import type { Log } from "./auth.js";
10
10
  import type { XgImConfig } from "./types.js";
11
11
  export { OPENCLAW_WORKSPACE_EVENT_CMD } from "./workspace-event-protocol.js";
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-event.d.ts","sourceRoot":"","sources":["../../src/workspace-event.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAiBrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAU7E,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG,cAAc,CAAC;AACpE,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,aAAa,CAAC;AACjE,MAAM,MAAM,kBAAkB,GACxB,iBAAiB,GACjB,wBAAwB,GACxB,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,uBAAuB,GACvB,gBAAgB,GAChB,MAAM,GACN,aAAa,CAAC;AA8BpB,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAmtB7D;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,qBAAqB,EAC1B,SAAS,EAAE,OAAO,GACnB,OAAO,CAAC,sBAAsB,CAAC,CAajC"}
1
+ {"version":3,"file":"workspace-event.d.ts","sourceRoot":"","sources":["../../src/workspace-event.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAiBrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAU7E,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG,cAAc,CAAC;AACpE,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,aAAa,CAAC;AACjE,MAAM,MAAM,kBAAkB,GACxB,iBAAiB,GACjB,wBAAwB,GACxB,WAAW,GACX,iBAAiB,GACjB,YAAY,GACZ,uBAAuB,GACvB,gBAAgB,GAChB,MAAM,GACN,aAAa,CAAC;AA8BpB,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAmtB7D;;GAEG;AACH,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,qBAAqB,EAC1B,SAAS,EAAE,OAAO,GACnB,OAAO,CAAC,sBAAsB,CAAC,CAajC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xgjktech/xg_cwork_im",
3
- "version": "1.17.55",
3
+ "version": "1.18.0",
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",
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",
29
29
  "install:prod": "npm install --omit=dev",
30
30
  "prepublishOnly": "npm run build"
31
31
  },