@xgjktech/xg_cwork_im 1.17.19 → 1.17.21

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 (58) hide show
  1. package/README.md +432 -432
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +10 -0
  4. package/dist/index.js.map +1 -1
  5. package/dist/src/account-connection.d.ts +37 -0
  6. package/dist/src/account-connection.d.ts.map +1 -0
  7. package/dist/src/account-connection.js +335 -0
  8. package/dist/src/account-connection.js.map +1 -0
  9. package/dist/src/account-reconciler.d.ts +55 -0
  10. package/dist/src/account-reconciler.d.ts.map +1 -0
  11. package/dist/src/account-reconciler.js +294 -0
  12. package/dist/src/account-reconciler.js.map +1 -0
  13. package/dist/src/account-reconciler.test.d.ts +2 -0
  14. package/dist/src/account-reconciler.test.d.ts.map +1 -0
  15. package/dist/src/account-reconciler.test.js +148 -0
  16. package/dist/src/account-reconciler.test.js.map +1 -0
  17. package/dist/src/agent-stream-client-registry.d.ts +2 -0
  18. package/dist/src/agent-stream-client-registry.d.ts.map +1 -1
  19. package/dist/src/agent-stream-client-registry.js +6 -0
  20. package/dist/src/agent-stream-client-registry.js.map +1 -1
  21. package/dist/src/channel.d.ts +5 -0
  22. package/dist/src/channel.d.ts.map +1 -1
  23. package/dist/src/channel.js +9 -297
  24. package/dist/src/channel.js.map +1 -1
  25. package/dist/src/deliver-text.test.js +22 -22
  26. package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
  27. package/dist/src/dispatch-mentioned-reply.js +9 -4
  28. package/dist/src/dispatch-mentioned-reply.js.map +1 -1
  29. package/dist/src/gateway-session-queue.d.ts +2 -2
  30. package/dist/src/gateway-session-queue.d.ts.map +1 -1
  31. package/dist/src/gateway-session-queue.js +6 -6
  32. package/dist/src/gateway-session-queue.js.map +1 -1
  33. package/dist/src/item-event-guard.d.ts +28 -0
  34. package/dist/src/item-event-guard.d.ts.map +1 -0
  35. package/dist/src/item-event-guard.js +22 -0
  36. package/dist/src/item-event-guard.js.map +1 -0
  37. package/dist/src/item-event-guard.test.d.ts +2 -0
  38. package/dist/src/item-event-guard.test.d.ts.map +1 -0
  39. package/dist/src/item-event-guard.test.js +55 -0
  40. package/dist/src/item-event-guard.test.js.map +1 -0
  41. package/dist/src/plan-store-access.test.js +9 -9
  42. package/dist/src/subagent-monitor.js +1 -1
  43. package/dist/src/subagent-monitor.js.map +1 -1
  44. package/dist/src/turn-deliver-buffer.test.js +25 -25
  45. package/openclaw.plugin.json +27 -27
  46. package/package.json +78 -78
  47. package/dist/src/channel-disabled-account.test.d.ts +0 -2
  48. package/dist/src/channel-disabled-account.test.d.ts.map +0 -1
  49. package/dist/src/channel-disabled-account.test.js +0 -44
  50. package/dist/src/channel-disabled-account.test.js.map +0 -1
  51. package/dist/src/modified-file-push-tracker.d.ts +0 -24
  52. package/dist/src/modified-file-push-tracker.d.ts.map +0 -1
  53. package/dist/src/modified-file-push-tracker.js +0 -125
  54. package/dist/src/modified-file-push-tracker.js.map +0 -1
  55. package/dist/src/progress-display.d.ts +0 -77
  56. package/dist/src/progress-display.d.ts.map +0 -1
  57. package/dist/src/progress-display.js +0 -420
  58. package/dist/src/progress-display.js.map +0 -1
