dsh-prime-memory 0.20.0-beta.9 → 0.20.2

package/dist/index.js

@@ -36,10 +36,8 @@ import { SlotStore } from './store/slots.js';
 import { registerMemoryTools } from './tools/index.js';
 import { registerSlotTools } from './tools/slots.js';
 import { registerSlotRecall } from './hooks/slot-recall.js';
-import { registerLongTaskMonitor } from './hooks/long-task.js';
-import { ContextUsageStore } from './store/context-usage.js';
-import { TodoRefStore } from './store/todo-ref.js';
 import { RoomRegistryStore } from './store/rooms-registry.js';
+import { RecallUsageStore } from './store/recall-usage.js';
 import { registerSlotsProjection } from './projection/slots.js';
 import { errDetail, withFileLog } from './util/filelog.js';
 import { buildRouteChain, resolveModelRoute, invalidateEffortCache } from './llm.js';
@@ -162,6 +160,7 @@ export async function apply(ctx, config) {
         }
     }
     const stores = {
+        usage: undefined, // 装配于下方(依赖 dataDir 就绪)
         l0: new L0Store(dataDir, db, embed, logger),
         l1: new L1Store(dataDir, db, embed, config.recall.strategy, logger, config.recall.decayHalfLifeDays, 
         // §D 第 3 路:图谱回链。图谱不可用时 searchNodes 自带 no-op,不影响双路。
@@ -364,28 +363,17 @@ export async function apply(ctx, config) {
     if (storageOk) {
         flushL0 = registerCapture(ctx, config, runner, stores.l0, logger, live, modes);
     }
-    // 长任务模式(cfg.longTask.enabled 门控,默认关):官方 usage 上下文计量 +
-    // todo/write 快照参考(仅长任务会话;写 pinned 槽位走 slot-recall 常驻注入)。
-    const contextUsage = new ContextUsageStore(logger);
-    const todoRef = new TodoRefStore();
-    // Room 注册表(分类管理 beta.4;损坏降级为纯自生长目录)
-    if (storageOk) {
-        registerLongTaskMonitor(ctx, {
-            cfg: config,
-            modes,
-            slots: stores.slots,
-            contextUsage,
-            todoRef,
-            logger,
-        });
-    }
-    const recall = registerRecall(ctx, config, stores, logger, live, modes, dataDir);
+    // 召回使用统计(进 topN 才算 used;热路径只碰内存,去抖落盘)
+    const recallUsage = new RecallUsageStore(dataDir, logger);
+    await recallUsage.init();
+    stores.usage = recallUsage;
+    const recall = registerRecall(ctx, config, stores, logger, live, modes, dataDir, recallUsage);
     runner.setAfterRun(recall.invalidateProfile);
     registerMemoryTools(ctx, config, stores, logger, modes, live, ruminate, storageOk ? roomRegistry : undefined);
     // 激活槽位(active slot):工具面 + 常驻注入 + 服务端投影(均走 ctx.effect,可撤销)
     registerSlotTools(ctx, config, stores.slots, logger, modes, live, stores.l1);
     const slotRecall = registerSlotRecall(ctx, config, stores.slots, logger, live);
-    registerSlotsProjection(ctx, stores.slots);
+    registerSlotsProjection(ctx, stores.slots, stores.l1);
     void slotRecall;
     registerMemoryRpc(ctx, config, stores, logger, {
         degraded: () => !storageOk || db.isDegraded(),
@@ -400,7 +388,7 @@ export async function apply(ctx, config) {
         runnerView: (sid, mode) => runner.sessionView(sid, mode),
         l0Count: (sid) => stores.l0.countBySession(sid),
         capabilities: () => db.getCapabilities(),
-    }, ruminate, storageOk ? { runner, slots: stores.slots, contextUsage, todoRef } : undefined, storageOk ? roomRegistry : undefined);
+    }, ruminate, storageOk ? roomRegistry : undefined);
     // bench 控制服务(config.benchControl 门控,默认关):仅基准/调试部署注册,
     // 供同进程的 bench-runner lifecycle 赛道触发 rebuild / 设置会话档位
     // (宿主侧 RPC 无 call(),见 bench-control.ts)

package/dist/metadata-validators.d.ts

@@ -10,6 +10,11 @@
  * 已是 string 的变量收窄成 `never`(该分支内无法再 `.slice`,已在 wing-backfill 踩过)。
  */
 export declare function isWingId(v: unknown): boolean;
+/**
+ * 两级 Room slug(`major` 或 `major/minor`,各段满足 isTag;至多一个 slash)。
+ * Room 注册表/归类写回的 tags 域;与 rooms-registry.ts 同一事实源(就近定义避免依赖环)。
+ */
+export declare function isRoomSlug(v: unknown): boolean;
 /** 同为布尔谓词(理由见 isWingId 注释)。 */
 export declare function isTag(v: unknown): boolean;
 /**

package/dist/metadata-validators.js

@@ -31,6 +31,16 @@ export function isWingId(v) {
 }
 /** 标签(Room 的构成单元)校验:小写字母数字连字符,1-32 字符。 */
 const TAG_RE = /^[a-z0-9][a-z0-9-]{0,31}$/;
+/**
+ * 两级 Room slug(`major` 或 `major/minor`,各段满足 isTag;至多一个 slash)。
+ * Room 注册表/归类写回的 tags 域;与 rooms-registry.ts 同一事实源(就近定义避免依赖环)。
+ */
+export function isRoomSlug(v) {
+    if (typeof v !== 'string')
+        return false;
+    const parts = v.split('/');
+    return parts.length <= 2 && parts.every((p) => TAG_RE.test(p));
+}
 /** 同为布尔谓词(理由见 isWingId 注释)。 */
 export function isTag(v) {
     return typeof v === 'string' && TAG_RE.test(v);
@@ -47,7 +57,7 @@ export function normTags(v, max = 3) {
         if (typeof raw !== 'string')
             continue;
         const t = raw.trim().toLowerCase();
-        if (!isTag(t) || out.includes(t))
+        if (!(isTag(t) || isRoomSlug(t)) || out.includes(t))
             continue;
         out.push(t);
         if (out.length >= max)

package/dist/pipeline/recluster.js

@@ -15,7 +15,7 @@ export async function processSceneReclusterJobs(source, scenes, logger, maxJobs
         const family = job.family === 'work' ? 'work' : 'chat';
         const store = scenes[family];
         // 快照在 try 外声明:catch 的回滚要用它
-        let snapshots = [];
+        const snapshots = [];
         try {
             // ① 内存快照:按场景名(文件 basename)匹配当前存在的摘要文件
             const all = await store.list();

package/dist/projection/slots.d.ts

@@ -17,6 +17,20 @@ export interface SlotsViewSlot {
     kind: string;
     status: string;
     priority: number;
+    /** 原始引用(L1 record_id / 文件路径 / URL);存在才校验,旧 checkpoint 无此字段照常通过。 */
+    refs?: string[];
+    /**
+     * L1 record_id 类引用的解析视图(v0.20.2):ref → 名称简述(content 首行截断)。
+     * 前端展示用;解析发生在投影帧构建时(帧随 slots rev 刷新,L1 记录后续编辑
+     * 不回灌旧帧——引用集在写入时即冻结,可接受)。缺失/已退场记录不产生条目,
+     * 前端回落显示原始 ref。
+     */
+    refViews?: SlotRefView[];
+}
+/** 一条 record_id 引用的展示解析。 */
+export interface SlotRefView {
+    ref: string;
+    title: string;
 }
 export interface SlotsProjectionState {
     rev: number;
@@ -51,5 +65,13 @@ interface SchemaLike<T> {
 export declare const stateSchema: SchemaLike<SlotsProjectionState>;
 /** wire view 校验:registry 在 view 出网前调用(也覆盖 live drive 的发布路径)。 */
 export declare const viewSchema: SchemaLike<SlotsView>;
-export declare function registerSlotsProjection(ctx: Context, store: SlotStore): void;
+/** 投影需要的 L1 只读面(结构化声明,避免跨模块类型耦合)。 */
+export interface L1LookupFace {
+    getByIds(ids: string[]): Array<{
+        id: string;
+        content: string;
+        type: string;
+    }>;
+}
+export declare function registerSlotsProjection(ctx: Context, store: SlotStore, l1?: L1LookupFace): void;
 export {};

package/dist/projection/slots.js

@@ -40,6 +40,26 @@ function parseSlotsPayload(value, what) {
         if (typeof priority !== 'number' || !Number.isInteger(priority) || priority < 0 || priority > 100) {
             invalid(at, 'priority 必须是 0-100 的整数');
         }
+        // refs / refViews:存在才校验(附加字段,旧 checkpoint 行没有也必须整条通过)
+        if (item.refs !== undefined) {
+            if (!Array.isArray(item.refs))
+                invalid(at, 'refs 必须是字符串数组');
+            item.refs.forEach((r, i) => {
+                if (typeof r !== 'string')
+                    invalid(at + '.refs[' + i + ']', '必须是字符串');
+            });
+        }
+        if (item.refViews !== undefined) {
+            if (!Array.isArray(item.refViews))
+                invalid(at, 'refViews 必须是数组');
+            item.refViews.forEach((v, i) => {
+                const at2 = at + '.refViews[' + i + ']';
+                const view = requireRecord(v, at2);
+                if (typeof view.ref !== 'string' || typeof view.title !== 'string') {
+                    invalid(at2, 'ref/title 必须是字符串');
+                }
+            });
+        }
     });
     return value;
 }
@@ -51,9 +71,38 @@ export const stateSchema = {
 export const viewSchema = {
     parse: (value) => parseSlotsPayload(value, 'memorySlots.view'),
 };
-function buildState(store) {
+/** L1 record_id 的引用形态(newId('mem') 生成)。 */
+const RECORD_REF_PREFIX = 'mem_';
+/** refView 名称简述的截断上限(展示用,全文走 memory_receipts / memory_read_scene)。 */
+const REF_TITLE_MAX = 80;
+/**
+ * 把槽位 refs 里的 L1 record_id 解析成名称简述([type] content 首行截断)。
+ * 只解析 record_id 类引用;路径/URL 保持字面。缺失/已退场记录不产生条目。
+ */
+function resolveRefViews(refs, l1) {
+    const recordRefs = refs.filter((r) => r.startsWith(RECORD_REF_PREFIX));
+    if (recordRefs.length === 0 || l1 === undefined)
+        return undefined;
+    const byId = new Map(l1.getByIds(recordRefs).map((r) => [r.id, r]));
+    const views = [];
+    for (const ref of recordRefs) {
+        const record = byId.get(ref);
+        if (record === undefined)
+            continue;
+        const firstLine = record.content.split('\n', 1)[0] ?? '';
+        const summary = firstLine.length > REF_TITLE_MAX ? firstLine.slice(0, REF_TITLE_MAX) + '…' : firstLine;
+        views.push({ ref, title: '[' + record.type + '] ' + summary });
+    }
+    return views.length > 0 ? views : undefined;
+}
+function buildState(store, l1) {
     const snap = store.projectionSnapshot();
-    return { rev: store.revision(), count: snap.count, openCount: snap.openCount, slots: snap.slots };
+    const slots = snap.slots.map((slot) => {
+        if (slot.refs === undefined)
+            return slot;
+        return { ...slot, refViews: resolveRefViews(slot.refs, l1) };
+    });
+    return { rev: store.revision(), count: snap.count, openCount: snap.openCount, slots };
 }
 /**
  * view 引用稳定:同一 state 连续两次 view() 满足 Object.is(注册表据此判脏,
@@ -75,27 +124,22 @@ function view(state) {
 }
 /**
  * apply(state, event):同步。
- * - 仅 tool/result(settled,非 error)才检查:tool/call 在 store 变更提交前发生,按
- *   call 折会读到 stale;tool/result settled 才保证变更已落库(对齐 deliverables-fold)。
- * - 闭包 SlotStore,同步读 revision():rev 未变 → 本插件槽位未动 → 返回同引用
- *   (满足 I1b,避免 republish thrash);rev 变 → 重建快照。
- * - 任何无关事件 → 返回同引用(不 spread)。
+ * - **任意已提交事件都判脏**(v0.18.4 起):此前仅在 tool/result(settled、非 error)
+ *   时检查,实际运行中暴露出脆弱性——写入后的投影帧依赖"该会话恰好再来一条
+ *   tool/result"才刷新;跨会话场景(会话 A 写、会话 B 看)更是要等 B 自己的下一次
+ *   工具调用。改为对所有事件做 O(1) revision 比较:rev 未变 → 同引用(满足 I1b,
+ *   无 republish thrash);rev 变 → 立即重建。写入后的下一条任意事件(用户消息、
+ *   turn 边界、其他工具结果)都会把新帧推给客户端。
+ * - isError 守卫一并移除:rev 只在 store 真实变更后递增(persist 内联 RMW),
+ *   事件成败与否不影响"store 是否变了"这一事实;错误事件后重建读到的仍是
+ *   当前真实快照,不会引入错误数据。
  */
-function applySlotsEvent(state, event, store) {
-    if (event.type !== 'tool/result')
-        return state;
-    const data = event.data;
-    // v4 native（宿主 ≥0.1.7-rc.1）：isError 在 message 顶层；v3 wrapper：块上 isError（历史兼容）。
-    const isError = data?.message?.isError === true ||
-        (Array.isArray(data?.message?.content) &&
-            data.message.content.some((c) => c.isError === true));
-    if (isError)
-        return state;
+function applySlotsEvent(state, event, store, l1) {
     if (store.revision() === state.rev)
         return state;
-    return buildState(store);
+    return buildState(store, l1);
 }
-export function registerSlotsProjection(ctx, store) {
+export function registerSlotsProjection(ctx, store, l1) {
     ctx.inject(['sessionProjections'], (injected) => {
         const registry = injected
             .sessionProjections;
@@ -104,8 +148,8 @@ export function registerSlotsProjection(ctx, store) {
         registry.register({
             key: MEMORY_SLOTS_KEY,
             stateSchema,
-            init: () => buildState(store),
-            apply: (state, event) => applySlotsEvent(state, event, store),
+            init: () => buildState(store, l1),
+            apply: (state, event) => applySlotsEvent(state, event, store, l1),
             wire: { viewSchema, view },
             stateVersion: 0,
         });

package/dist/room-review.d.ts

@@ -65,6 +65,11 @@ export interface RoomMergeStore extends RoomReviewStore {
 export interface RoomRegistryMerge {
     markMerged(fromSlug: string, toSlug: string): Promise<boolean>;
     renameSlug(oldSlug: string, newSlug: string): Promise<boolean>;
+    /** rename 收尾恢复先前状态用(active 条目改名后不掉出标注词表)。 */
+    bySlug?(slug: string): {
+        status: 'active' | 'retired';
+    } | undefined;
+    setStatus?(slug: string, status: 'active' | 'retired'): Promise<boolean>;
 }
 export interface RoomCandidate {
     id: string;
@@ -153,7 +158,9 @@ export declare function mergeRoom(io: {
     dryRun?: boolean;
     cap?: number;
 }): Promise<MergeRoomResult>;
-/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。 */
+/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。
+ *  归类语义:改名**不是退役**——merge 编排的 markMerged 会把旧条目置 retired,
+ *  这里在改名后恢复其先前状态(active 条目改名后仍 active,不掉出标注词表)。 */
 export declare function renameRoom(io: {
     l1: RoomMergeStore;
     registry: RoomRegistryMerge;

package/dist/room-review.js

@@ -171,10 +171,10 @@ export async function mergeRoom(io, from, to, opts = {}) {
         const backup = io.l1.backupTagRecords(from);
         io.logger.info(`[memory] Room merge 备份:${from} → ${to},${backup.count} 条 → ${backup.file}`);
         let applied = 0;
-        let hasMore = false;
+        const hasMore = false; // 循环到收敛,单次调用内 hasMore 恒 false(重写返回值沿用结果形状)
         const families = new Set();
         const scenes = new Set();
-        // 游标重写:上限 cap/次,hasMore 时继续(总量受 cap×轮次约束,单飞内收敛)
+        // 游标重写:上限 cap/次,r.hasMore 时继续(总量受 cap×轮次约束,单飞内收敛)
         for (;;) {
             const r = io.l1.rewriteTag(from, to, cap);
             applied += r.rewritten;
@@ -202,11 +202,17 @@ export async function mergeRoom(io, from, to, opts = {}) {
         roomMergeRunning = false;
     }
 }
-/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。 */
+/** rename = merge 1:1 + 注册表改名(冲突时抛错提示走 merge)。
+ *  归类语义:改名**不是退役**——merge 编排的 markMerged 会把旧条目置 retired,
+ *  这里在改名后恢复其先前状态(active 条目改名后仍 active,不掉出标注词表)。 */
 export async function renameRoom(io, from, to, opts = {}) {
+    const priorStatus = io.registry.bySlug?.(from)?.status ?? 'active';
     const r = await mergeRoom(io, from, to, opts);
-    if (!r.dryRun && r.applied > 0)
+    if (!r.dryRun && r.applied > 0) {
         await io.registry.renameSlug(from, to);
+        if (priorStatus === 'active')
+            await io.registry.setStatus?.(to, 'active');
+    }
     return r;
 }
 /** 下一条待复查(供 agent 逐个过):记录摘要 + 候选 + 现有 Room 词表 + 剩余数。 */

package/dist/stats.d.ts

@@ -4,15 +4,12 @@ import { type RecallSessionStats } from './hooks/recall.js';
 import type { RebuildController } from './pipeline/rebuild.js';
 import type { RuminateController } from './pipeline/ruminate.js';
 import type { RoomRegistryStore } from './store/rooms-registry.js';
+import type { RecallUsageStore } from './store/recall-usage.js';
 import { type LiveSettingsHandle } from './settings.js';
 import type { GraphStore } from './store/graph-store.js';
 import type { L0Store } from './store/l0.js';
 import type { L1Store } from './store/l1.js';
 import type { PersonaStore } from './store/persona.js';
-import type { SlotStore } from './store/slots.js';
-import type { ContextUsageStore } from './store/context-usage.js';
-import type { TodoRefStore } from './store/todo-ref.js';
-import type { MemoryRunner } from './pipeline/runner.js';
 import type { SceneStore } from './store/scenes.js';
 import type { SessionModeStore } from './store/session-modes.js';
 import type { EmbeddingManager } from './store/embedding-source.js';
@@ -72,29 +69,6 @@ export interface SessionInfoSource {
 }
 import type { MemoryOccupancy, UiRecord } from './contract.js';
 export type { MemoryStats } from './contract.js';
-/** 注册状态 RPC(web 侧 connection 服务可选,缺失时跳过,不影响插件主体)。 */
-/** 长任务端点依赖(可选:未装配时端点返 enabled:false,不报错)。 */
-export interface LongTaskEndpointDeps {
-    runner: MemoryRunner;
-    slots: SlotStore;
-    contextUsage: ContextUsageStore;
-    todoRef: TodoRefStore;
-}
-/**
- * 尾部 turn 压缩:把 (水位线, maxCapturedTurn] 内最近的最近 N 轮强制蒸馏入记忆
- * (force 跳过阈值;L1 去重与水位线双重防重)。off 档会话保持完全隐身(不压缩)。
- * 无锚点老数据只在首次压缩(无水位线)时纳入——宁少收不重蒸。
- */
-export declare function compressTailTurns(sessionId: string, turns: number, io: {
-    modes: SessionModeStore;
-    l0: L0Store;
-    runner: MemoryRunner;
-    logger: MemoryLogger;
-}): Promise<{
-    enqueued: number;
-    fromTurn: number | null;
-    toTurn: number | null;
-}>;
 /** registerMemoryRpc 形参中需要落入端点 deps 的部分。 */
 interface MemoryRpcSources {
     status?: MemoryStatusSource;
@@ -104,8 +78,6 @@ interface MemoryRpcSources {
     rebuild?: RebuildController;
     embedManager?: EmbeddingManager;
     sessionInfo?: SessionInfoSource;
-    /** 长任务端点依赖(未装配 = 端点恒 disabled,面板不挂载)。 */
-    longTask?: LongTaskEndpointDeps;
     /** Room 注册表(未装配 = rooms-get 不带 registry,rooms-export 不可用)。 */
     roomRegistry?: RoomRegistryStore;
 }
@@ -123,6 +95,8 @@ export declare function registerMemoryRpc(ctx: Context, cfg: MemoryConfig, store
     scenes: Record<MemoryFamily, SceneStore>;
     persona: Record<MemoryFamily, PersonaStore>;
     state: StateStore;
+    /** 召回使用统计(可选)。 */
+    usage?: RecallUsageStore;
     /** 记忆后端(后台边界);未装配时回退为包 l1 的进程内实现。 */
     backend?: MemoryBackend;
     /** 图谱存储(可选:未装配时图谱端点返空,不报错)。 */
@@ -130,8 +104,6 @@ export declare function registerMemoryRpc(ctx: Context, cfg: MemoryConfig, store
 }, logger: MemoryLogger, status?: MemoryStatusSource, live?: LiveSettingsHandle, modes?: SessionModeStore, dataDir?: string, rebuild?: RebuildController, embedManager?: EmbeddingManager, sessionInfo?: SessionInfoSource, 
 /** 反刍控制器(存储降级时为 undefined):经 buildEndpointDeps 落入 deps.ruminate。 */
 ruminate?: RuminateController, 
-/** 长任务端点依赖(cfg.longTask.enabled 门控;缺省 = 端点恒 disabled)。 */
-longTaskDeps?: LongTaskEndpointDeps, 
 /** Room 分类管理依赖(注册表;缺省 = rooms-get 不带 registry、rooms-export 恒 404 语义)。 */
 roomRegistry?: RoomRegistryStore): void;
 export interface EndpointDeps {
@@ -140,6 +112,8 @@ export interface EndpointDeps {
     stores: {
         l0: L0Store;
         l1: L1Store;
+        /** 召回使用统计(可选:未装配 = 列表不带 usage/usageSummary)。 */
+        usage?: RecallUsageStore;
         scenes: Record<MemoryFamily, SceneStore>;
         persona: Record<MemoryFamily, PersonaStore>;
         state: StateStore;
@@ -156,14 +130,14 @@ export interface EndpointDeps {
     ruminate?: RuminateController;
     embedManager?: EmbeddingManager;
     sessionInfo?: SessionInfoSource;
-    /** 长任务端点依赖(未装配 = 端点恒 disabled,面板不挂载)。 */
-    longTask?: LongTaskEndpointDeps;
     /** Room 注册表(未装配 = rooms-get 不带 registry,rooms-export 不可用)。 */
     roomRegistry?: RoomRegistryStore;
 }
 /** 端点分发表(导出供测试直调:可精确注入 rebuild/ruminate 等可选控制器,验证 deps 接线)。 */
 export declare function handleEndpoint(endpoint: string, payload: unknown, deps: EndpointDeps): Promise<unknown>;
 /** 浏览器卡片字段(比 MemoryRecord 精简,去掉大 metadata;Hall 从 metadata 提取)。 */
+/** 老化权重(与读路径 applyDecayWeight 同式):max(0.5, 0.5^(Δ天/半衰期));半衰期 ≤0 = 关 → null。 */
+export declare function agingWeightOf(updatedAtMs: number | undefined, halfLifeDays: number, now?: number): number | null;
 export declare function hitToUiRecord(r: {
     id: string;
     content: string;
@@ -180,4 +154,12 @@ export declare function hitToUiRecord(r: {
     family?: string;
     /** 退场判据:`valid_to` 闭合即已退场(软删)。由 `listL1`/`getByIds` 透传。 */
     validTo?: number;
+}, extra?: {
+    agingWeight?: number | null;
+    usage?: {
+        attempts: number;
+        used: number;
+        lastAttemptAt: number | null;
+        lastUsedAt: number | null;
+    } | null;
 }): UiRecord;