dsh-lite-memory 0.18.19 → 0.18.26

package/index.js

@@ -29,6 +29,8 @@ import {
   evolutionStatus,
   controlStatus,
   setMemoryEnabled,
+  setMemoryControl,
+  setRecallMode,
   isExperimentalRecord,
   setEvolution,
   taskState,
@@ -83,6 +85,9 @@ function cwdOf(execution) {
   return process.cwd();
 }
 
+/** 插件配置的默认触发方式，面板要按项目实际生效值显示。 */
+let hostRecallMode = 'adaptive';
+
 /** 本项目记忆总开关：读不出来时不擅自关掉，按开处理。 */
 function memoryEnabled(scope) {
   try {
@@ -168,6 +173,12 @@ function noteRecall(scope, sessionId, receipt) {
   while (recallReceipts.size > 64) recallReceipts.delete(recallReceipts.keys().next().value);
 }
 
+/** 投影没发出去就撤销回执：面板不能显示一条模型从没见过的提醒。 */
+function clearRecall(scope, sessionId) {
+  if (!scope || typeof sessionId !== 'string' || !sessionId) return;
+  recallReceipts.delete(`${scope.key}\u0000${sessionId}`);
+}
+
 function recallReceiptOf(scope, sessionId) {
   if (!scope || typeof sessionId !== 'string' || !sessionId) return null;
   return recallReceipts.get(`${scope.key}\u0000${sessionId}`) || null;
@@ -290,6 +301,8 @@ function keepHandler(webServer, cwdForSession) {
         scope: found.scope,
         scopeLabel: found.scopeLabel || '',
         revision: found.revision,
+        applicability: found.applicability || 'all_in_scope',
+        conditions: Array.isArray(found.conditions) ? found.conditions : [],
         body: found.body,
         currentBody: typeof found.currentBody === 'string' ? found.currentBody : found.body,
         versions,
@@ -328,8 +341,15 @@ function keepHandler(webServer, cwdForSession) {
         return sendJson(res, 409, { ok: false, reason: '这条记忆的版本不清楚，先刷新再改' });
       }
       if (!title.trim()) return sendJson(res, 400, { ok: false, reason: '标题不能为空' });
+      /** 面板只让人确认「适用范围」这一件事实，不开放条件编辑；取值由 view 再校验。 */
+      const applicability = typeof body.applicability === 'string' ? body.applicability : undefined;
+      const conditions = Array.isArray(body.conditions) ? body.conditions : undefined;
       try {
-        const result = saveEntry(scope, { id, title, body: text, expectedRevision, scope: 'project', source: 'user_explicit' });
+        const result = saveEntry(scope, {
+          id, title, body: text, expectedRevision, scope: 'project', origin: 'user_explicit',
+          ...(applicability !== undefined ? { applicability } : {}),
+          ...(conditions !== undefined ? { conditions } : {}),
+        });
         if (!result || !result.record) {
           const reason = result && result.reasonCode === 'memory_disabled' ? '本项目记忆已关闭'
             : result && result.needsResolution ? '改动和另一条太像，先去那条上改'
@@ -448,7 +468,7 @@ function keepHandler(webServer, cwdForSession) {
         selection: record.selection || null,
         links: Array.isArray(record.links) ? record.links.slice(0, 24).map((link) => ({ type: link.type || 'related', id: link.id })) : [],
         revision: Number(record.revision) || 1,
-        origin: record.origin || 'user_explicit',
+        origin: originOut(record.origin),
         updated: record.updated || '',
         lastUsed: record.lastUsed || '',
         bytes: Number(record.bytes) || 0,
@@ -478,10 +498,14 @@ function keepHandler(webServer, cwdForSession) {
       const currentControl = (() => {
         try { return controlStatus(scope); } catch { return { enabled: true, epoch: '' }; }
       })();
+      const modeOf = (target) => {
+        try { return { effectiveMode: controlStatus(target).mode || hostRecallMode }; } catch { return { effectiveMode: hostRecallMode }; }
+      };
+      currentControl.effectiveMode = modeOf(scope).effectiveMode;
       const selectedControl = selectedScope.key === scope.key
         ? currentControl
         : (() => {
-          try { return controlStatus(selectedScope); } catch { return { enabled: true, epoch: '' }; }
+          try { return { ...controlStatus(selectedScope), ...modeOf(selectedScope) }; } catch { return { enabled: true, epoch: '', effectiveMode: recallMode() }; }
         })();
       const selectedEvolution = selectedScope.key === scope.key
         ? currentEvolution
@@ -529,8 +553,11 @@ function keepHandler(webServer, cwdForSession) {
       if (!scope.confirmed) return sendJson(res, 409, { ok: false, reason: '项目根还没确认，先重新打开这个项目' });
       const operationId = typeof body.operationId === 'string' ? body.operationId : '';
       try {
-        const result = typeof body.enabled === 'boolean'
-          ? setMemoryEnabled(scope, body.enabled, { operationId })
+        const result = typeof body.enabled === 'boolean' || typeof body.mode === 'string'
+          ? setMemoryControl(scope, {
+            ...(typeof body.enabled === 'boolean' ? { enabled: body.enabled } : {}),
+            ...(typeof body.mode === 'string' ? { mode: body.mode } : {}),
+          }, { operationId })
           : { ok: true, ...controlStatus(scope) };
         if (typeof body.enabled === 'boolean' && result && result.ok !== false && body.enabled === false) {
           const controller = learningAborts.get(scope.key);
@@ -730,13 +757,26 @@ function keepHandler(webServer, cwdForSession) {
 }
 
 /** 给界面的事件引用：只有定位与版次，不带正文，避免把维护字段当内容画出来。 */
+/** 保存失败的统一回执：字段与成功回执同形，渲染只报这一次没写成。 */
+function saveFailure(message, args) {
+  return {
+    title: String(args && args.title || '').trim(), summary: '', when: '', revision: 0,
+    merged: false, changed: false, scope: '', needsResolution: false, needsScope: false,
+    archived: '', error: String(message || '').replace(/^memory · /, ''),
+  };
+}
+
+function originOut(value) {
+  return value === 'project_evolution' || value === 'model_drafted' ? value : 'user_explicit';
+}
+
 function refsOf(hits) {
   return hits.map((item) => ({
     title: item.title || '',
     scope: item.scope || 'project',
     revision: item.revision || 1,
     status: item.status || 'ok',
-    origin: item.origin === 'project_evolution' ? 'project_evolution' : 'user_explicit',
+    origin: originOut(item.origin),
     /** 界面要按类型分开展示（偏好/约定/流程/资料），维护字段不进正文。 */
     kind: typeof item.kind === 'string' && item.kind ? item.kind : 'note',
     when: typeof item.when === 'string' ? item.when : '',
@@ -764,7 +804,7 @@ const SAVE_PARAMS = {
       enum: ['distinct'],
       description: '明确表示「这确实是另一条」。返回 needsResolution 时，只有确认不是同一件事才带上它再存一次',
     },
-    scope: { type: 'string', enum: ['auto', 'project', 'global'], description: '存哪一层：auto 按记忆类别判定（默认）；用户明确说「以后所有项目都这样」用 global；明确说只在这个项目用 project' },
+    scope: { type: 'string', enum: ['auto', 'project', 'global'], description: '存哪一层：auto 按记忆类别判定（默认）；只有用户这一次明确说「以后所有项目都这样」才用 global，模型自己判断通用不是理由；明确说只在这个项目用 project。本机路径/端口和项目事实即使写 global 也会留在项目层，降级原因见 scopeNote；只在本机成立的命令/流程声明 machine 或 runtime 条件后可进全局层' },
     memoryClass: { type: 'string', enum: ['personal_preference', 'project_fact', 'environment_fact', 'portable_procedure'], description: '归属提案：个人偏好 / 项目事实 / 设备事实 / 可搬流程。服务端据此判定存哪层；设备事实必须同时给设备条件' },
     durability: { type: 'string', enum: ['durable', 'task'], description: '一般认为 durable；只是一次性任务参数用 task，服务端会拒绝落盘' },
     evidenceRef: { type: 'string', description: '归属判定的依据（哪条消息、哪个文件、哪次观察）；用户没说范围时用来判断能不能存' },
@@ -975,7 +1015,8 @@ function statusLabel(status) {
  */
 export const RECALL_MODES = ['adaptive', 'tool_only', 'off'];
 const RECALL_QUERY_CHARS = 400;
-const RECALL_DEADLINE_MS = 150;
+/** 单轮投影的耗时上限：慢机器上宁可这轮不注入，也不把回合拖住。测试可临时放宽。 */
+let recallDeadlineMs = 150;
 const RECALL_HEADER = '已有记忆可能相关（需要细节用 memory_read 带标题取正文，别凭标题猜）：';
 
 /** 卡片只放够判断要不要读的几行；必要前提整条在场，装不下就整卡省略。 */
@@ -1020,6 +1061,16 @@ export function apply(ctx, config) {
 
   /** 升级不覆盖用户的选择：默认 adaptive，别的模式只由明确配置切换。 */
   const recallMode = () => (RECALL_MODES.includes(config?.mode) ? config.mode : 'adaptive');
+  hostRecallMode = recallMode();
+  /** 项目自己的选择优先；没有写过就跟随插件配置，升级不改用户选择。 */
+  const modeFor = (scope) => {
+    try {
+      const mode = controlStatus(scope).mode;
+      return RECALL_MODES.includes(mode) ? mode : recallMode();
+    } catch {
+      return recallMode();
+    }
+  };
   /** 已准备好的快照只挂在 Agent 上，弱引用随手回收，不跨会话串。 */
   const prepared = new WeakMap();
   /** turn-stopping 只回 signal，不带头 agent；这里记 signal → agent 供收尾清理。 */
@@ -1190,6 +1241,7 @@ export function apply(ctx, config) {
     /** 卡片上限含包装；共享请求账本也要把标题行算进去，不能只算卡片行。 */
     let headerCharged = win ? win.recallHeader === true : false;
     const lines = [];
+    const linesMeta = [];
     const cards = [];
     for (const row of ranked) {
       const usedCards = cards.length + (auto ? (auto.experimentCards || 0) : 0);
@@ -1222,6 +1274,8 @@ export function apply(ctx, config) {
       }
       lines.push(line);
       cards.push({ revision, scope: card.scope, title: card.title });
+      /** 卡片行与到期时间一起留到最后输出：中间隔了系统提示组装，不能拿投影时的判断当现在。 */
+      linesMeta.push({ line, validUntil: row.record.validUntil || '' });
     }
     const finalText = `${RECALL_HEADER}\n${lines.join('\n')}`;
     if (auto) {
@@ -1243,6 +1297,8 @@ export function apply(ctx, config) {
     }
     let waiting = near.some((row) => row.status !== 'ok' || row.record.reviewState === 'legacy_unreviewed');
     let nearMatched = near.length;
+    /** 冲突与「条件未确认」是两种原因：前者要人先裁决，后者只差一句任务说明。 */
+    let conflictNear = false;
     if (!cards.length && !ranked.length) {
       /** 整组被条件或冲突挡下的候选没进 records，单独按同一查询算；只计数，不投放。 */
       for (const group of groups) {
@@ -1252,16 +1308,18 @@ export function apply(ctx, config) {
         });
         if (!hits.length) continue;
         waiting = true;
+        if (group.status === 'conflict') conflictNear = true;
         nearMatched += hits.length;
       }
     }
     const reason = cards.length ? 'hit'
       : ranked.length ? 'budget'
-        : waiting ? 'needs_context'
-          : (gateRuntime && gateRuntime.enabled ? 'no_overlap' : 'needs_context');
+        : conflictNear ? 'conflict'
+          : waiting ? 'needs_context'
+            : (gateRuntime && gateRuntime.enabled ? 'no_overlap' : 'needs_context');
     const matched = ranked.length || nearMatched;
-    if (!cards.length) return { text: '', cards: [], bytes: 0, query, reason, matched };
-    return { text: finalText, cards, bytes: Buffer.byteLength(finalText), query, reason, matched };
+    if (!cards.length) return { text: '', cards: [], lines: [], bytes: 0, query, reason, matched };
+    return { text: finalText, cards, lines: linesMeta, bytes: Buffer.byteLength(finalText), query, reason, matched };
   }
 
   /* ---------------- 项目自进化：任务锚点、读取决策、上下文解析 ---------------- */
@@ -1462,7 +1520,16 @@ export function apply(ctx, config) {
       ? Math.max(0, view.CARD.bytes - Buffer.byteLength(auto.normalText || '') - 2)
       : EXPERIMENT_BYTES;
     let used = Buffer.byteLength(EXPERIMENT_RULES_HEADER) + 1;
-    for (const record of matched.slice(0, cardCap)) {
+    /** 实验规则也要过本轮相关度：和当前问题没有交集就不占卡片，不能“来自自进化”就天然优先。 */
+    const query = held && held.query ? String(held.query) : '';
+    const relevant = query
+      ? matched.map((record) => ({ record, score: view.matchScore(record, query).score }))
+        /** 条件明确且已满足的规则按绑定注入；无条件的全项目规则必须和本轮问题有交集。 */
+        .filter((row) => row.score > 0 || (Array.isArray(row.record.conditions) && row.record.conditions.length > 0))
+        .sort((a, b) => b.score - a.score)
+        .map((row) => row.record)
+      : matched;
+    for (const record of relevant.slice(0, cardCap)) {
       const body = String(record.body || '');
       const short = body && body.length <= EXPERIMENT_SHORT_CHARS && body.split('\n').length <= 4;
       const conditions = conditionLabel(record.conditions);
@@ -1752,7 +1819,23 @@ export function apply(ctx, config) {
       }
       /** 没有逐条快照时才退回整段到期判断；有快照就只撤到期的那一条。 */
       if (evolutionText && !state.experimentParts && state.validUntil && Date.now() > Date.parse(String(state.validUntil))) evolutionText = '';
-      return [evolutionText, state.text].filter(Boolean).join('\n\n');
+      /** 普通卡片也在输出前逐条复核到期：投影到真正发给模型之间可能已经过了 validUntil。 */
+      let normalText = state.text;
+      if (Array.isArray(state.lines)) {
+        const now = Date.now();
+        const live = state.lines.filter((row) => !row.validUntil || now <= Date.parse(String(row.validUntil)));
+        normalText = live.length ? `${RECALL_HEADER}\n${live.map((row) => row.line).join('\n')}` : '';
+        /** 投影时还在、发出时已过期：回执跟着真实输出改，别在面板上说「提醒了 2 条」而正文是空的。 */
+        if (state.scope && live.length !== state.cards.length) {
+          noteRecall(state.scope, state.sessionId, {
+            reason: live.length ? 'hit' : 'expired',
+            matched: state.matched || state.cards.length,
+            cards: live.length,
+            chars: live.length ? view.bytesOf(normalText) : 0,
+          });
+        }
+      }
+      return [evolutionText, normalText].filter(Boolean).join('\n\n');
     } catch {
       return '';
     }
@@ -1771,7 +1854,8 @@ export function apply(ctx, config) {
         revision: value.revision || 0,
         changed: value.changed === true,
         recordKind: typeof value.kind === 'string' && value.kind ? value.kind : '',
-        mode: value.needsScope ? 'needs_scope'
+        mode: value.error ? 'failed'
+          : value.needsScope ? 'needs_scope'
           : value.existingTitle ? 'duplicate'
             : value.needsResolution ? 'needs_resolution'
               : value.changed === false ? 'unchanged' : value.merged ? 'updated' : 'created',
@@ -1800,16 +1884,20 @@ export function apply(ctx, config) {
           sameTopic: { type: 'boolean' },
           similarTitles: { type: 'string' },
           similar: { type: 'string' },
+          scopeNote: { type: 'string' },
           supersededTitle: { type: 'string' },
           archived: { type: 'string' },
           pendingConflicts: { type: 'integer' },
+          error: { type: 'string' },
         },
         required: ['title', 'summary', 'when', 'revision', 'merged', 'changed', 'scope', 'needsResolution', 'archived'],
         additionalProperties: false,
       },
       render: (_args, value) => [{
         type: 'text',
-        text: value.needsScope
+        text: value.error
+          ? `memory · ${value.error}`
+          : value.needsScope
           ? value.reason === 'memory_disabled'
             ? `memory · ${memoryOffCopy(projectScope)}`
             : value.reason === 'unconfirmed_project'
@@ -1821,7 +1909,7 @@ export function apply(ctx, config) {
           ? `memory · 需要确认：「${value.title}」与已有条目相近${value.crossLayer ? '（在另一层）' : ''}${value.sameTopic ? '（同一主题槽位）' : ''}\n${value.similar}\n要更新它：用同一个标题${value.crossScope === 'global' ? '、并带 scope="global"' : ''}再存一次；确实是另一条，加 resolution="distinct"`
           : value.changed === false
             ? `memory · unchanged ${withTag(value, `"${value.title}"`)}`
-            : `memory · ${value.merged ? 'merged' : 'saved'} ${withTag(value, `"${value.title}"`)}${value.when ? `（${value.when}）` : ''}${value.similar ? ` · 相近：${value.similar}` : ''}${value.archived ? ` · 已归档「${value.archived}」腾位` : ''}${value.fullTextSaved ? ' · 完整原句已另存' : ''}${value.supersededTitle ? ` · 已取代「${value.supersededTitle}」` : ''}`,
+            : `memory · ${value.merged ? 'merged' : 'saved'} ${withTag(value, `"${value.title}"`)}${value.when ? `（${value.when}）` : ''}${value.similar ? ` · 相近：${value.similar}` : ''}${value.archived ? ` · 已归档「${value.archived}」腾位` : ''}${value.fullTextSaved ? ' · 完整原句已另存' : ''}${value.supersededTitle ? ` · 已取代「${value.supersededTitle}」` : ''}${value.scopeNote ? ` · ${value.scopeNote}` : ''}`,
       }],
     },
     execute: async (args, execution) => {
@@ -1831,7 +1919,6 @@ export function apply(ctx, config) {
         return {
           title: String(args.title || ''), summary: '', when: '', revision: 0,
           merged: false, changed: false, scope: '', needsScope: true, reason: 'memory_disabled',
-          recoveryPending: controlStatus(projectScope).recoveryPending,
           needsResolution: false, similarTitles: '', similar: '', archived: '',
         };
       }
@@ -1839,17 +1926,18 @@ export function apply(ctx, config) {
       const supersedesId = supersedes && !/^mem_[a-z0-9]+$/.test(supersedes)
         ? (() => { try { return refIdOf(projectScope, { title: supersedes }, '记忆'); } catch { return ''; } })()
         : supersedes;
-      const draft = { ...args, writeMode: args.mode || 'patch' };
+      /** 工具写入的正文由模型写，来源标成模型整理，不能冒充用户原话。 */
+      const draft = { ...args, writeMode: args.mode || 'patch', origin: 'model_drafted' };
       if (supersedes) { if (supersedesId) draft.supersedes = supersedesId; else delete draft.supersedes; }
       /** 更新句柄也用标题：id 只是底层实现，模型抄标题就行。 */
       const updateTitle = String(args.updateTitle || '').trim();
       if (updateTitle) {
         const candidates = args.scope ? [] : titleCandidates(projectScope, updateTitle);
         if (candidates.length > 1) {
-          return { error: `memory · 「${updateTitle}」在项目层和全局层各有一条：改全局加 scope="global"，改项目加 scope="project"` };
+          return saveFailure(`「${updateTitle}」在项目层和全局层各有一条：改全局加 scope="global"，改项目加 scope="project"`, args);
         }
         const updateId = (() => { try { return refIdOf(projectScope, { title: updateTitle, scope: args.scope }, '记忆'); } catch { return ''; } })();
-        if (!updateId) return { error: `memory · 没有「${updateTitle}」这条记忆；要新增就不用 updateTitle` };
+        if (!updateId) return saveFailure(`没有「${updateTitle}」这条记忆；要新增就不用 updateTitle`, args);
         draft.id = updateId;
       }
       /** 关联目标同样按标题解析成内部 id 再落盘。 */
@@ -1857,9 +1945,9 @@ export function apply(ctx, config) {
         const resolved = [];
         for (const link of args.links) {
           const title = typeof link?.title === 'string' ? link.title.trim() : '';
-          if (!title) return { error: 'memory · 关联要写成 {type, title}：给被关联那条记忆的标题' };
+          if (!title) return saveFailure('关联要写成 {type, title}：给被关联那条记忆的标题', args);
           const targetId = (() => { try { return refIdOf(projectScope, { title }, '记忆'); } catch { return ''; } })();
-          if (!targetId) return { error: `memory · 没有「${title}」这条记忆，关联没写成` };
+          if (!targetId) return saveFailure(`没有「${title}」这条记忆，关联没写成`, args);
           resolved.push({ type: link.type || 'related', id: targetId });
         }
         draft.links = resolved;
@@ -1902,6 +1990,13 @@ export function apply(ctx, config) {
         };
       }
       const scope = saved.chosenScope === 'global' || (args.scope === 'global' && !saved.chosenScope) ? globalScope() : projectScope;
+      /** 显式要了全局却被硬冲突挡回项目层时说清原因：否则模型只能看到 scope=project，无从纠。 */
+      const scopeNote = (() => {
+        if (args.scope !== 'global' || scope.key === 'global') return '';
+        if (saved.reasonCode === 'machine_bound_scope') return '按本机痕迹留在项目层：正文或依据里写了本机路径/端口，改成别的项目仍成立的通用规则再存全局；只在本机适用的流程可补 machine 条件后存全局';
+        if (saved.reasonCode === 'model_global_project_fact') return '按项目事实留在项目层：换成别的项目就不成立；确实是通用流程就改 memoryClass';
+        return '';
+      })();
       if (saved.needsResolution) {
         return {
           title: saved.draft.title,
@@ -1919,6 +2014,7 @@ export function apply(ctx, config) {
           similarTitles: saved.similarList.map((item) => item.title).join('、'),
           similar: saved.similarList.map((item) => describeCandidate(item, { sameTopic: saved.sameTopic })).join('；'),
           archived: '',
+          ...(scopeNote ? { scopeNote } : {}),
           pendingConflicts: Number(saved.pendingConflicts) || 0,
         };
       }
@@ -1938,6 +2034,7 @@ export function apply(ctx, config) {
         needsScope: false,
         needsResolution: false,
         similarTitles: saved.similarList.map((item) => item.title).join('、'),
+        ...(scopeNote ? { scopeNote } : {}),
         supersededTitle: supersedes && supersedesId ? supersedes : '',
         archived: (saved.archived || []).map((item) => item.title).join('、'),
         pendingConflicts: Number(saved.pendingConflicts) || 0,
@@ -2040,7 +2137,7 @@ export function apply(ctx, config) {
       }],
     },
     execute: async (args, execution) => {
-      if (recallMode() === 'off' || !memoryEnabledFor(execution)) return { count: 0, chars: 0, text: '', status: 'memory_disabled', refs: [] };
+      if (!memoryEnabledFor(execution) || modeFor(scopeOf(cwdOf(execution))) === 'off') return { count: 0, chars: 0, text: '', status: 'memory_disabled', refs: [] };
       const agent = execution?.agent;
       const win = windowOf(agent);
       if (win && !affordableTool(win, 0)) return { count: 0, chars: 0, text: '', status: 'budget_exhausted', refs: [] };
@@ -2143,7 +2240,7 @@ export function apply(ctx, config) {
           revision: { type: 'integer' },
           scope: { type: 'string' },
           scopeName: { type: 'string' },
-          origin: { type: 'string', enum: ['user_explicit', 'project_evolution'] },
+          origin: { type: 'string', enum: ['user_explicit', 'model_drafted', 'project_evolution'] },
           kind: { type: 'string' },
           status: { type: 'string', enum: ['ok', 'archived', 'needs_context', 'not_applicable', 'gone', 'budget_exhausted', 'memory_disabled'] },
           body: { type: 'string' },
@@ -2180,13 +2277,13 @@ export function apply(ctx, config) {
         title: value.title || '',
         scope: value.scope || '',
         revision: value.revision || 0,
-        origin: value.origin === 'project_evolution' ? 'project_evolution' : 'user_explicit',
+        origin: originOut(value.origin),
         recordKind: typeof value.kind === 'string' && value.kind ? value.kind : '',
         status: value.status || 'ok',
       }),
     },
     execute: async (args, execution) => {
-      if (recallMode() === 'off' || !memoryEnabledFor(execution)) return { scope: '', status: 'memory_disabled' };
+      if (!memoryEnabledFor(execution) || modeFor(scopeOf(cwdOf(execution))) === 'off') return { scope: '', status: 'memory_disabled' };
       const resolved = resolveRequestContext(execution, args.contextId);
       if (!resolved.ok) return { scope: '', status: resolved.status || 'needs_context' };
       const scope = resolved.scope;
@@ -2222,7 +2319,7 @@ export function apply(ctx, config) {
           ? '- 有一条已失效'
           : `- ${link.scope === 'global' ? '[global] ' : (scopeName ? `[${scopeName}] ` : '')}「${link.title}」`));
         const text = rows.join('\n') || '(无)';
-        const value = { scope: found.scope, scopeName, status: found.status, links: text };
+        const value = { title: found.title || '', scope: found.scope, scopeName, status: found.status, links: text };
         if (win) {
           const bytes = jsonBytes(value);
           if (!affordableTool(win, bytes)) return { scope: '', status: 'budget_exhausted' };
@@ -2258,6 +2355,8 @@ export function apply(ctx, config) {
         scopeName,
         status: record.status,
         kind: record.kind || 'note',
+        /** 来源随正文回执一起给：模型整理稿要能标出来，但不会因此变成全局。 */
+        origin: originOut(record.origin),
         body,
       };
       if (win) {
@@ -2488,6 +2587,7 @@ export function apply(ctx, config) {
             if (snapshot || experimentText) {
               previous.text = snapshot ? snapshot.text : '';
               previous.cards = snapshot ? snapshot.cards : [];
+              previous.lines = snapshot ? snapshot.lines : [];
               previous.experimentText = experimentText;
               previous.experimentParts = win && win.experiment ? (win.experiment.experimentParts || null) : null;
               previous.validUntil = win && win.experiment ? (win.experiment.validUntil || '') : '';
@@ -2510,7 +2610,10 @@ export function apply(ctx, config) {
         autoBudget: win.autoBudget ? JSON.parse(JSON.stringify(win.autoBudget)) : null,
       } : null;
       /** 工具模式也要记下本轮真人原话：只用于核对绑定，不自动注入。 */
-      const query = view.newestUserQuery(fresh).slice(0, RECALL_QUERY_CHARS);
+      const said = view.newestUserQuery(fresh).slice(0, RECALL_QUERY_CHARS);
+      /** 「继续」这类续说没有检索词：带上同会话上一轮原话，否则这一轮必然召回为空。 */
+      const carried = sameSession && previous?.query && view.isContinuationQuery(said) ? previous.query : '';
+      const query = (carried ? `${said} ${carried}` : said).trim().slice(0, RECALL_QUERY_CHARS);
       if (win && query) win.query = query;
 
       if (!query) {
@@ -2533,10 +2636,10 @@ export function apply(ctx, config) {
        * 工具模式也必须先有本请求上下文：memory_search/read/links 靠同一个 contextId 判项目和任务，
        * 不能等到自动召回分支才建，否则工具模式永远拿不到可核对的任务。
        */
-      const runtime = runtimeFor(scope, { sessionId, query, batchKey, messageIds: ids, autoRoute: recallMode() === 'adaptive' });
+      const runtime = runtimeFor(scope, { sessionId, query, batchKey, messageIds: ids, autoRoute: modeFor(scope) === 'adaptive' });
       if (win && runtime) win.runtime = runtime.held;
       rememberRuntime(scope, sessionId, runtime && runtime.held);
-      if (recallMode() !== 'adaptive') {
+      if (modeFor(scope) !== 'adaptive') {
         noteRecall(scope, sessionId, { reason: 'tools_only' });
         clearPrepared(agent);
         return decision;
@@ -2553,7 +2656,30 @@ export function apply(ctx, config) {
       const remembered = runtime && runtime.enabled
         ? rememberFeedback(scope, sessionId, fresh, runtime.held, turn)
         : null;
-      const snapshot = projectRecall(scope, query, recalledContext, win, runtime ? runtime.held : null);
+      let snapshot = projectRecall(scope, query, recalledContext, win, runtime ? runtime.held : null);
+      /**
+       * 预防型记忆约束的是「下一步动作」，词面常写在上一轮助手的话和工具调用里，用户这句话反而没提。
+       * 第一次检索一张卡都没有时，用最近的实词/工具名补一次有界查询，预算仍是同一份。
+       */
+      if (!snapshot.cards.length && !carried) {
+        const humanTail = (() => {
+          const messages = Array.isArray(decision.messages) ? decision.messages : [];
+          for (let i = messages.length - 1; i >= 0; i -= 1) {
+            if (messages[i]?.source?.kind === 'user') return messages.slice(0, i);
+          }
+          return messages;
+        })();
+        const trail = view.actionTerms(humanTail, { limit: 12 }).slice(0, 240);
+        if (trail) {
+          const actionQuery = `${trail} ${query}`.trim().slice(0, RECALL_QUERY_CHARS);
+          const retry = projectRecall(scope, actionQuery, recalledContext, win, runtime ? runtime.held : null);
+          /** 补查是为了给出提醒：补不到就保留第一次的「为什么没提醒」，不拿空结果盖掉。 */
+          if (retry.cards.length) {
+            snapshot = retry;
+            if (win) win.query = actionQuery;
+          }
+        }
+      }
       noteRecall(scope, sessionId, {
         reason: snapshot.reason, matched: snapshot.matched, cards: snapshot.cards.length, chars: snapshot.bytes,
       });
@@ -2572,16 +2698,18 @@ export function apply(ctx, config) {
         win.experiment = null;
         win.contexts.clear();
       };
-      if (generation !== generations.get(agent)) { rollbackBudget(); return decision; }
+      if (generation !== generations.get(agent)) { rollbackBudget(); if (snapshot.cards.length) clearRecall(scope, sessionId); return decision; }
       /** 投影期间开关被改过：丢弃这批内容，不把关闭前的记忆交给当前请求。 */
       if (!memoryEnabled(scope) || (controlStatus(scope).epoch || '') !== controlEpoch) {
         rollbackBudget();
+        if (snapshot.cards.length) clearRecall(scope, sessionId);
         clearPrepared(agent);
         return decision;
       }
       /** 超时或被取消：这一步不留半旧卡片，下一真人请求重新投影。 */
-      if (signal?.aborted || Date.now() - startedAt > RECALL_DEADLINE_MS) {
+      if (signal?.aborted || Date.now() - startedAt > recallDeadlineMs) {
         rollbackBudget();
+        if (snapshot.cards.length) clearRecall(scope, sessionId);
         clearPrepared(agent);
         return decision;
       }
@@ -2599,6 +2727,9 @@ export function apply(ctx, config) {
         experimentParts: experiment && experiment.held ? (experiment.held.experimentParts || null) : null,
         validUntil: experiment && experiment.held ? (experiment.held.validUntil || '') : '',
         cards: snapshot ? snapshot.cards : [],
+        lines: snapshot ? snapshot.lines : [],
+        matched: snapshot ? snapshot.matched : 0,
+        scope,
         query,
         sessionId,
         turn,
@@ -2614,7 +2745,7 @@ export function apply(ctx, config) {
       if (signal) signalAgents.set(signal, agent);
       const key = agentKey(agent);
       if (key && signal && typeof signal.addEventListener === 'function') {
-        const onAbort = () => clearPrepared(agent);
+        const onAbort = () => { clearPrepared(agent); clearRecall(scope, sessionId); };
         signal.addEventListener('abort', onAbort, { once: true });
         abortCleanups.set(key, () => signal.removeEventListener('abort', onAbort));
       }
@@ -2914,6 +3045,8 @@ export function apply(ctx, config) {
       mode: recallMode,
       preparedOf: (agent) => prepared.get(agent) || null,
       windowOf: (agent) => windowOf(agent),
+      /** 测试专用：CI 冷启动偶尔超过 150ms，逻辑测试不该被耗时上限判失败。 */
+      setDeadlineMs: (ms) => { if (Number.isFinite(ms) && ms > 0) recallDeadlineMs = ms; },
     };
     return () => {
       delete globalThis.__liteMemoryRecall;

package/learning.js

@@ -44,7 +44,8 @@ const UNCLEAR = /不太对|再想想|感觉不对|说不上|有点怪|不对劲/
  * 点名项目范围才算全项目授权；「以后都」不等于「所有项目」。
  * 「所有口播」「一律」这种覆盖全部对象的说法也算，但只限当前项目层。
  */
-const PROJECT_WIDE = /(这个项目|本项目|所有项目|全项目|整个项目|全库|每个项目|所有(?!项目)|一律)/;
+const PROJECT_WIDE = /(这个项目|本项目|所有项目|全项目|整个项目|全库|每个项目)/;
+/** 「所有口播」「一律」限定的是对象，不是整个项目：没有可信范围时只算待确认。 */
 
 const has = (pattern, text) => pattern.test(text);
 
@@ -380,7 +381,7 @@ export function pendingChangeFrom(feedback = {}) {
     ? (expected.applicability === 'all_in_scope'
       ? 'all_in_scope'
       : expectedConditions.length ? 'conditional' : 'unresolved')
-    : /(所有|全都|一律|任何|默认|整个项目|这个项目|本项目)/.test(currentText)
+    : /(这个项目|本项目|所有项目|全项目|整个项目|全库|每个项目)/.test(currentText)
       ? 'all_in_scope'
       : taskKind ? 'conditional' : 'unresolved';
   const conditions = expected

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.18.19",
+  "version": "0.18.26",
   "description": "On-demand memory for the DeepSeek Harness: nothing resident, at most three small cards on a real hit, bodies read on demand.",
   "type": "module",
   "main": "index.js",

package/state.js

@@ -106,10 +106,12 @@ export function evolutionOf(state) {
 export function controlOf(state) {
   const raw = state && state.control;
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
-    return { enabled: true, epoch: '', changedAt: '', recoveryPending: false, compatible: true };
+    return { enabled: true, mode: '', epoch: '', changedAt: '', recoveryPending: false, compatible: true };
   }
   return {
     enabled: raw.enabled !== false && raw.recoveryPending !== true,
+    /** 空字符串表示跟随插件配置；只有明确写过的项目才覆盖。 */
+    mode: raw.mode === 'adaptive' || raw.mode === 'tool_only' || raw.mode === 'off' ? raw.mode : '',
     epoch: typeof raw.epoch === 'string' ? raw.epoch : '',
     changedAt: typeof raw.changedAt === 'string' ? raw.changedAt : '',
     recoveryPending: raw.recoveryPending === true,
@@ -122,12 +124,15 @@ export function controlOf(state) {
  * 只清运行层（在途整理、临时锚点、旧召回快照）。重新打开也换代次，关闭前排队的任务不能补交。
  * 自进化跟随总开关一起停：重新打开记忆后，自进化仍是关闭的，等用户单独开启。
  */
-export function applyControl(draft, enabled) {
+export function applyControl(draft, enabled, mode) {
   const now = new Date().toISOString();
   const current = controlOf(draft);
-  const next = Boolean(enabled);
-  if (current.enabled === next) return { changed: false, enabled: next };
-  const config = { enabled: next, epoch: crypto.randomUUID(), changedAt: now };
+  const next = typeof enabled === 'boolean' ? enabled : current.enabled;
+  const nextMode = mode === 'adaptive' || mode === 'tool_only' || mode === 'off'
+    ? mode
+    : current.mode;
+  if (current.enabled === next && current.mode === nextMode) return { changed: false, enabled: next, mode: nextMode };
+  const config = { enabled: next, mode: nextMode, epoch: crypto.randomUUID(), changedAt: now };
   draft.control = config;
   const evolution = draft.experimental && draft.experimental.projectEvolution;
   if (evolution && typeof evolution === 'object' && !Array.isArray(evolution)) {
@@ -141,7 +146,7 @@ export function applyControl(draft, enabled) {
     /** 额度只增不减：次数与回执留着，最近观察清掉。 */
     evolution.learning = { ...ledger, recent: [] };
   }
-  return { changed: true, enabled: next, epoch: config.epoch };
+  return { changed: true, enabled: next, mode: nextMode, epoch: config.epoch };
 }
 
 /**