solopup-memory 0.21.0-beta.2 → 0.22.0-beta.3

package/test/test-detect.mjs

@@ -0,0 +1,125 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+
+import { detectRoot, detectStore } from '../detect.mjs'
+
+function store(files = {}) {
+  const dir = mkdtempSync(join(tmpdir(), 'dsh-detect-'))
+  for (const [name, text] of Object.entries(files)) writeFileSync(join(dir, name), text)
+  return dir
+}
+
+function ids(report) {
+  return report.findings.map((finding) => finding.id)
+}
+
+test('检测：干净库不报错，锚点用折叠比较（标题带标点也能解析）', () => {
+  const dir = store({
+    'MEMORY.md': '# 记忆索引\n\n## user\n\n- [user] 中文母语 — user.md#身份说明\n',
+    'user.md': '## 身份 说明\n\n中文母语写作者。\n',
+  })
+  try {
+    const report = detectStore(dir)
+    assert.equal(report.summary.errors, 0)
+    assert.ok(!ids(report).includes('I2-missing-anchor'))
+    assert.equal(report.metrics.indexLines, 1)
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('检测：坏索引行、缺失主题文件、重复行、冲突签名都会被报出来', () => {
+  const dir = store({
+    'MEMORY.md': [
+      '# 记忆索引',
+      '',
+      '## project',
+      '',
+      '- [nope] 类型不合法 — user.md',
+      '- [project] 剧本上限 100 集 — missing.md',
+      '- [project] 剧本上限 120 集 — project.md',
+      '- [project] 剧本上限 120 集 — project.md',
+      '',
+    ].join('\n'),
+    'project.md': '## 正文\n\n剧本上限 120 集。\n',
+  })
+  try {
+    const report = detectStore(dir, { scope: 'project' })
+    const seen = ids(report)
+    assert.ok(seen.includes('I1-invalid-index-line'))
+    assert.ok(seen.includes('I2-missing-topic-file'))
+    assert.ok(seen.includes('I6-duplicate-line'))
+    assert.ok(seen.includes('I7-conflict'))
+    assert.equal(report.summary.errors >= 2, true)
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('检测：预算超限与过期标记语法错误', () => {
+  const lines = ['# 记忆索引', '', '## user', '']
+  for (let i = 0; i < 302; i += 1) lines.push(`- [user] 条目 ${i} — user.md`)
+  const dir = store({ 'MEMORY.md': lines.join('\n'), 'user.md': '# 用户\n' })
+  try {
+    const report = detectStore(dir)
+    const seen = ids(report)
+    assert.ok(seen.includes('I8-budget-lines'))
+    assert.equal(report.metrics.indexLines, 302)
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('检测：根目录会报告空库与内容完全相同的重复库', () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-detect-root-'))
+  const projectA = join(root, 'projects', 'v2-a')
+  const projectB = join(root, 'projects', 'v2-b')
+  const empty = join(root, 'projects', 'v2-empty')
+  mkdirSync(projectA, { recursive: true })
+  mkdirSync(projectB, { recursive: true })
+  mkdirSync(empty, { recursive: true })
+  const body = '# 记忆索引\n\n## project\n\n- [project] 同一条 — project.md\n'
+  writeFileSync(join(root, 'MEMORY.md'), body)
+  writeFileSync(join(projectA, 'MEMORY.md'), body)
+  writeFileSync(join(projectB, 'MEMORY.md'), body)
+  try {
+    const report = detectRoot(root)
+    const seen = report.crossFindings.map((finding) => finding.id)
+    assert.ok(seen.includes('X1-empty-project-store'))
+    assert.ok(seen.includes('X2-duplicate-store'))
+    assert.equal(report.stores.length, 4)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test('检测：正文块出现在标题之前会被提示（结构检查）', () => {
+  const dir = store({
+    'MEMORY.md': '# 记忆索引\n\n## feedback\n\n- [feedback] 先读再改 — feedback.md\n',
+    'feedback.md': '[candidate:aaaaaaaa]\n先读再改\n',
+  })
+  try {
+    const report = detectStore(dir)
+    assert.ok(ids(report).includes('I14-candidate-without-heading'))
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+test('检测：段落以未完成标点结尾会被标记为截断；列表引导句不误报', () => {
+  const dir = store({
+    'MEMORY.md': '# 索引\n\n## user\n\n- [user] 一条 — user.md\n',
+    'user.md': '# user\n\n## 记录\n\n主要产出：\n\n- 剧本\n- 剪辑\n\n- 2026-10-28｜交接文件需自带上下文，\n',
+  })
+  try {
+    const report = detectStore(dir)
+    const truncated = report.findings.filter((finding) => finding.id === 'I14-truncated-paragraph')
+    assert.equal(truncated.length, 1)
+    assert.match(truncated[0].message, /交接文件/)
+  } finally {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})

package/test/test-dream-plan.mjs

@@ -0,0 +1,72 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { createHash } from 'node:crypto'
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { fileURLToPath } from 'node:url'
+
+const { planDream } = await import(join(dirname(fileURLToPath(import.meta.url)), '..', 'scripts', 'dream.mjs'))
+const hash = (file) => createHash('sha256').update(readFileSync(file)).digest('hex')
+
+function store() {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-dream-'))
+  writeFileSync(join(root, 'MEMORY.md'), [
+    '# 索引',
+    '',
+    '## project',
+    '',
+    '- [project] 重复条目 — project.md',
+    '- [project] 重复条目 — project.md',
+    '- [project] 指向缺失文件 — missing.md',
+    '- [project] 当前版本 v0.2.0 — project.md',
+    '',
+  ].join('\n'))
+  writeFileSync(join(root, 'project.md'), '# project\n\n## 一\n\n正文。\n')
+  return root
+}
+
+test('做梦 P0：只生成 op 计划，不改任何文件、不调模型', () => {
+  const root = store()
+  try {
+    const before = hash(join(root, 'MEMORY.md'))
+    const plan = planDream(root)
+    assert.equal(plan.readOnly, true)
+    assert.equal(plan.applySupported, false)
+    assert.equal(plan.modelCalls, 0)
+    const kinds = plan.ops.map((op) => op.kind)
+    assert.ok(kinds.includes('merge-duplicate'))
+    assert.ok(kinds.includes('repair-reference'))
+    assert.ok(kinds.includes('compact-index') || kinds.includes('review-stale'))
+    assert.ok(plan.ops.every((op) => /^[0-9a-f]{12}$/.test(op.opId)))
+    assert.equal(hash(join(root, 'MEMORY.md')), before)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test('做梦 P1：只自动执行 compact-index，需 reviewed 哈希，可重复执行且不二次改动', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-dream-apply-'))
+  try {
+    const lines = ['# 索引', '', '## project', '']
+    for (let index = 0; index < 302; index += 1) lines.push(`- [project] 条目 ${index} 编号 ${index} — project.md`)
+    writeFileSync(join(root, 'MEMORY.md'), lines.join('\n') + '\n')
+    writeFileSync(join(root, 'project.md'), '# project\n\n## 一\n\n正文。\n')
+    const { planDream, applyDream, planHash } = await import(join(dirname(fileURLToPath(import.meta.url)), '..', 'scripts', 'dream.mjs'))
+    const before = hash(join(root, 'MEMORY.md'))
+    const plan = planDream(root)
+    const compact = plan.ops.filter((op) => op.kind === 'compact-index')
+    assert.ok(compact.length >= 1, '超限库应产生 compact-index op')
+    assert.throws(() => applyDream(plan, 'deadbeef'), /dream-review-hash-mismatch/)
+    const result = applyDream(plan, planHash(plan))
+    assert.equal(result.applied >= 1, true)
+    assert.ok(result.backup !== null && Object.keys(result.backup).length >= 1)
+    assert.ok(result.verification.every((row) => row.ok))
+    assert.ok(readFileSync(join(root, 'MEMORY.md'), 'utf8') !== readFileSync(Object.values(result.backup)[0] + '/MEMORY.md', 'utf8') || hash(join(root, 'MEMORY.md')) !== before)
+    const again = planDream(root)
+    const compactAgain = again.ops.filter((op) => op.kind === 'compact-index')
+    assert.equal(compactAgain.length, 0, '应用后不应再产生 compact-index op')
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})

package/test/test-dsh-registration.mjs

@@ -0,0 +1,111 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { mkdtempSync, existsSync, readFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { setupMemoryHistory } from '../context-history.mjs'
+import { apply } from '../index.mjs'
+
+function deferredRegistration() {
+  let resolve, reject, calls = 0
+  const pending = new Promise((yes, no) => { resolve = yes; reject = no })
+  // Real DSH deliberately returns a callable thenable, not a native Promise.
+  const registration = Object.assign(() => { calls++ }, { then: pending.then.bind(pending) })
+  return { registration, resolve, reject, get calls() { return calls } }
+}
+const header = 'Current runtime context. This snapshot supersedes earlier runtime-context snapshots.'
+function oldSession() {
+  const sections = [{ name: 'memory:index', text: 'old synthetic memory' }]
+  let messages = [{ id: 'old', role: 'user', source: { kind: 'runtime-context', sections }, content: [{ type: 'text', text: `${header}\n\nold synthetic memory` }] }]
+  return { id: 'synthetic-session', surface: { nodes: [1] }, deriveMessages: () => messages,
+    append(type, message, options) { assert.equal(type, 'user/message'); assert.deepEqual(options.sourceEventSeqs, [1]); messages = [message] } }
+}
+
+test('callable asynchronous projection registration publishes no hooks before its retained handle is ready', async () => {
+  const deferred = deferredRegistration(), handlers = new Map(), session = oldSession()
+  let reads = 0
+  const ctx = { sessionProjections: { register: () => deferred.registration,
+    stateOf() { throw Error('deprecated registry reader must not be used') } },
+    workingDirectory: { get: () => '/synthetic' }, on: (name, fn) => handlers.set(name, fn) }
+  const pending = setupMemoryHistory(ctx, () => 'new synthetic memory')
+  assert.equal(handlers.size, 0)
+  deferred.resolve({ stateOf(value) { assert.equal(value, session); reads++; return { nodes: [{ id: 'old', seq: 1 }], overflow: false } } })
+  const history = await pending
+  assert.equal(history.available, true)
+  assert.equal(deferred.calls, 0, 'await must not invoke the legacy disposer')
+  assert.equal(handlers.get('agent/request')({ agent: { session } }, () => 'continued'), 'continued')
+  assert.equal(reads, 1)
+  assert.doesNotMatch(JSON.stringify(session.deriveMessages()), /old synthetic memory/)
+})
+
+test('handle-only hosts need no deprecated registry stateOf method', async () => {
+  const handlers = new Map()
+  const history = await setupMemoryHistory({ sessionProjections: { register: async () => ({ stateOf: () => ({ nodes: [], overflow: false }) }) }, on: (name, fn) => handlers.set(name, fn) }, () => '')
+  assert.equal(history.available, true)
+  assert.equal(handlers.size, 4)
+})
+
+test('rejected projection registration installs no history consumers', async () => {
+  const deferred = deferredRegistration(), handlers = []
+  const pending = setupMemoryHistory({ sessionProjections: { register: () => deferred.registration }, on: (...args) => handlers.push(args) }, () => '')
+  deferred.reject(Error('synthetic-registration-rejected'))
+  await assert.rejects(pending, /synthetic-registration-rejected/)
+  assert.deepEqual(handlers, [])
+})
+
+test('malformed ready handle is rejected rather than advertised as available', async () => {
+  await assert.rejects(setupMemoryHistory({ sessionProjections: { register: async () => ({}) } }, () => ''), /memory-context-reader-unavailable/)
+})
+
+for (const success of [true, false]) test(`apply awaits registration before tools, prompts and success marker (${success ? 'success' : 'failure'})`, async () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-registration-')), previous = process.env.DSH_HOME
+  process.env.DSH_HOME = root
+  const deferred = deferredRegistration(), tools = [], prompts = [], effects = [], handlers = []
+  const ctx = { sessionProjections: { register: () => deferred.registration },
+    systemPrompt: { context: value => prompts.push(value) }, workingDirectory: { get: () => root }, tools: { register: value => tools.push(value) },
+    on: (...args) => handlers.push(args), effect(fn) { effects.push(fn()) } }
+  try {
+    const pending = apply(ctx, { autoCapture: { enabled: false } })
+    assert.equal(typeof pending?.then, 'function')
+    assert.deepEqual(tools, []); assert.deepEqual(prompts, []); assert.deepEqual(handlers, [])
+    const marker = join(root, 'memory', '.loaded.json')
+    assert.equal(existsSync(marker), false)
+    if (success) {
+      deferred.resolve({ stateOf: () => ({ nodes: [], overflow: false }) })
+      await pending
+      assert.equal(tools.length, 6); assert.equal(prompts.length, 2)
+      assert.equal(JSON.parse(readFileSync(marker)).memoryHistory.available, true)
+    } else {
+      deferred.reject(Error('synthetic-owner-disposed'))
+      await assert.rejects(pending, /synthetic-owner-disposed/)
+      assert.equal(existsSync(marker), false); assert.deepEqual(tools, []); assert.deepEqual(prompts, []); assert.deepEqual(handlers, [])
+    }
+    assert.equal(deferred.calls, 0)
+  } finally {
+    for (const dispose of effects.reverse()) dispose?.()
+    if (previous === undefined) delete process.env.DSH_HOME; else process.env.DSH_HOME = previous
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+
+test('a successful handle arriving after owner disposal cannot activate history or tools', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'dsh-disposed-registration-')), previous = process.env.DSH_HOME
+  process.env.DSH_HOME = root
+  const deferred = deferredRegistration(), consumers = [], fiber = { uid: 1 }
+  const ctx = { fiber, sessionProjections: { register: () => deferred.registration },
+    systemPrompt: { context: value => consumers.push(value) }, workingDirectory: { get: () => root },
+    tools: { register: value => consumers.push(value) }, on: (...args) => consumers.push(args) }
+  try {
+    const pending = apply(ctx, { autoCapture: { enabled: false } })
+    fiber.uid = null
+    deferred.resolve({ stateOf: () => ({ nodes: [], overflow: false }) })
+    await pending
+    assert.deepEqual(consumers, [])
+    assert.equal(existsSync(join(root, 'memory', '.loaded.json')), false)
+    assert.equal(deferred.calls, 0)
+  } finally {
+    if (previous === undefined) delete process.env.DSH_HOME; else process.env.DSH_HOME = previous
+    rmSync(root, { recursive: true, force: true })
+  }
+})

package/{test-episodes.mjs → test/test-episodes.mjs}

@@ -4,11 +4,11 @@ import {mkdtempSync,realpathSync,mkdirSync,readFileSync,writeFileSync,rmSync,exi
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
 import {createHash} from 'node:crypto'
-import {apply,indexLine,searchStore,forgetMemory,forgetExpired,pruneStore,withdrawManagedSource,recoverMemoryPublication,adoptCandidate,storeRevision,storeDirFor} from './index.mjs'
-import {candidateSnapshot,stageCandidate} from './candidates.mjs'
-import {writeFixtureMemory} from './fixture-host.mjs'
-import {episodeSnapshot,prepareEpisodes,historyRows,EPISODE_FILE,EPISODE_LIMIT} from './episodes.mjs'
-import {toolProposal} from './source-record.mjs'
+import {apply,indexLine,searchStore,forgetMemory,forgetExpired,pruneStore,withdrawManagedSource,recoverMemoryPublication,adoptCandidate,storeRevision,storeDirFor} from '../index.mjs'
+import {candidateSnapshot,stageCandidate} from '../candidates.mjs'
+import {writeFixtureMemory} from '../fixture-host.mjs'
+import {episodeSnapshot,prepareEpisodes,historyRows,EPISODE_FILE,EPISODE_LIMIT} from '../episodes.mjs'
+import {toolProposal} from '../source-record.mjs'
 
 const digest=value=>createHash('sha256').update(JSON.stringify(value)).digest('hex')
 async function box(run){

package/{test-explicit-memory.mjs → test/test-explicit-memory.mjs}

@@ -1,9 +1,9 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
-import {memoryProtocol} from './memory-protocol.mjs'
-import {captureSourceAliases} from './capture-source-aliases.mjs'
-import {extractWithLlm} from './capture-llm.mjs'
-import {assessCandidate} from './capture-evidence.mjs'
+import {memoryProtocol} from '../memory-protocol.mjs'
+import {captureSourceAliases} from '../capture-source-aliases.mjs'
+import {extractWithLlm} from '../capture-llm.mjs'
+import {assessCandidate} from '../capture-evidence.mjs'
 
 test('protocol reports scoped availability and remains available with no memory data', () => {
   const agent={session:{id:'owner'}}

package/{test-field-lineage.mjs → test/test-field-lineage.mjs}

@@ -5,10 +5,10 @@ import {createHash} from 'node:crypto'
 import {mkdtempSync,mkdirSync,rmSync,readFileSync,writeFileSync} from 'node:fs'
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
-import {compileValueRevision,normalizeFieldLineage} from './field-lineage.mjs'
-import {writeMemory,indexLine,searchStore,withdrawManagedSource,forgetMemory,recoverMemoryPublication,storeRevision} from './index.mjs'
-import {candidateSnapshot,stageCandidate,rejectCandidate,pruneCandidates} from './candidates.mjs'
-import {episodeSnapshot} from './episodes.mjs'
+import {compileValueRevision,normalizeFieldLineage} from '../field-lineage.mjs'
+import {writeMemory,indexLine,searchStore,withdrawManagedSource,forgetMemory,recoverMemoryPublication,storeRevision} from '../index.mjs'
+import {candidateSnapshot,stageCandidate,rejectCandidate,pruneCandidates} from '../candidates.mjs'
+import {episodeSnapshot} from '../episodes.mjs'
 const hash=v=>createHash('sha256').update(JSON.stringify(v)).digest('hex')
 const meaning={kind:'preference',conditions:[{dimension:'document_kind',value:'draft'}],except:[{dimension:'audience',value:'experts'}]}
 const proof=n=>({sessionId:'owner-session-'+n,basis:'tool-context',via:'memory_write',callHash:hash(['call',n]),evidence:[{messageId:'message-'+n,hash:hash(['message',n]),quote:'Synthetic source '+n+' for lasting draft palette.'}]})

package/{test-history.mjs → test/test-history.mjs}

@@ -1,7 +1,7 @@
 import {realpathSync} from 'node:fs'
-import {applyWithOwnerFixture as apply} from './fixture-host.mjs'
+import {applyWithOwnerFixture as apply} from '../fixture-host.mjs'
 /**
- * 历史链与写入相似度闸。跑法：node --test ~/.dsh/plugins/memory/test-history.mjs
+ * 历史链与写入相似度闸。跑法：node --test ~/.dsh/plugins/memory/test/test-history.mjs
  *
  * 两件事各自的「为什么」：
  *   · 历史链：审计回答「做过什么」，历史回答「原来是什么」。取代/删除后原文必须可回溯，
@@ -24,7 +24,7 @@ import {
   storeDirFor,
   summaryOf,
   writeMemory,
-} from './index.mjs'
+} from '../index.mjs'
 
 function sandbox() {
   const root = realpathSync(mkdtempSync(join(tmpdir(), 'dsh-mem-hist-')))
@@ -272,7 +272,7 @@ test('工具调用遇到近似重复时，错误信息足以让模型自行修
 // ── 审计发现的两个数据安全问题（回归） ──────────────────────────────────────
 
 test('主题文件超出读取上限时拒绝追加，绝不覆盖历史', async () => {
-  const { appendTopic } = await import('./index.mjs')
+  const { appendTopic } = await import('../index.mjs')
   const box = sandbox()
   try {
     const dir = join(box.cwd, 'store')

package/{test-inline-summary.mjs → test/test-inline-summary.mjs}

@@ -1,14 +1,14 @@
 import {realpathSync} from 'node:fs'
-import {applyWithOwnerFixture as apply} from './fixture-host.mjs'
+import {applyWithOwnerFixture as apply} from '../fixture-host.mjs'
 import {test} from 'node:test'
 import assert from 'node:assert/strict'
 import {mkdtempSync,mkdirSync,readFileSync,writeFileSync,rmSync,existsSync} from 'node:fs'
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
-import {writeMemory,storeDirFor,indexLine,summaryOf,isExpired,lookupLinks,storeRevision,adoptCandidate,withdrawManagedSource,searchStore} from './index.mjs'
-import {stageCandidate} from './candidates.mjs'
-import {entryId} from './security.mjs'
-const legacy=JSON.parse(readFileSync(new URL('./corpus/legacy-summary-v15.json',import.meta.url)))
+import {writeMemory,storeDirFor,indexLine,summaryOf,isExpired,lookupLinks,storeRevision,adoptCandidate,withdrawManagedSource,searchStore} from '../index.mjs'
+import {stageCandidate} from '../candidates.mjs'
+import {entryId} from '../security.mjs'
+const legacy=JSON.parse(readFileSync(new URL('../corpus/legacy-summary-v15.json',import.meta.url)))
 function box(scope='global'){const root=realpathSync(mkdtempSync(join(tmpdir(),'dsh-inline-summary-'))),home=join(root,'home');mkdirSync(home,{recursive:true});const previous=process.env.DSH_HOME;process.env.DSH_HOME=home;const dir=storeDirFor(scope,root);mkdirSync(dir,{recursive:true});let mounted
  function mount(){if(mounted)return mounted;const tools=[],captured={};apply({systemPrompt:{context:provider=>captured.provider=provider},tools:{register:tool=>tools.push(tool)},workingDirectory:{get:()=>root},on(){}},{autoCapture:{enabled:false}});return mounted={tools,provider:captured.provider}}
  return{root,dir,get tools(){return mount().tools},get provider(){return mount().provider},close(){if(previous===undefined)delete process.env.DSH_HOME;else process.env.DSH_HOME=previous;rmSync(root,{recursive:true,force:true})}}

package/{test-legacy-source-identity.mjs → test/test-legacy-source-identity.mjs}

@@ -4,8 +4,8 @@ import {mkdtempSync,mkdirSync,readFileSync,writeFileSync,rmSync,realpathSync} fr
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
 import {createHash} from 'node:crypto'
-import {initializeManagedMemory,managedMemoryStatus,writeMemory,indexLine,withdrawManagedSource,withdrawManagedSourceKey,searchStore} from './index.mjs'
-import {withdrawalSelector,discoverWithdrawalIdentity} from './source-identity.mjs'
+import {initializeManagedMemory,managedMemoryStatus,writeMemory,indexLine,withdrawManagedSource,withdrawManagedSourceKey,searchStore} from '../index.mjs'
+import {withdrawalSelector,discoverWithdrawalIdentity} from '../source-identity.mjs'
 const hash=value=>createHash('sha256').update(value).digest('hex'),key=(sid,msg)=>hash(JSON.stringify([sid,msg]))
 const sid='synthetic-current-owner',msg='synthetic-current-message',target=key(sid,msg)
 function box(run,{legacySid='synthetic-different-legacy-owner',auditOnly=false}={}){

package/{test-links.mjs → test/test-links.mjs}

@@ -1,7 +1,7 @@
 import {realpathSync} from 'node:fs'
-import {applyWithOwnerFixture as apply} from './fixture-host.mjs'
+import {applyWithOwnerFixture as apply} from '../fixture-host.mjs'
 /**
- * 条目 id、关系边与多跳查询。跑法：node --test ~/.dsh/plugins/memory/test-links.mjs
+ * 条目 id、关系边与多跳查询。跑法：node --test ~/.dsh/plugins/memory/test/test-links.mjs
  *
  * 对应两项差距：MemOS 的「版本可查询」与 A-MEM 的「插入时建链」。
  * id 用内容寻址（sha1 前 8 位），不新增字段、不改索引格式：一行内容的 id 就是它自己。
@@ -13,8 +13,8 @@ import { mkdtempSync, mkdirSync, readFileSync, rmSync, existsSync } from 'node:f
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 
-import { entryId } from './security.mjs'
-import { LINK_LIMIT, LINK_THRESHOLD,  lookupLinks, relatedEntries, storeDirFor, writeMemory } from './index.mjs'
+import { entryId } from '../security.mjs'
+import { LINK_LIMIT, LINK_THRESHOLD,  lookupLinks, relatedEntries, storeDirFor, writeMemory } from '../index.mjs'
 
 function sandbox() {
   const root = realpathSync(mkdtempSync(join(tmpdir(), 'dsh-mem-links-')))

package/{test-managed-access.mjs → test/test-managed-access.mjs}

@@ -4,11 +4,13 @@ import {mkdtempSync,mkdirSync,readFileSync,writeFileSync,rmSync,cpSync,readdirSy
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
 import {createHash} from 'node:crypto'
-import {writeMemory,indexLine,searchStore,lookupLinks,statusOf,storeRevision,withdrawManagedSource,recoverMemoryPublication,initializeManagedMemory,managedMemoryStatus,adoptCandidate,apply,storeDirFor} from './index.mjs'
-import {candidateSnapshot,listCandidates,stageCandidate,withdrawSource,withdrawalPolicy} from './candidates.mjs'
-import {legacyProjectSlug,inspectProjectStore,migrateProjectStore,projectStoreDir} from './project-stores.mjs'
-import {managedRead,managedProjectOperation} from './managed-access.mjs'
-import {withManagedRead} from './managed-policy.mjs'
+import {once} from 'node:events'
+import {Worker} from 'node:worker_threads'
+import {writeMemory,indexLine,searchStore,lookupLinks,statusOf,storeRevision,withdrawManagedSource,recoverMemoryPublication,initializeManagedMemory,managedMemoryStatus,adoptCandidate,apply,storeDirFor} from '../index.mjs'
+import {candidateSnapshot,listCandidates,stageCandidate,withdrawSource,withdrawalPolicy} from '../candidates.mjs'
+import {legacyProjectSlug,inspectProjectStore,migrateProjectStore,projectStoreDir} from '../project-stores.mjs'
+import {managedRead,managedProjectOperation} from '../managed-access.mjs'
+import {withManagedRead} from '../managed-policy.mjs'
 const hash=value=>createHash('sha256').update(value).digest('hex')
 const proof=(fresh=false)=>({basis:'tool-context',via:'memory_write',sessionId:fresh?'unrelated-owner':'managed-owner',callHash:hash(fresh?'other-call':'managed-call'),evidence:[{messageId:fresh?'unrelated-root':'managed-root',hash:hash('synthetic-source'),quote:fresh?'Synthetic unrelated delivery choice cobalt7654':'Synthetic palette choice jade9876'}]})
 const box=run=>{const root=realpathSync(mkdtempSync(join(tmpdir(),'managed-access-'))),data=join(root,'memory');mkdirSync(data);try{const result=run({root,data,rows:[{name:'.',role:'global'},{name:'projects/v2-synthetic',role:'project'}],project:join(data,'projects/v2-synthetic')});if(result&&typeof result.then==='function')return result.finally(()=>rmSync(root,{recursive:true,force:true}));rmSync(root,{recursive:true,force:true});return result}catch(error){rmSync(root,{recursive:true,force:true});throw error}}
@@ -20,6 +22,28 @@ test('a read never creates a missing control database or invokes the data callba
  let read=false;assert.throws(()=>withManagedRead(f.data,'.',()=>{read=true}),/control-missing/)
  assert.equal(read,false);assert.equal(existsSync(f.data+'.control/state.sqlite'),false)
 }))
+test('a managed read recovers after a brief control database lock',()=>box(async f=>{
+ seeded(f);initialize(f)
+ const worker=new Worker(`
+  const {DatabaseSync}=require('node:sqlite')
+  const {parentPort,workerData}=require('node:worker_threads')
+  const db=new DatabaseSync(workerData)
+  try{
+   db.exec('BEGIN IMMEDIATE')
+   parentPort.postMessage('locked')
+   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,220)
+   db.exec('ROLLBACK')
+  }finally{db.close()}
+ `,{eval:true,workerData:f.data+'.control/state.sqlite'})
+ const finished=once(worker,'exit')
+ try{
+  await once(worker,'message')
+  assert.ok(searchStore(f.data,'jade9876').hits.length>0)
+ }finally{
+  const [code]=await finished
+  assert.equal(code,0)
+ }
+}))
 test('transaction identity rejection happens before fresh-source and data callbacks',()=>box(f=>{
  seeded(f);initialize(f);let fresh=false,read=false
  assert.throws(()=>withManagedRead(f.data,'.',()=>{read=true},{validateIdentity(){throw Error('synthetic-identity-rejected')},readFreshProofs(){fresh=true;return[]}}),/identity-rejected/)

package/{test-managed-activation.mjs → test/test-managed-activation.mjs}

@@ -6,11 +6,11 @@ import {tmpdir} from 'node:os'
 import {fileURLToPath} from 'node:url'
 import {createHash} from 'node:crypto'
 import {spawnSync} from 'node:child_process'
-import {writeMemory,indexLine,withdrawManagedSource,searchStore,managedMemoryStatus,initializeManagedMemory,storeRevision,adoptCandidate} from './index.mjs'
-import {stageCandidate} from './candidates.mjs'
-import {activateManagedMemory,activationStores} from './managed-activation.mjs'
-import {probeEnvironment} from './scripts/probe-env.mjs'
-const here=dirname(fileURLToPath(import.meta.url)),hash=value=>createHash('sha256').update(value).digest('hex')
+import {writeMemory,indexLine,withdrawManagedSource,searchStore,managedMemoryStatus,initializeManagedMemory,storeRevision,adoptCandidate} from '../index.mjs'
+import {stageCandidate} from '../candidates.mjs'
+import {activateManagedMemory,activationStores} from '../managed-activation.mjs'
+import {probeEnvironment} from '../scripts/probe-env.mjs'
+const here=dirname(dirname(fileURLToPath(import.meta.url))),hash=value=>createHash('sha256').update(value).digest('hex')
 function box(run){const root=realpathSync(mkdtempSync(join(tmpdir(),'managed-activation-'))),data=join(root,'memory');mkdirSync(data);try{return run({root,data})}finally{rmSync(root,{recursive:true,force:true})}}
 function write(dir,scope='global',owner='old-owner',word='jade9876'){
  const summary='Synthetic activation preference '+word

package/{test-meaning.mjs → test/test-meaning.mjs}

@@ -1,15 +1,15 @@
-import {applyWithValidationFixture as apply} from './fixture-host.mjs'
+import {applyWithValidationFixture as apply} from '../fixture-host.mjs'
 import {test} from 'node:test'
 import assert from 'node:assert/strict'
 import {mkdtempSync,realpathSync,mkdirSync,readFileSync,writeFileSync,existsSync,rmSync} from 'node:fs'
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
 import {createHash} from 'node:crypto'
-import {normalizeMeaning,meaningForScope,normalizeContext,normalizeTask,applicability,meaningView,memoryAdvice,detailedMeanings,meaningLabel} from './meaning.mjs'
-import {indexLine, searchStore, writeMemory, storeRevision, withdrawManagedSource, adoptCandidate, storeDirFor} from './index.mjs'
-import {candidateSnapshot,stageCandidate} from './candidates.mjs'
-import {writeFixtureMemory,applyWithOwnerFixture} from './fixture-host.mjs'
-import {captureMessage,assessCandidate} from './capture-evidence.mjs'
+import {normalizeMeaning,meaningForScope,normalizeContext,normalizeTask,applicability,meaningView,memoryAdvice,detailedMeanings,meaningLabel} from '../meaning.mjs'
+import {indexLine, searchStore, writeMemory, storeRevision, withdrawManagedSource, adoptCandidate, storeDirFor} from '../index.mjs'
+import {candidateSnapshot,stageCandidate} from '../candidates.mjs'
+import {writeFixtureMemory,applyWithOwnerFixture} from '../fixture-host.mjs'
+import {captureMessage,assessCandidate} from '../capture-evidence.mjs'
 
 const condition={dimension:'audience',value:'children'},exception={dimension:'delivery',value:'urgent'}
 const pref=normalizeMeaning({kind:'preference',conditions:[condition]})

package/{test-native-service-lifecycle.mjs → test/test-native-service-lifecycle.mjs}

@@ -5,7 +5,7 @@ import {mkdtempSync,realpathSync,mkdirSync,rmSync} from 'node:fs'
 import {tmpdir} from 'node:os'
 import {join,resolve} from 'node:path'
 import {pathToFileURL} from 'node:url'
-const source=process.env.DSH_NATIVE_SERVICE_SOURCE?pathToFileURL(resolve(process.env.DSH_NATIVE_SERVICE_SOURCE)+'/'):new URL('./',import.meta.url)
+const source=process.env.DSH_NATIVE_SERVICE_SOURCE?pathToFileURL(resolve(process.env.DSH_NATIVE_SERVICE_SOURCE)+'/'):new URL('../',import.meta.url)
 const {apply}=await import(new URL('index.mjs',source)),{candidateSnapshot}=await import(new URL('candidates.mjs',source)),{scriptedNativeValidationLlm}=await import(new URL('fixture-host.mjs',source))
 for(const mode of ['stable-owner-fresh-proxies','owner-disappears','owner-replaced'])test('native service lifecycle: '+mode,async()=>{
  const base=realpathSync(mkdtempSync(join(tmpdir(),'native-service-generation-'))),home=join(base,'home'),old=process.env.DSH_HOME;mkdirSync(home);process.env.DSH_HOME=home

package/{test-native-write-validation.mjs → test/test-native-write-validation.mjs}

@@ -4,10 +4,10 @@ import assert from 'node:assert/strict'
 import {mkdtempSync,realpathSync,mkdirSync,rmSync,readFileSync,existsSync} from 'node:fs'
 import {tmpdir} from 'node:os'
 import {join} from 'node:path'
-import {apply,storeDirFor,searchStore,withdrawManagedSource} from './index.mjs'
-import {candidateSnapshot} from './candidates.mjs'
-import {VALIDATION_FIELDS} from './capture-validation-contract.mjs'
-import {writeFixtureMemory} from './fixture-host.mjs'
+import {apply,storeDirFor,searchStore,withdrawManagedSource} from '../index.mjs'
+import {candidateSnapshot} from '../candidates.mjs'
+import {VALIDATION_FIELDS} from '../capture-validation-contract.mjs'
+import {writeFixtureMemory} from '../fixture-host.mjs'
 const proposal={type:'user',scope:'global',summary:'长期反馈先列两处问题再给办法',meaning:{kind:'preference',conditions:[{dimension:'task',value:'review'}]}}
 const text='跨我的所有项目，长期反馈都先列两处问题再给修改办法。'
 async function box(options,run){
@@ -40,6 +40,12 @@ test('native approval publishes the unchanged typed candidate; exact replay is a
  assert.equal(result.status,'recorded');assert.equal(f.records()[0].summary,proposal.summary);assert.equal(f.requests.length,1)
  assert.equal((await f.tool.execute(proposal,exec)).status,'duplicate');assert.equal(f.requests.length,1)
 }))
+test('unrelated native admission does not disclose saved private records to its reviewer',()=>box({duringStream:(_f,input)=>{
+ assert.doesNotMatch(JSON.stringify(input.currentMemory),/1993|4月16|个人档案/)
+}},async f=>{
+ writeFixtureMemory({dir:f.root,type:'user',scope:'global',summary:'个人档案：出生于1993年4月16日，女性',meaning:{kind:'claim'}})
+ f.owner();const result=await f.tool.execute(proposal,f.call());assert.equal(result.status,'recorded')
+}))
 test('definite rejection leaves no current or pending memory and does not render success',()=>box({state:'unsupported'},async f=>{
  f.owner();const result=await f.tool.execute(proposal,f.call());assert.equal(result.status,'rejected');assert.equal(f.records().length,0);assert.doesNotMatch(f.rendered(result),/已写入/);assert.equal(searchStore(f.root,'长期反馈').hits.length,0)
 }))