@zoria-lind/dsh-ecolink-adapter 0.2.2 → 0.3.0

package/extension/core/selector.mjs

@@ -1,88 +1,89 @@
-// 注入选择器(PLAN §3.5):打分排序 + token 预算 + #记忆名 显式调用。
-// 打分:关键词重叠(内容 2-gram 命中 ×5)+ 会话名匹配 ×15 + 时间衰减 + 访问计数 + pinned。
-// 预算:maxInjectionChars(默认 3000 字符),长提示词自动缩减。
-// ⚠ 双份维护:inject.js 有本文件的经典脚本内联镜像(页面世界无法 import ESM)。
-// 本文件是规范与单测基准;改逻辑时必须同步 inject.js 的 selectMemories/effectiveBudget/parseMemoryCommand。
-
-export const SCOPE_PREFIX = '[dsh-ecolink 记忆]'
-
-// 中文友好的大块匹配:内容 2-gram 与提示词 2-gram 的重叠命中数
-export function bigrams(s) {
-  const t = String(s ?? '')
-  if (t.length < 2) return new Set()
-  const set = new Set()
-  for (let i = 0; i < t.length - 1; i++) set.add(t.slice(i, i + 2))
-  return set
-}
-
-export function keywordHits(content, promptBigrams, promptLower) {
-  const c = String(content ?? '')
-  const cb = bigrams(c)
-  let hits = 0
-  for (const g of cb) if (promptBigrams.has(g)) hits += 1
-  // 整词附加分(英文/数字词)
-  const words = promptLower.split(/[^\w一-龥]+/).filter((w) => w.length >= 2)
-  const cl = c.toLowerCase()
-  for (const w of words) if (cl.includes(w)) hits += 2
-  return hits
-}
-
-export function scoreItem(item, prompt, now = Date.now()) {
-  const promptLower = String(prompt ?? '').toLowerCase()
-  const pb = bigrams(promptLower)
-  const content = item?.content ?? ''
-  let score = Math.min(20, keywordHits(content, pb, promptLower) * 5)
-  // 会话名匹配(identity 即"名字",权重 ×15)
-  const identity = item?.identity
-  if (identity && promptLower.includes(String(identity).toLowerCase())) score += 15
-  // 时间衰减:越新越相关(半衰 ~7 天)
-  const ts = new Date(item?.timestamp).getTime()
-  if (Number.isFinite(ts)) {
-    const ageDays = Math.max(0, (now - ts) / 86400e3)
-    score += 10 / (1 + ageDays / 7)
-  }
-  // 访问过的记忆加权(选择器自举:用过的更可能再用)
-  if (item?.last_accessed) score += 5
-  if (item?.pinned) score += 10
-  return score
-}
-
-// 在预算内精选:按分数排序取前 N,单条截断到 500 字符
-export function selectMemories(items, prompt, budgetChars = 3000, now = Date.now()) {
-  const scored = items
-    .map((item) => ({ item, score: scoreItem(item, prompt, now) }))
-    .sort((a, b) => b.score - a.score || (b.item?.timestamp ?? '').localeCompare(a.item?.timestamp ?? ''))
-  const chosen = []
-  let used = 0
-  for (const { item } of scored) {
-    const content = String(item?.content ?? '').trim()
-    if (!content) continue
-    const capped = content.length > 500 ? content.slice(0, 500) + '…' : content
-    const cost = capped.length + 24 // 条目头部格式开销
-    if (used + cost > budgetChars) break
-    chosen.push({ ...item, content: capped })
-    used += cost
-  }
-  return { memories: chosen, chars: used }
-}
-
-// 长提示词自动缩减预算:提示词本身越长,留给记忆的空间越小
-export function effectiveBudget(prompt, maxInjectionChars = 3000) {
-  const len = String(prompt ?? '').length
-  if (len <= 5000) return maxInjectionChars
-  if (len <= 12000) return Math.floor(maxInjectionChars * 0.5)
-  return Math.floor(maxInjectionChars * 0.25)
-}
-
-// #记忆名 显式调用(PLAN §3.5,WebTool parseMemoryCommand 模式):
-// 提示词里的 "#<会话名>" 命中会话池 identity → 只注入该会话的记忆,返回会话 id
-export function parseMemoryCommand(prompt, sessionPools) {
-  const m = /#([^\s#,，。.!?？、#]{1,40})/.exec(String(prompt ?? ''))
-  if (!m) return null
-  const name = m[1].trim()
-  if (!name) return null
-  for (const [sid, pool] of Object.entries(sessionPools ?? {})) {
-    if (pool?.identity && String(pool.identity).toLowerCase() === name.toLowerCase()) return sid
-  }
-  return null
-}
+// 注入选择器(PLAN §3.5):打分排序 + token 预算 + #记忆名 显式调用。
+// 打分:关键词重叠(内容 2-gram 命中 ×5)+ 会话名匹配 ×15 + 时间衰减 + 访问计数 + pinned。
+// 预算:maxInjectionChars(默认 3000 字符),长提示词自动缩减。
+// ⚠ 双份维护:inject.js 有本文件的经典脚本内联镜像(页面世界无法 import ESM)。
+// 本文件是规范与单测基准;改逻辑时必须同步 inject.js 的 selectMemories/effectiveBudget/parseMemoryCommand。
+
+export const SCOPE_PREFIX = '[dsh-ecolink 记忆]'
+
+// 中文友好的大块匹配:内容 2-gram 与提示词 2-gram 的重叠命中数
+export function bigrams(s) {
+  const t = String(s ?? '')
+  if (t.length < 2) return new Set()
+  const set = new Set()
+  for (let i = 0; i < t.length - 1; i++) set.add(t.slice(i, i + 2))
+  return set
+}
+
+export function keywordHits(content, promptBigrams, promptLower) {
+  const c = String(content ?? '')
+  const cb = bigrams(c)
+  let hits = 0
+  for (const g of cb) if (promptBigrams.has(g)) hits += 1
+  // 整词附加分(英文/数字词)
+  const words = promptLower.split(/[^\w一-龥]+/).filter((w) => w.length >= 2)
+  const cl = c.toLowerCase()
+  for (const w of words) if (cl.includes(w)) hits += 2
+  return hits
+}
+
+export function scoreItem(item, prompt, now = Date.now()) {
+  const promptLower = String(prompt ?? '').toLowerCase()
+  const pb = bigrams(promptLower)
+  const content = item?.content ?? ''
+  let score = Math.min(20, keywordHits(content, pb, promptLower) * 5)
+  // 会话名匹配(identity 即"名字",权重 ×15)
+  const identity = item?.identity
+  if (identity && promptLower.includes(String(identity).toLowerCase())) score += 15
+  // 时间衰减:越新越相关(半衰 ~7 天)
+  const ts = new Date(item?.timestamp).getTime()
+  if (Number.isFinite(ts)) {
+    const ageDays = Math.max(0, (now - ts) / 86400e3)
+    score += 10 / (1 + ageDays / 7)
+  }
+  // 访问过的记忆加权(选择器自举:用过的更可能再用)
+  if (item?.last_accessed) score += 5
+  if (item?.pinned) score += 10
+  return score
+}
+
+// 在预算内精选:按分数排序取前 N,单条截断到 500 字符
+export function selectMemories(items, prompt, budgetChars = 3000, now = Date.now()) {
+  const scored = items
+    .filter(item => item?.kind !== 'artifact')
+    .map((item) => ({ item, score: scoreItem(item, prompt, now) }))
+    .sort((a, b) => b.score - a.score || (b.item?.timestamp ?? '').localeCompare(a.item?.timestamp ?? ''))
+  const chosen = []
+  let used = 0
+  for (const { item } of scored) {
+    const content = String(item?.content ?? '').trim()
+    if (!content) continue
+    const capped = content.length > 500 ? content.slice(0, 500) + '…' : content
+    const cost = capped.length + 24 // 条目头部格式开销
+    if (used + cost > budgetChars) break
+    chosen.push({ ...item, content: capped })
+    used += cost
+  }
+  return { memories: chosen, chars: used }
+}
+
+// 长提示词自动缩减预算:提示词本身越长,留给记忆的空间越小
+export function effectiveBudget(prompt, maxInjectionChars = 3000) {
+  const len = String(prompt ?? '').length
+  if (len <= 5000) return maxInjectionChars
+  if (len <= 12000) return Math.floor(maxInjectionChars * 0.5)
+  return Math.floor(maxInjectionChars * 0.25)
+}
+
+// #记忆名 显式调用(PLAN §3.5,WebTool parseMemoryCommand 模式):
+// 提示词里的 "#<会话名>" 命中会话池 identity → 只注入该会话的记忆,返回会话 id
+export function parseMemoryCommand(prompt, sessionPools) {
+  const m = /#([^\s#,，。.!?？、#]{1,40})/.exec(String(prompt ?? ''))
+  if (!m) return null
+  const name = m[1].trim()
+  if (!name) return null
+  for (const [sid, pool] of Object.entries(sessionPools ?? {})) {
+    if (pool?.identity && String(pool.identity).toLowerCase() === name.toLowerCase()) return sid
+  }
+  return null
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@zoria-lind/dsh-ecolink-adapter",
-  "version": "0.2.2",
-  "description": "dsh-ecolink DSH 适配层:直读本地记忆池、pre-step 注入(打分+预算+会话去重)、#记忆名 过滤,打通网页端记忆生态",
+  "version": "0.3.0",
+  "description": "DSH 跨端记忆：指定全文读取、侧栏浏览与注入、通用/非通用分类",
   "license": "MIT",
   "type": "module",
   "main": "adapter/src/index.js",
   "exports": {
-    ".": "./adapter/src/index.js"
+    ".": "./adapter/src/index.js",
+    "./client": "./adapter/src/client.js"
   },
   "files": [
     "adapter/src",
@@ -19,6 +20,7 @@
     "!service/config.json.bak-*",
     "!service/*.log",
     "!service/test.mjs",
+    "!service/*.test.mjs",
     "!service/fix-pool.mjs"
   ],
   "engines": {
@@ -33,13 +35,14 @@
       "patch": "./adapter/cordis.patch.yml"
     },
     "compatibility": {
-      "dsh": ">=0.1.5-rc.1 <0.1.6-0 || >=0.1.6-rc.0 <0.1.7-0 || >=0.1.7-rc.0 <0.2.0-0",
+      "dsh": "0.2.1-rc.2",
       "dshReleases": {
-        "0.1.5-rc.1": "compatible",
-        "0.1.5-rc.2": "compatible",
-        "0.1.7-rc.1": "compatible",
-        "0.2.0-rc.2": "compatible"
+        "0.2.1-rc.2": "compatible"
       }
+    },
+    "client": {
+      "inject": [],
+      "platform": "web"
     }
   },
   "keywords": [

package/service/README.md

@@ -1,3 +1,5 @@
+> **v0.3.0（2026-10-29）**：新增 `/memory/artifact` 完整成果存储（独立于短记忆，保留历史修订）、池条目的类型与时间排序、跨池分页读取。规则与限制见 [adapter/README.md](../adapter/README.md)。
+
 # dsh-ecolink-service
 
 dsh-ecolink 的本地记忆池服务:memory.json 的**唯一写者**,浏览器扩展经 localhost POST 推送记忆,DSH 适配层只读文件(PLAN.md §3.3 / §7)。

package/service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoria-lind/dsh-ecolink-service",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "dsh-ecolink 本地记忆服务:网页扩展与 DSH 共享记忆池的唯一写者(零依赖、127.0.0.1、token 鉴权)",
   "license": "MIT",
   "type": "module",

package/service/pool.mjs

@@ -39,6 +39,11 @@ export function renderTimestamp(isoTs, precision = null) {
   return isoTs.slice(0, 16) // minute
 }
 
+// Same wire fingerprint as extension/core/entry.mjs (covered by contract tests).
+export function entryVersion(item) {
+  return createHash('sha256').update(JSON.stringify([item?.id ?? null,item?.key ?? null,item?.content ?? '',
+    item?.injectionPolicy === 'universal' ? 'universal' : 'manual',item?.kind ?? 'fact',item?.revision ?? null])).digest('hex')
+}
 const EMPTY_POOL = { version: 1, shared_pool: [], session_pools: {} }
 
 // ---- 快照与 diff(E3:变更角标/同步的基础;此前服务侧完全没有 hash/快照能力) ----
@@ -164,7 +169,7 @@ export function createPool(options = {}) {
 
   // 串行执行变更(所有写操作经此排队,防并发交错)
   function mutate(fn) {
-    const run = queue.then(() => { load(); const r = fn(); save(); return r })
+    const run = queue.then(() => { load(); const before = structuredClone(state); try { const r = fn(); save(); return r } catch (error) { state = before; throw error } })
     queue = run.catch(() => {})
     return run
   }
@@ -175,7 +180,7 @@ export function createPool(options = {}) {
     const cutoff = now - retentionDays * 86400e3
     const archived = []
     const keep = (item) => {
-      if (item.pinned) return true
+      if (item.pinned || item.kind === 'artifact' || item.injectionPolicy === 'universal') return true
       const ts = new Date(item.timestamp).getTime()
       const acc = item.last_accessed ? new Date(item.last_accessed).getTime() : 0
       // <= 而非 <:条目时间戳可能与 cutoff 同毫秒(实测抖动),同刻即视为到期
@@ -213,6 +218,7 @@ export function createPool(options = {}) {
       importance,
       pinned: !!pinned,
       last_accessed: null,
+      injectionPolicy: 'manual',
     }
   }
 
@@ -246,7 +252,7 @@ export function createPool(options = {}) {
       if (isBlocked(m.content)) { blocked += 1; continue }
       if (m.action === 'replace' && typeof m.id === 'string') {
         const target = findItem(m.id)
-        if (target) {
+        if (target && target.kind !== 'artifact') {
           target.content = m.content.trim()
           target.timestamp = new Date().toISOString()
           target.source = m.source ?? target.source
@@ -259,7 +265,7 @@ export function createPool(options = {}) {
       const key = typeof m.key === 'string' && m.key.trim().length > 0 ? m.key.trim() : null
       if (key) {
         const poolArr = sessionId ? (state.session_pools[sessionId]?.memories ?? []) : state.shared_pool
-        const existing = poolArr.find((it) => it.key === key)
+        const existing = poolArr.find((it) => it.key === key && it.kind !== 'artifact')
         if (existing) {
           // DSM 同款:同 key 同值跳过写入(防时间戳无意义翻新与重复计数)
           if (existing.content === m.content.trim()) continue
@@ -279,7 +285,7 @@ export function createPool(options = {}) {
       {
         const trimmed = m.content.trim()
         const allPools = [...state.shared_pool, ...Object.values(state.session_pools ?? {}).flatMap((sp) => sp.memories ?? [])]
-        if (allPools.some((it) => it.content === trimmed)) { deduped += 1; continue }
+        if (allPools.some((it) => it.kind !== 'artifact' && it.content === trimmed)) { deduped += 1; continue }
       }
       // 无 key 条目按内容去重:相同内容已存在则跳过
       // (模型回显示例会同一内容反复吐,池层是最后一道闸)
@@ -309,6 +315,49 @@ export function createPool(options = {}) {
   }
 
   return {
+
+    // Explicit metadata mutation is independent from text upsert/deduplication.
+    metadata({id,poolId,version,injectionPolicy}={}) {
+      return mutate(()=>{
+        const arr=poolId==='shared'?state.shared_pool:state.session_pools[poolId]?.memories
+        const found=(arr??[]).filter(it=>it.id===id)
+        if(found.length!==1) return {ok:false,error:'条目不存在或不唯一'}
+        const item=found[0]
+        if(!version || entryVersion(item)!==version) return {ok:false,conflict:true,error:'条目已变化，请刷新后重试'}
+        if(!['manual','universal'].includes(injectionPolicy)) return {ok:false,error:'类型无效'}
+        item.injectionPolicy=injectionPolicy
+        return {ok:true,id,version:entryVersion(item),injectionPolicy}
+      })
+    },
+    // Explicit artifact save bypasses short-fact trimming/harvest/blacklist/compression.
+    // requestId is stable across retry; same name requires the exact previewed version.
+    saveArtifact({name,content,requestId,expectedVersion}={}) {
+      return mutate(()=>{
+        if(typeof name!=='string'||!name.trim()||name.trim().length>200) return {ok:false,error:'名称须为1–200字符'}
+        if(typeof content!=='string'||!content.trim()||Buffer.byteLength(content,'utf8')>1500000) return {ok:false,error:'正文为空或超过1.5MB'}
+        if(typeof requestId!=='string'||!/^[a-zA-Z0-9_-]{8,100}$/.test(requestId)) return {ok:false,error:'缺少有效保存请求ID'}
+        const title=name.trim(), existing=state.shared_pool.find(it=>it.kind==='artifact'&&it.key===title)
+        const prior=existing&&[existing,...(existing.versions??[])].find(v=>v.requestId===requestId)
+        if(prior) {
+          if(prior.content!==content) return {ok:false,error:'保存请求ID已用于不同正文，请新建保存请求'}
+          return {ok:true,id:existing.id,revision:prior.revision,version:entryVersion(existing),duplicate:true}
+        }
+        if(existing&&expectedVersion!==entryVersion(existing))
+          return {ok:false,conflict:true,error:'已有同名完整成果；确认后保存新版本并保留旧版',id:existing.id,version:entryVersion(existing),revision:existing.revision}
+        const now=new Date().toISOString()
+        let item=existing
+        if(item) {
+          item.versions??=[]
+          item.versions.push({content:item.content,timestamp:item.timestamp,revision:item.revision,requestId:item.requestId})
+          item.content=content;item.timestamp=now;item.revision=(item.revision??1)+1;item.requestId=requestId
+        }else{
+          item={id:randomUUID(),key:title,content,timestamp:now,source:'web-artifact',kind:'artifact',revision:1,requestId,versions:[],
+            injectionPolicy:'manual',importance:'called',pinned:true,last_accessed:null}
+          state.shared_pool.push(item)
+        }
+        return {ok:true,id:item.id,revision:item.revision,version:entryVersion(item),retainedVersions:item.versions.length}
+      })
+    },
     poolFile,
     archiveFile,
     dir,
@@ -483,7 +532,7 @@ export function createPool(options = {}) {
       const push = (it, sessionId = null, identity = null) => {
         const ts = new Date(it.timestamp).getTime()
         // <= 与归档同语义:同毫秒即视为到期(days=0 时全部命中,测试用)
-        if (Number.isFinite(ts) && ts <= cutoff) out.push({ ...it, session_id: sessionId, identity })
+        if (it.kind !== 'artifact' && it.injectionPolicy !== 'universal' && Number.isFinite(ts) && ts <= cutoff) out.push({ ...it, session_id: sessionId, identity })
       }
       for (const it of state.shared_pool) push(it)
       for (const [sid, sp] of Object.entries(state.session_pools)) {
@@ -518,12 +567,12 @@ export function createPool(options = {}) {
         const pull = (arr, sessionId = null) => {
           for (let i = arr.length - 1; i >= 0; i--) {
             const ts = new Date(arr[i].timestamp).getTime()
-            if (Number.isFinite(ts) && ts <= cutoff) staged.push({ ...arr[i], session_id: sessionId })
+            if (arr[i].kind !== 'artifact' && arr[i].injectionPolicy !== 'universal' && Number.isFinite(ts) && ts <= cutoff) staged.push({ ...arr[i], session_id: sessionId })
           }
         }
         const keep = (arr, sessionId = null) => arr.filter((it) => {
           const ts = new Date(it.timestamp).getTime()
-          return !(Number.isFinite(ts) && ts <= cutoff)
+          return it.kind === 'artifact' || it.injectionPolicy === 'universal' || !(Number.isFinite(ts) && ts <= cutoff)
         })
         pull(state.shared_pool)
         state.shared_pool = keep(state.shared_pool)
@@ -560,6 +609,7 @@ export function createPool(options = {}) {
         // 全池内容去重:同内容保留首条(暂存条目先放回,新标签若内容一致则被吸收)
         const seen = new Set()
         const dedupe = (arr) => arr.filter((it) => {
+          if (it.kind === 'artifact' || it.injectionPolicy === 'universal') return true
           const c = String(it.content ?? '').trim()
           if (!c || seen.has(c)) return false
           seen.add(c)

package/service/server.mjs

@@ -169,6 +169,15 @@ const server = createServer(async (req, res) => {
 
   try {
     // ---- POST ----
+    if (path === '/memory/metadata' && method === 'POST') {
+      const result = await pool.metadata(await readBody(req))
+      return send(res, result.ok ? 200 : (result.conflict ? 409 : 400), result)
+    }
+    if (path === '/memory/artifact' && method === 'POST') {
+      const result = await pool.saveArtifact(await readBody(req))
+      return send(res, result.ok ? 200 : (result.conflict ? 409 : 400), result)
+    }
+
     if (path === '/memory/sync' && method === 'POST') {
       const body = await readBody(req)
       const memories = Array.isArray(body.memories) ? body.memories : []