dsh-selfnote 0.14.1 → 0.14.3

package/lib/profile.js

@@ -8,6 +8,8 @@
  *   - 同一标签下多条时不擅自归纳，只取最新并标注「另有 N 条」
  */
 
+import { countChars } from './store.js'
+
 const DEFAULT_MAX_CHARS = 80
 const DEFAULT_PIECE_MAX = 60
 
@@ -51,10 +53,10 @@ export function buildProfile(facts, options = {}) {
     const latest = bucket.slice().sort((a, b) => (stamp(a) < stamp(b) ? 1 : stamp(a) > stamp(b) ? -1 : 0))[0]
     const body = String(latest.text ?? '').trim()
     if (body === '') continue
-    if (body.length > pieceMax) continue
+    if (countChars(body) > pieceMax) continue
     const piece = `${tag}：${body}`
     const candidate = text === '' ? piece : `${text}；${piece}`
-    if (candidate.length > maxChars) continue
+    if (countChars(candidate) > maxChars) continue
     text = candidate
     parts.push({ tag, factId: latest.id, text: body })
     if (bucket.length > 1) conflicts.push({ tag, count: bucket.length - 1 })
@@ -64,7 +66,7 @@ export function buildProfile(facts, options = {}) {
     text,
     parts,
     conflicts,
-    chars: text.length,
+    chars: countChars(text),
     sources: parts.map((part) => part.factId),
   }
 }

package/lib/store.js

@@ -15,6 +15,16 @@ import { join } from 'node:path'
 import { writeAtomic, writeJsonAtomic } from './atomic.js'
 
 /** 当前生效内容的上限（字符）。默认 1600 字，约 1.1k token。 */
+export function countChars(text) {
+  return [...String(text ?? '')].length
+}
+
+/** 按码点截断：不把 emoji / 增补汉字的代理对切一半。 */
+export function truncateChars(text, max) {
+  const room = Math.max(0, Math.floor(max))
+  return [...String(text ?? '')].slice(0, room).join('')
+}
+
 export const DEFAULT_MAX_CHARS = 1600
 /** 条数上限，和字符上限共同生效。 */
 export const DEFAULT_MAX_ENTRIES = 40