@@ -0,0 +1,294 @@
1
+ /**
2
+ * 账户级热更新 Reconciler(OpenClaw 6.x,无 accountScopedRestart)。
3
+ *
4
+ * 前提:index.ts 通过 api.registerReload({ hotPrefixes: ["channels.xg_cwork_im"] }) 让
5
+ * Gateway 对通道配置变更走 hot reload(提交运行时快照)但不重启通道。因此本模块
6
+ * 需要自行轮询 api.runtime.config.current() 感知账号变更,并对变更账号单独启停。
7
+ *
8
+ * 运行中账号:Map<accountId, AccountRun>;每个账号一个 AbortController + 一个连接句柄。
9
+ * diff 指纹(robotKey|appKey|baseUrl|wsBaseUrl|agentId|enabled)后:
10
+ * - 新增 → 启动
11
+ * - 删除 / enabled=false → 停止
12
+ * - 指纹变化 → 重启
13
+ * - 指纹不变 → 空转(非连接字段由每次入站重读最新 config 生效)
14
+ */
15
+ import { getXgImConfig, normalizeRobotKey } from "./channel-config.js";
16
+ import { startAccountConnection } from "./account-connection.js";
17
+ import { toLogger } from "./channel-log.js";
18
+ import { deregisterStreamClient } from "./agent-stream-client-registry.js";
19
+ const DEFAULT_POLL_INTERVAL_MS = 3_000;
20
+ const DEFAULT_DEBOUNCE_MS = 500;
21
+ export function fingerprintOf(config) {
22
+ const normalized = normalizeRobotKey(config);
23
+ return [
24
+ normalized.robotKey ?? normalized.appKey ?? "",
25
+ normalized.baseUrl ?? "",
26
+ normalized.wsBaseUrl ?? "",
27
+ normalized.agentId ?? "main",
28
+ String(config.enabled !== false),
29
+ ].join("|");
30
+ }
31
+ function isWanted(config) {
32
+ return config.enabled !== false && Boolean((config.robotKey ?? config.appKey) && config.baseUrl);
33
+ }
34
+ /** 从配置中解析应保持运行的账号集合(与 config.listAccountIds 口径一致,过滤 disabled/未配置)。 */
35
+ export function collectDesiredAccounts(cfg) {
36
+ const desired = new Map();
37
+ try {
38
+ const raw = cfg?.channels
39
+ ?.xg_cwork_im;
40
+ if (!raw)
41
+ return desired;
42
+ const accounts = raw.accounts;
43
+ const hasAccountsMap = accounts && typeof accounts === "object" && !Array.isArray(accounts);
44
+ const keys = hasAccountsMap
45
+ ? Object.keys(accounts).filter((k) => k !== "default")
46
+ : [];
47
+ if (keys.length > 0) {
48
+ for (const accountId of keys) {
49
+ const config = getXgImConfig(cfg, accountId);
50
+ if (isWanted(config))
51
+ desired.set(accountId, config);
52
+ }
53
+ }
54
+ else if (!hasAccountsMap) {
55
+ const config = getXgImConfig(cfg, "default");
56
+ if (isWanted(config))
57
+ desired.set("default", config);
58
+ }
59
+ }
60
+ catch {
61
+ /* 配置暂不可解析时保持现状 */
62
+ }
63
+ return desired;
64
+ }
65
+ export class AccountReconciler {
66
+ options;
67
+ rt = null;
68
+ runs = new Map();
69
+ pollTimer = null;
70
+ reconcileTimer = null;
71
+ lastCfg = null;
72
+ started = false;
73
+ constructor(options = {}) {
74
+ this.options = options;
75
+ }
76
+ get pollIntervalMs() {
77
+ return this.options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
78
+ }
79
+ get debounceMs() {
80
+ return this.options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
81
+ }
82
+ setRuntime(rt) {
83
+ this.rt = rt;
84
+ }
85
+ start() {
86
+ if (this.started)
87
+ return;
88
+ this.started = true;
89
+ this.pollTimer = setInterval(() => {
90
+ void this.poll();
91
+ }, this.pollIntervalMs);
92
+ }
93
+ async stopAll() {
94
+ this.started = false;
95
+ if (this.pollTimer) {
96
+ clearInterval(this.pollTimer);
97
+ this.pollTimer = null;
98
+ }
99
+ if (this.reconcileTimer) {
100
+ clearTimeout(this.reconcileTimer);
101
+ this.reconcileTimer = null;
102
+ }
103
+ for (const accountId of [...this.runs.keys()]) {
104
+ this.stopAccount(accountId);
105
+ }
106
+ }
107
+ /** Gateway startAccount 委托入口:确保账号运行,并等待 Gateway 端 abort 停止该账号。 */
108
+ async startAccountLifecycle(ctx) {
109
+ if (!this.rt) {
110
+ ctx.log?.info?.("[xg_cwork_im] [reconciler] runtime not ready, skipping startAccount");
111
+ return;
112
+ }
113
+ const log = toLogger(ctx.log);
114
+ if (!ctx.account.enabled) {
115
+ log.info(`[${ctx.account.accountId}] [reconciler] account disabled, not starting`);
116
+ this.stopAccount(ctx.account.accountId);
117
+ return;
118
+ }
119
+ await this.syncAccount(ctx.account.accountId, ctx.cfg, ctx.account.config, log);
120
+ if (!ctx.abortSignal)
121
+ return;
122
+ if (ctx.abortSignal.aborted) {
123
+ this.stopAccount(ctx.account.accountId);
124
+ return;
125
+ }
126
+ await new Promise((resolve) => {
127
+ const onAbort = () => {
128
+ ctx.abortSignal?.removeEventListener("abort", onAbort);
129
+ this.stopAccount(ctx.account.accountId);
130
+ resolve();
131
+ };
132
+ ctx.abortSignal.addEventListener("abort", onAbort, { once: true });
133
+ });
134
+ }
135
+ /** 确保某账号按最新配置运行(新增/指纹变化时启动或重启)。失败会抛错。 */
136
+ async syncAccount(accountId, cfg, config, logOverride) {
137
+ const fingerprint = fingerprintOf(config);
138
+ let run = this.runs.get(accountId);
139
+ if (run && run.fingerprint !== fingerprint) {
140
+ run.log.info(`[${accountId}] [reconciler] connection fingerprint changed, restarting`);
141
+ this.stopRun(run);
142
+ this.runs.delete(accountId);
143
+ run = undefined;
144
+ }
145
+ if (!run) {
146
+ run = {
147
+ accountId,
148
+ fingerprint,
149
+ config,
150
+ abort: new AbortController(),
151
+ started: null,
152
+ handle: null,
153
+ log: logOverride ?? this.channelLog(),
154
+ };
155
+ this.runs.set(accountId, run);
156
+ run.started = this.startRun(run, cfg);
157
+ }
158
+ try {
159
+ await run.started;
160
+ }
161
+ catch (err) {
162
+ if (this.runs.get(accountId) === run) {
163
+ this.runs.delete(accountId);
164
+ }
165
+ throw err;
166
+ }
167
+ }
168
+ startRun(run, cfg) {
169
+ const rt = this.rt;
170
+ if (!rt) {
171
+ run.log.error(`[${run.accountId}] [reconciler] runtime not ready, cannot start`);
172
+ return Promise.resolve();
173
+ }
174
+ return (async () => {
175
+ try {
176
+ run.log.info(`[${run.accountId}] [reconciler] Starting xg-cwork-im channel...`);
177
+ const handle = await startAccountConnection({
178
+ cfg,
179
+ account: {
180
+ accountId: run.accountId,
181
+ config: run.config,
182
+ enabled: true,
183
+ configured: true,
184
+ },
185
+ config: run.config,
186
+ rt,
187
+ log: run.log,
188
+ abortSignal: run.abort.signal,
189
+ cfgProvider: () => this.latestCfg() ?? cfg,
190
+ });
191
+ run.handle = handle;
192
+ run.log.info(`[${run.accountId}] [reconciler] Account connection established`);
193
+ }
194
+ catch (err) {
195
+ // 被主动停止/重启触发的中止:按正常取消处理,不抛错。
196
+ if (run.abort.signal.aborted) {
197
+ run.log.info(`[${run.accountId}] [reconciler] start cancelled (aborted)`);
198
+ return;
199
+ }
200
+ // 启动失败:移出运行集合,下次轮询自动重试。
201
+ if (this.runs.get(run.accountId) === run) {
202
+ this.runs.delete(run.accountId);
203
+ }
204
+ throw err;
205
+ }
206
+ })();
207
+ }
208
+ stopRun(run) {
209
+ run.abort.abort();
210
+ // 防孤儿 Promise unhandled rejection(discard 时该 start 可能仍在飞)。
211
+ run.started?.catch(() => { });
212
+ if (run.handle) {
213
+ run.handle.stop();
214
+ deregisterStreamClient(run.config.agentId || "main", run.handle.streamClient);
215
+ }
216
+ }
217
+ stopAccount(accountId) {
218
+ const run = this.runs.get(accountId);
219
+ if (!run)
220
+ return;
221
+ this.stopRun(run);
222
+ this.runs.delete(accountId);
223
+ }
224
+ channelLog() {
225
+ return toLogger(this.options.logSink);
226
+ }
227
+ latestCfg() {
228
+ try {
229
+ const cfg = this.rt?.config.current();
230
+ if (cfg)
231
+ this.lastCfg = cfg;
232
+ return cfg ?? this.lastCfg;
233
+ }
234
+ catch {
235
+ return this.lastCfg;
236
+ }
237
+ }
238
+ poll() {
239
+ if (!this.started || !this.rt)
240
+ return;
241
+ const cfg = this.latestCfg();
242
+ if (!cfg)
243
+ return;
244
+ const desired = collectDesiredAccounts(cfg);
245
+ if (this.snapshotMatches(desired))
246
+ return;
247
+ if (this.reconcileTimer)
248
+ clearTimeout(this.reconcileTimer);
249
+ this.reconcileTimer = setTimeout(() => {
250
+ this.reconcileTimer = null;
251
+ void this.reconcile();
252
+ }, this.debounceMs);
253
+ }
254
+ async reconcile() {
255
+ if (!this.started || !this.rt)
256
+ return;
257
+ const cfg = this.latestCfg();
258
+ if (!cfg)
259
+ return;
260
+ const desired = collectDesiredAccounts(cfg);
261
+ for (const accountId of [...this.runs.keys()]) {
262
+ const want = desired.get(accountId);
263
+ if (!want || want.enabled === false) {
264
+ this.runs.get(accountId)?.log.info(`[${accountId}] [reconciler] stopping account (removed or disabled)`);
265
+ this.stopAccount(accountId);
266
+ }
267
+ }
268
+ for (const [accountId, config] of desired) {
269
+ const run = this.runs.get(accountId);
270
+ const log = run?.log ?? this.channelLog();
271
+ try {
272
+ await this.syncAccount(accountId, cfg, config, log);
273
+ }
274
+ catch (err) {
275
+ log.error(`[${accountId}] [reconciler] reconcile start failed: ${String(err)}`);
276
+ }
277
+ }
278
+ }
279
+ snapshotMatches(desired) {
280
+ for (const accountId of this.runs.keys()) {
281
+ if (!desired.has(accountId))
282
+ return false;
283
+ }
284
+ for (const [accountId, config] of desired) {
285
+ const run = this.runs.get(accountId);
286
+ if (!run || run.fingerprint !== fingerprintOf(config))
287
+ return false;
288
+ }
289
+ return true;
290
+ }
291
+ }
292
+ /** 插件级单例:由 index.ts 注入 runtime 并启动/停止。 */
293
+ export const accountReconciler = new AccountReconciler();
294
+ //# sourceMappingURL=account-reconciler.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account-reconciler.js","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAgC,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAE,QAAQ,EAAe,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAG3E,MAAM,wBAAwB,GAAG,KAAK,CAAC;AACvC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEhC,MAAM,UAAU,aAAa,CAAC,MAAkB;IAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO;QACH,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,IAAI,EAAE;QAC9C,UAAU,CAAC,OAAO,IAAI,EAAE;QACxB,UAAU,CAAC,SAAS,IAAI,EAAE;QAC1B,UAAU,CAAC,OAAO,IAAI,MAAM;QAC5B,MAAM,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC;KACnC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,QAAQ,CAAC,MAAkB;IAChC,OAAO,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AACrG,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,sBAAsB,CAAC,GAAmB;IACtD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC9C,IAAI,CAAC;QACD,MAAM,GAAG,GAAI,GAA8C,EAAE,QAAQ;YACjE,EAAE,WAAqC,CAAC;QAC5C,IAAI,CAAC,GAAG;YAAE,OAAO,OAAO,CAAC;QACzB,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAmB,CAAC;QACzC,MAAM,cAAc,GAAG,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5F,MAAM,IAAI,GAAG,cAAc;YACvB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAmC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;YACjF,CAAC,CAAC,EAAE,CAAC;QACT,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAC7C,IAAI,QAAQ,CAAC,MAAM,CAAC;oBAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC7C,IAAI,QAAQ,CAAC,MAAM,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACL,kBAAkB;IACtB,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAkBD,MAAM,OAAO,iBAAiB;IAQG;IAPrB,EAAE,GAAyB,IAAI,CAAC;IAChC,IAAI,GAAG,IAAI,GAAG,EAAsB,CAAC;IACrC,SAAS,GAA0C,IAAI,CAAC;IACxD,cAAc,GAAyC,IAAI,CAAC;IAC5D,OAAO,GAA0B,IAAI,CAAC;IACtC,OAAO,GAAG,KAAK,CAAC;IAExB,YAA6B,UAAoC,EAAE;QAAtC,YAAO,GAAP,OAAO,CAA+B;IAAG,CAAC;IAEvE,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,wBAAwB,CAAC;IACnE,CAAC;IAED,IAAY,UAAU;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,mBAAmB,CAAC;IAC1D,CAAC;IAED,UAAU,CAAC,EAAiB;QACxB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;YAC9B,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAC1B,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC/B,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,kEAAkE;IAClE,KAAK,CAAC,qBAAqB,CAAC,GAAwB;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,qEAAqE,CAAC,CAAC;YACvF,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,+CAA+C,CAAC,CAAC;YACnF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxC,OAAO;QACX,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChF,IAAI,CAAC,GAAG,CAAC,WAAW;YAAE,OAAO;QAC7B,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxC,OAAO;QACX,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,GAAS,EAAE;gBACvB,GAAG,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACvD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACxC,OAAO,EAAE,CAAC;YACd,CAAC,CAAC;YACF,GAAG,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,WAAW,CACb,SAAiB,EACjB,GAAmB,EACnB,MAAkB,EAClB,WAAoB;QAEpB,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;YACzC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,2DAA2D,CAAC,CAAC;YACvF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5B,GAAG,GAAG,SAAS,CAAC;QACpB,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,GAAG,GAAG;gBACF,SAAS;gBACT,WAAW;gBACX,MAAM;gBACN,KAAK,EAAE,IAAI,eAAe,EAAE;gBAC5B,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;gBACZ,GAAG,EAAE,WAAW,IAAI,IAAI,CAAC,UAAU,EAAE;aACxC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAC9B,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC;YACD,MAAM,GAAG,CAAC,OAAO,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC;gBACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAEO,QAAQ,CAAC,GAAe,EAAE,GAAmB;QACjD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,gDAAgD,CAAC,CAAC;YACjF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,gDAAgD,CAAC,CAAC;gBAChF,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;oBACxC,GAAG;oBACH,OAAO,EAAE;wBACL,SAAS,EAAE,GAAG,CAAC,SAAS;wBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,OAAO,EAAE,IAAI;wBACb,UAAU,EAAE,IAAI;qBACnB;oBACD,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,EAAE;oBACF,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM;oBAC7B,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG;iBAC7C,CAAC,CAAC;gBACH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;gBACpB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,+CAA+C,CAAC,CAAC;YACnF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,6BAA6B;gBAC7B,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBAC3B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,0CAA0C,CAAC,CAAC;oBAC1E,OAAO;gBACX,CAAC;gBACD,wBAAwB;gBACxB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC;oBACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACpC,CAAC;gBACD,MAAM,GAAG,CAAC;YACd,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAEO,OAAO,CAAC,GAAe;QAC3B,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,2DAA2D;QAC3D,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7B,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACb,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAClB,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAClF,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,SAAiB;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAEO,UAAU;QACd,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAuD,CAAC,CAAC;IAC1F,CAAC;IAEO,SAAS;QACb,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,EAAgC,CAAC;YACpE,IAAI,GAAG;gBAAE,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;YAC5B,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;IACL,CAAC;IAEO,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,OAAO,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAAE,OAAO;QAC1C,IAAI,IAAI,CAAC,cAAc;YAAE,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,SAAS;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,OAAO,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAC5C,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,IAAI,CAC9B,IAAI,SAAS,uDAAuD,CACvE,CAAC;gBACF,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YACxD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS,0CAA0C,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpF,CAAC;QACL,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,OAAgC;QACpD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC9C,CAAC;QACD,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,aAAa,CAAC,MAAM,CAAC;gBAAE,OAAO,KAAK,CAAC;QACxE,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED,0CAA0C;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=account-reconciler.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account-reconciler.test.d.ts","sourceRoot":"","sources":["../../src/account-reconciler.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,148 @@
1
+ import assert from "node:assert/strict";
2
+ import { describe, it } from "node:test";
3
+ import { collectDesiredAccounts, fingerprintOf } from "./account-reconciler.js";
4
+ function cfgWith(channels) {
5
+ return { channels };
6
+ }
7
+ describe("account-reconciler: fingerprintOf", () => {
8
+ const base = {
9
+ robotKey: "rk-1",
10
+ baseUrl: "https://im.example.com",
11
+ wsBaseUrl: "wss://ws.example.com",
12
+ agentId: "assistant-a",
13
+ enabled: true,
14
+ };
15
+ it("same connection fields produce equal fingerprints", () => {
16
+ assert.equal(fingerprintOf(base), fingerprintOf({ ...base }));
17
+ });
18
+ it("robotKey change changes fingerprint", () => {
19
+ assert.notEqual(fingerprintOf(base), fingerprintOf({ ...base, robotKey: "rk-2" }));
20
+ });
21
+ it("baseUrl change changes fingerprint", () => {
22
+ assert.notEqual(fingerprintOf(base), fingerprintOf({ ...base, baseUrl: "https://other.example.com" }));
23
+ });
24
+ it("wsBaseUrl change changes fingerprint", () => {
25
+ assert.notEqual(fingerprintOf(base), fingerprintOf({ ...base, wsBaseUrl: "wss://ws-2.example.com" }));
26
+ });
27
+ it("agentId change changes fingerprint", () => {
28
+ assert.notEqual(fingerprintOf(base), fingerprintOf({ ...base, agentId: "assistant-b" }));
29
+ });
30
+ it("enabled toggle changes fingerprint", () => {
31
+ assert.notEqual(fingerprintOf(base), fingerprintOf({ ...base, enabled: false }));
32
+ });
33
+ it("non-connection fields (name/systemPrompt/groupPolicy) keep fingerprint", () => {
34
+ assert.equal(fingerprintOf(base), fingerprintOf({ ...base, name: "新名称", systemPrompt: "you are kind", groupPolicy: "open" }));
35
+ });
36
+ it("appKey and robotKey normalize to same fingerprint", () => {
37
+ assert.equal(fingerprintOf({ ...base, robotKey: "rk-1", appKey: undefined }), fingerprintOf({ ...base, robotKey: undefined, appKey: "rk-1" }));
38
+ });
39
+ });
40
+ describe("account-reconciler: collectDesiredAccounts", () => {
41
+ it("collects named accounts with inherited top-level baseUrl", () => {
42
+ const cfg = cfgWith({
43
+ xg_cwork_im: {
44
+ baseUrl: "https://im.example.com",
45
+ accounts: {
46
+ default: { baseUrl: "https://im.example.com" },
47
+ "assistant-1": { robotKey: "rk-1" },
48
+ "assistant-2": { robotKey: "rk-2" },
49
+ },
50
+ },
51
+ });
52
+ const desired = collectDesiredAccounts(cfg);
53
+ assert.deepEqual([...desired.keys()].sort(), ["assistant-1", "assistant-2"]);
54
+ assert.equal(desired.get("assistant-1")?.baseUrl, "https://im.example.com");
55
+ });
56
+ it("excludes disabled accounts", () => {
57
+ const cfg = cfgWith({
58
+ xg_cwork_im: {
59
+ baseUrl: "https://im.example.com",
60
+ accounts: {
61
+ "assistant-1": { robotKey: "rk-1" },
62
+ "assistant-2": { robotKey: "rk-2", enabled: false },
63
+ },
64
+ },
65
+ });
66
+ const desired = collectDesiredAccounts(cfg);
67
+ assert.deepEqual([...desired.keys()], ["assistant-1"]);
68
+ });
69
+ it("excludes accounts missing robotKey", () => {
70
+ const cfg = cfgWith({
71
+ xg_cwork_im: {
72
+ baseUrl: "https://im.example.com",
73
+ accounts: {
74
+ "assistant-1": { robotKey: "rk-1" },
75
+ "assistant-2": {},
76
+ },
77
+ },
78
+ });
79
+ const desired = collectDesiredAccounts(cfg);
80
+ assert.deepEqual([...desired.keys()], ["assistant-1"]);
81
+ });
82
+ it("empty accounts map yields no accounts", () => {
83
+ const cfg = cfgWith({
84
+ xg_cwork_im: { baseUrl: "https://im.example.com", accounts: {} },
85
+ });
86
+ assert.equal(collectDesiredAccounts(cfg).size, 0);
87
+ });
88
+ it("single-account mode (no accounts map) yields default", () => {
89
+ const cfg = cfgWith({
90
+ xg_cwork_im: { robotKey: "rk-1", baseUrl: "https://im.example.com" },
91
+ });
92
+ const desired = collectDesiredAccounts(cfg);
93
+ assert.deepEqual([...desired.keys()], ["default"]);
94
+ });
95
+ it("returns empty when channel config is missing", () => {
96
+ assert.equal(collectDesiredAccounts(cfgWith({})).size, 0);
97
+ });
98
+ it("adding an account changes the desired set", () => {
99
+ const before = cfgWith({
100
+ xg_cwork_im: {
101
+ baseUrl: "https://im.example.com",
102
+ accounts: { "assistant-1": { robotKey: "rk-1" } },
103
+ },
104
+ });
105
+ const after = cfgWith({
106
+ xg_cwork_im: {
107
+ baseUrl: "https://im.example.com",
108
+ accounts: {
109
+ "assistant-1": { robotKey: "rk-1" },
110
+ "assistant-2": { robotKey: "rk-2" },
111
+ },
112
+ },
113
+ });
114
+ assert.deepEqual([...collectDesiredAccounts(after).keys()].sort(), ["assistant-1", "assistant-2"]);
115
+ assert.equal(collectDesiredAccounts(before).size, 1);
116
+ });
117
+ it("removing an account removes it from the desired set", () => {
118
+ const cfg = cfgWith({
119
+ xg_cwork_im: {
120
+ baseUrl: "https://im.example.com",
121
+ accounts: { "assistant-1": { robotKey: "rk-1" } },
122
+ },
123
+ });
124
+ assert.equal(collectDesiredAccounts(cfg).has("assistant-1"), true);
125
+ const removed = cfgWith({
126
+ xg_cwork_im: { baseUrl: "https://im.example.com", accounts: {} },
127
+ });
128
+ assert.equal(collectDesiredAccounts(removed).has("assistant-1"), false);
129
+ });
130
+ it("robotKey change yields a different fingerprint for the account", () => {
131
+ const cfgA = cfgWith({
132
+ xg_cwork_im: {
133
+ baseUrl: "https://im.example.com",
134
+ accounts: { "assistant-1": { robotKey: "rk-1" } },
135
+ },
136
+ });
137
+ const cfgB = cfgWith({
138
+ xg_cwork_im: {
139
+ baseUrl: "https://im.example.com",
140
+ accounts: { "assistant-1": { robotKey: "rk-9" } },
141
+ },
142
+ });
143
+ const a = collectDesiredAccounts(cfgA).get("assistant-1");
144
+ const b = collectDesiredAccounts(cfgB).get("assistant-1");
145
+ assert.notEqual(fingerprintOf(a), fingerprintOf(b));
146
+ });
147
+ });
148
+ //# sourceMappingURL=account-reconciler.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account-reconciler.test.js","sourceRoot":"","sources":["../../src/account-reconciler.test.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
1
  import type { ImStreamClient } from "./connection.js";
