fix(memory): 「已注入」标记单点化——injectedIds 与 journalFor 同源选取,页面吃名单不另算
线上现象(用户实测):调试页「已注入」标在了最早 3 条上。根因是页面按 API 位置序 (created_at 倒序前 N)自算注入窗,而 journalFor 已改事件日优先——迁移又让 52 片 created_at 齐平(旧行 updated_at 单值),位置序退化成 rowid 序=搬家序=最老片,两边错位。 修复:memory.injectedIds() 与 journalFor 共用同一条选取规则(INJECT_ORDER: day DESC, created_at DESC LIMIT inject_max),API 返回 injected 名单,页面按 session_id 贴标;journalFor 内部迁移兜底的 JS 重排一并清除(SQL 已保序)。
This commit is contained in:
+14
-6
@@ -55,19 +55,27 @@ function markJournaled(db, sessionId, ms) {
|
||||
}
|
||||
|
||||
// ---------- 读:开场注入文本(wechat/web 新会话的数据源) ----------
|
||||
// 最近 inject_max 片(按收口时刻),渲染分天:新日在前、天内按发生顺序;【sid】头拼在这里。
|
||||
// 最近 inject_max 片按事件日优先(同序供 injectedIds/journalFor 共用),渲染分天:新日在前、天内按发生顺序。
|
||||
// 选取序单点定义在此(调试 API/页面走 injectedIds 取名单,不另算一套,避免两边错位)。
|
||||
const INJECT_ORDER = ' ORDER BY day DESC, created_at DESC';
|
||||
// 注入窗名单:与 journalFor 同选取规则的 session_id 列表(调试页打「已注入」标用)。
|
||||
function injectedIds(db, cfg, user) {
|
||||
const cap = injectMax(cfg);
|
||||
if (!cap) return [];
|
||||
return db.prepare(
|
||||
'SELECT session_id FROM memory_fragments WHERE user = ?' + INJECT_ORDER + ' LIMIT ?'
|
||||
).all(String(user || ''), cap).map(r => r.session_id);
|
||||
}
|
||||
function renderFrag(r) { return '【' + r.session_id + '】\n' + r.text; }
|
||||
function journalFor(db, cfg, user) {
|
||||
const cap = injectMax(cfg);
|
||||
if (!cap) return '';
|
||||
const rows = db.prepare(
|
||||
// 选取按事件日(积压补记/迁移会令 created_at 同刻扎堆,按收口序会拿到「最晚补记」而非「最新事件」;
|
||||
// 选取按事件日(积压补记/迁移会令 created_at 齐平,按收口序会拿到「最晚补记」而非「最新事件」;
|
||||
// 稳态下两者等价,事件日序更符合「最近记忆」直觉),同日并列再按收口时刻。
|
||||
'SELECT session_id, day, text FROM memory_fragments WHERE user = ? ORDER BY day DESC, created_at DESC LIMIT ?'
|
||||
'SELECT session_id, day, text FROM memory_fragments WHERE user = ?' + INJECT_ORDER + ' LIMIT ?'
|
||||
).all(String(user || ''), cap);
|
||||
if (!rows.length) return '';
|
||||
// 选取按收口序,展示按事件日重排(同日碎片可能异日落库,直接按日分组避免同一日出现两个头)
|
||||
rows.sort((a, b) => a.day < b.day ? 1 : a.day > b.day ? -1 : 0);
|
||||
const head = '【长期记忆·日记(最近' + rows.length + '条)】收工时的当日事件摘要,新在前、天内按发生顺序;'
|
||||
+ '每条【编号】是来源会话 id:更早的日记用 recall 工具 op=search 关键词检索、op=days 按日期翻页再 op=day 取整天;'
|
||||
+ '那次工作的成果文件用 op=files 查、op=link 取。';
|
||||
@@ -138,7 +146,7 @@ function prune(db, cfg) {
|
||||
|
||||
module.exports = {
|
||||
retainDays, injectMax, dayString, cutoffDay,
|
||||
appendFragment, markJournaled, journalFor,
|
||||
appendFragment, markJournaled, journalFor, injectedIds,
|
||||
searchFragments, daysIndex, dayEntry, prune,
|
||||
INJECT_CAP, FRAG_MAX,
|
||||
};
|
||||
|
||||
@@ -78,14 +78,14 @@ function render(d) {
|
||||
|
||||
document.getElementById('injection').textContent = d.injection || '(无注入文本:无记忆或功能关闭)';
|
||||
|
||||
var frs = d.entries || []; // created_at 倒序的全量碎片行
|
||||
// 注入窗 = 按收口时刻取最新 inject_max 片(与 journalFor 选取规则一致),直接标在卡上。
|
||||
var frs = d.entries || []; // API 已按 day 降序、同日收口时刻降序(与注入选取同源)
|
||||
// 「已注入」直接吃 API 给的名单(memory.injectedIds,与 journalFor 同序),页面不再自算窗。
|
||||
var injected = {};
|
||||
for (var ii = 0; ii < Math.min(d.inject_max || 0, frs.length); ii++) injected[ii] = 1;
|
||||
(d.injected || []).forEach(function (sid) { injected[sid] = 1; });
|
||||
var groups = {}, order = [];
|
||||
frs.forEach(function (f, fi) {
|
||||
frs.forEach(function (f) {
|
||||
if (!groups[f.day]) { groups[f.day] = []; order.push(f.day); }
|
||||
groups[f.day].push({ f: f, fi: fi });
|
||||
groups[f.day].push({ f: f });
|
||||
});
|
||||
order.sort(function (a, b) { return a < b ? 1 : -1; }); // 新日在前
|
||||
var cutoffStale = !d.retain_days ? '' : '(保留 ' + d.retain_days + ' 天)';
|
||||
@@ -95,7 +95,7 @@ function render(d) {
|
||||
+ (items[0].f.in_window ? '' : '<span class="badge out">窗外' + cutoffStale + ')</span>')
|
||||
+ '<span class="t">' + items.length + ' 片</span></div>'
|
||||
+ items.map(function (it) {
|
||||
return '<div class="frag">' + (injected[it.fi] ? '<span class="badge on inj-tag">已注入</span>' : '')
|
||||
return '<div class="frag">' + (injected[it.f.session_id] ? '<span class="badge on inj-tag">已注入</span>' : '')
|
||||
+ sidLink(it.f.session_id) + ' <span class="t">收口 ' + fmtTime(it.f.created_at) + ' · 事件日 ' + esc(it.f.day) + '</span>\n' + esc(it.f.text)
|
||||
+ '</div>';
|
||||
}).join('')
|
||||
|
||||
@@ -14,7 +14,7 @@ router.get('/', (req, res) => {
|
||||
const user = String(req.user || '');
|
||||
const cutoff = memory.cutoffDay(cfg); // '' = 永久存储,无下界
|
||||
const rows = db.prepare(
|
||||
'SELECT session_id, day, text, created_at FROM memory_fragments WHERE user = ? ORDER BY created_at DESC LIMIT 500'
|
||||
'SELECT session_id, day, text, created_at FROM memory_fragments WHERE user = ? ORDER BY day DESC, created_at DESC LIMIT 500'
|
||||
).all(user);
|
||||
const sessions = db.prepare(
|
||||
'SELECT id, title, status, model_id, journaled_at, updated_at FROM sessions WHERE user = ? AND journaled_at IS NOT NULL ORDER BY journaled_at DESC LIMIT 100'
|
||||
@@ -26,6 +26,7 @@ router.get('/', (req, res) => {
|
||||
wrap_idle_ms: Math.floor(Number((cfg.memory || {}).wrap_idle_ms) || 0),
|
||||
auto_complete_ms: Math.floor(Number((cfg.agent || {}).auto_complete_ms) || 0),
|
||||
injection: memory.journalFor(db, cfg, user),
|
||||
injected: memory.injectedIds(db, cfg, user), // 注入窗名单(与 journalFor 同源选取),页面只贴标不另算
|
||||
entries: rows.map(r => ({
|
||||
session_id: r.session_id, day: r.day, created_at: r.created_at,
|
||||
in_window: !cutoff || r.day >= cutoff, text: r.text,
|
||||
|
||||
Reference in New Issue
Block a user