From ba4b1149aa757760236a37a843a2334a7b2492d9 Mon Sep 17 00:00:00 2001 From: kicer Date: Tue, 29 Sep 2026 22:21:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(scheduler):=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E9=80=9A=E7=9F=A5=E7=BB=8F=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E7=9B=B4=E6=8A=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 任务专柜下班退位后执行结果没人接——现在跑完主动推微信: 「⏰ 任务 · 完成/失败」+ 本轮收尾纯文本 + 触发时刻后 files 表新增成果文件(沙箱+限5个/20MB, 正文里的 /p/ 链同样转卡片)。超长截头部+全文落 .md 转卡片,与交互投递同款兜底。 - scheduled_tasks 加 notify_channel 列:op=create 时记本会话微信绑定(谁设的闹钟通知谁), 建任务回执带一行事实;存量任务/无绑定退回用户全部在线绑定 - 钩点在 scheduler 阶段A(running→ok 轮询推断=定时轮收尾权威信号,用户手聊专柜不误触)与 阶段B投递失败;notifyTask 经 server.js 惰性闭包注入(防 scheduler→wechat→engine require 环) - 通知与交互投递共用 bid 串行链不插队;不碰 last_msg_id 游标;失败/离线只记日志不重试 - definitions.json prompt 参数撤掉 skill/webhook 自推引导(内置通知防双推) --- app/server/db.js | 3 ++ app/server/scheduler.js | 49 ++++++++++++++++++++--- app/server/server.js | 5 ++- app/server/tools/definitions.json | 2 +- app/server/tools/executor.js | 7 +++- app/server/wechat.js | 64 +++++++++++++++++++++++++++++++ 6 files changed, 120 insertions(+), 10 deletions(-) diff --git a/app/server/db.js b/app/server/db.js index 0c88f1a..34e24a8 100644 --- a/app/server/db.js +++ b/app/server/db.js @@ -192,6 +192,9 @@ function initDb(dbPath) { // 触发不验存在(参数存在本身就是对 AI 的脚本化暗示,怎么写进 prompt、用 bash 还是 python 由它自定); // get 详情里展示这个「肌肉记忆长在哪」。与 brief 同构,新库建表后也靠本迁移补列。 if (!schedCols.some(c => c.name === 'script')) db.exec("ALTER TABLE scheduled_tasks ADD COLUMN script TEXT NOT NULL DEFAULT ''"); + // 升级老库:scheduled_tasks 补 notify_channel 列——schedule op=create 时记下的微信通道('wx:'+bid): + // 谁设的闹钟通知谁,专柜退位后仍能找得到人。空串 = 存量任务/网页端建的任务,完成通知退回该用户全部在线绑定。 + if (!schedCols.some(c => c.name === 'notify_channel')) db.exec("ALTER TABLE scheduled_tasks ADD COLUMN notify_channel TEXT NOT NULL DEFAULT ''"); // 迁移:model_slot 记会话粘住的具体池 key 槽位(「平台#key下标」,key 为共享资源不再独占), // 跨结版/重启保持(只有手动换绑或模型失效改选会动),model_id 存模型 id 供展示/统计(见 engine.applyBinding)。 if (!cols.some(c => c.name === 'model_slot')) db.exec('ALTER TABLE sessions ADD COLUMN model_slot TEXT'); diff --git a/app/server/scheduler.js b/app/server/scheduler.js index b0bfd96..f6acf57 100644 --- a/app/server/scheduler.js +++ b/app/server/scheduler.js @@ -18,6 +18,7 @@ const MIN_INTERVAL_MS = 3600000; // cron 最小间隔 1 小时:防 AI const PROMPT_MAX_LEN = 20000; // prompt 长度上限,与 routes/sessions.js PATCH 口径一致 let eng = null; // engine 引用(start 注入) +let notify = null; // 完成通知投递面(server.js 注入 wechat.notifyTask;缺位则跳过通知) let timer = null; function fmtTime(t) { @@ -60,15 +61,15 @@ function validateCron(cronExpr) { // sessionId 由调用方从工具 ctx 取(AI 无法指定别的会话)。校验顺序: // validateCron → 本会话尚无任务 → INSERT(主键冲突兜底)。 -function createTask(db, sessionId, cronExpr, prompt, brief, script) { +function createTask(db, sessionId, cronExpr, prompt, brief, script, notifyChannel) { if (prompt.length > PROMPT_MAX_LEN) throw new Error('prompt 过长(上限 ' + PROMPT_MAX_LEN + ' 字符)'); const first = validateCron(cronExpr); const exist = db.prepare('SELECT cron_expr FROM scheduled_tasks WHERE session_id = ?').get(sessionId); if (exist) throw new Error('本会话已有定时任务(' + exist.cron_expr + ')。改频次或提示词用 op=update;确要换新任务先 op=delete 再 op=create'); try { db.prepare( - 'INSERT INTO scheduled_tasks (session_id, cron_expr, prompt, brief, script, next_run_at, created_at) VALUES (?,?,?,?,?,?,?)' - ).run(sessionId, cronExpr, prompt, String(brief || '').slice(0, 40), String(script || '').replace(/\s+/g, ' ').trim().slice(0, 80), first, Date.now()); + 'INSERT INTO scheduled_tasks (session_id, cron_expr, prompt, brief, script, notify_channel, next_run_at, created_at) VALUES (?,?,?,?,?,?,?,?)' + ).run(sessionId, cronExpr, prompt, String(brief || '').slice(0, 40), String(script || '').replace(/\s+/g, ' ').trim().slice(0, 80), String(notifyChannel || ''), first, Date.now()); } catch (_) { // 单进程同步 API 下正常到不了这里(上一步已查重),仅作主键约束重复报错的兜底 const ex = db.prepare('SELECT cron_expr FROM scheduled_tasks WHERE session_id = ?').get(sessionId); @@ -142,6 +143,35 @@ function deliver(sessionId, prompt) { return eng.postUserMessage(sessionId, prompt); } +// 定时轮收尾通知(阶段 A ok / 阶段 B 投递失败时调):正文=本执行窗口内最后一条纯文本 +// assistant 收尾消息(即白天交互时本会推给用户的那句),附件=触发时刻起 files 表新增记录。 +// notify 由 server.js 注入(wechat.notifyTask);任何异常只记日志,绝不动调度主流程。 +function fireNotify(t, status, errNote) { + if (!notify) return; + try { + const dbh = eng.getDb(); + const name = String(t.brief || t.prompt || t.session_id).replace(/\s+/g, ' ').trim().slice(0, 40) || t.session_id; + let text = String(errNote || ''); + let files = []; + if (status === 'ok') { + const m = dbh.prepare( + "SELECT content FROM messages WHERE session_id = ? AND role = 'assistant' AND type IS NULL AND created_at >= ?" + + " AND content IS NOT NULL AND TRIM(content) != '' ORDER BY id DESC LIMIT 1" + ).get(t.session_id, t.last_run_at || 0); + text = String((m && m.content) || '').trim(); + files = dbh.prepare('SELECT filename FROM files WHERE session_id = ? AND created_at >= ? ORDER BY created_at DESC LIMIT 10') + .all(t.session_id, t.last_run_at || 0).map(r => r.filename); + } + Promise.resolve(notify({ + user: t.user, channel: t.notify_channel || '', sessionId: t.session_id, + head: '⏰ ' + name + ' · ' + (status === 'ok' ? '完成' : '失败'), + text, files, stamp: t.last_run_at || Date.now(), + })).catch(e => log.warn('scheduler', '任务通知入队失败: ' + (e && e.message || e))); + } catch (e) { + log.warn('scheduler', '任务通知组装失败: ' + (e && e.message || e)); + } +} + // ---------- tick ---------- function drop(db, sessionId) { db.prepare('DELETE FROM scheduled_tasks WHERE session_id = ?').run(sessionId); @@ -155,18 +185,23 @@ function tick() { // 阶段 A:收尾上一轮标记 running 的任务。runLoop 结束没有回调可挂,改为轮询推断: // 会话已转非 active = 回合结束 → ok(局限:异常结束的回合也会被标 ok)。 // 会话仍 active → AI 还在跑,保持 running 等下轮再看。 - for (const t of db.prepare("SELECT session_id FROM scheduled_tasks WHERE last_status='running'").all()) { + for (const t of db.prepare( + "SELECT t.session_id, t.brief, t.prompt, t.notify_channel, t.last_run_at, s.user" + + ' FROM scheduled_tasks t JOIN sessions s ON s.id = t.session_id WHERE t.last_status=\'running\'' + ).all()) { const s = eng.getSession(t.session_id); if (!s) { drop(db, t.session_id); continue; } if (s.status !== 'active') { db.prepare("UPDATE scheduled_tasks SET last_status='ok' WHERE session_id=?").run(t.session_id); + fireNotify(t, 'ok'); // 跑完没人在看:把收尾那句话与成果文件主动送到微信 } } // 阶段 B:投递到期任务。上一轮还 running 的不取(等阶段 A 收尾); // 会话本身 active 直接跳过本次——防堆积以会话状态为准,不依赖 DB 标记的时序,更可靠。 const due = db.prepare( - "SELECT * FROM scheduled_tasks WHERE next_run_at <= ? AND (last_status IS NULL OR last_status != 'running')" + "SELECT t.*, s.user FROM scheduled_tasks t JOIN sessions s ON s.id = t.session_id" + + " WHERE t.next_run_at <= ? AND (t.last_status IS NULL OR t.last_status != 'running')" ).all(now); for (const t of due) { const s = eng.getSession(t.session_id); @@ -195,13 +230,15 @@ function tick() { "UPDATE scheduled_tasks SET last_run_at=?, last_status='error', last_note=?, next_run_at=? WHERE session_id=?" ).run(now, String(err && err.message || err).slice(0, 200), computeNext(t.cron_expr), t.session_id); log.error('scheduler', t.session_id + ' 定时任务失败: ' + (err && err.message || err)); + fireNotify(t, 'error', String(err && err.message || err).slice(0, 200)); // 失败是最值得用户知道的通知 } } } -function start(engine) { +function start(engine, notifyFn) { if (timer) return; eng = engine; + notify = typeof notifyFn === 'function' ? notifyFn : null; timer = setInterval(() => { try { tick(); diff --git a/app/server/server.js b/app/server/server.js index bb791fd..098f9e7 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -25,7 +25,10 @@ engine.setModelPool(cfg, db, bus); engine.init(); // 定时任务调度器(scheduler.js):必须在 engine.init() 之后启动——init 先把会话状态归位 //(active/遗留 queued → held),首轮 tick 才不会看到脏状态。 -scheduler.start(engine); +// 通知面注入:定时轮收尾(完成/投递失败)经 wechat.notifyTask 转递微信(组装见 scheduler.fireNotify)。 +// scheduler 不反向 require wechat(engine→executor→scheduler→wechat→engine 成环会拿到半成品 exports), +// 惰性闭包传递;wechat 未启用(无 WXBOT_URL)时 notifyTask 自带 enabled 闸门静默跳。 +scheduler.start(engine, p => wechat.notifyTask(p)); // 长期记忆保留窗裁剪(memory.js):平时追加碎片顺带裁,这里兑底「窗口改小/长期无轮换」的表残留。 require('./memory').prune(db, cfg); diff --git a/app/server/tools/definitions.json b/app/server/tools/definitions.json index 908543e..e7f358b 100644 --- a/app/server/tools/definitions.json +++ b/app/server/tools/definitions.json @@ -320,7 +320,7 @@ }, "prompt": { "type": "string", - "description": "Self-contained instruction delivered as the only input at each trigger (prior history is archived). Output stays in the task's session; if the result must reach the user proactively, say how inside the prompt (e.g. via a skill or webhook). Required with op=create; optional with op=update." + "description": "Self-contained instruction delivered as the only input at each trigger (prior history is archived). Each run's closing reply plus newly written artifact files are automatically pushed to the user via WeChat, so do not wire a webhook/email push into the prompt. Required with op=create; optional with op=update." }, "brief": { "type": "string", diff --git a/app/server/tools/executor.js b/app/server/tools/executor.js index d3b818a..d952685 100644 --- a/app/server/tools/executor.js +++ b/app/server/tools/executor.js @@ -963,12 +963,15 @@ function toolScheduleTask(ctx, args) { // script 纯标记:存在即暗示模型把流程沉淀成脚本(怎么写、用什么跑、prompt 怎么引用由它自定); // 创建与触发均不校验——缺脚本时 prompt 自身的指示就是回退面。 const script = String(args.script || '').replace(/\s+/g, ' ').trim().slice(0, 80); - const t = scheduler.createTask(db, ctx.sessionId, cronExpr, prompt, brief, script); + // 谁设的闹钟通知谁:本会话当前的微信绑定落进任务行(专柜退位后 channel_sessions 就没了,就地捕获)。 + const chRow = db.prepare("SELECT channel FROM channel_sessions WHERE session_id = ? AND channel LIKE 'wx:%'").get(ctx.sessionId); + const t = scheduler.createTask(db, ctx.sessionId, cronExpr, prompt, brief, script, chRow ? chRow.channel : ''); // 定时即下班:标记本回合收尾时由 engine 收口(brief 碎片 + 归档 + 通道解绑,见 engine.taskClockOut)。 if (ctx.onTaskCreated) ctx.onTaskCreated(); return '已创建 id=' + ctx.sessionId + '\ncron="' + t.cron_expr + '"\nnext=' + scheduler.fmtIso(t.next_run_at) + (script ? '\nscript=' + script : '') - + '\n本会话即收口为该任务专柜(用户无感知,下条消息自动进新会话)。'; + + '\n本会话即收口为该任务专柜(用户无感知,下条消息自动进新会话)。' + + (chRow ? '\n完成/失败结果自动通知微信。' : ''); } case 'update': { if (!cronExpr && !prompt) throw new Error('op=update 需要 cron_expr 和 prompt 至少提供一个'); diff --git a/app/server/wechat.js b/app/server/wechat.js index a510eb3..16611f1 100644 --- a/app/server/wechat.js +++ b/app/server/wechat.js @@ -749,6 +749,69 @@ function splitText(text, max = 1800) { return out; } +// ---------- 定时任务完成通知(scheduler 注入入口,不走交互投递闸口)---------- +// 任务专柜下班即退位:执行 AI 夜里/清晨收尾的那句回复没人接——本入口补上这一段: +// 「⏰ 任务 · 完成/失败」+ 收尾正文 + 本轮新增成果文件,直投微信。 +// 发给谁:优先创建时记下的 notify_channel(谁设的闹钟通知谁); +// 存量任务/网页端建的(channel 空)退回该用户全部在线绑定。与交互投递共用同一条 +// bid 串行链,通知不会插队用户对话回复;不碰 last_msg_id 游标(通知不是消息重放)。 +const NOTICE_MAX_SEGS = 6; // 通知正文最多 6 段(≈11k 字),超出走全文落文件转卡片——通知不该刷屏 +function notifyTask(p) { + if (!enabled() || !p) return Promise.resolve(); + const bids = []; + const ch = String(p.channel || ''); + if (ch.startsWith('wx:')) bids.push(ch.slice(3)); + if (!bids.length) { + 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)); + return Promise.resolve(); +} + +async function sendTaskNotice(bid, p) { + const b = bindReady(bid); + if (!b) { log.warn('wechat', '任务通知跳过(绑定不在线):' + bid + ' ' + String(p.head || '')); return; } + const text = String(p.text || '').trim(); + let segs = splitText(String(p.head || '') + (text ? '\n' + text : '')); + const attach = collectTaskFiles(p); + if (segs.length > NOTICE_MAX_SEGS) { // 与交互投递同款语义:截头部 + 全文落文件,内容零丢失 + const name = '任务通知全文-' + (Number(p.stamp) || now()) + '.md'; + try { + const abs = path.join(engine.taskDirOf(String(p.sessionId || '')), name); + fs.writeFileSync(abs, String(p.head || '') + '\n\n' + text); + attach.unshift({ filename: name, b64: Buffer.from(fs.readFileSync(abs)).toString('base64') }); + segs = [String(segs[0]).slice(0, 1500) + '\n……内容较长,全文见附件「' + name + '」']; + } catch (e) { + log.warn('wechat', '任务通知超长落文件失败,降级只截段:' + msg(e)); + segs = segs.slice(0, NOTICE_MAX_SEGS); + } + } + for (const a of findAttachments(text, String(p.sessionId || ''))) attach.push(a); // 正文里的 /p/ 链同样转卡片(B 案同规则) + if (!await sendSegs(b, segs)) return; + const n = await sendAttachments(b, attach.slice(0, ATTACH_MAX_COUNT)); + log.info('wechat', bid + ' 定时任务通知已投(' + segs.length + ' 段/' + n + ' 附件):' + String(p.head || '')); +} + +// scheduler 交来的文件 = 触发时刻后 files 表新增记录名;此处做任务目录沙箱 + 限额 + 单个失败跳过 +//(已删/超限/异常 → 不推微信,网页端可见)。 +function collectTaskFiles(p) { + const out = []; + let dir; + try { dir = engine.taskDirOf(String(p.sessionId || '')); } catch (_) { return out; } + for (const rel of (p.files || [])) { + if (out.length >= ATTACH_MAX_COUNT) break; + try { + const abs = path.resolve(dir, String(rel)); + if (!abs.startsWith(dir + path.sep)) continue; + const st = fs.statSync(abs); + if (!st.isFile() || st.size > ATTACH_MAX_BYTES) continue; + out.push({ filename: path.basename(abs), b64: Buffer.from(fs.readFileSync(abs)).toString('base64') }); + } catch (_) { /* 已删/异常:跳过 */ } + } + return out; +} + module.exports = { init, restore, @@ -763,4 +826,5 @@ module.exports = { handleHook, handleInbox, findAttachments, // 投递前的附件解析(链接→文件);导出供上电探针/未来其他投递面复用 + notifyTask, // 定时任务完成通知入口(server.js 注入 scheduler;组装逻辑见 scheduler.fireNotify) };