Skip to content

Commit 571069a

Browse files
committed
feat(recall): 被取代行的检索降权——fuseRecall 感知取代链(#641 beta 第三阶段续)
T3 落了链(180d261)但检索还不知道——被取代的行照常与继任者竞争注入名次。 本提交接上检索侧: - store:supersededIds() 走部分索引拿已取代行 id(未落链的库上是空查询)。 - fuseRecall:新增 supersededIds 参数(id 集合,与行形状解耦——向量源可能 是瘦行,读行上的列不可靠)。融合完成后对集合内的行乘 0.5 并重排:语义是 「同卷必排继任者之后」,不是隐藏;取代链只在 enforce 档落笔,链没落过时 本段与从前逐字节一致。keyword 模式的短路保持在前——那是人的显式检索, 保留完整可见性。 - 已知边界如实记录:各分支已按 lim 截断,降权后只重排不回填——极端情况下 刚挤进末位的被取代行占住名额但被压到继任者之后,按名次消费的注入实际 效果等价;挪进截断前是显式重构,等召回基准跑过一轮再决定。 全量 3351 tests / 3350 pass / 0 fail(pipefail)。
1 parent 9991638 commit 571069a

5 files changed

Lines changed: 76 additions & 4 deletions

File tree

‎dsh-mneme/lib/service.js‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ export function createService({ store, mirror, config, onWrite, logger, document
835835
* Returns { merged, signals }, where signals is Map<id, {keyword, vector,
836836
* bm25}> so searchMemories can decorate rows when signalTransparency is on.
837837
*/
838-
function fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we }) {
838+
function fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we, supersededIds = null }) {
839839
const recipe = config?.recallFusion ?? "blend";
840840

841841
// Per-source scores are recorded for every recipe so signalTransparency
@@ -976,6 +976,22 @@ export function createService({ store, mirror, config, onWrite, logger, document
976976
// 且带 seen 去重与容量控制),不该由收尾段替别的配方代劳。删掉后 rrf/minmax
977977
// 的 auto 排序就是它们各自算出来的排序。
978978

979+
// #641(T3 取代链的检索侧,beta 第三阶段):已被取代的行整体降权后重排——
980+
// 它仍是「曾经为真」的可追溯历史,显式搜索照样能找到,但不该与取代它的
981+
// 那行竞争注入名次。乘 0.5 的语义是「同卷必排继任者之后」,不是隐藏;
982+
// 取代链只会在 enforce 档下落笔,链没落过时本段与从前逐字节一致。
983+
// keyword 短路在前面已 return——那是人的显式检索动作,保留完整可见性与
984+
// 原始排序。已知边界:各分支已按 lim 截断,这里只重排不再回填——极端
985+
// 情况下一个刚挤进末位的被取代行会占住名额,但它被压到继任者之后,按
986+
// 名次消费的注入实际效果等价;把降权挪进各分支截断前是显式重构,等
987+
// 召回基准跑过一轮再决定值不值。行形状随来源不一(向量源可能是瘦行),
988+
// 所以按 id 集合判定而不是读行上的 superseded_by。
989+
if (supersededIds?.size) {
990+
merged = merged
991+
.map((m) => (supersededIds.has(m.id) ? { ...m, score: (m.score ?? 0) * 0.5 } : m))
992+
.sort((a, b) => (b.score ?? 0) - (a.score ?? 0));
993+
}
994+
979995
return { merged, signals };
980996
}
981997

@@ -1090,7 +1106,9 @@ export function createService({ store, mirror, config, onWrite, logger, document
10901106
const wv = config?.hybridSearchVectorWeight ?? DEFAULT_HYBRID_WEIGHTS.vector;
10911107
const wk = config?.hybridSearchKeywordWeight ?? DEFAULT_HYBRID_WEIGHTS.keyword;
10921108

1093-
const { merged: fusedMerged, signals } = fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we: wb });
1109+
// T3 降权的判定集:一次部分索引查询拿全部已取代行 id(通常为空或个位数)。
1110+
const supersededIds = new Set(store.supersededIds());
1111+
const { merged: fusedMerged, signals } = fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we: wb, supersededIds });
10941112
let merged = fusedMerged;
10951113
// v0.8.0 A3(issue #17):strictScope 硬过滤——他 scope 的候选直接出局
10961114
// (区别于 A2 的降权保留可见);未标注行与命中行保留。strict 与 A2 加权

