dsh-prime-memory 0.21.0 → 0.22.2

package/dist/hooks/recall.js

@@ -11,7 +11,7 @@ import { applyRecallBudget, raceRecallTimeout, RECALL_EMBED_CAP_MS } from '../ut
 import { clearProfileShare, emptyOccupancyLedger, estimateInjectedMessageTokens, estimateStableSectionTokens, recordProfileShare, recordRecallInjection, resetForCompaction, } from '../util/context-occupancy.js';
 import { errDetail } from '../util/filelog.js';
 import { blocksToText } from '../util/text.js';
-import { domainGate, formatWeights, hardFilterByWingLock, sortByDomainWeight, WING_ANCHORS } from '../domain-gate.js';
+import { domainGate, formatWeights, hardFilterByWingLock, sortByDomainWeight, sortByUsageScenario, WING_ANCHORS } from '../domain-gate.js';
 const PROFILE_TTL = 60_000;
 /** 存储回填缓存上限(超过即按插入序淘汰最旧;查看会话数为百级,500 足够)。 */
 const STORED_ESTIMATE_CACHE_CAP = 500;
@@ -209,7 +209,7 @@ usage) {
     let ackDegradeWarned = false;
     // §E 压缩感知(memorax-absorb):宿主 `compaction/end`(无 error)→ 该会话下一轮
     // 做一次"定向增强召回"——跳过去重压制、画像立即重注入、占用账本归零;消费即清。
-    // 会话级回退路径保留(下方 session-start source='compact' 全量重置),两者幂等。
+    // 会话级回退路径保留(下方 agent/created source='compact' 全量重置),两者幂等。
     // 宿主无压缩计数器(compactionId 为 per-transaction UUID),故不做 generation 对账。
     const postCompaction = new PostCompactionTracker();
     ctx.on('session/event', (session, event) => {
@@ -225,6 +225,7 @@ usage) {
     ctx.on('agent/created', async (payload) => {
         if (payload.source === 'compact' || payload.source === 'clear') {
             dedupe.reset(payload.agent.id);
+            stores.recalled?.reset(String(payload.agent.session?.id ?? payload.agent.id));
             const led = ledgerFor(payload.agent.id);
             resetForCompaction(led);
             occupancyStore.save(payload.agent.id, led); // stock 归零 ⇒ 流水条目删除
@@ -372,6 +373,21 @@ usage) {
                     });
                     logger.info(`[memory] repo 软围栏:currentRepo=${currentRepoKey || '(未识别)'} 跨仓乘子=${cfg.recall.scopeFence.crossRepoMultiplier} agent=${payload.agent.id}`);
                 }
+                // ── G1 使用场景细排(默认关):命中 usageScenario 的记忆上浮,纯函数重排,score 不改写。
+                // 关闭时不进本分支(零 getByIds、零重排,召回逐字现状);无场景/未命中保持原序(fail-open)。
+                if (cfg.usageScenario?.enabled === true && scoped.length > 1) {
+                    const scenarioById = new Map(stores.l1.getByIds(scoped.map((h) => h.id)).map((r) => [
+                        r.id,
+                        Array.isArray(r.metadata?.dsh_usage_scenario)
+                            ? r.metadata.dsh_usage_scenario
+                            : [],
+                    ]));
+                    const before = scoped.map((h) => h.id).join(',');
+                    scoped = sortByUsageScenario(scoped, (id) => scenarioById.get(id) ?? [], query);
+                    if (scoped.map((h) => h.id).join(',') !== before) {
+                        logger.info(`[memory] 使用场景细排生效:agent=${payload.agent.id}`);
+                    }
+                }
                 // 召回去重:同会话已注入过的记录不再重复注入(模型上下文已持有,省 token)。
                 // 纯过滤——剩几条注几条,全量压制(0 条新鲜命中)是正确状态而非未命中。
                 // §E:压缩后增强轮跳过压制(压缩把已注入内容逐出了模型上下文)。
@@ -442,6 +458,9 @@ usage) {
                 });
                 // 使用统计:候选=scoped(尝试),进 topN(注入)=used
                 usage?.recordAttempt(scoped.map((h) => h.id), fresh.slice(0, lines.length).map((h) => h.id));
+                // G-live:按 **sessionKey**(=agent.session?.id ?? agent.id，与 pill 的 sessionId / 投影 header.id 同源，
+                // 非 ownerId)记入本会话“活召回集”，供侧栏卡读取；压缩时同键 reset。
+                stores.recalled?.add(sessionKey, fresh.slice(0, lines.length).map((h) => h.id));
                 // 入账在成功构造注入消息之后、返回 enter 之前——任何前置抛错路径账目零扰动
                 const led = ledgerFor(payload.agent.id);
                 recordRecallInjection(led, text.length);

package/dist/hooks/skill-recall.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 技能常驻注入 Hook（轨2）。**默认关**（cfg.skills.enabled && cfg.skills.inject）。
+ *
+ * 完全对齐 `slot-recall.ts` 的范式（同一注入通道范本，不新建入口）：
+ * - `agent/pre-step`(waterfall,prepend) 注入，`createUserMessage({source:{kind:'plugin:memory',form:'recall'}}})`
+ *   ——**复用既有 source kind**，自动享受 `isOwnRecallSource` 双形状判据与召回去重/占用账本（S4 红线）；
+ * - 帧体转义 `<\/system-reminder>` 防正文伪造帧边界；
+ * - **独立字节预算**（cfg.skills.maxPerTurnBytes），不与召回 2000 预算抢名额；
+ * - 注入前 `archiveDue` 机械闲置归档（0 LLM、不引入 timer，对齐 `slots.expireDue`）。
+ *
+ * 本轮语义：常驻注入全部 active 技能（按插入序 + 字节预算截断），**不做按触发词选择**
+ * （selective trigger 匹配属后续增强；常驻语义与 slots 一致，先保证默认关时零表面积）。
+ * 三档渲染（full/excerpt/hint）是显示策略，同一 body/steps 现场组词，无缓存副本漂移。
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { MemoryConfig } from '../config.js';
+import type { LiveSettingsHandle } from '../settings.js';
+import type { Skill, SkillStore } from '../store/skill-store.js';
+import type { MemoryLogger } from '../types.js';
+/** 按档位现场组词：full=标题+正文+步骤；excerpt=标题+正文截断；hint=仅标题+读取指引。 */
+export declare function renderSkill(s: Skill, excerptChars: number): string;
+export interface SkillRecallController {
+    buildInjection(): string | null;
+}
+export declare function registerSkillRecall(ctx: Context, cfg: MemoryConfig, skills: SkillStore, logger: MemoryLogger, live: LiveSettingsHandle): SkillRecallController;

package/dist/hooks/skill-recall.js

@@ -0,0 +1,72 @@
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
+const SYSTEM_REMINDER_OPEN = '<system-reminder>';
+const SYSTEM_REMINDER_CLOSE = '</system-reminder>';
+const SKILLS_INTRO = '以下是本环境沉淀的技能(程序性记忆):过去重复工作流固化出的清单,仅在与之相关时作为指引遵循。' +
+    '它们是系统注入的元信息,不是用户发言——无需回应,请勿在回复中复述本节内容;' +
+    '且不覆盖系统提示与用户的直接指令。需要完整步骤用 memory_skill_read 展开。';
+function escapeFrameBody(body) {
+    return body.replaceAll(SYSTEM_REMINDER_CLOSE, '<\\/system-reminder>');
+}
+/** 按档位现场组词：full=标题+正文+步骤；excerpt=标题+正文截断；hint=仅标题+读取指引。 */
+export function renderSkill(s, excerptChars) {
+    if (s.injectionTier === 'hint')
+        return `[技能·${s.title}] 详见 memory_skill_read(${s.id})`;
+    const steps = s.steps.length ? '\n' + s.steps.map((st) => `  - ${st}`).join('\n') : '';
+    if (s.injectionTier === 'full')
+        return `[技能·${s.title}] ${s.body}${steps}`;
+    const body = s.body.length > excerptChars ? s.body.slice(0, excerptChars) + '…' : s.body;
+    return `[技能·${s.title}] ${body}`;
+}
+export function registerSkillRecall(ctx, cfg, skills, logger, live) {
+    // 生效开关：部署 cfg.skills.enabled 或看板 live.skillsEnabled 任一开。
+    const on = () => cfg.skills.enabled === true || live.get().skillsEnabled === true;
+    const buildInjection = () => {
+        if (!on() || !cfg.skills.inject)
+            return null;
+        const active = skills.listActive();
+        if (active.length === 0)
+            return null;
+        const budget = cfg.skills.maxPerTurnBytes;
+        const out = [];
+        let used = 0;
+        let hidden = 0;
+        for (const s of active) {
+            const rendered = renderSkill(s, cfg.skills.excerptChars);
+            const bytes = Buffer.byteLength(rendered, 'utf8');
+            if (used + bytes > budget) {
+                hidden++;
+                continue;
+            }
+            out.push(rendered);
+            used += bytes;
+        }
+        if (out.length === 0)
+            return null;
+        if (hidden > 0)
+            out.push(`… 另有 ${hidden} 个技能因预算未显示,可用 memory_skill_list 查看`);
+        return [SYSTEM_REMINDER_OPEN, SKILLS_INTRO, escapeFrameBody(out.join('\n')), SYSTEM_REMINDER_CLOSE].join('\n');
+    };
+    ctx.on('agent/pre-step', async (payload, next) => {
+        const decision = await next();
+        if (decision.kind === 'reject' || (payload.signal && payload.signal.aborted))
+            return decision;
+        if (!on() || !cfg.skills.inject)
+            return decision;
+        try {
+            await skills.archiveDue(Date.now(), cfg.skills.idleArchiveDays);
+            const text = buildInjection();
+            if (!text)
+                return decision;
+            const injection = createUserMessage({
+                content: [{ type: 'text', text }],
+                source: { kind: 'plugin:memory', form: 'recall' },
+            });
+            return { kind: 'enter', messages: [injection, ...decision.messages] };
+        }
+        catch (err) {
+            logger.warn(`[memory] 技能注入失败(跳过本轮): ${err instanceof Error ? err.message : String(err)}`);
+            return decision;
+        }
+    });
+    return { buildInjection };
+}

package/dist/index.d.ts

@@ -84,6 +84,51 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         maxPending: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         timeoutDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
     }>>, "plain">;
