dsh-lite-memory 0.17.0 → 0.18.19

package/learning.js

@@ -40,6 +40,11 @@ const NEGATIVE = /不要|不用|别用|别再|停用|取消这条|这条不要|
 const CORRECTION = /改成|改为|换成|重做|重来|再来|下次|不对|错了|不是这样|又没|怎么又|还是没|没按|不好|不行|不满意|不要|别/;
 const EXECUTION_MISS = /之前说过|已经说过|不是说好|怎么又|又没|还是没|没按|又忘|重复/;
 const UNCLEAR = /不太对|再想想|感觉不对|说不上|有点怪|不对劲/;
+/**
+ * 点名项目范围才算全项目授权；「以后都」不等于「所有项目」。
+ * 「所有口播」「一律」这种覆盖全部对象的说法也算，但只限当前项目层。
+ */
+const PROJECT_WIDE = /(这个项目|本项目|所有项目|全项目|整个项目|全库|每个项目|所有(?!项目)|一律)/;
 
 const has = (pattern, text) => pattern.test(text);
 
@@ -182,6 +187,8 @@ export function candidateFrom({ messages, anchor, sessionId, projectId, now } =
   if (!context.projectId) return null;
   /** 没有作品绑定时，规范纠正同样按项目候选收集；单次局部改动交给整理器判空，不再用电平词一刀切。 */
   if (cue.type !== 'spec_change') return null;
+  /** 作用域在收集时就固定：只有原句点名项目范围才给全项目，否则先待确认。 */
+  const applicability = PROJECT_WIDE.test(text) ? 'all_in_scope' : 'unresolved';
   return {
     projectId: context.projectId,
     sessionId: context.sessionId,
@@ -195,7 +202,7 @@ export function candidateFrom({ messages, anchor, sessionId, projectId, now } =
     text,
     sourceExcerpt,
     cue,
-    expectedTarget: { scope: 'project', projectId, applicability: 'unresolved' },
+    expectedTarget: { scope: 'project', projectId, applicability },
     episodeUpdatedAt: '',
     at,
   };
@@ -356,13 +363,36 @@ export function pendingChangeFrom(feedback = {}) {
   if (!currentText) return null;
   const first = (lines[0] || currentText).split(/[，。！？；]/)[0].trim();
   const topicKey = String(feedback.cue?.dimension || first || currentText).slice(0, 60);
+  /**
+   * 兜底不是授权：只在文本自己说到全项目时才按全项目收，否则保留它原本的适用范围
+   * （有任务种类就挂条件，没有就待确认），不能让一句「以后开头先给结论」变成全库规则。
+   */
+  const expected = feedback.expectedTarget && typeof feedback.expectedTarget === 'object' ? feedback.expectedTarget : null;
+  const taskKind = String(feedback.cue?.taskKind || expected?.taskKind || '').trim();
+  const expectedConditions = ['taskKind', 'seriesId', 'phase']
+    .filter((key) => String(expected?.[key] || '').trim())
+    .map((key) => ({ key, value: String(expected[key]).trim() }));
+  /**
+   * 兜底不重新推导作用域：候选收集时已经固定 expectedTarget 就照抄（只能沿用或收窄），
+   * 没有 expectedTarget 的旧调用才退回原句判断。
+   */
+  const applicability = expected
+    ? (expected.applicability === 'all_in_scope'
+      ? 'all_in_scope'
+      : expectedConditions.length ? 'conditional' : 'unresolved')
+    : /(所有|全都|一律|任何|默认|整个项目|这个项目|本项目)/.test(currentText)
+      ? 'all_in_scope'
+      : taskKind ? 'conditional' : 'unresolved';
+  const conditions = expected
+    ? (applicability === 'conditional' ? expectedConditions : [])
+    : applicability === 'conditional' ? [{ key: 'taskKind', value: taskKind }] : [];
   return {
     target: 'new',
     feedbackType: 'spec_change',
     topicKey,
     currentText,
-    applicability: 'all_in_scope',
-    conditions: [],
+    applicability,
+    conditions,
     evidence: ['u0'],
     persistence: 'project_candidate',
     /** 摘录从候选一路带到提交路径，模型返回空时也不丢来源。 */
@@ -504,7 +534,7 @@ export function buildCallInput({ projectId, episodeId, taskKind, seriesId, phase
   return { system, prompt, messages: [{ role: 'user', content: prompt }], refs, rules: inputRules, bytes: Buffer.byteLength(system) + Buffer.byteLength(prompt), sourceExcerpt, messageIds };
 }
 /** 严格解析：截断、工具调用、额外字段、超限都整批拒绝，不做第二次修复调用。 */
-export function parseOutput(text, { finish, refs, rules, ranges } = {}) {
+export function parseOutput(text, { finish, refs, rules, ranges, expectedTarget } = {}) {
   if (finish && finish.kind !== 'stop' && finish.kind !== 'completed') return { ok: false, reason: '整理没有正常结束' };
   const raw = String(text || '').trim();
   if (!raw) return { ok: false, reason: '整理没有返回内容' };
@@ -522,14 +552,14 @@ export function parseOutput(text, { finish, refs, rules, ranges } = {}) {
   if (data.changes.length > LIMITS.maxChanges) return { ok: false, reason: '一次改动太多' };
   const changes = [];
   for (const change of data.changes) {
-    const checked = validateChange(change, { refs, rules, ranges });
+    const checked = validateChange(change, { refs, rules, ranges, expectedTarget });
     if (!checked.ok) return checked;
     changes.push(checked.change);
   }
   return { ok: true, changes };
 }
 
-export function validateChange(change, { refs, rules, ranges } = {}) {
+export function validateChange(change, { refs, rules, ranges, expectedTarget } = {}) {
   if (!change || typeof change !== 'object' || Array.isArray(change)) return { ok: false, reason: '变化不是对象' };
   for (const key of Object.keys(change)) if (!ALLOWED_KEYS.has(key)) return { ok: false, reason: `变化里有未知字段：${key}` };
   const byRef = new Map((Array.isArray(rules) ? rules : []).map((row) => [row.ref, row]));
@@ -590,6 +620,35 @@ export function validateChange(change, { refs, rules, ranges } = {}) {
       if (!allowed) return { ok: false, reason: '条件值不在本项目的栏目或阶段里' };
     }
   }
+  /** 收集时固定的作用域只能沿用或收窄：整理器不能把待确认候选抬成全项目规则。 */
+  const expected = expectedTarget && typeof expectedTarget === 'object' ? expectedTarget : null;
+  const expectedConditions = ['taskKind', 'seriesId', 'phase']
+    .filter((key) => String(expected?.[key] || '').trim())
+    .map((key) => ({ key, value: String(expected[key]).trim() }));
+  const expectedApplicability = expected
+    ? (expected.applicability === 'all_in_scope'
+      ? 'all_in_scope'
+      : expectedConditions.length ? 'conditional' : 'unresolved')
+    : '';
+  if (expectedApplicability && applicability === 'all_in_scope' && expectedApplicability !== 'all_in_scope') {
+    return { ok: false, reason: '适用范围不能从待确认抬成全项目' };
+  }
+  if (expected && expected.scope === 'episode' && applicability === 'all_in_scope') {
+    return { ok: false, reason: '作品规则不能抬成全项目' };
+  }
+  const effectiveConditions = conditions !== undefined ? conditions : normalizeConditions(existing?.conditions);
+  if (applicability === 'all_in_scope' && effectiveConditions.length) {
+    return { ok: false, reason: '全项目规则不能带条件' };
+  }
+  if (applicability === 'conditional' && !conditions && !existing && !sampleOnly) {
+    return { ok: false, reason: '条件适用必须给出条件' };
+  }
+  if (conditions && expectedConditions.length) {
+    const has = new Set(conditions.map((row) => `${row.key}=${row.value}`));
+    if (expectedConditions.some((row) => !has.has(`${row.key}=${row.value}`))) {
+      return { ok: false, reason: '条件不能删掉收集时的任务范围' };
+    }
+  }
   const evidence = Array.isArray(change.evidence) ? change.evidence.map((value) => String(value)) : [];
   if (!evidence.length || evidence.length > LIMITS.evidence) return { ok: false, reason: '证据数量不对' };
   for (const ref of evidence) if (!refs?.feedback?.[ref]) return { ok: false, reason: '证据不在本次反馈里' };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.17.0",
-  "description": "On-demand memory for the DeepSeek Harness: nothing in the system prompt, one muted line only when something is saved, hit or suggested.",
+  "version": "0.18.19",
+  "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",
   "engines": {
     "dsh": ">=0.1.5"
   },
   "scripts": {
-    "test": "node test/store.test.mjs && node test/state.test.mjs && node test/view.test.mjs && node test/anchor.test.mjs && node test/recall.test.mjs && node test/evolution-read.test.mjs && node test/lexical.test.mjs && node test/control.test.mjs && node test/learning.test.mjs && node test/scenario.test.mjs && node test/crossing.test.mjs && node test/runtime-context.test.mjs && node test/client.test.mjs && node test/palace.test.mjs && node test/contract.test.mjs",
+    "test": "node test/store.test.mjs && node test/state.test.mjs && node test/view.test.mjs && node test/anchor.test.mjs && node test/recall.test.mjs && node test/evolution-read.test.mjs && node test/lexical.test.mjs && node test/layer-read.test.mjs && node test/control.test.mjs && node test/learning.test.mjs && node test/scenario.test.mjs && node test/crossing.test.mjs && node test/runtime-context.test.mjs && node test/client.test.mjs && node test/palace.test.mjs && node test/contract.test.mjs && node test/safety.test.mjs && node test/ha.test.mjs && node test/record.test.mjs && node test/eval-seed.test.mjs",
     "bench": "node bench/bench.mjs",
     "bench:evolution": "node bench/evolution.mjs"
   },
@@ -66,6 +66,9 @@
   "bugs": {
     "url": "https://github.com/regrevia/dsh-lite-memory/issues"
   },
-  "author": "regrevia",
+  "author": {
+    "name": "regrevia",
+    "url": "https://github.com/regrevia"
+  },
   "license": "MIT"
 }

package/state.js

@@ -106,12 +106,13 @@ 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: '', compatible: true };
+    return { enabled: true, epoch: '', changedAt: '', recoveryPending: false, compatible: true };
   }
   return {
-    enabled: raw.enabled !== false,
+    enabled: raw.enabled !== false && raw.recoveryPending !== true,
     epoch: typeof raw.epoch === 'string' ? raw.epoch : '',
     changedAt: typeof raw.changedAt === 'string' ? raw.changedAt : '',
+    recoveryPending: raw.recoveryPending === true,
     compatible: true,
   };
 }
@@ -143,13 +144,39 @@ export function applyControl(draft, enabled) {
   return { changed: true, enabled: next, epoch: config.epoch };
 }
 
+/**
+ * 旧策略生成的实验规则没记下作用域指纹，无法证明它该在哪些任务里出现。
+ * 只把它们转成待复核：正文、来源、版本原样保留，不删除也不改写内容。
+ */
+function quarantineLegacyRules(draft, now) {
+  let touched = 0;
+  for (const entry of Array.isArray(draft.entries) ? draft.entries : []) {
+    if (!entry || entry.origin !== 'project_evolution') continue;
+    const maintenance = entry.maintenance || (entry.maintenance = {});
+    if (maintenance.reviewState === 'legacy_unreviewed') continue;
+    if (maintenance.learning && maintenance.learning.specDigest) continue;
+    maintenance.reviewState = 'legacy_unreviewed';
+    maintenance.legacyReview = { reason: 'scope_unverified', at: now };
+    const learning = maintenance.learning;
+    if (learning && (learning.state === 'trial' || learning.state === 'active')) {
+      learning.state = 'paused';
+      learning.blockedReason = 'needs_scope_review';
+      learning.pausedAt = now;
+      learning.pausedBy = 'legacy_scope';
+    }
+    touched += 1;
+  }
+  return touched;
+}
+
 /** 自进化开关只停运行层：规则、候选、试用、证据和额度都保留，恢复时接着用。 */
 export function applyEvolution(draft, enabled) {
   const now = new Date().toISOString();
   const current = evolutionOf(draft);
   if (!current.compatible) throw new StateError('invalid', '实验配置版本不认，先不要改动开关');
   const next = Boolean(enabled);
-  if (current.enabled === next) return { changed: false, enabled: next };
+  const quarantined = next ? quarantineLegacyRules(draft, now) : 0;
+  if (current.enabled === next) return { changed: quarantined > 0, enabled: next, quarantined };
   const config = {
     enabled: next,
     epoch: crypto.randomUUID(),
@@ -174,7 +201,7 @@ export function applyEvolution(draft, enabled) {
       }
     }
   }
-  return { changed: true, enabled: next, epoch: config.epoch };
+  return { changed: true, enabled: next, epoch: config.epoch, quarantined };
 }
 
 /** 容量与预算都归这里管：写入路径只报「要写什么」，能不能落地由 state 决定。 */
@@ -535,13 +562,17 @@ export function emptyState(scope) {
     candidates: [],
     receipts: [],
     suppressions: [],
+    conflicts: [],
     control: { enabled: true, epoch: crypto.randomUUID(), changedAt: now },
     experimental: { projectEvolution: newEvolution() },
   };
 }
 
+/** 坏文件不自动覆盖（可能还能人工找回），但错误里必须给出下一步，不能只说「坏了」。 */
 function fail(file, why, code = 'corrupt') {
-  return new StateError(code, `记忆状态${why}，已停止读写：${file}`);
+  const name = path.basename(file);
+  const prev = name === 'state.json' ? 'state.prev.json' : `${name}.prev`;
+  return new StateError(code, `记忆状态${why}，已停止读写：${file}。恢复：把 ${name} 改名成 ${name}.bad 后重试，会自动从上一份完好的 ${prev} 恢复；${prev} 也不在就删掉整个目录重建（旧文件可人工找回）`);
 }
 
 function validEntry(entry) {
@@ -566,7 +597,7 @@ export function validateState(data) {
     if (typeof data[key] !== 'string' || !data[key]) throw new StateError('invalid', `记忆状态缺少 ${key}`);
   }
   if (!Number.isInteger(data.generation) || data.generation < 0) throw new StateError('invalid', '记忆状态 generation 不对');
-  for (const key of ['entries', 'candidates', 'receipts', 'suppressions']) {
+  for (const key of ['entries', 'candidates', 'receipts', 'suppressions', 'conflicts']) {
     if (!Array.isArray(data[key])) throw new StateError('invalid', `记忆状态 ${key} 不是数组`);
   }
   const ids = new Set();
@@ -662,9 +693,12 @@ function readEnvelope(file) {
     if (upgraded.experimental === undefined) {
       upgraded.experimental = { projectEvolution: { enabled: false, epoch: '', policyVersion: EVOLUTION_POLICY_VERSION, feedbackGeneration: 0, learning: emptyLearning() } };
     }
+    if (!Array.isArray(upgraded.conflicts)) upgraded.conflicts = [];
     validateState(upgraded);
     return upgraded;
   }
+  /** 旧库没有冲突队列：读时补空数组。 */
+  if (!Array.isArray(data.payload.conflicts)) data.payload.conflicts = [];
   validateState(data.payload);
   return data.payload;
 }
@@ -1135,6 +1169,20 @@ export function migrateLegacy(scope, options = {}) {
   });
 }
 
+/** 恢复出来的状态把总开关留在关闭态并记下原因，避免用一份旧快照静默恢复授权。 */
+function withRecoveryMarker(payload) {
+  const raw = payload && payload.control && typeof payload.control === 'object' && !Array.isArray(payload.control) ? payload.control : {};
+  return {
+    ...payload,
+    control: {
+      enabled: false,
+      epoch: typeof raw.epoch === 'string' ? raw.epoch : '',
+      changedAt: new Date().toISOString(),
+      recoveryPending: true,
+    },
+  };
+}
+
 /**
  * 读当前状态：只有「完全没有」才算新库；坏文件、未知版本、迁移痕迹都报错，
  * 绝不用空库覆盖。
@@ -1166,7 +1214,7 @@ export function load(scope, options = {}) {
     }
     if (recovered) {
       return {
-        state: recovered,
+        state: withRecoveryMarker(recovered),
         exists: true,
         recovered: true,
         recovery: {
@@ -1197,7 +1245,7 @@ export function load(scope, options = {}) {
     const prev = readEnvelope(prevFile(scope));
     if (prev) {
       // current 丢了但 prev 完好：恢复 prev，并标记需要重写 current。
-      return { state: prev, exists: false, recovered: true };
+      return { state: withRecoveryMarker(prev), exists: false, recovered: true };
     }
     return { state: emptyState(scope), exists: false, recovered: false };
   }