@@ -94,7 +104,7 @@ export function today() {
 
 /** 正文归一：回车换行压成空格、去掉首尾空白、截到硬上限。 */
 function cleanEntryText(text) {
-  return String(text ?? '').replace(/\s+/g, ' ').trim().slice(0, MAX_ENTRY_CHARS)
+  return truncateChars(String(text ?? '').replace(/\s+/g, ' ').trim(), MAX_ENTRY_CHARS)
 }
 
 /**
@@ -166,12 +176,12 @@ export function writeNotes(entries) {
 export function trim(entries, { maxChars = DEFAULT_MAX_CHARS, maxEntries = DEFAULT_MAX_ENTRIES } = {}) {
   const kept = [...entries]
   const overflow = []
-  let total = renderNotes(kept).length
+  let total = countChars(renderNotes(kept))
   while (kept.length > maxEntries || (total > maxChars && kept.length > 1)) {
     const dropped = kept.shift()
     if (!dropped) break
     overflow.push(dropped)
-    total = renderNotes(kept).length
+    total = countChars(renderNotes(kept))
   }
   return { kept, overflow }
 }
@@ -290,7 +300,7 @@ export function stats() {
   }
   return {
     entries: entries.length,
-    chars: renderNotes(entries).length,
+    chars: countChars(renderNotes(entries)),
     // 三型各几条：设置页要能解释「为什么我这条没进上下文」
     tiers: countTiers(entries),
     pinned: entries.filter((entry) => entry.pin === true).length,

package/lib/transfer.js

@@ -9,6 +9,8 @@
  * 索引不导出：它记的是磁盘路径与 mtime，搬过去必然过期，导入后重建一次就行。
  */
 
+import { normalizeTier } from './store.js'
+
 export const BUNDLE_VERSION = 2
 export const BUNDLE_APP = 'dsh-selfnote'
 
@@ -55,7 +57,7 @@ export function buildBundle({ notes = [], facts = [], habits = [], config = {},
     v: BUNDLE_VERSION,
     exportedAt: now.toISOString(),
     counts: { notes: notes.length, facts: facts.length, habits: habits.length },
-    notes: notes.map((entry) => ({ date: entry.date ?? '', text: entry.text ?? '' })),
+    notes: notes.map((entry) => ({ date: entry.date ?? '', text: entry.text ?? '', tier: normalizeTier(entry.tier), pin: entry.pin === true })),
     facts: facts.map((fact) => ({ ...fact })),
     habits: habits.map((habit) => ({ ...habit })),
     // 人格跟着走（v2）；纠偏候选不跟 —— 它是「这台机器上攒下的证据」，搬过去就失了上下文
@@ -65,6 +67,26 @@ export function buildBundle({ notes = [], facts = [], habits = [], config = {},
 }
 
 /** 导入前的体检：结构不对就直说，别合并一半。 */
+export function mergeConfig(bundle, current = {}) {
+  const source = isObject(bundle?.config) ? bundle.config : {}
+  const base = isObject(current) ? current : {}
+  const config = {}
+  for (const field of CONFIG_FIELDS) if (base[field] !== undefined) config[field] = base[field]
+  const applied = []
+  const bools = new Set(['enabled', 'profileEnabled', 'personaEnabled'])
+  const nums = new Set(['maxChars', 'maxEntries', 'profileMaxChars', 'halfLifeDays', 'tempTtlDays'])
+  for (const field of CONFIG_FIELDS) {
+    if (!Object.hasOwn(source, field)) continue
+    const value = source[field]
+    const good = bools.has(field) ? typeof value === 'boolean'
+      : nums.has(field) ? typeof value === 'number' && Number.isFinite(value)
+      : typeof value === 'string'
+    if (!good) continue
+    config[field] = value
+    applied.push(field)
+  }
+  return { config, applied }
+}
 export function validateBundle(bundle) {
   if (!isObject(bundle)) return '不是 JSON 对象'
   if (bundle.app !== BUNDLE_APP) return `不是本插件导出的文件（app=${String(bundle.app)}）`
@@ -138,11 +160,8 @@ export function mergeBundle(bundle, current = {}, options = {}) {
       continue
     }
     const status = textOf(raw.status) || 'candidate'
-    const fact = { ...raw, text }
-    if (!keepStatus && status !== 'candidate') {
-      fact.status = 'candidate'
-      demoted.push(id)
-    }
+    const fact = { ...raw, text, status: keepStatus ? status : 'candidate' }
+    if (!keepStatus && status !== 'candidate') demoted.push(id)
     if (fact.status === 'candidate') {
       delete fact.reviewedAt
       delete fact.retiredAt
@@ -164,7 +183,7 @@ export function mergeBundle(bundle, current = {}, options = {}) {
       skipped.notes += 1
       continue
     }
-    notes.push({ date: textOf(raw.date) || '', text })
+    notes.push({ date: textOf(raw.date) || '', text, tier: normalizeTier(raw.tier), pin: raw.pin === true })
     seenNotes.add(text)
     added.notes += 1
   }

package/lib/warm.js

@@ -12,6 +12,7 @@ import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
 
 import { memoryRoot, readFacts, tokenize } from './memory.js'
+import { countChars } from './store.js'
 import { writeAtomic } from './atomic.js'
 
 const MAX_TEXT = 300
@@ -19,6 +20,16 @@ const MAX_POINTERS = 8
 
 export const warmPath = () => join(memoryRoot(), 'warm.jsonl')
 
+let pendingBadRows = []
+function collectBadRows(rows) {
+  for (const row of rows) if (!pendingBadRows.includes(row)) pendingBadRows.push(row)
+}
+function flushBadRows() {
+  if (pendingBadRows.length === 0) return
+  mkdirSync(memoryRoot(), { recursive: true })
+  writeAtomic(join(memoryRoot(), `warm.bad-${Date.now().toString(36)}-${process.pid}.jsonl`), pendingBadRows.join('\n') + '\n')
+  pendingBadRows = []
+}
 export function readWarm() {
   const file = warmPath()
   if (!existsSync(file)) return []
@@ -28,8 +39,10 @@ export function readWarm() {
     try {
       const item = JSON.parse(line)
       if (item && typeof item === 'object') out.push(item)
+      else collectBadRows([line])
     } catch {
-      // 坏行跳过：一条摘要读不出来，不该让整层都废掉
+      // 坏行跳过：隔离留存，别在下一次写回时无声抹掉
+      collectBadRows([line])
     }
   }
   return out
@@ -39,6 +52,7 @@ function writeWarm(items) {
   // 目录可能还不存在（第一次写温层）
   mkdirSync(memoryRoot(), { recursive: true })
   writeAtomic(warmPath(), items.map((item) => JSON.stringify(item)).join('\n') + (items.length > 0 ? '\n' : ''))
+  flushBadRows()
 }
 
 function validPointer(pointer) {
@@ -55,7 +69,7 @@ function validPointer(pointer) {
 export function writeSummary(input = {}) {
   const text = String(input.text ?? '').trim()
   if (text === '') return { ok: false, error: 'text 不能为空' }
-  if (text.length > MAX_TEXT) return { ok: false, error: `一条摘要最多 ${MAX_TEXT} 字，拆成两条` }
+  if (countChars(text) > MAX_TEXT) return { ok: false, error: `一条摘要最多 ${MAX_TEXT} 字，拆成两条` }
 
   const raw = Array.isArray(input.pointers) ? input.pointers : []
   const pointers = raw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-selfnote",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "type": "module",
   "description": "Self-narrative memory for DeepSeek Harness: the model writes notes to itself, which persist across sessions and are injected back. | 人格库：模型写给自己看的话，跨会话保留并每回合注入。",
   "keywords": [
@@ -27,7 +27,7 @@
     "assets"
   ],
   "scripts": {
-    "test": "node tests/smoke.mjs && node tests/memory.mjs && node tests/roles.mjs && node tests/heat.mjs && node tests/fair.mjs && node tests/capture-debug.mjs && node tests/facts-tx.mjs && node tests/crash-write.mjs && node tests/capture.mjs && node tests/capture-p1b.mjs && node tests/index.mjs && node tests/incremental.mjs && node tests/profile.mjs && node tests/warm.mjs && node tests/transfer.mjs && node tests/api.mjs && node tests/notes-tier.mjs && node tests/persona.mjs && node tests/corrections.mjs && node tests/client-state.mjs && node tests/client.mjs",
+    "test": "node tests/smoke.mjs && node tests/memory.mjs && node tests/roles.mjs && node tests/heat.mjs && node tests/fair.mjs && node tests/capture-debug.mjs && node tests/facts-tx.mjs && node tests/crash-write.mjs && node tests/capture.mjs && node tests/capture-p1b.mjs && node tests/index.mjs && node tests/incremental.mjs && node tests/profile.mjs && node tests/warm.mjs && node tests/transfer.mjs && node tests/api.mjs && node tests/explain.mjs && node tests/skipped.mjs && node tests/injection-count.mjs && node tests/notes-tier.mjs && node tests/capacity-warning.mjs && node tests/atomic-retry.mjs && node tests/unicode-rulers.mjs && node tests/transfer-roundtrip.mjs && node tests/r3-regressions.mjs && node tests/persona.mjs && node tests/corrections.mjs && node tests/client-state.mjs && node tests/client.mjs",
     "test:accept": "node tests/acceptance-runtime.mjs"
   },
   "engines": {