+    memport: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        scanMaxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        scanMaxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    skills: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        allowPromote: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        minSessions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        minEvidence: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxPerTurnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxSkillCatalogBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        excerptChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        idleArchiveDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        allowPromote: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        minSessions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        minEvidence: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxPerTurnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxSkillCatalogBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        excerptChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        idleArchiveDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    backfill: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        maxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        timeBudgetMs: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        maxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        timeBudgetMs: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    usageScenario: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, "plain">;
+    narrativeTemplates: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, "plain">;
     recall: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
         enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         maxResults: import("@deepseek-ai/schemastery").default<number, number, "defined">;
@@ -315,12 +360,14 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         maxSlots: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxAlwaysOnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxBodyChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        migrateLegacy: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     }>>, Schemastery.ObjectT<NoInfer<{
         enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         maxSlots: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxAlwaysOnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxBodyChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        migrateLegacy: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     }>>, "plain">;
     tools: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     benchControl: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
@@ -421,6 +468,7 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         embedRemoteDimensions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         memoryMutate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         conflictFreeze: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        skillsEnabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRoom: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolGraph: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRuminate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
@@ -523,6 +571,7 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         embedRemoteDimensions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         memoryMutate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         conflictFreeze: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        skillsEnabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRoom: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolGraph: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRuminate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
@@ -598,6 +647,51 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         maxPending: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         timeoutDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
     }>>, "plain">;
