@@ -60,20 +60,34 @@ export function isManagedDocumentPath(dir, path) {
6060// id + 旧行 content_history 里的旧摘要(source=superseded)。
6161const supersededByPointer = ( id ) => `\n\n[superseded by ${ id } ]` ;
6262
63+ // 升格吸收不碰的类型(#275 拍板 5 的边界):吸收的对象是「原子条」,而下面这两种
64+ // 行各有自己的生命周期,被归档会各自留下第二行——
65+ // document:本体是磁盘上的文件。归档它等于替用户撤下外档;而且 supersede 探测
66+ // 只看活跃行(store.list 默认排除归档),同一 path 下次注册会在旧行还挂着
67+ // 「新版本」语义时再铸一行,指针注记与 content_history 记账也走不到。
68+ // summary:dream 总览与叙述按 source 身份去重、并按注入档位常驻。归档它会让下一
69+ // 次做梦把它当不存在(候选集同样只取活跃行),于是库里多出一行同源总览。
70+ // 口径是保守方向的:拿不准的行一律不吸收——少做一步没有代价,收错一步是内容事故。
71+ const ABSORB_EXEMPT_TYPES = new Set ( [ "document" , "summary" ] ) ;
72+
6373/**
6474 * Build the document registrar. Injected deps are service.js closure members
6575 * (store / embedQuery / transaction / finalize) so this module stays free of
6676 * service-internal wiring; `finalize` is the single write epilogue (mirror
6777 * sync + notify + re-embed) so callers never duplicate it.
6878 *
69- * @returns {(payload: object) => Promise<object> }
79+ * `pinnedTypes` 是注入的 #249 逐字保真池(service.js 的 PINNED_MEMORY_TYPES):
80+ * 这里不 import 它在 service.js 里,是因为 service.js 反向 import 本模块——
81+ * 方向反了会成环。
82+ *
83+ * @returns {(payload: object, opts?: object) => Promise<object> }
7084 * `{ action: "created"|"superseded", memory, superseded?, evidence_kept,
71- * evidence_dropped, degraded }`
85+ * evidence_dropped, evidence_archived, degraded }`
7286 * @throws flag 关 / 路径非法或文件缺失 / title 或 summary 为空 / evidence 全部
7387 * 捏造 / 仅 vector 近重复(疑似重复外档,交 agent 裁决而不是静默二选一)。
7488 */
75- export function createDocumentRegistrar ( { store, config, embedQuery, pushContentHistory, transaction, finalize } ) {
76- return async function registerDocument ( payload , { hiddenEvidenceIds = [ ] } = { } ) {
89+ export function createDocumentRegistrar ( { store, config, embedQuery, pushContentHistory, transaction, finalize, pinnedTypes } ) {
90+ return async function registerDocument ( payload , { hiddenEvidenceIds = [ ] , archiveEvidence = true } = { } ) {
7791 // opt-in 总闸(#230 对齐 #228 形态):关 = 注册入口整体不存在,错误信息
7892 // 指回配置键,agent 能准确转告用户去开。
7993 if ( config ?. documentMemoryEnabled !== true ) {
@@ -121,15 +135,14 @@ export function createDocumentRegistrar({ store, config, embedQuery, pushContent
121135 const hidden = new Set ( ( Array . isArray ( hiddenEvidenceIds ) ? hiddenEvidenceIds : [ ] ) . map ( ( id ) => String ( id ) ) ) ;
122136 const kept = [ ] ;
123137 const dropped = [ ] ;
138+ // 存在但已归档的引用另记一份:它可能是被上一版文档升格吸收走的行(见下方
139+ // supersede 目标探测后的「认回」),不能一律按「不可用」处理。
140+ const archivedRefs = new Set ( ) ;
124141 for ( const id of wanted ) {
125142 const row = hidden . has ( id ) ? null : store . getById ( id ) ;
143+ if ( row ?. archived ) archivedRefs . add ( id ) ;
126144 ( row && ! row . archived ? kept : dropped ) . push ( id ) ;
127145 }
128- if ( wanted . length > 0 && kept . length === 0 ) {
129- throw new Error (
130- `registerDocument: all ${ wanted . length } evidence ids are unknown, archived or out of scope — fabricated evidence is rejected`
131- ) ;
132- }
133146
134147 const title = String ( payload ?. title ?? "" ) . trim ( ) ;
135148 if ( ! title ) throw new Error ( "registerDocument: title is required" ) ;
@@ -162,6 +175,25 @@ export function createDocumentRegistrar({ store, config, embedQuery, pushContent
162175 . filter ( ( m ) => scopeMatches ( m ) ) ;
163176 const explicitTarget = scopeMatched . find ( ( m ) => samePath ( m . doc_path , expanded ) )
164177 ?? scopeMatched . find ( ( m ) => m . title . trim ( ) === title ) ;
178+ // 升格吸收过的引用认回(#275 拍板 5 的配套):evidence 行在文档注册成功后就翻了
179+ // archived,于是「同一份文档出新版、evidence 照旧」这一最常规的路径会整批落在
180+ // dropped——那会被下面的捏造判据误报成「证据都是编的」。口径:已归档行仍可为
181+ // **吸收它的那份文档**背书(loser.evidence 就是它吸收走的名单),不为别的文档
182+ // 背书;捏造与跨 scope 照旧拒绝。
183+ if ( explicitTarget ) {
184+ const own = new Set ( explicitTarget . evidence ?? [ ] ) ;
185+ for ( const id of archivedRefs ) {
186+ if ( ! own . has ( id ) ) continue ;
187+ const at = dropped . indexOf ( id ) ;
188+ if ( at >= 0 ) dropped . splice ( at , 1 ) ;
189+ kept . push ( id ) ;
190+ }
191+ }
192+ if ( wanted . length > 0 && kept . length === 0 ) {
193+ throw new Error (
194+ `registerDocument: all ${ wanted . length } evidence ids are unknown, archived or out of scope — fabricated evidence is rejected`
195+ ) ;
196+ }
165197 if ( ! explicitTarget ) {
166198 // vector 档:embedder 不可用/向量缺失一律跳过——去重是增强不是写入依赖
167199 // (findSessionDuplicate 同原则)。probe 用 title+summary,与行向量
@@ -237,7 +269,25 @@ export function createDocumentRegistrar({ store, config, embedQuery, pushContent
237269 store . setArchived ( loser . id , true ) ;
238270 superseded = store . getById ( loser . id ) ;
239271 }
240- return { created, superseded } ;
272+ // #275 拍板 5(#230 验收口径的补丁):升格吸收的 evidence 行随之退出活跃面——
273+ // 一次吸收 20 条,库里就是「21 行不是 1 行」。四条口径:①与本行同一事务(要么
274+ // 都成、要么都不成);②pinned(constraint / preference,即 #249 的逐字保真池)
275+ // 永不自动归档——升格不能绕过它;③自有生命周期的类型(document / summary,见
276+ // ABSORB_EXEMPT_TYPES)不吸收,吸收的是原子条;④只翻标志位、内容与审计全留
277+ // (可恢复),opt-out 走 archiveEvidence。
278+ // pinnedTypes 拿不到就不做这一步:宁可少做,也不能把保真池当普通行收走。
279+ let evidenceArchived = 0 ;
280+ if ( archiveEvidence && pinnedTypes && typeof pinnedTypes . has === "function" ) {
281+ for ( const id of kept ) {
282+ // 事务内重读:期间被别的进程归档/遗忘的行不重复计数,也不误伤 pinned。
283+ const row = store . getById ( id ) ;
284+ if ( ! row || row . archived || row . forgotten ) continue ;
285+ if ( pinnedTypes . has ( row . type ) || ABSORB_EXEMPT_TYPES . has ( row . type ) ) continue ;
286+ store . setArchived ( id , true ) ;
287+ evidenceArchived += 1 ;
288+ }
289+ }
290+ return { created, superseded, evidenceArchived } ;
241291 } ) ;
242292 finalize ( result . superseded ? [ result . created , result . superseded ] : [ result . created ] ) ;
243293 return {
@@ -246,6 +296,7 @@ export function createDocumentRegistrar({ store, config, embedQuery, pushContent
246296 ...( result . superseded ? { superseded : result . superseded } : { } ) ,
247297 evidence_kept : kept . length ,
248298 evidence_dropped : dropped . length ,
299+ evidence_archived : result . evidenceArchived ,
249300 degraded : dropped . length > 0
250301 } ;
251302 } ;
0 commit comments