2
2
  export declare function registerStreamClient(agentId: string, client: ImStreamClient): void;
3
3
  export declare function getStreamClient(agentId: string): ImStreamClient | undefined;
4
+ /** 仅当该 agentId 当前仍指向同一 client 时移除,避免误删其它账号注册的流客户端。 */
5
+ export declare function deregisterStreamClient(agentId: string, client: ImStreamClient): void;
4
6
  //# sourceMappingURL=agent-stream-client-registry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"agent-stream-client-registry.d.ts","sourceRoot":"","sources":["../../src/agent-stream-client-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAItD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAElF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAE3E"}
1
+ {"version":3,"file":"agent-stream-client-registry.d.ts","sourceRoot":"","sources":["../../src/agent-stream-client-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAItD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAElF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAE3E;AAED,sDAAsD;AACtD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpF"}
@@ -5,4 +5,10 @@ export function registerStreamClient(agentId, client) {
5
5
  export function getStreamClient(agentId) {
6
6
  return agentStreamClients.get(agentId);
7
7
  }
8
+ /** 仅当该 agentId 当前仍指向同一 client 时移除,避免误删其它账号注册的流客户端。 */
9
+ export function deregisterStreamClient(agentId, client) {
10
+ if (agentStreamClients.get(agentId) === client) {
11
+ agentStreamClients.delete(agentId);
12
+ }
13
+ }
8
14
  //# sourceMappingURL=agent-stream-client-registry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"agent-stream-client-registry.js","sourceRoot":"","sources":["../../src/agent-stream-client-registry.ts"],"names":[],"mappings":"AAEA,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA0B,CAAC;AAE7D,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,MAAsB;IAC1E,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC"}
1
+ {"version":3,"file":"agent-stream-client-registry.js","sourceRoot":"","sources":["../../src/agent-stream-client-registry.ts"],"names":[],"mappings":"AAEA,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA0B,CAAC;AAE7D,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,MAAsB;IAC1E,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,MAAsB;IAC5E,IAAI,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;AACH,CAAC"}
@@ -3,6 +3,11 @@
3
3
  *
4
4
  * 配置与解析见 channel-config.ts;入站正文见 inbound-display.ts;
5
5
  * 排队调度见 gateway-session-queue.ts;@ 后派发见 dispatch-mentioned-reply.ts。
6
+ * 单账号 WebSocket 连接运行见 account-connection.ts。
7
+ *
8
+ * 账号生命周期由 account-reconciler 管理:Gateway 对 channels.xg_cwork_im 变更不再
9
+ * 重启整通道(index.ts 注册 hotPrefixes,仅提交运行时快照),由 Reconciler 轮询
10
+ * diff 并按账号启停,避免 1 个账号变更导致全部账号 Abort 重连。
6
11
  */
7
12
  import type { PluginRuntime, XgImChannelPlugin } from "./types.js";
8
13
  export declare function setXgImRuntime(rt: PluginRuntime): void;
@@ -1 +1 @@
1
- {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAwCH,OAAO,KAAK,EAER,aAAa,EAGb,iBAAiB,EAEpB,MAAM,YAAY,CAAC;AAMpB,wBAAgB,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAEtD;AASD,eAAO,MAAM,sBAAsB,EAAE,iBAwdpC,CAAC"}
1
+ {"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH,OAAO,KAAK,EAAuB,aAAa,EAAmB,iBAAiB,EAAc,MAAM,YAAY,CAAC;AAMrH,wBAAgB,cAAc,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAEtD;AAID,eAAO,MAAM,sBAAsB,EAAE,iBAgJpC,CAAC"}