dsh-lite-memory 0.18.28 → 0.18.29

package/client.js

@@ -2200,6 +2200,21 @@ window.__ModuleLoader__.load({
 
       React.useEffect(() => { load(); }, [sessionId]);
 
+      /** 待裁决只做两件事：把草稿另存成一条，或删掉这条待办；不在面板里悄悄合并。 */
+      const resolveQueued = (row, op) => {
+        if (!row || busy) return;
+        setBusy(true);
+        setNote('');
+        post('/lite-memory/conflict', { sessionId, scopeKey: selectedKey, title: row.title, op }).then((result) => {
+          if (!alive.current) return;
+          setBusy(false);
+          if (result.ok && result.body && result.body.ok) {
+            if (op === 'drop') setNote('已忽略这条待裁决');
+            load(selectedKey);
+          } else setNote(failure(result, '待裁决没处理成'));
+        });
+      };
+
       /** 显示设置跟着当前项目走；换项目或换范围时重新读。 */
       React.useEffect(() => {
         setDisplay(readDisplaySettings(selectedKey));
@@ -2249,6 +2264,7 @@ window.__ModuleLoader__.load({
       const selected = data ? data.selected : null;
       const records = selected && Array.isArray(selected.records) ? selected.records : EMPTY;
       const total = selected && selected.stats && Number.isInteger(selected.stats.total) ? selected.stats.total : records.length;
+      const queued = selected && Array.isArray(selected.conflicts) ? selected.conflicts : EMPTY;
       const currentKey = current ? current.key : '';
       const control = selected && selected.control
         ? selected.control
@@ -2710,12 +2726,24 @@ window.__ModuleLoader__.load({
       const memoryViewActive = viewModeOf(display, memoryView);
       const evolutionViewActive = graphViewOf(display.graph, evolutionView);
 
+      const conflictBar = queued.length === 0 ? null : h('div', {
+        style: { display: 'flex', flexDirection: 'column', gap: '3px', padding: '7px 9px 8px', borderBottom: '1px solid var(--dsw-alias-border-l1)', flex: '0 0 auto' },
+      },
+      h('div', { style: { ...PANEL_MUTED, lineHeight: '18px' } }, `${queued.length} 条保存没确认`),
+      queued.slice(0, 2).map((row) => h('div', {
+        key: row.id || row.title,
+        style: { display: 'flex', alignItems: 'center', gap: '8px', minWidth: 0 },
+      },
+      h('span', { style: { flex: 1, minWidth: 0, fontSize: '12px', lineHeight: '20px', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, row.title),
+      h(Action, { disabled: busy, onClick: () => resolveQueued(row, 'keep') }, '另存'),
+      h(Action, { disabled: busy, onClick: () => resolveQueued(row, 'drop') }, '忽略'),
+      )));
       const memoryListPane = h('div', {
         style: {
           ...PANEL_CARD, padding: '2px 4px', minHeight: 0, overflowY: 'auto',
           display: 'flex', flexDirection: 'column', gap: 0,
         },
-      }, memoryList);
+      }, conflictBar, memoryList);
       const memoryGraphPane = h('div', {
         style: { ...PANEL_CARD, padding: 0, minHeight: 0, overflow: 'hidden', display: 'flex' },
       },

package/index.js

@@ -13,6 +13,9 @@ import {
   runtimeLayers,
   findAnywhere,
   renderIndex,
+  conflictsOf,
+  resolveConflict,
+  dropConflict,
   loadIndex,
   saveEntry,
   move,
@@ -214,6 +217,7 @@ function keepHandler(webServer, cwdForSession) {
               : pathname === REMOTE_PATH + '/entry' ? 'entry'
               : pathname === REMOTE_PATH + '/move' ? 'move'
                 : pathname === REMOTE_PATH + '/overview' ? 'overview'
+                  : pathname === REMOTE_PATH + '/conflict' ? 'conflict'
                   : pathname === REMOTE_PATH + '/control' ? 'control'
                   : pathname === REMOTE_PATH + '/evolution' ? 'evolution'
                   : pathname === REMOTE_PATH + '/resume-move' ? 'resume-move' : '';
@@ -530,6 +534,7 @@ function keepHandler(webServer, cwdForSession) {
           evolution: selectedEvolution,
           records,
           archived,
+          conflicts: conflictsOf(selectedScope),
           stats: {
             total: records.length,
             experimental: records.filter((record) => record.experimental).length,
@@ -541,6 +546,26 @@ function keepHandler(webServer, cwdForSession) {
       });
     }
 
+    /** 待裁决：用队列里留下的草稿另存，或删掉这条待办；不预写、不替用户合并。 */
+    if (action === 'conflict') {
+      const sessionId = typeof body.sessionId === 'string' ? body.sessionId : '';
+      if (!sessionId) return sendJson(res, 400, { ok: false, reason: '缺少 sessionId' });
+      const cwd = typeof cwdForSession === 'function' ? cwdForSession(sessionId) : '';
+      if (!cwd) return sendJson(res, 409, { ok: false, reason: '这个会话还没有项目目录' });
+      const projectScope = scopeOf(cwd);
+      const requested = typeof body.scopeKey === 'string' ? body.scopeKey : '';
+      const target = requested === 'global' ? globalScope() : projectScope;
+      const title = typeof body.title === 'string' ? body.title.trim() : '';
+      if (!title) return sendJson(res, 400, { ok: false, reason: '缺少标题' });
+      try {
+        const outcome = body.op === 'drop' ? { ok: dropConflict(target, title) } : resolveConflict(target, title);
+        if (!outcome.ok) return sendJson(res, 409, { ok: false, reason: outcome.reason || '这条待裁决还没处理成' });
+        return sendJson(res, 200, { ok: true, remaining: conflictsOf(target).length });
+      } catch (error) {
+        return sendJson(res, 409, { ok: false, reason: error instanceof Error ? error.message : '待裁决处理失败' });
+      }
+    }
+
     /**
      * 本项目记忆总开关：关闭后这层不再召回、检索、读写、学习，也不继承全局记忆。
      * 自进化设置原样保留，但有效状态随总开关暂停。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.18.28",
+  "version": "0.18.29",
   "description": "On-demand memory for the DeepSeek Harness: nothing resident, at most three small cards on a real hit, bodies read on demand.",
   "type": "module",
   "main": "index.js",

package/store.js

@@ -2723,6 +2723,29 @@ function bindSameTopic(projectScope, ref) {
 /** 冲突队列：只记待办，不预写记忆；最多 20 条。 */
 const CONFLICT_LIMIT = 20;
 
+/** 待办里留一份可重放的草稿：面板能直接另存，不用用户回忆刚才想记什么。 */
+const CONFLICT_DRAFT_KEYS = ['title', 'summary', 'body', 'when', 'kind', 'tags', 'conditions', 'applicability', 'topicKey', 'source', 'origin'];
+function conflictDraftOf(draft) {
+  const out = {};
+  if (!draft || typeof draft !== 'object') return out;
+  for (const key of CONFLICT_DRAFT_KEYS) {
+    const value = draft[key];
+    if (value === undefined || value === null) continue;
+    if (key === 'title') out.title = normalizeText(value, 120);
+    else if (key === 'summary') out.summary = normalizeText(value, 400);
+    else if (key === 'body') out.body = typeof value === 'string' ? value.slice(0, 8000) : '';
+    else if (key === 'when') out.when = normalizeText(value, 160);
+    else if (key === 'kind') { if (KINDS.includes(value)) out.kind = value; }
+    else if (key === 'tags') out.tags = Array.isArray(value) ? value.slice(0, 5) : undefined;
+    else if (key === 'conditions') out.conditions = Array.isArray(value) ? value.slice(0, 8) : undefined;
+    else if (key === 'applicability') out.applicability = value;
+    else if (key === 'topicKey') out.topicKey = normalizeText(value, 80);
+    else if (key === 'source') out.source = value;
+    else if (key === 'origin') out.origin = value;
+  }
+  return out;
+}
+
 function queueConflictLocked(scope, draft, candidates) {
   const index = loadIndex(scope);
   const title = normalizeText(draft && draft.title, 120);
@@ -2734,11 +2757,13 @@ function queueConflictLocked(scope, draft, candidates) {
     id: item.id, title: item.title || '', when: item.when || '', reason: item.reason || 'similar_title',
   }));
   const hit = rows.find((row) => row.title === title && row.scope === scopeKey);
+  const replay = conflictDraftOf(draft);
   if (hit) {
     hit.candidates = view;
+    hit.draft = replay;
     hit.updatedAt = now;
   } else {
-    rows.push({ id: `cf_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`, title, scope: scopeKey, candidates: view, createdAt: now, updatedAt: now });
+    rows.push({ id: `cf_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`, title, scope: scopeKey, candidates: view, draft: replay, createdAt: now, updatedAt: now });
   }
   index.conflicts = rows.slice(-CONFLICT_LIMIT);
   saveIndex(scope, index);
@@ -2756,6 +2781,36 @@ function clearConflictLocked(scope, title) {
   return next.length;
 }
 
+/** 面板待裁决列表：只给可重放草稿与候选，不预写记忆。 */
+export function conflictsOf(scope) {
+  const rows = loadIndex(scope).conflicts;
+  return Array.isArray(rows) ? JSON.parse(JSON.stringify(rows)) : [];
+}
+
+/** 确认另存：用队列里的草稿按 distinct 重放一次，成功后出队。 */
+export function resolveConflict(scope, title, options = {}) {
+  const rows = Array.isArray(loadIndex(scope).conflicts) ? loadIndex(scope).conflicts : [];
+  const norm = normalizeText(title, 120);
+  const row = rows.find((item) => item.title === norm && item.scope === (scope.key === 'global' ? 'global' : 'project'));
+  if (!row) return { ok: false, reason: '这条待裁决已经不在了，刷新面板看看' };
+  const draft = { ...(row.draft || {}), resolution: 'distinct', writeMode: options.writeMode === 'append' ? 'append' : 'patch' };
+  if (scope.key === 'global') draft.scope = 'global';
+  else draft.scope = 'project';
+  if (!draft.title) draft.title = row.title;
+  const result = saveEntry(scope, draft);
+  if (result.needsResolution) return { ok: false, reason: '还是相近：换一个标题或等确认', result };
+  if (result.needsScope) return { ok: false, reason: '这条记忆的适用范围还没定，先说明当前环境', result };
+  clearConflictLocked(scope, row.title);
+  return { ok: true, result };
+}
+
+/** 删掉待裁决：用户决定不再另存。 */
+export function dropConflict(scope, title) {
+  const before = pendingConflictsOf(scope);
+  clearConflictLocked(scope, title);
+  return pendingConflictsOf(scope) < before;
+}
+
 /** 当前层还有几条没处理的冲突。 */
 export function pendingConflictsOf(scope) {
   const rows = loadIndex(scope).conflicts;

package/test/contract.test.mjs

@@ -1210,4 +1210,26 @@ assert.equal(ovArchivedBody.status, 200);
 assert.equal(ovArchivedBody.body.status, 'archived');
 assert.equal(ovArchivedBody.body.body, '右侧留白。');
 
+// 待裁决：面板看得到队列，确认后按草稿另存，不预写正文
+const cfCwd = fs.mkdtempSync(path.join(os.tmpdir(), 'lite-memory-contract-conflict-'));
+sessionCwds.set('session-conflict-panel', cfCwd);
+const cfAgent = { id: 'session-conflict-panel', cwd: cfCwd, session: { id: 'session-conflict-panel', header: { cwd: cfCwd } } };
+await defs.get('memory_save').execute({ title: '发布窗口', summary: '只在周四晚上发版', body: '周四晚上再发版。', scope: 'global' }, { agent: cfAgent });
+const cfSave = await defs.get('memory_save').execute({ title: '发布窗口', summary: '本项目周五发版', body: '周五发版。' }, { agent: cfAgent });
+assert.equal(cfSave.needsResolution, true);
+assert.equal(store.loadIndex(store.scopeOf(cfCwd)).entries.length, 0, '没确认前不落库');
+const cfBefore = await call('/lite-memory/overview', { sessionId: 'session-conflict-panel' });
+assert.equal(cfBefore.status, 200);
+assert.equal(cfBefore.body.selected.conflicts.length, 1);
+assert.equal(cfBefore.body.selected.conflicts[0].title, '发布窗口');
+assert.equal(cfBefore.body.selected.conflicts[0].draft.body, '周五发版。');
+const cfKeep = await call('/lite-memory/conflict', { sessionId: 'session-conflict-panel', scopeKey: cfBefore.body.selected.key, title: '发布窗口', op: 'keep' });
+assert.equal(cfKeep.status, 200);
+assert.equal(cfKeep.body.ok, true);
+const cfAfter = await call('/lite-memory/overview', { sessionId: 'session-conflict-panel' });
+assert.equal(cfAfter.body.selected.conflicts.length, 0);
+assert.ok(cfAfter.body.selected.records.some((row) => row.title === '发布窗口' && row.summary === '本项目周五发版'));
+const cfAgain = await call('/lite-memory/conflict', { sessionId: 'session-conflict-panel', scopeKey: cfBefore.body.selected.key, title: '发布窗口', op: 'keep' });
+assert.equal(cfAgain.status, 409, '队列没了就明确说，不重复落库');
+
 console.log('contract.test.mjs: all passed');

package/test/crossing.test.mjs

@@ -11,6 +11,7 @@ const view = await import('../view.js');
 const {
   saveEntry, routeScope, visibleRules, move, resumeMove, movePending,
   upsert, forget, readLinks, loadIndex, scopeOf, globalScope, readEntry, pendingConflictsOf,
+  conflictsOf, resolveConflict, dropConflict,
 } = store;
 
 let passed = 0;
@@ -79,6 +80,12 @@ await test('S03 模型给的类别标签不能把「本项目」抬进全局层'
   });
   assert.equal(proc.chosenScope, 'project');
   assert.equal(proc.reasonCode, 'project_bound_procedure');
+  /** 人自己确认「就存全局」时，措辞推断不能压过明确指令。 */
+  const human = routeScope({
+    title: '本项目回复用中文', body: '本项目统一中文、简短', memoryClass: 'personal_preference', scope: 'global',
+  }, { humanScope: true, project: { confirmed: true } });
+  assert.equal(human.chosenScope, 'global');
+  assert.equal(human.reasonCode, 'explicit');
 });
 
 await test('S03 设备事实没给设备条件就返回 needsScope，不落盘', () => {
@@ -412,4 +419,22 @@ await test('S12 相近保存进待办队列，确认 distinct 后出队', () =>
   assert.equal(pendingConflictsOf(scope), 0);
 });
 
+await test('S12 待裁决留可重放草稿，面板确认另存后才落库', () => {
+  const scope = fresh('conflict-replay');
+  saveEntry(globalScope(), { title: '提交信息格式', summary: '用一句话说清做了什么', body: '全局约定', resolution: 'distinct' });
+  const near = saveEntry(scope, { title: '提交信息格式', summary: '本项目用中文写提交信息', body: '项目补充', when: '本仓库' });
+  assert.equal(near.needsResolution, true);
+  assert.equal(loadIndex(scope).entries.length, 0, '没确认前不能预写正文');
+  const [row] = conflictsOf(scope);
+  assert.equal(row.title, '提交信息格式');
+  assert.equal(row.draft.body, '项目补充');
+  assert.equal(row.draft.when, '本仓库');
+  const kept = resolveConflict(scope, '提交信息格式');
+  assert.equal(kept.ok, true);
+  assert.equal(pendingConflictsOf(scope), 0);
+  assert.equal(loadIndex(scope).entries.length, 1);
+  assert.equal(loadIndex(scope).entries[0].body, '项目补充');
+  assert.equal(dropConflict(scope, '不存在'), false);
+});
+
 console.log(`crossing.test.mjs: ${passed} passed`);