@zaofan/dsh-qqbot 1.1.3 → 1.1.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/README.md +25 -4
- package/README_EN.md +13 -1
- package/client/qqbot-settings.js +7 -2
- package/dist/channel-tools.d.ts.map +1 -1
- package/dist/channel-tools.js +29 -3
- package/dist/channel-tools.js.map +1 -1
- package/dist/commands/botplay.js +2 -2
- package/dist/commands/botplay.js.map +1 -1
- package/dist/commands/model.d.ts.map +1 -1
- package/dist/commands/model.js +4 -1
- package/dist/commands/model.js.map +1 -1
- package/dist/commands/outmode.d.ts.map +1 -1
- package/dist/commands/outmode.js +4 -1
- package/dist/commands/outmode.js.map +1 -1
- package/dist/commands/session.d.ts +4 -2
- package/dist/commands/session.d.ts.map +1 -1
- package/dist/commands/session.js +27 -10
- package/dist/commands/session.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +8 -6
- package/dist/config.js.map +1 -1
- package/dist/features/botplay.d.ts +7 -5
- package/dist/features/botplay.d.ts.map +1 -1
- package/dist/features/botplay.js +27 -12
- package/dist/features/botplay.js.map +1 -1
- package/dist/features/group-hub.d.ts +6 -0
- package/dist/features/group-hub.d.ts.map +1 -1
- package/dist/features/group-hub.js +48 -8
- package/dist/features/group-hub.js.map +1 -1
- package/dist/features/group-join-request.d.ts.map +1 -1
- package/dist/features/group-join-request.js +47 -2
- package/dist/features/group-join-request.js.map +1 -1
- package/dist/features/history-store.d.ts +2 -2
- package/dist/features/history-store.d.ts.map +1 -1
- package/dist/features/history-store.js +15 -3
- package/dist/features/history-store.js.map +1 -1
- package/dist/features/outbound-mode-switch.d.ts +4 -4
- package/dist/features/outbound-mode-switch.d.ts.map +1 -1
- package/dist/features/outbound-mode-switch.js +27 -9
- package/dist/features/outbound-mode-switch.js.map +1 -1
- package/dist/features/poll-join-requests.d.ts.map +1 -1
- package/dist/features/poll-join-requests.js +42 -27
- package/dist/features/poll-join-requests.js.map +1 -1
- package/dist/features/preset-switcher.d.ts +4 -4
- package/dist/features/preset-switcher.d.ts.map +1 -1
- package/dist/features/preset-switcher.js +17 -8
- package/dist/features/preset-switcher.js.map +1 -1
- package/dist/features/qq-approval.d.ts +9 -4
- package/dist/features/qq-approval.d.ts.map +1 -1
- package/dist/features/qq-approval.js +26 -14
- package/dist/features/qq-approval.js.map +1 -1
- package/dist/features/schedule-store.d.ts +4 -4
- package/dist/features/schedule-store.d.ts.map +1 -1
- package/dist/features/schedule-store.js +18 -4
- package/dist/features/schedule-store.js.map +1 -1
- package/dist/features/sticker-gate.d.ts +4 -4
- package/dist/features/sticker-gate.d.ts.map +1 -1
- package/dist/features/sticker-gate.js +20 -4
- package/dist/features/sticker-gate.js.map +1 -1
- package/dist/features/sticker-store.d.ts +5 -3
- package/dist/features/sticker-store.d.ts.map +1 -1
- package/dist/features/sticker-store.js +21 -3
- package/dist/features/sticker-store.js.map +1 -1
- package/dist/gateway/bootstrap.d.ts.map +1 -1
- package/dist/gateway/bootstrap.js +18 -14
- package/dist/gateway/bootstrap.js.map +1 -1
- package/dist/gateway/debounce.d.ts.map +1 -1
- package/dist/gateway/debounce.js +9 -24
- package/dist/gateway/debounce.js.map +1 -1
- package/dist/gateway/middleware-setup.js +2 -2
- package/dist/gateway/middleware-setup.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/middleware/media-history.d.ts.map +1 -1
- package/dist/middleware/media-history.js +4 -1
- package/dist/middleware/media-history.js.map +1 -1
- package/dist/model/model-resolver.d.ts +24 -12
- package/dist/model/model-resolver.d.ts.map +1 -1
- package/dist/model/model-resolver.js +89 -20
- package/dist/model/model-resolver.js.map +1 -1
- package/dist/model/settings-reader.d.ts +6 -0
- package/dist/model/settings-reader.d.ts.map +1 -1
- package/dist/model/settings-reader.js +15 -2
- package/dist/model/settings-reader.js.map +1 -1
- package/dist/session/session-manager.d.ts +41 -8
- package/dist/session/session-manager.d.ts.map +1 -1
- package/dist/session/session-manager.js +210 -64
- package/dist/session/session-manager.js.map +1 -1
- package/dist/session/workspace-attach.d.ts +17 -18
- package/dist/session/workspace-attach.d.ts.map +1 -1
- package/dist/session/workspace-attach.js +162 -13
- package/dist/session/workspace-attach.js.map +1 -1
- package/dist/setup.d.ts +2 -2
- package/dist/setup.js +2 -2
- package/dist/shared/mention-clean.d.ts +18 -0
- package/dist/shared/mention-clean.d.ts.map +1 -0
- package/dist/shared/mention-clean.js +42 -0
- package/dist/shared/mention-clean.js.map +1 -0
- package/dist/transport/inbound.d.ts.map +1 -1
- package/dist/transport/inbound.js +3 -1
- package/dist/transport/inbound.js.map +1 -1
- package/package.json +1 -1
- package/settings-host.js +7 -1
|
@@ -104,11 +104,6 @@ export async function notifyGroupHub(manager, config, logger, ev) {
|
|
|
104
104
|
if (!ga?.hubNotify || !ga.hubSessionId)
|
|
105
105
|
return 'no-hub';
|
|
106
106
|
try {
|
|
107
|
-
const rec = manager.findBySessionId(ga.hubSessionId);
|
|
108
|
-
if (!rec) {
|
|
109
|
-
logger.warn?.(`[group-hub] hub 会话未找到: ${ga.hubSessionId.slice(0, 8)}…(该会话可能已重建/换绑, 请在 dock 重新设置)`);
|
|
110
|
-
return 'no-session';
|
|
111
|
-
}
|
|
112
107
|
const lines = [`【群管·${ev.kind === 'join_request' ? '入群申请' : ev.kind === 'member_add' ? '新成员入群' : '机器人被拉入群'}】群 ${ev.gid}`];
|
|
113
108
|
if (ev.kind === 'join_request') {
|
|
114
109
|
lines.push(`申请人: ${ev.name ?? '(未知昵称)'}(${tail(ev.memberOpenid)})`);
|
|
@@ -123,15 +118,60 @@ export async function notifyGroupHub(manager, config, logger, ev) {
|
|
|
123
118
|
lines.push(`操作者: ${tail(ev.memberOpenid)}${ev.extra ? ' · ' + ev.extra : ''}`);
|
|
124
119
|
lines.push('群台账已自动登记, 之后该群消息会持续累积。');
|
|
125
120
|
}
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
121
|
+
const text = lines.join('\n');
|
|
122
|
+
// ① 本插件 QQ 会话表(宿主 QQ 会话 record)
|
|
123
|
+
const rec = manager.findBySessionId(ga.hubSessionId);
|
|
124
|
+
if (rec) {
|
|
125
|
+
const r = await safeAppendUserMessage(rec.agent, text, logger);
|
|
126
|
+
logger.info(`[group-hub] ${ev.kind} → hub(${ga.hubSessionId.slice(0, 8)}…) ${r}`);
|
|
127
|
+
return r;
|
|
128
|
+
}
|
|
129
|
+
// ② 宿主全局 registry(web/hub 非 QQ 会话) —— 2026-09-11 修复:
|
|
130
|
+
// 之前只走 findBySessionId, hub 会话若在 QQ 会话表"未创建"则注入失败,
|
|
131
|
+
// 事件驱动(GROUP_JOIN_REQUEST)就会 fallback 到"申请所在群群内提醒",
|
|
132
|
+
// 导致「普通群」的 web 会话也收到【入群申请】(主人实测不一致)。
|
|
133
|
+
// 与 wakeSessionAgent 同款三级 fallback: hub 注入成功即不再打扰普通群。
|
|
134
|
+
const host = manager.findHostAgent(ga.hubSessionId);
|
|
135
|
+
if (host) {
|
|
136
|
+
const r = await safeAppendUserMessage(host.agent, text, logger);
|
|
137
|
+
logger.info(`[group-hub] ${ev.kind} → hub-host(${ga.hubSessionId.slice(0, 8)}…) ${r}`);
|
|
138
|
+
return r;
|
|
139
|
+
}
|
|
140
|
+
const resumed = await manager.resumeHostAgent(ga.hubSessionId);
|
|
141
|
+
if (resumed) {
|
|
142
|
+
const r = await safeAppendUserMessage(resumed.agent, text, logger);
|
|
143
|
+
logger.info(`[group-hub] ${ev.kind} → hub-resumed(${ga.hubSessionId.slice(0, 8)}…) ${r}`);
|
|
144
|
+
return r;
|
|
145
|
+
}
|
|
146
|
+
logger.warn?.(`[group-hub] hub 会话未找到且无法恢复: ${ga.hubSessionId.slice(0, 8)}…(该会话可能已重建/换绑, 请在 dock 重新设置)`);
|
|
147
|
+
return 'no-session';
|
|
129
148
|
}
|
|
130
149
|
catch (err) {
|
|
131
150
|
logger.warn?.(`[group-hub] 转发异常: ${err instanceof Error ? err.message : String(err)}`);
|
|
132
151
|
return 'fail';
|
|
133
152
|
}
|
|
134
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* 判断某 scope/peer 是否就是群组管理器(hub)会话绑定的目标(2026-09-11):
|
|
156
|
+
* 事件/poll 通知申请所在群前调用——申请群即 hub 群时, hub 注记已覆盖,
|
|
157
|
+
* 再对同一会话 notifyGroup/wakeGroup 就是重复。返回 true=应跳过。
|
|
158
|
+
*/
|
|
159
|
+
export async function isHubPeerOf(manager, config, scope, peerId) {
|
|
160
|
+
const hubId = config.groupAdmin?.hubSessionId?.trim();
|
|
161
|
+
if (!hubId || scope !== 'group')
|
|
162
|
+
return false;
|
|
163
|
+
try {
|
|
164
|
+
// ① QQ 会话表: hub record 的 peer 就是申请群
|
|
165
|
+
const hubRec = manager.findBySessionId(hubId);
|
|
166
|
+
if (hubRec && hubRec.scope === 'group' && hubRec.peerId === peerId)
|
|
167
|
+
return true;
|
|
168
|
+
// ② 确定性派生: 申请群的 sessionId 就是 hub 会话 id(如 8DBA 群 ↔ hub 65279bec 同源)
|
|
169
|
+
if (manager.sessionIdFor('group', peerId) === hubId)
|
|
170
|
+
return true;
|
|
171
|
+
}
|
|
172
|
+
catch { /* 判定失败默认 false(保守: 宁可有提示不静默丢) */ }
|
|
173
|
+
return false;
|
|
174
|
+
}
|
|
135
175
|
/**
|
|
136
176
|
* 唤醒指定会话的 LLM: 把 text 作为"用户消息" followup 给该会话的 agent,
|
|
137
177
|
* AI 开回合即可主动处理。可用于 hub 轮询唤醒, 也可跨会话发送+唤醒(工具用)。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-hub.js","sourceRoot":"","sources":["../../src/features/group-hub.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"group-hub.js","sourceRoot":"","sources":["../../src/features/group-hub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-join-request.d.ts","sourceRoot":"","sources":["../../src/features/group-join-request.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,2CAA2C;AAC3C,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;IACzH,aAAa,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,gCAAgC;AAChC,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAuCD,+CAA+C;AAC/C,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,EAAE,EAAE,kBAAkB,GACrB,IAAI,CAUN;AAED,sCAAsC;AACtC,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,GAAG,CAAC,EAAE,MAAM,GACX,kBAAkB,EAAE,CAItB;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,OAAO,EACb,IAAI,EAAE;IACJ,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CACzB,GACA,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"group-join-request.d.ts","sourceRoot":"","sources":["../../src/features/group-join-request.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,2CAA2C;AAC3C,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,KAAK,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC;IACzH,aAAa,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,gCAAgC;AAChC,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAuCD,+CAA+C;AAC/C,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,EAAE,EAAE,kBAAkB,GACrB,IAAI,CAUN;AAED,sCAAsC;AACtC,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,GAAG,CAAC,EAAE,MAAM,GACX,kBAAkB,EAAE,CAItB;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,OAAO,EACb,IAAI,EAAE;IACJ,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CACzB,GACA,OAAO,CAAC,OAAO,CAAC,CA+JlB"}
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
*/
|
|
20
20
|
import { mkdirSync, readFileSync, writeFileSync, existsSync } from 'node:fs';
|
|
21
21
|
import { join } from 'node:path';
|
|
22
|
-
import { notifyGroupHub, safeAppendUserMessage, joinDataDir } from './group-hub.js';
|
|
22
|
+
import { notifyGroupHub, safeAppendUserMessage, joinDataDir, wakeSessionAgent, isHubPeerOf } from './group-hub.js';
|
|
23
23
|
import { appendGroupMember } from './chat-ledger.js';
|
|
24
24
|
import { verifyHuman } from '../api/group-admin.js';
|
|
25
25
|
/** 内存去重(join_request_id)与群内提醒限频: 每群 5 分钟至多 1 条, 防风暴 */
|
|
@@ -103,6 +103,17 @@ export async function handleGroupJoinRequestEvent(data, opts) {
|
|
|
103
103
|
return false;
|
|
104
104
|
}
|
|
105
105
|
recentIds.set(jid, now);
|
|
106
|
+
// 持久化去重(2026-09-11 主人实测重复通知): 宿主重启后 recentIds 清空,
|
|
107
|
+
// QQ 可能重推 GROUP_JOIN_REQUEST → 同一条申请被处理两次、双条通知;
|
|
108
|
+
// pending 里同 join_request_id 已 notified(上次通知成功) → 视为重复跳过。
|
|
109
|
+
try {
|
|
110
|
+
const existed = readPendingJoinRequests(config.cwd, gid).find((x) => x.join_request_id === jid);
|
|
111
|
+
if (existed?.notified) {
|
|
112
|
+
logger.info(`[group-join] 已通知过的重复事件跳过(重启重推): ${jid.slice(0, 16)}…`);
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch { /* 读失败不阻断(走正常流程) */ }
|
|
106
117
|
// 自动审批下行: 只记审计, 不提醒(结果已确定, 无需管理员操作)
|
|
107
118
|
if (ev.auto_approved && ev.auto_approved.strategy_id) {
|
|
108
119
|
logger.info(`[group-join] 自动审批通过(下行): gid=${gid} user=${ev.username}(${mid}) strategy=${ev.auto_approved.strategy_id}`);
|
|
@@ -154,7 +165,41 @@ export async function handleGroupJoinRequestEvent(data, opts) {
|
|
|
154
165
|
if (hubR === 'ok') {
|
|
155
166
|
item.notified = true;
|
|
156
167
|
pushPendingJoinRequest(config.cwd, item);
|
|
157
|
-
logger.info(`[group-join] 已转发群组管理器(hub)
|
|
168
|
+
logger.info(`[group-join] 已转发群组管理器(hub) gid=${gid}`);
|
|
169
|
+
// ⚠️ 2026-09-11 主人实测: hub 注入成功≠申请群不用通知。
|
|
170
|
+
// 主人开「通知普通群/唤醒普通群AI」(pollJoinRequests 的开关, 与轮询总开关独立)时,
|
|
171
|
+
// 期望申请所在群(非 hub 群)的 web 会话也收到: notifyGroup=注记, wakeGroup=唤醒。
|
|
172
|
+
// 申请群就是 hub 群时跳过(hub 注记已覆盖, 避免同一会话重复)。
|
|
173
|
+
const isHub = await isHubPeerOf(manager, config, 'group', gid);
|
|
174
|
+
if (!isHub) {
|
|
175
|
+
const pollOpts = config.groupAdmin?.pollJoinRequests;
|
|
176
|
+
if (pollOpts?.notifyGroup || pollOpts?.wakeGroup) {
|
|
177
|
+
let record = manager.findByPeer('group', gid);
|
|
178
|
+
if (!record) {
|
|
179
|
+
try {
|
|
180
|
+
const target = { scope: 'group', targetId: gid };
|
|
181
|
+
record = await manager.getOrCreate('group', gid, mid, target);
|
|
182
|
+
logger.info(`[group-join] 申请群会话不在, 已 getOrCreate 恢复 gid=${gid}`);
|
|
183
|
+
}
|
|
184
|
+
catch (err) {
|
|
185
|
+
logger.warn(`[group-join] 申请群 getOrCreate 失败: ${err instanceof Error ? err.message : String(err)}`);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
if (record) {
|
|
189
|
+
if (pollOpts.notifyGroup) {
|
|
190
|
+
const r = await safeAppendUserMessage(record.agent, summary, logger);
|
|
191
|
+
logger.info(`[group-join] 通知普通群(notifyGroup, 不唤醒): ${r} gid=${gid.slice(0, 8)}…`);
|
|
192
|
+
}
|
|
193
|
+
if (pollOpts.wakeGroup) {
|
|
194
|
+
const w = await wakeSessionAgent(manager, record.sessionId, logger, `${summary}\n\n可回复我处理(如: 查看入群申请 / 通过 某人 / 拒绝 某人)`);
|
|
195
|
+
logger.info(`[group-join] 唤醒普通群 AI(wakeGroup): ${w} gid=${gid.slice(0, 8)}…`);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
logger.info(`[group-join] 申请群即 hub 群, 不再额外通知(注记已在 hub) gid=${gid.slice(0, 8)}…`);
|
|
202
|
+
}
|
|
158
203
|
return true;
|
|
159
204
|
}
|
|
160
205
|
// ② 无 hub / 转发未成功 → 原群内提醒(回合安全 append; busy/fail 兜底 QQ 静态卡)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-join-request.js","sourceRoot":"","sources":["../../src/features/group-join-request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAKjC,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"group-join-request.js","sourceRoot":"","sources":["../../src/features/group-join-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { HistoryStore } from '@tencent-connect/qqbot-nodejs';
|
|
2
|
-
/**
|
|
3
|
-
export declare function getHistoryStore(): HistoryStore;
|
|
2
|
+
/** 获取历史存储。带 appId → 按实例(账号)独立 store; 无参 → 共享单例(兼容旧调用)。 */
|
|
3
|
+
export declare function getHistoryStore(appId?: string): HistoryStore;
|
|
4
4
|
/** 用 appId 前缀隔离群历史(单账号下等价于 groupOpenid,保留多账号扩展) */
|
|
5
5
|
export declare function historyGroupKey(appId: string, groupId: string): string;
|
|
6
6
|
/** 清空群历史(回复后调用,避免下次 @ 时重复组包) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-store.d.ts","sourceRoot":"","sources":["../../src/features/history-store.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"history-store.d.ts","sourceRoot":"","sources":["../../src/features/history-store.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAQlE,0DAA0D;AAC1D,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,YAAY,CAW5D;AAED,mDAAmD;AACnD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,gCAAgC;AAChC,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAEtE"}
|
|
@@ -6,9 +6,21 @@
|
|
|
6
6
|
* 对齐 openclaw-qqbot 的 features/history-store。
|
|
7
7
|
*/
|
|
8
8
|
import { MemoryHistoryStore } from '@tencent-connect/qqbot-nodejs';
|
|
9
|
+
// ⚠️ 2026-09-11 B类修复: 原 _store 单例被多实例共享(内存 store, key 带 appId 隔离其实无害),
|
|
10
|
+
// 但为彻底隔离改为 per-appId —— 每个实例(账号)各持一个 MemoryHistoryStore。
|
|
11
|
+
// getHistoryStore() 无参保留单例兜底(兼容旧调用)。
|
|
12
|
+
const _storesByAppId = new Map();
|
|
9
13
|
let _store = null;
|
|
10
|
-
/**
|
|
11
|
-
export function getHistoryStore() {
|
|
14
|
+
/** 获取历史存储。带 appId → 按实例(账号)独立 store; 无参 → 共享单例(兼容旧调用)。 */
|
|
15
|
+
export function getHistoryStore(appId) {
|
|
16
|
+
if (appId) {
|
|
17
|
+
let s = _storesByAppId.get(appId);
|
|
18
|
+
if (!s) {
|
|
19
|
+
s = new MemoryHistoryStore();
|
|
20
|
+
_storesByAppId.set(appId, s);
|
|
21
|
+
}
|
|
22
|
+
return s;
|
|
23
|
+
}
|
|
12
24
|
if (!_store)
|
|
13
25
|
_store = new MemoryHistoryStore();
|
|
14
26
|
return _store;
|
|
@@ -19,6 +31,6 @@ export function historyGroupKey(appId, groupId) {
|
|
|
19
31
|
}
|
|
20
32
|
/** 清空群历史(回复后调用,避免下次 @ 时重复组包) */
|
|
21
33
|
export function clearGroupHistory(appId, groupId) {
|
|
22
|
-
|
|
34
|
+
getHistoryStore(appId).clear?.(historyGroupKey(appId, groupId));
|
|
23
35
|
}
|
|
24
36
|
//# sourceMappingURL=history-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-store.js","sourceRoot":"","sources":["../../src/features/history-store.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,IAAI,MAAM,GAAwB,IAAI,CAAC;AAEvC,
|
|
1
|
+
{"version":3,"file":"history-store.js","sourceRoot":"","sources":["../../src/features/history-store.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,uEAAuE;AACvE,4DAA4D;AAC5D,wCAAwC;AACxC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAwB,CAAC;AACvD,IAAI,MAAM,GAAwB,IAAI,CAAC;AAEvC,0DAA0D;AAC1D,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,CAAC,GAAG,IAAI,kBAAkB,EAAE,CAAC;YAC7B,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,MAAM;QAAE,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,OAAe;IAC5D,OAAO,GAAG,KAAK,IAAI,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,iBAAiB,CAAC,KAAa,EAAE,OAAe;IAC7D,eAAe,CAAC,KAAK,CAAkB,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AACpF,CAAC"}
|
|
@@ -20,10 +20,10 @@ type Writer = (mode: OutboundMode) => Promise<{
|
|
|
20
20
|
msg: string;
|
|
21
21
|
mode: OutboundMode;
|
|
22
22
|
}>;
|
|
23
|
-
/** bootstrap 注册切换实现(
|
|
24
|
-
export declare function setOutboundModeWriter(fn: Writer | undefined): void;
|
|
25
|
-
/** 执行切换:
|
|
26
|
-
export declare function switchOutboundMode(m: unknown): Promise<{
|
|
23
|
+
/** bootstrap 注册切换实现(每实例一次, 按 ns 隔离) */
|
|
24
|
+
export declare function setOutboundModeWriter(ns: string, fn: Writer | undefined): void;
|
|
25
|
+
/** 执行切换: 命令/工具共用入口。ns=当前实例 settingsNs(多实例下必须传, 否则切错实例) */
|
|
26
|
+
export declare function switchOutboundMode(m: unknown, ns?: string): Promise<{
|
|
27
27
|
ok: boolean;
|
|
28
28
|
msg: string;
|
|
29
29
|
mode: OutboundMode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound-mode-switch.d.ts","sourceRoot":"","sources":["../../src/features/outbound-mode-switch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AACpF,MAAM,MAAM,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEvE,4CAA4C;AAC5C,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CAE9D;AAED,6BAA6B;AAC7B,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,sBAAsB,CAEpE;AAED,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"outbound-mode-switch.d.ts","sourceRoot":"","sources":["../../src/features/outbound-mode-switch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AACpF,MAAM,MAAM,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEvE,4CAA4C;AAC5C,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CAE9D;AAED,6BAA6B;AAC7B,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,sBAAsB,CAEpE;AAED,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC;AAYhG,uCAAuC;AACvC,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAG9E;AAED,0DAA0D;AAC1D,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,CAY3H"}
|
|
@@ -6,17 +6,35 @@ export function normalizeOutboundMode(m) {
|
|
|
6
6
|
export function isSwitchable(m) {
|
|
7
7
|
return m === 'adaptive' || m === 'passive' || m === 'silent';
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
/**
|
|
10
|
+
* 多实例 writer 注册表(2026-09-11 主人实测修复): 原实现是模块级单例 `let writer` ——
|
|
11
|
+
* 多个 dsh-qqbot 实例(多个实例)各自 apply 时 setOutboundModeWriter
|
|
12
|
+
* 会互相覆盖, 后启动的实例把前一个的 writer 顶掉。于是 `/outmode nothink` 在 某实例会话
|
|
13
|
+
* 里执行, switchOutboundMode 却调到了别的实例的 writer, 改的是别人的 config ——
|
|
14
|
+
* 症状: dock 显示的模式与实际切换不一致、nothink/adaptive 切了不生效。
|
|
15
|
+
* 改为按 settingsNs 注册, 切换时显式携带当前实例 ns。
|
|
16
|
+
*/
|
|
17
|
+
const writers = new Map();
|
|
18
|
+
/** bootstrap 注册切换实现(每实例一次, 按 ns 隔离) */
|
|
19
|
+
export function setOutboundModeWriter(ns, fn) {
|
|
20
|
+
if (fn)
|
|
21
|
+
writers.set(ns, fn);
|
|
22
|
+
else
|
|
23
|
+
writers.delete(ns);
|
|
13
24
|
}
|
|
14
|
-
/** 执行切换:
|
|
15
|
-
export async function switchOutboundMode(m) {
|
|
25
|
+
/** 执行切换: 命令/工具共用入口。ns=当前实例 settingsNs(多实例下必须传, 否则切错实例) */
|
|
26
|
+
export async function switchOutboundMode(m, ns) {
|
|
16
27
|
const mode = normalizeOutboundMode(m);
|
|
17
|
-
|
|
18
|
-
|
|
28
|
+
const w = ns ? writers.get(ns) : undefined;
|
|
29
|
+
if (!w) {
|
|
30
|
+
// 未传 ns / 找不到: 单实例时取唯一 writer 兜底; 多实例但无法判定 → 明确报错(宁拒绝不切错)
|
|
31
|
+
if (writers.size === 1) {
|
|
32
|
+
const only = writers.values().next().value;
|
|
33
|
+
if (only)
|
|
34
|
+
return only(mode);
|
|
35
|
+
}
|
|
36
|
+
return { ok: false, msg: `出站模式切换器未注册(ns=${ns ?? '(未指定)'})`, mode };
|
|
19
37
|
}
|
|
20
|
-
return
|
|
38
|
+
return w(mode);
|
|
21
39
|
}
|
|
22
40
|
//# sourceMappingURL=outbound-mode-switch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound-mode-switch.js","sourceRoot":"","sources":["../../src/features/outbound-mode-switch.ts"],"names":[],"mappings":"AAcA,4CAA4C;AAC5C,MAAM,UAAU,qBAAqB,CAAC,CAAU;IAC9C,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;AAC/E,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,YAAY,CAAC,CAAU;IACrC,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ,CAAC;AAC/D,CAAC;AAID,IAAI,
|
|
1
|
+
{"version":3,"file":"outbound-mode-switch.js","sourceRoot":"","sources":["../../src/features/outbound-mode-switch.ts"],"names":[],"mappings":"AAcA,4CAA4C;AAC5C,MAAM,UAAU,qBAAqB,CAAC,CAAU;IAC9C,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;AAC/E,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,YAAY,CAAC,CAAU;IACrC,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ,CAAC;AAC/D,CAAC;AAID;;;;;;;GAOG;AACH,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE1C,uCAAuC;AACvC,MAAM,UAAU,qBAAqB,CAAC,EAAU,EAAE,EAAsB;IACtE,IAAI,EAAE;QAAE,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;;QACvB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC1B,CAAC;AAED,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,CAAU,EAAE,EAAW;IAC9D,MAAM,IAAI,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,0DAA0D;QAC1D,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAA2B,CAAC;YACjE,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,OAAO,GAAG,EAAE,IAAI,EAAE,CAAC;IACrE,CAAC;IACD,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-join-requests.d.ts","sourceRoot":"","sources":["../../src/features/poll-join-requests.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"poll-join-requests.d.ts","sourceRoot":"","sources":["../../src/features/poll-join-requests.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA+D1D;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,GACb,MAAM,IAAI,CA2LZ"}
|
|
@@ -16,12 +16,25 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { mkdirSync, readFileSync, writeFileSync, existsSync } from 'node:fs';
|
|
18
18
|
import { join } from 'node:path';
|
|
19
|
-
import { handleInbound } from '../transport/inbound.js';
|
|
20
19
|
import { pushPendingJoinRequest } from './group-join-request.js';
|
|
21
|
-
import { notifyGroupHub, wakeHubAgent } from './group-hub.js';
|
|
20
|
+
import { notifyGroupHub, wakeHubAgent, safeAppendUserMessage, wakeSessionAgent } from './group-hub.js';
|
|
22
21
|
import { groupRegistryPath } from '../api/group-admin.js';
|
|
23
22
|
import { verifyHuman } from '../api/group-admin.js';
|
|
24
23
|
import { dataRootOf } from '../gateway/data-root.js';
|
|
24
|
+
/** 获取申请所在群会话(不在则 getOrCreate 恢复; 失败返回 undefined) */
|
|
25
|
+
async function groupRecOf(manager, gid, senderId) {
|
|
26
|
+
let rec = manager.findByPeer('group', gid);
|
|
27
|
+
if (!rec) {
|
|
28
|
+
try {
|
|
29
|
+
const target = { scope: 'group', targetId: gid };
|
|
30
|
+
rec = await manager.getOrCreate('group', gid, senderId, target);
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return rec;
|
|
37
|
+
}
|
|
25
38
|
/** 轮询 tick: 30s 精度足够(分钟级间隔) */
|
|
26
39
|
const TICK_MS = 30_000;
|
|
27
40
|
function statePath(config) {
|
|
@@ -180,10 +193,11 @@ export function startJoinRequestPolling(manager, config, logger) {
|
|
|
180
193
|
}
|
|
181
194
|
persist();
|
|
182
195
|
const summary = lines.join('\n');
|
|
183
|
-
// ── 注入策略(主人 2026-09-
|
|
184
|
-
//
|
|
185
|
-
//
|
|
186
|
-
// notifyGroup
|
|
196
|
+
// ── 注入策略(主人 2026-09-11 定稿): 四个独立开关, 各管一摊 ──
|
|
197
|
+
// wakeLlm → 唤醒【群管会话】AI(hub agent 起来处理审批)
|
|
198
|
+
// hubNotify → 注入群管会话(web 可见, 不唤醒; 与 wakeLlm 互斥——唤醒优先)
|
|
199
|
+
// notifyGroup → 通知普通群(申请所在群会话 append 一条, web 可见, 不唤醒 AI)
|
|
200
|
+
// wakeGroup → 唤醒【普通群】AI(申请所在群会话的 AI 起来处理; 2026-09-11 主人要求拆分)
|
|
187
201
|
const first = wakeTargets[0];
|
|
188
202
|
if (first) {
|
|
189
203
|
if (poll.wakeLlm !== false) {
|
|
@@ -209,28 +223,29 @@ export function startJoinRequestPolling(manager, config, logger) {
|
|
|
209
223
|
logger.info(`[join-poll] wakeLlm=false 且 hubNotify=false, 仅落盘`);
|
|
210
224
|
}
|
|
211
225
|
}
|
|
212
|
-
// 通知普通群(独立开关, 默认 false):
|
|
226
|
+
// 通知普通群(独立开关, 默认 false): 申请所在群会话 append 一条(web 可见, **不唤醒 AI**)
|
|
227
|
+
// 2026-09-11 主人要求拆分: 原实现走 handleInbound 会唤醒普通群 AI 并可能发 QQ 消息;
|
|
228
|
+
// 现在「通知普通群」只做 web 可见, 唤醒由独立开关 wakeGroup 控制。
|
|
213
229
|
if (poll.notifyGroup !== false) {
|
|
214
|
-
const
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
kind: 'group',
|
|
219
|
-
senderId: 'master',
|
|
220
|
-
senderName: '审批轮询',
|
|
221
|
-
content: `[审批轮询 ${ts}] ${summary}\n\n可回复我处理(如: 查看入群申请 / 通过 某人 / 拒绝 某人)`,
|
|
222
|
-
messageId: '',
|
|
223
|
-
timestamp: now2.toISOString(),
|
|
224
|
-
groupOpenid: first.gid,
|
|
225
|
-
msgType: 0,
|
|
226
|
-
attachments: undefined,
|
|
227
|
-
};
|
|
228
|
-
try {
|
|
229
|
-
await handleInbound(fakeMsg, manager, config, logger, undefined);
|
|
230
|
-
logger.info(`[join-poll] 普通群已提醒(notifyGroup)`);
|
|
230
|
+
const rec = await groupRecOf(manager, first.gid, first.items[0]?.member_openid ?? 'master');
|
|
231
|
+
if (rec) {
|
|
232
|
+
const r = await safeAppendUserMessage(rec.agent, summary, logger);
|
|
233
|
+
logger.info(`[join-poll] 普通群已通知(notifyGroup, 不唤醒): ${r}`);
|
|
231
234
|
}
|
|
232
|
-
|
|
233
|
-
logger.warn?.(`[join-poll]
|
|
235
|
+
else {
|
|
236
|
+
logger.warn?.(`[join-poll] 普通群会话不可用(notifyGroup 跳过): ${first.gid.slice(0, 8)}…`);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
// 唤醒普通群 AI(独立开关, 默认 false): followup 申请所在群会话的 AI
|
|
240
|
+
// 2026-09-11 主人确认: 【入群申请】=消息注记(不唤醒), 【审批轮询】=系统提醒(唤醒), 两者不同用途, 不互斥不去重。
|
|
241
|
+
if (poll.wakeGroup !== false) {
|
|
242
|
+
const rec = await groupRecOf(manager, first.gid, first.items[0]?.member_openid ?? 'master');
|
|
243
|
+
if (rec) {
|
|
244
|
+
const w = await wakeSessionAgent(manager, rec.sessionId, logger, `${summary}\n\n可回复我处理(如: 查看入群申请 / 通过 某人 / 拒绝 某人)`);
|
|
245
|
+
logger.info(`[join-poll] 唤醒普通群 AI: ${w}`);
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
logger.warn?.(`[join-poll] 普通群会话不可用(wakeGroup 跳过): ${first.gid.slice(0, 8)}…`);
|
|
234
249
|
}
|
|
235
250
|
}
|
|
236
251
|
}
|
|
@@ -239,7 +254,7 @@ export function startJoinRequestPolling(manager, config, logger) {
|
|
|
239
254
|
timer.unref?.();
|
|
240
255
|
void pollOnce();
|
|
241
256
|
const poll = config.groupAdmin?.pollJoinRequests;
|
|
242
|
-
logger.info(`[join-poll] started (enabled=${poll?.enabled} interval=${poll?.intervalMin}min minCount=${poll?.minCount} wakeLlm=${poll?.wakeLlm} notifyGroup=${poll?.notifyGroup})`);
|
|
257
|
+
logger.info(`[join-poll] started (enabled=${poll?.enabled} interval=${poll?.intervalMin}min minCount=${poll?.minCount} wakeLlm=${poll?.wakeLlm} hubNotify=${poll?.hubNotify} notifyGroup=${poll?.notifyGroup} wakeGroup=${poll?.wakeGroup})`);
|
|
243
258
|
return () => {
|
|
244
259
|
clearInterval(timer);
|
|
245
260
|
persist();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-join-requests.js","sourceRoot":"","sources":["../../src/features/poll-join-requests.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"poll-join-requests.js","sourceRoot":"","sources":["../../src/features/poll-join-requests.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
import type { QQBotSender } from '../transport/outbound-buffer.js';
|
|
11
11
|
import type { SessionManager } from '../session/session-manager.js';
|
|
12
12
|
type PresetCardImpl = (target: Parameters<QQBotSender['sendMarkdownWithKeyboard']>[0], scope: 'group' | 'c2c', peerId: string, page?: number) => Promise<string>;
|
|
13
|
-
/** bootstrap 接线: 注入真实实现 */
|
|
14
|
-
export declare function setPresetCardImpl(impl: PresetCardImpl): void;
|
|
15
|
-
/** 命令层调用: 发预设选择卡片 */
|
|
16
|
-
export declare function sendPresetCard(target: Parameters<QQBotSender['sendMarkdownWithKeyboard']>[0], scope: 'group' | 'c2c', peerId: string, page?: number): Promise<string>;
|
|
13
|
+
/** bootstrap 接线: 注入真实实现(按实例 ns) */
|
|
14
|
+
export declare function setPresetCardImpl(ns: string, impl: PresetCardImpl | undefined): void;
|
|
15
|
+
/** 命令层调用: 发预设选择卡片(带当前实例 ns) */
|
|
16
|
+
export declare function sendPresetCard(ns: string, target: Parameters<QQBotSender['sendMarkdownWithKeyboard']>[0], scope: 'group' | 'c2c', peerId: string, page?: number): Promise<string>;
|
|
17
17
|
/**
|
|
18
18
|
* 解析 preset 按钮数据: `ps:<page>:<idx>` → {page, idx}; 非本卡片按钮返回 null。
|
|
19
19
|
* prev/next 为翻页导航(同前缀, idx 用字符串区分)。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset-switcher.d.ts","sourceRoot":"","sources":["../../src/features/preset-switcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAapE,KAAK,cAAc,GAAG,CACpB,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,KACV,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"preset-switcher.d.ts","sourceRoot":"","sources":["../../src/features/preset-switcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAapE,KAAK,cAAc,GAAG,CACpB,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,KACV,OAAO,CAAC,MAAM,CAAC,CAAC;AAMrB,mCAAmC;AACnC,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAGpF;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,SAAI,GACP,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAWlH;AAiDD,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;IAGrF,4CAA4C;IACtC,QAAQ,CACZ,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,SAAI,GACP,OAAO,CAAC,MAAM,CAAC;IAgClB,6EAA6E;IACvE,iBAAiB,CACrB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,EAC9D,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;CA+CpB"}
|
|
@@ -6,16 +6,25 @@ const MAX_ROWS = 4;
|
|
|
6
6
|
const COLS = 2;
|
|
7
7
|
/** 每页预设数 */
|
|
8
8
|
const PER_PAGE = MAX_ROWS * COLS;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
/** ⚠️ 2026-09-11 多实例修复: 原模块级单例会被多个实例互相覆盖(和 outbound writer/botplay 同款 bug,
|
|
10
|
+
* 实测 /preset 无参发卡失败/发到别的实例)。改为按 ns 注册表。 */
|
|
11
|
+
const presetCardImpls = new Map();
|
|
12
|
+
/** bootstrap 接线: 注入真实实现(按实例 ns) */
|
|
13
|
+
export function setPresetCardImpl(ns, impl) {
|
|
14
|
+
if (impl)
|
|
15
|
+
presetCardImpls.set(ns, impl);
|
|
16
|
+
else
|
|
17
|
+
presetCardImpls.delete(ns);
|
|
13
18
|
}
|
|
14
|
-
/** 命令层调用: 发预设选择卡片 */
|
|
15
|
-
export async function sendPresetCard(target, scope, peerId, page = 0) {
|
|
16
|
-
|
|
19
|
+
/** 命令层调用: 发预设选择卡片(带当前实例 ns) */
|
|
20
|
+
export async function sendPresetCard(ns, target, scope, peerId, page = 0) {
|
|
21
|
+
const impl = presetCardImpls.get(ns);
|
|
22
|
+
if (!impl) {
|
|
23
|
+
if (presetCardImpls.size === 1)
|
|
24
|
+
return presetCardImpls.values().next().value(target, scope, peerId, page);
|
|
17
25
|
return '预设切换卡片未就绪(宿主未接线), 可用 /presets 查看、/preset <id> 切换';
|
|
18
|
-
|
|
26
|
+
}
|
|
27
|
+
return impl(target, scope, peerId, page);
|
|
19
28
|
}
|
|
20
29
|
/**
|
|
21
30
|
* 解析 preset 按钮数据: `ps:<page>:<idx>` → {page, idx}; 非本卡片按钮返回 null。
|