‎dsh-mneme/lib/store.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4143,6 +4143,14 @@ export function createStore(path) {
41434143
return res.changes > 0;
41444144
}
41454145

4146+
/**
4147+
* 已被取代行的 id 清单(issue #641,T3 检索侧降权用)。走部分索引,未落链
4148+
* 的库上是空查询。返回数组而非 Set——集合语义由调用方决定。
4149+
*/
4150+
function supersededIds() {
4151+
return db.prepare("SELECT id FROM memories WHERE superseded_by IS NOT NULL").all().map((r) => r.id);
4152+
}
4153+
41464154
/** Triage rows for the panel/analysis views, newest detection first. */
41474155
function listConflictLedger({ limit = 200, offset = 0, tier, status } = {}) {
41484156
const lim = Math.max(1, Math.min(5000, limit | 0));
@@ -5745,6 +5753,7 @@ export function createStore(path) {
57455753
saveConflictLedgerEntry,
57465754
setConflictLedgerStatus,
57475755
supersedeChain,
5756+
supersededIds,
57485757
listConflictLedger,
57495758
countConflictLedger,
57505759
saveScopeChange,

‎dsh-mneme/src/service.js‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ export function createService({ store, mirror, config, onWrite, logger, document
835835
* Returns { merged, signals }, where signals is Map<id, {keyword, vector,
836836
* bm25}> so searchMemories can decorate rows when signalTransparency is on.
837837
*/
838-
function fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we }) {
838+
function fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we, supersededIds = null }) {
839839
const recipe = config?.recallFusion ?? "blend";
840840

841841
// Per-source scores are recorded for every recipe so signalTransparency
@@ -976,6 +976,22 @@ export function createService({ store, mirror, config, onWrite, logger, document
976976
// 且带 seen 去重与容量控制),不该由收尾段替别的配方代劳。删掉后 rrf/minmax
977977
// 的 auto 排序就是它们各自算出来的排序。
978978

979+
// #641(T3 取代链的检索侧,beta 第三阶段):已被取代的行整体降权后重排——
980+
// 它仍是「曾经为真」的可追溯历史,显式搜索照样能找到,但不该与取代它的
981+
// 那行竞争注入名次。乘 0.5 的语义是「同卷必排继任者之后」,不是隐藏;
982+
// 取代链只会在 enforce 档下落笔,链没落过时本段与从前逐字节一致。
983+
// keyword 短路在前面已 return——那是人的显式检索动作,保留完整可见性与
984+
// 原始排序。已知边界:各分支已按 lim 截断,这里只重排不再回填——极端
985+
// 情况下一个刚挤进末位的被取代行会占住名额,但它被压到继任者之后,按
986+
// 名次消费的注入实际效果等价;把降权挪进各分支截断前是显式重构,等
987+
// 召回基准跑过一轮再决定值不值。行形状随来源不一(向量源可能是瘦行),
988+
// 所以按 id 集合判定而不是读行上的 superseded_by。
989+
if (supersededIds?.size) {
990+
merged = merged
991+
.map((m) => (supersededIds.has(m.id) ? { ...m, score: (m.score ?? 0) * 0.5 } : m))
992+
.sort((a, b) => (b.score ?? 0) - (a.score ?? 0));
993+
}
994+
979995
return { merged, signals };
980996
}
981997

@@ -1090,7 +1106,9 @@ export function createService({ store, mirror, config, onWrite, logger, document
10901106
const wv = config?.hybridSearchVectorWeight ?? DEFAULT_HYBRID_WEIGHTS.vector;
10911107
const wk = config?.hybridSearchKeywordWeight ?? DEFAULT_HYBRID_WEIGHTS.keyword;
10921108

1093-
const { merged: fusedMerged, signals } = fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we: wb });
1109+
// T3 降权的判定集:一次部分索引查询拿全部已取代行 id(通常为空或个位数)。
1110+
const supersededIds = new Set(store.supersededIds());
1111+
const { merged: fusedMerged, signals } = fuseRecall({ keyword, vector, bm25, entity, lim, mode, wv, wk, wb, we: wb, supersededIds });
10941112
let merged = fusedMerged;
10951113
// v0.8.0 A3(issue #17):strictScope 硬过滤——他 scope 的候选直接出局
10961114
// (区别于 A2 的降权保留可见);未标注行与命中行保留。strict 与 A2 加权

‎dsh-mneme/src/store.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4143,6 +4143,14 @@ export function createStore(path) {
41434143
return res.changes > 0;
41444144
}
41454145

4146+
/**
4147+
* 已被取代行的 id 清单(issue #641,T3 检索侧降权用)。走部分索引,未落链
4148+
* 的库上是空查询。返回数组而非 Set——集合语义由调用方决定。
4149+
*/
4150+
function supersededIds() {
4151+
return db.prepare("SELECT id FROM memories WHERE superseded_by IS NOT NULL").all().map((r) => r.id);
4152+
}
4153+
41464154
/** Triage rows for the panel/analysis views, newest detection first. */
41474155
function listConflictLedger({ limit = 200, offset = 0, tier, status } = {}) {
41484156
const lim = Math.max(1, Math.min(5000, limit | 0));
@@ -5745,6 +5753,7 @@ export function createStore(path) {
57455753
saveConflictLedgerEntry,
57465754
setConflictLedgerStatus,
57475755
supersedeChain,
5756+
supersededIds,
57485757
listConflictLedger,
57495758
countConflictLedger,
57505759
saveScopeChange,

‎dsh-mneme/test/conflict-ledger-enforce.test.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,24 @@ test("issue#641 supersedeChain:幽灵行不落链,换指向以最后一次
196196
store.close();
197197
});
198198

199+
test("issue#641 检索降权:被取代的行排在其继任者之后(fuseRecall 的 T3 检索侧)", async () => {
200+
const { service, store } = setup();
201+
const oldMem = makeMemory(service, "部署方式旧", "部署方式用 systemd 托管服务");
202+
const newMem = makeMemory(service, "部署方式新", "部署方式已切换 systemd 托管并加了自动重启");
203+
assert.equal(service.supersedeChain(oldMem.id, newMem.id), true);
204+
const rows = await service.searchMemories("部署方式 systemd", { mode: "auto", recordRecall: false });
205+
const oldIdx = rows.findIndex((r) => r.id === oldMem.id);
206+
const newIdx = rows.findIndex((r) => r.id === newMem.id);
207+
assert.ok(oldIdx >= 0, "被取代的行仍可见(降权不是隐藏)");
208+
assert.ok(newIdx >= 0, "继任者在场");
209+
assert.ok(newIdx < oldIdx, "继任者必须排在被取代行之前");
210+
// 未落链的行不受影响:那条排序乘数只对链上的行生效
211+
const unrelated = makeMemory(service, "无关条目", "完全无关的部署笔记");
212+
const rows2 = await service.searchMemories("无关条目 部署", { mode: "auto", recordRecall: false });
213+
assert.ok(rows2.some((r) => r.id === unrelated.id), "未链行照常召回");
214+
store.close();
215+
});
216+
199217
test("issue#641 supersedeInfoFirstPair:长度优先(与 mint 顺序无关)", () => {
200218
const store = createStore(":memory:");
201219
const service = createService({ store, mirror: null, config: {} });

0 commit comments

Comments
 (0)