+    memport: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        scanMaxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        scanMaxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    skills: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        allowPromote: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        minSessions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        minEvidence: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxPerTurnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxSkillCatalogBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        excerptChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        idleArchiveDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        allowPromote: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        minSessions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        minEvidence: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxPerTurnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        maxSkillCatalogBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        excerptChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        idleArchiveDays: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    backfill: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        maxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        timeBudgetMs: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        maxRecords: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        timeBudgetMs: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+    }>>, "plain">;
+    usageScenario: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, "plain">;
+    narrativeTemplates: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, Schemastery.ObjectT<NoInfer<{
+        enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+    }>>, "plain">;
     recall: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
         enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         maxResults: import("@deepseek-ai/schemastery").default<number, number, "defined">;
@@ -829,12 +923,14 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         maxSlots: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxAlwaysOnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxBodyChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        migrateLegacy: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     }>>, Schemastery.ObjectT<NoInfer<{
         enabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         inject: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         maxSlots: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxAlwaysOnBytes: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         maxBodyChars: import("@deepseek-ai/schemastery").default<number, number, "defined">;
+        migrateLegacy: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     }>>, "plain">;
     tools: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
     benchControl: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
@@ -935,6 +1031,7 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         embedRemoteDimensions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         memoryMutate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         conflictFreeze: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        skillsEnabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRoom: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolGraph: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRuminate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
@@ -1037,6 +1134,7 @@ export declare const Config: import("@deepseek-ai/schemastery").default<Schemast
         embedRemoteDimensions: import("@deepseek-ai/schemastery").default<number, number, "defined">;
         memoryMutate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         conflictFreeze: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
