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

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){

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

@@ -1,5 +1,5 @@
 /**
- * 打包完整性。跑法：node --test ~/.dsh/plugins/memory/test-packaging.mjs
+ * 打包完整性。跑法：node --test ~/.dsh/plugins/memory/test/test-packaging.mjs
  *
  * 发布前最容易漏的四件事：版本两处不一致、manifest 字段缺失、files 漏了运行时文件、
  * 文档里指向不存在的文件。这些都是机械可查的，不该靠人记得。
@@ -7,16 +7,16 @@
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import { existsSync, readFileSync, mkdtempSync, mkdirSync, rmSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync, mkdtempSync, mkdirSync, rmSync } from 'node:fs'
 import { join, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { tmpdir } from 'node:os'
 import { spawnSync } from 'node:child_process'
-import { probeEnvironment } from './scripts/probe-env.mjs'
+import { probeEnvironment } from '../scripts/probe-env.mjs'
 
-import { VERSION } from './version.mjs'
+import { VERSION } from '../version.mjs'
 
-const HERE = dirname(fileURLToPath(import.meta.url))
+const HERE = dirname(dirname(fileURLToPath(import.meta.url)))
 const pkg = JSON.parse(readFileSync(join(HERE, 'package.json'), 'utf8'))
 
 test('版本单点：package.json 与 version.mjs 一致', () => {
@@ -72,6 +72,15 @@ test('npm scripts 指向真实存在的测试文件', () => {
   for (const file of files) assert.ok(existsSync(join(HERE, file)), `脚本引用了不存在的 ${file}`)
 })
 
+test('测试集中在 test/，命令与发布清单完整覆盖同一集合', () => {
+  const isSuite = name => /^test(?:-[a-z0-9-]+)?\.mjs$/.test(name)
+  assert.deepEqual(readdirSync(HERE).filter(isSuite), [], '根目录不应再有测试入口')
+  const suites = readdirSync(join(HERE, 'test')).filter(isSuite).map(name => `test/${name}`).sort()
+  const declared = pkg.scripts.test.split(/\s+/).filter(token => token.endsWith('.mjs')).sort()
+  assert.deepEqual(declared, suites, 'npm test 应覆盖全部测试且没有重复项')
+  for (const suite of suites) assert.ok(pkg.files.includes(suite), `files 漏了 ${suite}`)
+})
+
 test('LICENSE 与 package.json 的 license 字段一致', () => {
   assert.equal(pkg.license, 'MIT')
   assert.match(readFileSync(join(HERE, 'LICENSE'), 'utf8'), /MIT License/)
@@ -100,3 +109,21 @@ test('真实探针子进程看不到合成凭据或 NODE_OPTIONS，home/tmp 均
     assert.doesNotMatch(child.stdout,/synthetic-key/)
   } finally {rmSync(root,{recursive:true,force:true})}
 })
+
+// This executes from both the source tree and the extracted npm archive.
+test('随包示例执行真实处理器，保留来源并隔离不同项目（非真实模型验收）', () => {
+  const child = spawnSync(process.execPath, [join(HERE, 'scripts/demo-source-recall.mjs'), '--json'], { encoding: 'utf8', timeout: 30000 })
+  assert.equal(child.status, 0, child.stderr)
+  const receipt = JSON.parse(child.stdout)
+  assert.equal(receipt.kind, 'synthetic-scripted-host-mechanics')
+  assert.equal(receipt.realDshHost, false)
+  assert.equal(receipt.realModel, false)
+  assert.equal(receipt.networkRequests, 0)
+  assert.equal(receipt.isolatedTemporaryHome, true)
+  assert.equal(receipt.separateProcesses, 3)
+  assert.equal(receipt.phases.write.result.status, 'recorded')
+  assert.equal(receipt.phases.recall.current.hits.length, 1)
+  assert.equal(receipt.phases.recall.history.hits.length, 1)
+  assert.equal(receipt.phases['other-project'].current.hits.length, 0)
+  assert.equal(receipt.phases['other-project'].history.hits.length, 0)
+})

package/{test-paired-analysis.mjs → test/test-paired-analysis.mjs}

@@ -1,6 +1,6 @@
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import { analyzePairs, signTail } from './eval/paired-analysis.mjs'
+import { analyzePairs, signTail } from '../eval/paired-analysis.mjs'
 
 test('配对精确检验：已知二项尾概率', () => {
   assert.equal(signTail(0, 0), 1)

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

@@ -1,5 +1,5 @@
 /**
- * 安装/卸载脚本。跑法：node --test ~/.dsh/plugins/memory/test-patch.mjs
+ * 安装/卸载脚本。跑法：node --test ~/.dsh/plugins/memory/test/test-patch.mjs
  *
  * 这类脚本最容易在"用户的文件"上出事：删多了、重复插、覆盖掉别人的配置。
  * 所以测试重点不是"能不能装上"，而是"只动自己那几行"。
@@ -13,7 +13,7 @@ import { tmpdir } from 'node:os'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { spawnSync } from 'node:child_process'
 
-import { run } from './scripts/patch.mjs'
+import { run } from '../scripts/patch.mjs'
 
 const OTHER = `# 用户自己的配置
 - id: locale
@@ -57,7 +57,7 @@ test('插件路径不存在时拒绝安装，且不改动文件', () => {
 test('安装：真实路径下写入块，且原有条目一行不少', () => {
   const box = sandbox()
   try {
-    const plugin = fileURLToPath(new URL('./index.mjs', import.meta.url))
+    const plugin = fileURLToPath(new URL('../index.mjs', import.meta.url))
     const result = run(['install', '--profile', box.profile, '--plugin', plugin])
     assert.equal(result.changed, true)
 
@@ -79,7 +79,7 @@ test('安装：真实路径下写入块，且原有条目一行不少', () => {
 test('幂等：装两次不产生第二个块', () => {
   const box = sandbox()
   try {
-    const plugin = fileURLToPath(new URL('./index.mjs', import.meta.url))
+    const plugin = fileURLToPath(new URL('../index.mjs', import.meta.url))
     run(['install', '--profile', box.profile, '--plugin', plugin])
     const first = readFileSync(box.file, 'utf8')
 
@@ -95,7 +95,7 @@ test('幂等：装两次不产生第二个块', () => {
 test('卸载：只删自己的块，用户配置逐字保留', () => {
   const box = sandbox()
   try {
-    const plugin = fileURLToPath(new URL('./index.mjs', import.meta.url))
+    const plugin = fileURLToPath(new URL('../index.mjs', import.meta.url))
     run(['install', '--profile', box.profile, '--plugin', plugin])
     const result = run(['uninstall', '--profile', box.profile])
     assert.equal(result.changed, true)
@@ -124,7 +124,7 @@ test('卸载：没装过时不动文件', () => {
 test('dry-run 不落盘', () => {
   const box = sandbox()
   try {
-    const plugin = fileURLToPath(new URL('./index.mjs', import.meta.url))
+    const plugin = fileURLToPath(new URL('../index.mjs', import.meta.url))
     const before = readFileSync(box.file, 'utf8')
     const result = run(['install', '--profile', box.profile, '--plugin', plugin, '--dry-run'])
     assert.equal(result.dryRun, true)
@@ -138,7 +138,7 @@ test('dry-run 不落盘', () => {
 test('标记不成对时拒绝操作（不猜）', () => {
   const box = sandbox(`${OTHER}# >>> dsh-memory\n- insert:\n`)
   try {
-    assert.throws(() => run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('./index.mjs', import.meta.url))]), /标记不成对/)
+    assert.throws(() => run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('../index.mjs', import.meta.url))]), /标记不成对/)
     assert.throws(() => run(['uninstall', '--profile', box.profile]), /标记不成对/)
   } finally {
     box.cleanup()
@@ -158,7 +158,7 @@ test('已有未托管的 memory 条目时拒绝安装（不制造副本）', ()
   try {
     const before = readFileSync(box.file, 'utf8')
     assert.throws(
-      () => run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('./index.mjs', import.meta.url))]),
+      () => run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('../index.mjs', import.meta.url))]),
       /未托管的 memory 条目/,
     )
     assert.equal(readFileSync(box.file, 'utf8'), before, '拒绝时不应改动文件')
@@ -171,7 +171,7 @@ test('全新空列表配置可安装，卸载逐字恢复注释与空白', () =>
   const original = '# clean profile\n  [] # intentional empty\n\n'
   const box = sandbox(original)
   try {
-    run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('./index.mjs', import.meta.url))])
+    run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('../index.mjs', import.meta.url))])
     const installed = readFileSync(box.file, 'utf8')
     assert.doesNotMatch(installed, /^\s*\[\]/m)
     assert.match(installed, /^- insert:/m)
@@ -183,7 +183,7 @@ test('全新空列表配置可安装，卸载逐字恢复注释与空白', () =>
 test('恢复空列表时保留托管块以外的新注释，损坏恢复标记则拒绝', () => {
   const box = sandbox('[]\n')
   try {
-    run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('./index.mjs', import.meta.url))])
+    run(['install', '--profile', box.profile, '--plugin', fileURLToPath(new URL('../index.mjs', import.meta.url))])
     const installed = readFileSync(box.file, 'utf8')
     writeFileSync(box.file, '# newer outside comment\n' + installed)
     run(['uninstall', '--profile', box.profile])
@@ -212,7 +212,7 @@ test('插件路径中的空格、中文与井号使用有效 file URL', () => {
 test('default plugin path installs correctly from a Unicode directory with spaces and URL metacharacters',()=>{
  const box=sandbox()
  try{
-  const local=join(box.root,'插件 空间#'),scripts=join(local,'scripts');mkdirSync(scripts,{recursive:true});writeFileSync(join(local,'index.mjs'),'export function apply() {}\n');const file=join(scripts,'patch.mjs');copyFileSync(fileURLToPath(new URL('./scripts/patch.mjs',import.meta.url)),file)
+  const local=join(box.root,'插件 空间#'),scripts=join(local,'scripts');mkdirSync(scripts,{recursive:true});writeFileSync(join(local,'index.mjs'),'export function apply() {}\n');const file=join(scripts,'patch.mjs');copyFileSync(fileURLToPath(new URL('../scripts/patch.mjs',import.meta.url)),file)
   const result=spawnSync(process.execPath,[file,'install','--profile',box.profile],{encoding:'utf8'});assert.equal(result.status,0,result.stderr);const body=readFileSync(box.file,'utf8'),href=JSON.parse(body.split('\n').filter(line=>line.trim().startsWith('name:')).at(-1).split('name:')[1].trim());assert.equal(realpathSync(fileURLToPath(href)),realpathSync(join(local,'index.mjs')));assert.ok(href.includes('%20')&&href.includes('%23'));assert.ok(body.includes('id: mcp-godot'))
  }finally{box.cleanup()}
 })

package/{test-plugin-contract.mjs → test/test-plugin-contract.mjs}

@@ -4,10 +4,10 @@ import assert from 'node:assert/strict'
 import { mkdtempSync, mkdirSync, readFileSync, existsSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { Config, normalizePluginConfig, DEFAULT_AUTO_CAPTURE } from './plugin-config.mjs'
-import { optionalService } from './host-services.mjs'
-import { extractWithLlm } from './capture-llm.mjs'
-import { apply,storeDirFor } from './index.mjs'
+import { Config, normalizePluginConfig, DEFAULT_AUTO_CAPTURE } from '../plugin-config.mjs'
+import { optionalService } from '../host-services.mjs'
+import { extractWithLlm } from '../capture-llm.mjs'
+import { apply,storeDirFor } from '../index.mjs'
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 async function until(check) { for (let i = 0; i < 200; i++) { if (check()) return; await sleep(5) } throw Error('fixture deadline') }
 

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

@@ -3,9 +3,9 @@ import assert from 'node:assert/strict'
 import {mkdtempSync,realpathSync,mkdirSync,readFileSync,writeFileSync,rmSync} from 'node:fs'
 import {join} from 'node:path'
 import {tmpdir} from 'node:os'
-import {apply,searchStore,lookupLinks} from './index.mjs'
-import {writeFixtureMemory} from './fixture-host.mjs'
-import {memoryPrivacy,privateMemory,publicMemoryRecords,publicMemoryIndex} from './privacy.mjs'
+import {apply,searchStore,lookupLinks} from '../index.mjs'
+import {writeFixtureMemory} from '../fixture-host.mjs'
+import {memoryPrivacy,privateMemory,publicMemoryRecords,publicMemoryIndex} from '../privacy.mjs'
 
 test('actual background extractor receives no unrelated saved private source or summary',async()=>{
   const home=realpathSync(mkdtempSync(join(tmpdir(),'memory-private-background-'))),old=process.env.DSH_HOME;process.env.DSH_HOME=home

package/{test-project-stores.mjs → test/test-project-stores.mjs}

@@ -1,4 +1,4 @@
-import {prepareMountedFixture} from './fixture-host.mjs'
+import {prepareMountedFixture} from '../fixture-host.mjs'
 import {realpathSync} from 'node:fs'
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
@@ -7,8 +7,8 @@ import { spawnSync } from 'node:child_process'
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import { fileURLToPath } from 'node:url'
-import { projectStoreDir, projectIdentity, legacyProjectSlug, inspectProjectStore, migrateProjectStore, recoverProjectStore } from './project-stores.mjs'
-import { storeDirFor, writeMemory, indexLine, searchStore, apply } from './index.mjs'
+import { projectStoreDir, projectIdentity, legacyProjectSlug, inspectProjectStore, migrateProjectStore, recoverProjectStore } from '../project-stores.mjs'
+import { storeDirFor, writeMemory, indexLine, searchStore, apply } from '../index.mjs'
 
 function box(run) {
   const root = realpathSync(mkdtempSync(join(tmpdir(), 'dsh-project-store-'))), store = join(root, 'memory'), a = join(root, 'A B'), b = join(root, 'A-B')
@@ -160,7 +160,7 @@ test('a live loaded host blocks applying migration while read-only inspection re
 }))
 test('actual SIGKILL after directory publication is recoverable and never assigns the copy to a colliding project', () => box(box => {
   const dir = legacy(box), before = contents(dir), options = reviewed(box)
-  const worker = `import {migrateProjectStore} from ${JSON.stringify(new URL('./project-stores.mjs', import.meta.url).href)};migrateProjectStore(process.argv[1],process.argv[2],{...JSON.parse(process.argv[3]),fault:event=>{if(event.phase==='renamed')process.kill(process.pid,'SIGKILL')}})`
+  const worker = `import {migrateProjectStore} from ${JSON.stringify(new URL('../project-stores.mjs', import.meta.url).href)};migrateProjectStore(process.argv[1],process.argv[2],{...JSON.parse(process.argv[3]),fault:event=>{if(event.phase==='renamed')process.kill(process.pid,'SIGKILL')}})`
   const result = spawnSync(process.execPath, ['--input-type=module', '-e', worker, box.store, box.a, JSON.stringify(options)], { encoding: 'utf8', timeout: 15000 })
   assert.equal(result.signal, 'SIGKILL', result.stderr)
   assert.throws(() => storeDirFor('project', box.a), /migration-needs-recovery/)
@@ -204,7 +204,7 @@ test('source edits after completed migration are diagnosed and never silently me
 }))
 test('local CLI previews and applies with both review hashes without package installation', () => box(box => {
   legacy(box)
-  const cli = fileURLToPath(new URL('./scripts/projects.mjs', import.meta.url))
+  const cli = fileURLToPath(new URL('../scripts/projects.mjs', import.meta.url))
   const run = args => spawnSync(process.execPath, [cli, ...args, '--cwd', box.a], { env: process.env, encoding: 'utf8', timeout: 10000 })
   const preview = run(['migrate'])
   assert.equal(preview.status, 0, preview.stderr)