From 2fcd87ae0e3c3b87416f5e76e65a0e96c62fc211 Mon Sep 17 00:00:00 2001 From: kicer Date: Fri, 2 Oct 2026 07:42:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(scheduler):=20=E5=BD=93=E5=89=8D=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E7=9A=84=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20ok=20?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=8D=E5=86=8D=E9=87=8D=E5=A4=8D=E6=8E=A8?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 任务会话此刻仍绑在目标 bid 的当前会话上时,本轮收尾回复已由交互投递链 (attachBus)实时送过,notifyTask 按 bid 去重跳过 ok 通知;error 通知 照常(没跑起来的回合并没实时话可推,通知是唯一信号面)。 --- app/server/scheduler.js | 1 + app/server/wechat.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/server/scheduler.js b/app/server/scheduler.js index 69a7bd8..2b668ad 100644 --- a/app/server/scheduler.js +++ b/app/server/scheduler.js @@ -164,6 +164,7 @@ function fireNotify(t, status, errNote) { } Promise.resolve(notify({ user: t.user, channel: t.notify_channel || '', sessionId: t.session_id, + status, // notifyTask 的去重闸门用:ok 且会话仍是该通道当前会话 → 回复已实时投递过,不重发 head: '`' + name + ', ' + status + '`\n---\n', text, files, stamp: t.last_run_at || Date.now(), })).catch(e => log.warn('scheduler', '任务通知入队失败: ' + (e && e.message || e))); diff --git a/app/server/wechat.js b/app/server/wechat.js index 9d5cead..3100c47 100644 --- a/app/server/wechat.js +++ b/app/server/wechat.js @@ -251,7 +251,6 @@ const CHANNEL_NOTE = [ '本会话来自微信单聊,用户只能收发文本与文件,无可点击界面。', '- 交流风格:简短口语化,适配手机阅读;内容较长时整理成文件交付,不刷屏。', '- 交付文件:生成文件后,在回复时用mint_public_link给出可公开下载的链接,链接文字保留作兜底。', - '- 接收文件:用户发来的文件会自动存入当前工作目录,可直接读取。', ].join('\n'); // 开场日记(M2)的角色提示:日记是「你」的记忆,不是用户的新输入——拟人化人格锚点。 @@ -766,7 +765,19 @@ function notifyTask(p) { for (const b of db.prepare("SELECT id FROM wechat_bindings WHERE user = ? AND status = 'online'").all(String(p.user || ''))) bids.push(b.id); } if (!bids.length) return Promise.resolve(); // 无微信通道可发:静默跳过(任务结果网页端仍在) - for (const bid of bids) enqueueDelivery(bid, () => sendTaskNotice(bid, p)); + const sid = String(p.sessionId || ''); + for (const bid of bids) { + // 去重:任务会话此刻仍是该 bid 的当前会话 → 本轮回复已被交互投递链实时送过(attachBus), + // ok 通知不再重发;error 时本轮根本没跑起来(实时链上无话可推),照常通知。 + if (p.status === 'ok' && sid) { + const cur = db.prepare('SELECT session_id FROM channel_sessions WHERE channel = ?').get('wx:' + bid); + if (cur && String(cur.session_id) === sid) { + log.info('wechat', bid + ' 定时任务通知跳过(本会话回复已实时送达):' + String(p.head || '')); + continue; + } + } + enqueueDelivery(bid, () => sendTaskNotice(bid, p)); + } return Promise.resolve(); }