+        skillsEnabled: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRoom: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolGraph: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;
         toolRuminate: import("@deepseek-ai/schemastery").default<boolean, boolean, "defined">;

package/dist/index.js

@@ -13,6 +13,7 @@ import { memorySchema, resolveDataDir } from './config.js';
 import { registerBenchControl } from './bench-control.js';
 import { registerCapture } from './hooks/capture.js';
 import { registerRecall } from './hooks/recall.js';
+import { SessionRecalledStore } from './store/session-recalled.js';
 import { MemoryRunner } from './pipeline/runner.js';
 import { RebuildController } from './pipeline/rebuild.js';
 import { RuminateController } from './pipeline/ruminate.js';
@@ -37,8 +38,13 @@ import { registerMemoryTools } from './tools/index.js';
 import { registerSlotTools } from './tools/slots.js';
 import { registerSlotRecall } from './hooks/slot-recall.js';
 import { RoomRegistryStore } from './store/rooms-registry.js';
+import { MemorySourceStore } from './store/memory-sources.js';
+import { SkillStore } from './store/skill-store.js';
+import { registerSkillRecall } from './hooks/skill-recall.js';
+import { registerSkillTools } from './tools/skills.js';
 import { RecallUsageStore } from './store/recall-usage.js';
 import { registerSlotsProjection } from './projection/slots.js';
+import { registerRecallProjection } from './projection/recall.js';
 import { errDetail, withFileLog } from './util/filelog.js';
 import { buildRouteChain, resolveModelRoute, invalidateEffortCache } from './llm.js';
 import { effectiveCfg } from './pipeline/runner.js';
@@ -175,6 +181,8 @@ export async function apply(ctx, config) {
             work: new PersonaStore(dataDir, 'work', logger),
         },
         state: new StateStore(StateStore.pathFor(dataDir), logger),
