Skip to content

Commit 63c7fe5

Browse files
committed
feat(inject): T4 矛盾感知——取代行不进注入、矛盾对同批排位与互相标注(#641 beta 第三阶段续)
- 注入侧取代链落地:superseded 行不进 injectCandidates(继任者携带现状, 旧值注入只会浪费名额并冒被采用的风险;supersedeChain 只由 enforce 落笔, shadow/关闭态下集合恒空,过滤与从前逐字节一致)。 - 矛盾对同批感知(enforce 档门控):conflict_ledger 里 tier=conflict 且仍 open 的对,两侧同批时按「可信度(observation > inferred > subjective, 与 applyConflict 换位同序)→ 服务器时钟新者」排位,并互相标注—— #537 的教训是标注必须把区分信息带进注入文本本体(谁较新/更可信、以谁 为准、何时检出),消费方看不见的标注等于没标。标注文案双语进 lang.js。 - EPISTEMIC_PRIORITY 从 decisions.js 导出复用(与 applyConflict 换位、 inject 的 verified 前缀同一份优先序,不再三处各抄一份)。 - shadow 档负例锁死:只记账零处置,矛盾对不标注。 注入路径的判定成本:两次部分索引查询(取代行 id 集 + open 矛盾对), 未落链的库上均为空集,注入路径逐字节一致。全量 3354 tests / 3353 pass / 0 fail(pipefail)。
1 parent 4399a08 commit 63c7fe5

11 files changed

Lines changed: 188 additions & 8 deletions

File tree

‎dsh-mneme/lib/dream/decisions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const ACTIONS = new Set(["keep", "merge", "archive", "conflict", "update"
1111
// Epistemic trust (v0.4.5): when config.trustEpistemicWeighting is on, merge
1212
// keepSource and conflict winners prefer the higher-trust memory. Higher value
1313
// = preferred. observation (measured) > inferred (derived) > subjective (guess).
14-
const EPISTEMIC_PRIORITY = { observation: 3, inferred: 2, subjective: 1 };
14+
export const EPISTEMIC_PRIORITY = { observation: 3, inferred: 2, subjective: 1 };
1515

1616
// Issue #104 方向 2:archive 类型护栏的长保留类型集合——这些类型的存在意义
1717
// 就是长期保存(踩坑记录、约束、用户偏好、挖掘出的模式),LLM 以「价值判断」

‎dsh-mneme/lib/inject.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ export function createInjector(ctx, service, settings, config, gate = null, sess
291291
? STR.verified[language]
292292
: "";
293293
const title = STR.entryTitle[language](m.title, m.importance);
294-
const content = injectMemory(m, pinned ? PINNED_CONTENT_MAX : maxContent);
294+
// Issue #641(T4 注入标注):conflictNote 由 injectCandidates 在 enforce
295+
// 档下挂上(矛盾对同批时的机械排位说明)。#537 的教训:标注必须进注入
296+
// 文本本体,不能只留在账本里——消费方看不见的标注等于没标。
297+
const content = injectMemory(m, pinned ? PINNED_CONTENT_MAX : maxContent)
298+
+ (m.conflictNote ? "\n" + m.conflictNote : "");
295299
const full = m.graphHint === true
296300
? STR.graphHintLine[language](m.type, title, content)
297301
: STR.entryLine[language](m.type, verified, title, content);

‎dsh-mneme/lib/lang.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,17 @@ export const STR = {
130130
en: "[Memory] Cross-session memories from dsh-mneme (user preferences and high-priority project/decision entries):"
131131
},
132132
verified: { zh: "[verified] ", en: "[verified] " },
133+
// Issue #641(T4 注入标注):矛盾对同批时的机械排位说明。#537 教训的落地——
134+
// 区分信息必须进注入文本本体(谁较新/更可信、以谁为准、何时检出),不能只
135+
// 留在账本里让消费方猜。
136+
conflictPairPreferred: {
137+
zh: (otherTitle, detected) => `⚠ 本批「${otherTitle}」与本条矛盾:本条较新/更可信,以其为准(检出 ${detected})`,
138+
en: (otherTitle, detected) => `⚠ Conflicts with "${otherTitle}" in this batch: this entry is newer/more trusted and takes precedence (detected ${detected})`
139+
},
140+
conflictPairSecondary: {
141+
zh: (preferredTitle, detected) => `⚠ 本条与「${preferredTitle}」矛盾且居次,采用时以那条为准(检出 ${detected})`,
142+
en: (preferredTitle, detected) => `⚠ Conflicts with "${preferredTitle}" (newer/more trusted) — prefer that entry (detected ${detected})`
143+
},
133144
entryTitle: {
134145
zh: (title, importance) => `${title}(重要性 ${importance})`,
135146
en: (title, importance) => `${title} (importance ${importance})`

‎dsh-mneme/lib/service.js‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CAPACITY_WARNING_DEFAULTS } from "./config.js";
1111
// 外来行(source='imported',导入路径落的来源)的身份判定只许有一个定义处——本文件的
1212
// 两处汇流口与巩固/降级那些读侧行池都调这同一个谓词,避免各处自己写字符串比较然后各自漂移。
1313
import { isImportedRow } from "./memory-source.js";
14-
import { applyDecisions } from "./dream/decisions.js";
14+
import { applyDecisions, EPISTEMIC_PRIORITY } from "./dream/decisions.js";
1515
import { createDocumentRegistrar } from "./document.js";
1616
import { createOrganizer } from "./organize.js";
1717
import { createShareImport } from "./share-import.js";
@@ -2115,7 +2115,49 @@ export function createService({ store, mirror, config, onWrite, logger, document
21152115
}
21162116
// #249 第一批:pin 前置到块内相关性排序之前(验收项),且不占 maxItems 名额。
21172117
// pinned 为空时 selected 就是 general 本身——关闭态与改动前逐字节一致。
2118-
const selected = pinned.length > 0 ? [...pinned, ...general] : general;
2118+
let selected = pinned.length > 0 ? [...pinned, ...general] : general;
2119+
// Issue #641(T3/T4 注入侧,beta 第三阶段):取代链行不进注入——继任者携带
2120+
// 现状,旧值注入只会浪费名额、冒着被采用的风险(supersedeChain 只由 enforce
2121+
// 落笔,shadow/关闭态下集合恒空,本过滤与从前逐字节一致)。矛盾对(tier=
2122+
// conflict 且仍 open)同批时按「可信度 → 新者」排位并互相标注:#537 的教训
2123+
// 是标注必须把区分信息带进注入文本,否则重演「记账了但没用上」;标注再显式
2124+
// 门控在 enforce 档——shadow 只记账零处置。
2125+
const supersededIdSet = new Set(store.supersededIds());
2126+
if (supersededIdSet.size) {
2127+
selected = selected.filter((m) => !supersededIdSet.has(m.id));
2128+
}
2129+
if (config.conflictLedgerMode === "enforce" && selected.length > 1) {
2130+
const language = langOf(config);
2131+
const byId = new Map(selected.map((m) => [m.id, m]));
2132+
for (const p of store.openConflictPairs()) {
2133+
const ma = byId.get(p.memory_a);
2134+
const mb = byId.get(p.memory_b);
2135+
if (!ma || !mb) continue;
2136+
// 确定性排位:可信度(observation > inferred > subjective,与
2137+
// applyConflict 的换位同序)优先,平手退回服务器时钟新者。多对并存时
2138+
// 逐一交换以相对次序为准——矛盾对是稀有事件,交换足够且可预测。
2139+
const rank = (m) => EPISTEMIC_PRIORITY[m.epistemic_status] ?? 0;
2140+
let preferred = ma;
2141+
let other = mb;
2142+
const ra = rank(ma);
2143+
const rb = rank(mb);
2144+
if (ra !== rb) {
2145+
if (rb > ra) { preferred = mb; other = ma; }
2146+
} else if ((mb.created_at ?? "") > (ma.created_at ?? "")) {
2147+
preferred = mb;
2148+
other = ma;
2149+
}
2150+
const detected = String(p.detected ?? "").slice(0, 10);
2151+
preferred.conflictNote = STR.conflictPairPreferred[language](String(other.title ?? "").slice(0, 24), detected);
2152+
other.conflictNote = STR.conflictPairSecondary[language](String(preferred.title ?? "").slice(0, 24), detected);
2153+
const pi = selected.indexOf(preferred);
2154+
const oi = selected.indexOf(other);
2155+
if (pi > oi) {
2156+
selected.splice(pi, 1);
2157+
selected.splice(oi, 0, preferred);
2158+
}
2159+
}
2160+
}
21192161
if (pinnedStats) {
21202162
// 「未展示」只数**真的没进块**的 pin 类条目:被 pin 预算挤下来的条目会回到
21212163
// 候选池,仍可能被 general 槽选中——那就是展示了。按 eligible - pinned 直接

‎dsh-mneme/lib/store.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4151,6 +4151,18 @@ export function createStore(path) {
41514151
return db.prepare("SELECT id FROM memories WHERE superseded_by IS NOT NULL").all().map((r) => r.id);
41524152
}
41534153

4154+
/**
4155+
* 仍未消解的真矛盾对(issue #641,T4 注入侧感知用)。只取 tier=conflict 且
4156+
* status=open 的行——superseded/differentiated 已消解,zombied 已被 heat 兜底;
4157+
* shadow 档记下的观察对也在其中(注入侧标注以 enforce 档为门,见 injectCandidates)。
4158+
* 按最近观察排序,上限 2000:账本对的量级是个位数到几十,上限只为防御性兜底。
4159+
*/
4160+
function openConflictPairs(limit = 2000) {
4161+
return db.prepare(
4162+
"SELECT memory_a, memory_b, first_seen_at AS detected FROM conflict_ledger WHERE tier = 'conflict' AND status = 'open' ORDER BY last_seen_at DESC LIMIT ?"
4163+
).all(Math.max(1, Math.min(2000, limit | 0)));
4164+
}
4165+
41544166
/** Triage rows for the panel/analysis views, newest detection first. */
41554167
function listConflictLedger({ limit = 200, offset = 0, tier, status } = {}) {
41564168
const lim = Math.max(1, Math.min(5000, limit | 0));
@@ -5754,6 +5766,7 @@ export function createStore(path) {
57545766
setConflictLedgerStatus,
57555767
supersedeChain,
57565768
supersededIds,
5769+
openConflictPairs,
57575770
listConflictLedger,
57585771
countConflictLedger,
57595772
saveScopeChange,

‎dsh-mneme/src/dream/decisions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const ACTIONS = new Set(["keep", "merge", "archive", "conflict", "update"
1111
// Epistemic trust (v0.4.5): when config.trustEpistemicWeighting is on, merge
1212
// keepSource and conflict winners prefer the higher-trust memory. Higher value
1313
// = preferred. observation (measured) > inferred (derived) > subjective (guess).
14-
const EPISTEMIC_PRIORITY = { observation: 3, inferred: 2, subjective: 1 };
14+
export const EPISTEMIC_PRIORITY = { observation: 3, inferred: 2, subjective: 1 };
1515

1616
// Issue #104 方向 2:archive 类型护栏的长保留类型集合——这些类型的存在意义
1717
// 就是长期保存(踩坑记录、约束、用户偏好、挖掘出的模式),LLM 以「价值判断」

‎dsh-mneme/src/inject.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ export function createInjector(ctx, service, settings, config, gate = null, sess
291291
? STR.verified[language]
292292
: "";
293293
const title = STR.entryTitle[language](m.title, m.importance);
294-
const content = injectMemory(m, pinned ? PINNED_CONTENT_MAX : maxContent);
294+
// Issue #641(T4 注入标注):conflictNote 由 injectCandidates 在 enforce
295+
// 档下挂上(矛盾对同批时的机械排位说明)。#537 的教训:标注必须进注入
296+
// 文本本体,不能只留在账本里——消费方看不见的标注等于没标。
297+
const content = injectMemory(m, pinned ? PINNED_CONTENT_MAX : maxContent)
298+
+ (m.conflictNote ? "\n" + m.conflictNote : "");
295299
const full = m.graphHint === true
296300
? STR.graphHintLine[language](m.type, title, content)
297301
: STR.entryLine[language](m.type, verified, title, content);

‎dsh-mneme/src/lang.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,17 @@ export const STR = {
130130
en: "[Memory] Cross-session memories from dsh-mneme (user preferences and high-priority project/decision entries):"
131131
},
132132
verified: { zh: "[verified] ", en: "[verified] " },
133+
// Issue #641(T4 注入标注):矛盾对同批时的机械排位说明。#537 教训的落地——
134+
// 区分信息必须进注入文本本体(谁较新/更可信、以谁为准、何时检出),不能只
135+
// 留在账本里让消费方猜。
136+
conflictPairPreferred: {
137+
zh: (otherTitle, detected) => `⚠ 本批「${otherTitle}」与本条矛盾:本条较新/更可信,以其为准(检出 ${detected})`,
138+
en: (otherTitle, detected) => `⚠ Conflicts with "${otherTitle}" in this batch: this entry is newer/more trusted and takes precedence (detected ${detected})`
139+
},
140+
conflictPairSecondary: {
141+
zh: (preferredTitle, detected) => `⚠ 本条与「${preferredTitle}」矛盾且居次,采用时以那条为准(检出 ${detected})`,
142+
en: (preferredTitle, detected) => `⚠ Conflicts with "${preferredTitle}" (newer/more trusted) — prefer that entry (detected ${detected})`
143+
},
133144
entryTitle: {
134145
zh: (title, importance) => `${title}(重要性 ${importance})`,
135146
en: (title, importance) => `${title} (importance ${importance})`

‎dsh-mneme/src/service.js‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CAPACITY_WARNING_DEFAULTS } from "./config.js";
1111
// 外来行(source='imported',导入路径落的来源)的身份判定只许有一个定义处——本文件的
1212
// 两处汇流口与巩固/降级那些读侧行池都调这同一个谓词,避免各处自己写字符串比较然后各自漂移。
1313
import { isImportedRow } from "./memory-source.js";
14-
import { applyDecisions } from "./dream/decisions.js";
14+
import { applyDecisions, EPISTEMIC_PRIORITY } from "./dream/decisions.js";
1515
import { createDocumentRegistrar } from "./document.js";
1616
import { createOrganizer } from "./organize.js";
1717
import { createShareImport } from "./share-import.js";
@@ -2115,7 +2115,49 @@ export function createService({ store, mirror, config, onWrite, logger, document
21152115
}
21162116
// #249 第一批:pin 前置到块内相关性排序之前(验收项),且不占 maxItems 名额。
21172117
// pinned 为空时 selected 就是 general 本身——关闭态与改动前逐字节一致。
2118-
const selected = pinned.length > 0 ? [...pinned, ...general] : general;
2118+
let selected = pinned.length > 0 ? [...pinned, ...general] : general;
2119+
// Issue #641(T3/T4 注入侧,beta 第三阶段):取代链行不进注入——继任者携带
2120+
// 现状,旧值注入只会浪费名额、冒着被采用的风险(supersedeChain 只由 enforce
2121+
// 落笔,shadow/关闭态下集合恒空,本过滤与从前逐字节一致)。矛盾对(tier=
2122+
// conflict 且仍 open)同批时按「可信度 → 新者」排位并互相标注:#537 的教训
2123+
// 是标注必须把区分信息带进注入文本,否则重演「记账了但没用上」;标注再显式
2124+
// 门控在 enforce 档——shadow 只记账零处置。
2125+
const supersededIdSet = new Set(store.supersededIds());
2126+
if (supersededIdSet.size) {
2127+
selected = selected.filter((m) => !supersededIdSet.has(m.id));
2128+
}
2129+
if (config.conflictLedgerMode === "enforce" && selected.length > 1) {
2130+
const language = langOf(config);
2131+
const byId = new Map(selected.map((m) => [m.id, m]));
2132+
for (const p of store.openConflictPairs()) {
2133+
const ma = byId.get(p.memory_a);
2134+
const mb = byId.get(p.memory_b);
2135+
if (!ma || !mb) continue;
2136+
// 确定性排位:可信度(observation > inferred > subjective,与
2137+
// applyConflict 的换位同序)优先,平手退回服务器时钟新者。多对并存时
2138+
// 逐一交换以相对次序为准——矛盾对是稀有事件,交换足够且可预测。
2139+
const rank = (m) => EPISTEMIC_PRIORITY[m.epistemic_status] ?? 0;
2140+
let preferred = ma;
2141+
let other = mb;
2142+
const ra = rank(ma);
2143+
const rb = rank(mb);
2144+
if (ra !== rb) {
2145+
if (rb > ra) { preferred = mb; other = ma; }
2146+
} else if ((mb.created_at ?? "") > (ma.created_at ?? "")) {
2147+
preferred = mb;
2148+
other = ma;
2149+
}
2150+
const detected = String(p.detected ?? "").slice(0, 10);
2151+
preferred.conflictNote = STR.conflictPairPreferred[language](String(other.title ?? "").slice(0, 24), detected);
2152+
other.conflictNote = STR.conflictPairSecondary[language](String(preferred.title ?? "").slice(0, 24), detected);
2153+
const pi = selected.indexOf(preferred);
2154+
const oi = selected.indexOf(other);
2155+
if (pi > oi) {
2156+
selected.splice(pi, 1);
2157+
selected.splice(oi, 0, preferred);
2158+
}
2159+
}
2160+
}
21192161
if (pinnedStats) {
21202162
// 「未展示」只数**真的没进块**的 pin 类条目:被 pin 预算挤下来的条目会回到
21212163
// 候选池,仍可能被 general 槽选中——那就是展示了。按 eligible - pinned 直接

‎dsh-mneme/src/store.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4151,6 +4151,18 @@ export function createStore(path) {
41514151
return db.prepare("SELECT id FROM memories WHERE superseded_by IS NOT NULL").all().map((r) => r.id);
41524152
}
41534153

4154+
/**
4155+
* 仍未消解的真矛盾对(issue #641,T4 注入侧感知用)。只取 tier=conflict 且
4156+
* status=open 的行——superseded/differentiated 已消解,zombied 已被 heat 兜底;
4157+
* shadow 档记下的观察对也在其中(注入侧标注以 enforce 档为门,见 injectCandidates)。
4158+
* 按最近观察排序,上限 2000:账本对的量级是个位数到几十,上限只为防御性兜底。
4159+
*/
4160+
function openConflictPairs(limit = 2000) {
4161+
return db.prepare(
4162+
"SELECT memory_a, memory_b, first_seen_at AS detected FROM conflict_ledger WHERE tier = 'conflict' AND status = 'open' ORDER BY last_seen_at DESC LIMIT ?"
4163+
).all(Math.max(1, Math.min(2000, limit | 0)));
4164+
}
4165+
41544166
/** Triage rows for the panel/analysis views, newest detection first. */
41554167
function listConflictLedger({ limit = 200, offset = 0, tier, status } = {}) {
41564168
const lim = Math.max(1, Math.min(5000, limit | 0));
@@ -5754,6 +5766,7 @@ export function createStore(path) {
57545766
setConflictLedgerStatus,
57555767
supersedeChain,
57565768
supersededIds,
5769+
openConflictPairs,
57575770
listConflictLedger,
57585771
countConflictLedger,
57595772
saveScopeChange,

0 commit comments

Comments
 (0)