deepseek-plastic-memory 2.1.5 → 2.1.6

package/README.md

@@ -64,6 +64,10 @@ node memtree.mjs add M>习惯 改代码先备份
 
 模型想记东西不会直接落盘，先扔进待审队列。设置页「可塑性记忆」最上面就是它，每条后面三个按钮：改、驳、采纳。
 
+点采纳会问写进哪个记忆库（全局 / 各工作区都列出来）；记忆库只有一个「全局」时不问，直接写进去。写到别的工作区就是把这条搬过去，原库的待审里会消失。
+
+工作区（记忆库）在「+ 工作区」里建。新建时会连默认分区一起建好：`M` 主人、`P` 约定、`C` 续缘、`R` 喜好、`T` 时间线，不用再手动开。
+
 你自己写走「自己写一条」，选分区填一行，直接生效。
 
 ## 会忘

package/client.js

@@ -61,13 +61,14 @@ window.__ModuleLoader__.load({
       }, [])
     }
 
-    function PendingBox({ scope, folders, onChanged }) {
+    function PendingBox({ scope, scopes, folders, onChanged }) {
       const [rows, setRows] = React.useState([])
       const [msg, setMsg] = React.useState('')
       const [form, setForm] = React.useState(false)
       const [k, setK] = React.useState('')
       const [text, setText] = React.useState('')
       const [editing, setEditing] = React.useState(null)
+      const [pick, setPick] = React.useState(null) // 采纳时选记忆库：{ id, target }
       const load = React.useCallback(async () => {
         try { const d = await get('/pending', scope); setRows(d.rows || []) }
         catch (e) { setMsg(String((e && e.message) || e)) }
@@ -90,6 +91,16 @@ window.__ModuleLoader__.load({
         setText('')
         setForm(false)
       }
+      // 只有全局一个记忆库就直接采纳；有多个先问写进哪个
+      const startApprove = (r) => {
+        const list = scopes && scopes.length ? scopes : [{ id: 'global', label: '全局' }]
+        if (list.length <= 1) { act('/approve', { id: r.id }); return }
+        setPick({ id: r.id, target: scope || list[0].id })
+      }
+      const confirmApprove = async (id, target) => {
+        await act('/approve', { id, target })
+        setPick(null)
+      }
       return h('div', { className: 'pm-card' },
         h('div', { className: 'pm-head' },
           h('span', null, '待审批', h('span', { className: 'pm-badge' }, rows.length)),
@@ -106,25 +117,39 @@ window.__ModuleLoader__.load({
         msg ? h('div', { className: 'pm-msg' }, msg) : null,
         rows.length === 0
           ? h('div', { className: 'pm-empty' }, '没有待审的记忆')
-          : rows.map((r) => editing === r.id
-            ? h('div', { key: r.id, className: 'pm-form' },
-              h('span', { className: 'pm-k' }, r.k),
-              h('input', {
-                className: 'pm-inp', defaultValue: r.text, autoFocus: true,
-                id: 'pm-edit-' + r.id,
-                onKeyDown: (e) => { if (e.key === 'Enter') act('/edit', { id: r.id, text: e.currentTarget.value }) },
-              }),
-              h('button', { className: 'pm-btn', onClick: () => setEditing(null) }, '取消'),
-              h('button', {
-                className: 'pm-btn primary',
-                onClick: () => { const el = document.getElementById('pm-edit-' + r.id); act('/edit', { id: r.id, text: el && el.value }) },
-              }, '存'))
-            : h('div', { key: r.id, className: 'pm-row' },
-              h('span', { className: 'pm-k' }, r.k),
-              h('span', { className: 'pm-t', title: r.text }, r.text),
-              h('button', { className: 'pm-btn', onClick: () => setEditing(r.id) }, '改'),
-              h('button', { className: 'pm-btn', onClick: () => act('/reject', { id: r.id }) }, '驳'),
-              h('button', { className: 'pm-btn primary', onClick: () => act('/approve', { id: r.id }) }, '采纳')))
+          : rows.map((r) => {
+            const row = editing === r.id
+              ? h('div', { key: 'e' + r.id, className: 'pm-form' },
+                h('span', { className: 'pm-k' }, r.k),
+                h('input', {
+                  className: 'pm-inp', defaultValue: r.text, autoFocus: true,
+                  id: 'pm-edit-' + r.id,
+                  onKeyDown: (e) => { if (e.key === 'Enter') act('/edit', { id: r.id, text: e.currentTarget.value }) },
+                }),
+                h('button', { className: 'pm-btn', onClick: () => setEditing(null) }, '取消'),
+                h('button', {
+                  className: 'pm-btn primary',
+                  onClick: () => { const el = document.getElementById('pm-edit-' + r.id); act('/edit', { id: r.id, text: el && el.value }) },
+                }, '存'))
+              : h('div', { key: 'r' + r.id, className: 'pm-row' },
+                h('span', { className: 'pm-k' }, r.k),
+                h('span', { className: 'pm-t', title: r.text }, r.text),
+                h('button', { className: 'pm-btn', onClick: () => setEditing(r.id) }, '改'),
+                h('button', { className: 'pm-btn', onClick: () => act('/reject', { id: r.id }) }, '驳'),
+                h('button', { className: 'pm-btn primary', onClick: () => startApprove(r) }, '采纳'))
+            const chooser = pick && pick.id === r.id
+              ? h('div', { key: 'p' + r.id, className: 'pm-form' },
+                h('span', { className: 'pm-k' }, '写进'),
+                h('select', {
+                  className: 'pm-sel', value: pick.target,
+                  onChange: (e) => setPick({ id: r.id, target: e.target.value }),
+                }, (scopes && scopes.length ? scopes : [{ id: 'global', label: '全局' }])
+                  .map((s) => h('option', { key: s.id, value: s.id }, s.cwd ? s.label + '（' + s.cwd + '）' : s.label))),
+                h('button', { className: 'pm-btn', onClick: () => setPick(null) }, '取消'),
+                h('button', { className: 'pm-btn primary', onClick: () => confirmApprove(r.id, pick.target) }, '写进去'))
+              : null
+            return h(React.Fragment, { key: r.id }, row, chooser)
+          })
       )
     }
 
@@ -289,7 +314,7 @@ window.__ModuleLoader__.load({
         if (!cwd) { setMsg('填个工作区路径'); return }
         try {
           const r = await postJson('/bind', { cwd })
-          if (r.ok) { setMsg('已建 ' + r.label); setWsCwd(''); setWsOpen(false); await loadFolders() }
+          if (r.ok) { setMsg('已建 ' + r.label + (r.folders ? '，默认 ' + r.folders + ' 个分区已建好' : '')); setWsCwd(''); setWsOpen(false); await loadFolders() }
           else setMsg(r.error || '失败')
         } catch (e) { setMsg(String((e && e.message) || e)) }
       }
@@ -323,7 +348,7 @@ window.__ModuleLoader__.load({
           hits.length === 0
             ? h('div', { className: 'pm-empty' }, '没有匹配的记忆')
             : h('div', { className: 'pm-list' }, hits.map((line, i) => h('div', { key: i, className: 'pm-row' }, h('span', { className: 'pm-t' }, line))))) : null,
-        h(PendingBox, { scope, folders, onChanged: loadFolders }),
+        h(PendingBox, { scope, scopes, folders, onChanged: loadFolders }),
         h('div', { style: { display: 'flex', minHeight: 260 } },
           h(Browser, { scope, folders, cur, setCur, reload: () => loadFolders() })))
     }

package/index.js

@@ -55,7 +55,10 @@ function bindWorkspace(cwd) {
   mkdirSync(dir, { recursive: true })
   const meta = { cwd: String(cwd), name: basename(String(cwd)) }
   writeFileSync(join(dir, 'meta.json'), JSON.stringify(meta, null, 1), 'utf8')
-  return { ok: true, id: 'ws:' + slug, label: meta.name }
+  // 新建的记忆库直接把默认分区（M主人 P约定 C续缘 R喜好 T时间线）建出来
+  const out = runIn(['init'], 'ws:' + slug)
+  const folders = (readJson(join(dir, 'folders.json'), {}) || {}).folders || []
+  return { ok: true, id: 'ws:' + slug, label: meta.name, folders: folders.length, out }
 }
 
 function listDshWorkspaces() {
@@ -129,6 +132,48 @@ function readPendingList(scope) {
   return Array.isArray(a) ? a : []
 }
 
+function writePendingList(scope, rows) {
+  const home = homeOf(scope)
+  mkdirSync(home, { recursive: true })
+  writeFileSync(join(home, '_pending.json'), JSON.stringify(rows, null, 1), 'utf8')
+}
+
+// 直接写一条已采纳的记忆（跨记忆库采纳时用，不走命令行）
+function appendMemo(scope, folderK, text, flag, ts) {
+  const home = homeOf(scope)
+  const folders = (readJson(join(home, 'folders.json'), {}) || {}).folders || []
+  const hasKids = (k) => folders.some((x) => x.parent === k)
+  let f = folders.find((x) => x.k === folderK)
+  if (f && !f.parent && hasKids(f.k)) f = folders.find((x) => x.parent === f.k)
+  if (!f) f = folders.find((x) => x.k === 'R' && !hasKids('R'))
+  if (!f) f = folders.find((x) => !x.parent && !hasKids(x.k))
+  if (!f) f = folders.find((x) => !x.parent)
+  if (!f) return { ok: false, error: '目标记忆库还没有分区' }
+  const body = String(text || '').replace(/[\r\n|]+/g, ' ').trim()
+  if (!body) return { ok: false, error: '空内容' }
+  const dir = join(home, f.k)
+  mkdirSync(dir, { recursive: true })
+  const id = Math.random().toString(36).slice(2, 6)
+  appendFileSync(join(dir, 'notes.md'), [id, ts || Date.now(), flag || '', body].join('|') + String.fromCharCode(10), 'utf8')
+  return { ok: true, k: f.k }
+}
+
+// 把待审条目采纳到指定记忆库：同库走命令行，跨库先落到目标库再删源待审
+function approveTo(sourceScope, targetScope, id) {
+  const src = sourceScope || 'global'
+  const dst = targetScope || src
+  if (dst === src) return { ok: true, out: runIn(['approve', String(id)], src) }
+  const rows = readPendingList(src)
+  const i = rows.findIndex((x) => String(x.id) === String(id))
+  if (i < 0) return { ok: false, out: '无此条' }
+  const it = rows[i]
+  const r = appendMemo(dst, it.k, it.text, it.flag, it.ts)
+  if (!r.ok) return { ok: false, out: r.error }
+  rows.splice(i, 1)
+  writePendingList(src, rows)
+  return { ok: true, out: '采纳到 ' + r.k + ' 剩' + rows.length }
+}
+
 // DSH 要求插件工具 output.schema 是 object，所以统一包一层 { text }
 const asText = (v) => ({ text: typeof v === 'string' ? v : JSON.stringify(v ?? '', null, 2) })
 const textOutput = {
@@ -247,7 +292,12 @@ export function apply(ctx) {
         if (req.method === 'POST' && p === '/add-now') { const b = await readBody(req); return json(res, 200, { ok: true, out: directAdd(b.scope || qs, String(b.folder), String(b.text)) }) }
         if (req.method === 'POST' && p === '/edit-item') { const b = await readBody(req); return json(res, 200, { ok: true, out: runIn(['edit-mem', String(b.k), String(b.id), String(b.text)], b.scope || qs) }) }
         if (req.method === 'POST' && p === '/del-item') { const b = await readBody(req); return json(res, 200, { ok: true, out: runIn(['rm', String(b.k), String(b.id), 'force'], b.scope || qs) }) }
-        if (req.method === 'POST' && p === '/approve') { const b = await readBody(req); return json(res, 200, { ok: true, out: runIn(['approve', String(b.id)], b.scope || qs) }) }
+        if (req.method === 'POST' && p === '/approve') {
+          const b = await readBody(req)
+          const src = b.scope || qs
+          const target = b.target || src
+          return json(res, 200, { ok: true, ...approveTo(src, target, b.id) })
+        }
         if (req.method === 'POST' && p === '/reject') { const b = await readBody(req); return json(res, 200, { ok: true, out: runIn(['reject', String(b.id)], b.scope || qs) }) }
         if (req.method === 'POST' && p === '/edit') { const b = await readBody(req); return json(res, 200, { ok: true, out: runIn(['edit', String(b.id), String(b.text)], b.scope || qs) }) }
         return json(res, 404, { ok: false, error: 'unknown' })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepseek-plastic-memory",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "DeepSeek 可塑性记忆：给 DSH 用的分区式长期记忆，带遗忘曲线",
   "type": "module",
   "main": "index.js",