+        // 会话“活召回集”（G-live）：sessionKey → 本会话已注入未压缩的记录 id；持久化，旧会话重开载回。
+        recalled: new SessionRecalledStore(dataDir, logger),
         // 激活槽位(active slot):独立 slots.json,高频小改不拖累 checkpoint 原子写
         slots: new SlotStore(SlotStore.pathFor(dataDir), logger, {
             maxSlots: config.slots.maxSlots,
@@ -356,6 +364,12 @@ export async function apply(ctx, config) {
     // Room 注册表(分类管理 beta.4;损坏降级为纯自生长目录)
     const roomRegistry = new RoomRegistryStore(dataDir, logger);
     await roomRegistry.init();
+    // 外部记忆来源注册表（轨3 Connect；默认由 cfg.memport.enabled 关门控，sidecar 本身无条件加载）
+    const memorySources = new MemorySourceStore(dataDir, logger);
+    await memorySources.init();
+    // 技能存储（轨2；sidecar 无条件加载，但工具/注入均由 cfg.skills.enabled 默认关自 no-op）
+    const skillStore = new SkillStore(dataDir, logger);
+    await skillStore.init();
     const ruminate = storageOk && !db.isDegraded() && ruminateFile
         ? new RuminateController(ctx, config, runner, stores, logger, live, ruminateFile, roomRegistry)
         : undefined;
@@ -373,7 +387,18 @@ export async function apply(ctx, config) {
     // 激活槽位(active slot):工具面 + 常驻注入 + 服务端投影(均走 ctx.effect,可撤销)
     registerSlotTools(ctx, config, stores.slots, logger, modes, live, stores.l1);
     const slotRecall = registerSlotRecall(ctx, config, stores.slots, logger, live);
+    // 轨2 技能：工具面与常驻注入（均 cfg.skills.enabled 默认关时自 no-op，零表面积）。
+    registerSkillTools(ctx, config, skillStore, logger, live);
+    registerSkillRecall(ctx, config, skillStore, logger, live);
+    // memorySlots 投影：常驻槽位（手动 pin 的约定）的展示契约，消费方是 dsh-brief-sidebar。
+    // 宿主契约（dsh-session-projection/lib/index.js）：插件不注册时 key 从快照消失、
+    // 客户端读作 capability absence（不会毒化历史加载），所以“摘注册”技术上可行；
+    // 但那是把跨插件展示契约直接抽掉，旧版 brief-sidebar 会默默丢分区——隐藏请走它自己的
+    // 「记忆槽位分区」开关。本包另提供一个会话感知的 memoryRecall 投影。
     registerSlotsProjection(ctx, stores.slots, stores.l1);
+    // memoryRecall 投影：本会话“已注入且未被压缩覆盖”的召回集（会话感知，init 取 header.id），
+    // 与常驻槽位是两条轴：那个是手动 pin 的硬注入约定，这个是非常驻的相关性浮现结果。
+    registerRecallProjection(ctx, stores.recalled, stores.l1);
     void slotRecall;
     registerMemoryRpc(ctx, config, stores, logger, {
         degraded: () => !storageOk || db.isDegraded(),
@@ -388,7 +413,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 ? roomRegistry : undefined);
+    }, ruminate, storageOk ? roomRegistry : undefined, storageOk ? memorySources : undefined, skillStore);
     // bench 控制服务(config.benchControl 门控,默认关):仅基准/调试部署注册,
     // 供同进程的 bench-runner lifecycle 赛道触发 rebuild / 设置会话档位
     // (宿主侧 RPC 无 call(),见 bench-control.ts)

package/dist/memport/format.d.ts

@@ -0,0 +1,70 @@
+/** MMF v1.1 默认列序（缺 `#cols=` 时按此解析；v1 包缺 vf/vt/st 列按 -/-/? 补齐）。 */
+export declare const DEFAULT_COLS: readonly ["type", "created", "updated", "vf", "vt", "st", "cf", "rw", "tags", "content"];
+/** 类型码 → 运行时 type（与 memport.py TYPE_CODES 一字不差）。 */
+export declare const TYPE_CODES: Record<string, string>;
+/** 持续性取值域：p 时点 / s 已结束区间 / o 仍在持续 / t 无时间性 / ? 未判定。 */
+export declare const PERSISTENCE: readonly ["p", "s", "o", "t", "?"];
+export interface MemRecord {
+    seq: number;
+    type: string;
+    typeFull: string;
+    created: string;
+    updated: string;
+    vf: string;
+    vt: string;
+    st: string;
+    cf: string;
+    rw: string;
+    tags: Record<string, string>;
+    content: string;
+    hash: string;
+    createdMs: number | null;
+    createdPrec: string;
+    updatedMs: number | null;
+    updatedPrec: string;
+    vfMs: number | null;
+    vfPrec: string;
+    vtMs: number | null;
+    vtPrec: string;
+}
+export interface Bundle {
+    header: Record<string, string>;
+    cols: string[];
+    records: MemRecord[];
+    errors: string[];
+    warnings: string[];
+    declaredCount: number | null;
+    declaredSha: string | null;
+    /** 记录体原始行（未去转义），用于校验和复算——与 Python `body` 对齐。 */
+    bodyLines: string[];
+}
+/** NFKC + 空白折叠 + 去首尾（用于哈希与相似度，不改原文）。 */
+export declare function normText(s: string): string;
+/**
+ * 内容哈希：sha256(normText + 小写)[:16]。
+ * 注意：Python 用 casefold（激进大小写折叠），JS 用 toLowerCase；
+ * 对 CJK/ASCII 记忆正文等价，仅极端 Unicode 有别——实际记忆集不含此类，
+ * 跨实现金标准走包级 sha256（不逐条折叠），不受影响。
+ */
+export declare function contentHash(s: string): string;
+/** 记录稳定 id：`mp_` + sha256(src|chash)[:16]。 */
+export declare function recordId(src: string, chash: string): string;
+/** 解码内容列：反斜杠+反斜杠 → 单反斜杠；反斜杠+n → 换行（其余反斜杠原样）。 */
+export declare function unescapeContent(s: string): string;
+/**
+ * 编码内容列：反斜杠 → 双反斜杠、CRLF → LF、LF → 反斜杠+n。
+ * 用 charCode 常量而非控制字符字面量，避免跨工具写盘时 CR/LF 被吞进正则/字符串字面量。
+ */
+export declare function escapeContent(s: string): string;
+/** `k:v;k:v` → 对象（缺冒号的段忽略）。 */
+export declare function parseTags(raw: string): Record<string, string>;
+/** 时间串 → { ms|null, precision }（镜像 Python parse_time；naive 视为本地）。 */
+export declare function parseTime(raw: string): {
+    ms: number | null;
+    precision: string;
+};
+/**
+ * 解析整包文本 → Bundle（含结构校验）。镜像 memport.py parse_bundle。
+ * 入参是字符串（调用方读文件时自带编码处理）；此处容错剥离 BOM。
+ */
+export declare function parseBundle(text: string): Bundle;