dsh-lite-memory 0.18.29 → 0.18.30

package/client.js

@@ -2157,6 +2157,7 @@ window.__ModuleLoader__.load({
       const [display, setDisplay] = React.useState({ ...DISPLAY_DEFAULTS });
       const [hubFilter, setHubFilter] = React.useState(null);
       const [checkup, setCheckup] = React.useState(false);
+      const [expandedConflict, setExpandedConflict] = React.useState('');
       const alive = React.useRef(true);
       const generation = React.useRef(0);
       const scopeRef = React.useRef('');
@@ -2205,10 +2206,13 @@ window.__ModuleLoader__.load({
         if (!row || busy) return;
         setBusy(true);
         setNote('');
-        post('/lite-memory/conflict', { sessionId, scopeKey: selectedKey, title: row.title, op }).then((result) => {
+        post('/lite-memory/conflict', {
+          sessionId, scopeKey: selectedKey, conflictId: row.id, expectedRevision: row.revision, op,
+        }).then((result) => {
           if (!alive.current) return;
           setBusy(false);
           if (result.ok && result.body && result.body.ok) {
+            setExpandedConflict('');
             if (op === 'drop') setNote('已忽略这条待裁决');
             load(selectedKey);
           } else setNote(failure(result, '待裁决没处理成'));
@@ -2220,6 +2224,7 @@ window.__ModuleLoader__.load({
         setDisplay(readDisplaySettings(selectedKey));
         setShowSettings(false);
         setHubFilter(null);
+        setExpandedConflict('');
       }, [selectedKey]);
       React.useEffect(() => {
         setMemoryView((value) => viewModeOf(display, value));
@@ -2726,18 +2731,41 @@ window.__ModuleLoader__.load({
       const memoryViewActive = viewModeOf(display, memoryView);
       const evolutionViewActive = graphViewOf(display.graph, evolutionView);
 
+      const conflictReadOnly = !memoryOn || (!globalView && selectedKey !== currentKey);
+      const draftScope = (row) => (row.scope === 'global' ? '总记忆' : '本项目');
       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') }, '忽略'),
-      )));
+      h('div', { style: { ...PANEL_MUTED, lineHeight: '18px' } }, `${queued.length} 条保存没确认${conflictReadOnly ? ' · 只读' : ''}`),
+      queued.slice(0, 2).map((row) => {
+        const open = expandedConflict === row.id;
+        const draft = row.draft || {};
+        return h('div', {
+          key: row.id || row.title,
+          style: { display: 'flex', flexDirection: 'column', gap: '2px', minWidth: 0 },
+        },
+        h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', minWidth: 0 } },
+          h('button', {
+            type: 'button',
+            'aria-expanded': open,
+            onClick: () => setExpandedConflict(open ? '' : row.id),
+            style: {
+              flex: 1, minWidth: 0, padding: 0, border: 0, background: 'transparent', color: 'inherit',
+              textAlign: 'left', font: 'inherit', fontSize: '12px', lineHeight: '20px',
+              overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', cursor: 'pointer',
+            },
+          }, row.title),
+          conflictReadOnly ? null : h(Action, { disabled: busy, onClick: () => resolveQueued(row, 'keep') }, '另存'),
+          conflictReadOnly ? null : h(Action, { disabled: busy, onClick: () => resolveQueued(row, 'drop') }, '忽略'),
+        ),
+        open ? h('div', {
+          style: { ...PANEL_MUTED, padding: '2px 0 4px', lineHeight: '18px', overflowWrap: 'anywhere' },
+        },
+        h('div', null, `范围：${draftScope(row)}`),
+        draft.when ? h('div', null, `适用：${draft.when}`) : null,
+        h('div', null, String(draft.body || draft.summary || '（没有正文）').slice(0, 400)),
+        ) : null);
+      }));
       const memoryListPane = h('div', {
         style: {
           ...PANEL_CARD, padding: '2px 4px', minHeight: 0, overflowY: 'auto',

package/docs/RELEASE-0.18.30.md

@@ -0,0 +1,7 @@
+# 0.18.30
+
+- 待裁决入口按「当前会话项目 + 目标层 + 草稿版本」核验：跨项目请求直接拒绝，不再把别的 scope 静默解释成当前项目。
+- 项目记忆关闭时，本入口（含选全局层另存）一律拒绝，不绕过已有总开关。
+- 队列行增加稳定 id 与 revision；草稿被后续反馈替换后，旧面板的「另存」返回 `stale_draft`，不会保存用户没看过的新正文。
+- 面板可展开一条待裁决，看草稿正文、适用范围和目标层；关闭或跨项目浏览时显示只读，不出现操作按钮。
+- 回归覆盖：跨项目拒绝、关闭态拒绝、旧版本拒绝、全局草稿在项目关闭时拒绝。

package/index.js

@@ -553,14 +553,42 @@ function keepHandler(webServer, cwdForSession) {
       const cwd = typeof cwdForSession === 'function' ? cwdForSession(sessionId) : '';
       if (!cwd) return sendJson(res, 409, { ok: false, reason: '这个会话还没有项目目录' });
       const projectScope = scopeOf(cwd);
+      if (!projectScope.confirmed) return sendJson(res, 409, { ok: false, reason: '项目根还没确认，先重新打开这个项目' });
+      /** 请求里的目标必须与当前会话项目一致；别的项目只读，不能借面板改过去。 */
       const requested = typeof body.scopeKey === 'string' ? body.scopeKey : '';
+      if (!requested) return sendJson(res, 400, { ok: false, reason: '缺少目标范围' });
+      if (requested !== 'global' && requested !== projectScope.key) {
+        return sendJson(res, 409, { ok: false, reason: '别的项目只读，回到那个项目里再改' });
+      }
       const target = requested === 'global' ? globalScope() : projectScope;
-      const title = typeof body.title === 'string' ? body.title.trim() : '';
-      if (!title) return sendJson(res, 400, { ok: false, reason: '缺少标题' });
+      /** 关闭的项目记忆不能从这个入口绕过；选全局时全局总开关也必须开着。 */
+      if (!memoryEnabled(projectScope)) {
+        return sendJson(res, 409, { ok: false, code: 'memory_disabled', reason: memoryOffCopy(projectScope) });
+      }
+      if (target.key === 'global' && !memoryEnabled(target)) {
+        return sendJson(res, 409, { ok: false, code: 'memory_disabled', reason: '总记忆已关闭，先在面板打开' });
+      }
+      const op = body.op;
+      if (op !== 'keep' && op !== 'drop') return sendJson(res, 400, { ok: false, reason: '不认识这个操作' });
+      const conflictId = typeof body.conflictId === 'string' ? body.conflictId.trim() : '';
+      if (!conflictId) return sendJson(res, 400, { ok: false, reason: '缺少这条待裁决' });
+      const expectedRevision = Number(body.expectedRevision);
+      if (!Number.isInteger(expectedRevision) || expectedRevision < 1) {
+        return sendJson(res, 409, { 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 });
+        const ref = { id: conflictId, expectedRevision };
+        const outcome = op === 'drop' ? dropConflict(target, ref) : resolveConflict(target, ref);
+        if (!outcome.ok) {
+          return sendJson(res, outcome.reasonCode === 'stale_draft' ? 409 : 409, {
+            ok: false, code: outcome.reasonCode || '', reason: outcome.reason || '这条待裁决还没处理成',
+          });
+        }
+        return sendJson(res, 200, {
+          ok: true,
+          remaining: conflictsOf(target).length,
+          record: outcome.record ? { id: outcome.record.id, title: outcome.record.title, revision: outcome.record.revision } : null,
+        });
       } 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.29",
+  "version": "0.18.30",
   "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

@@ -2761,20 +2761,32 @@ function queueConflictLocked(scope, draft, candidates) {
   if (hit) {
     hit.candidates = view;
     hit.draft = replay;
+    /** 草稿被后来的反馈替换过：版本必须涨，旧面板不能拿旧版直接批准。 */
+    hit.revision = (Number(hit.revision) || 1) + 1;
     hit.updatedAt = now;
   } else {
-    rows.push({ id: `cf_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`, title, scope: scopeKey, candidates: view, draft: replay, createdAt: now, updatedAt: now });
+    rows.push({ id: `cf_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`, title, scope: scopeKey, candidates: view, draft: replay, revision: 1, createdAt: now, updatedAt: now });
   }
   index.conflicts = rows.slice(-CONFLICT_LIMIT);
   saveIndex(scope, index);
   return index.conflicts.length;
 }
 
-function clearConflictLocked(scope, title) {
+/** 按稳定 id 找；旧调用还传标题，只为兼容已有数据与测试。 */
+function conflictRowLocked(scope, ref) {
+  const rows = Array.isArray(loadIndex(scope).conflicts) ? loadIndex(scope).conflicts : [];
+  const layer = scope.key === 'global' ? 'global' : 'project';
+  if (ref && typeof ref === 'object' && ref.id) return rows.find((row) => row.id === ref.id && row.scope === layer) || null;
+  const norm = normalizeText(typeof ref === 'string' ? ref : '', 120);
+  return rows.find((row) => row.title === norm && row.scope === layer) || null;
+}
+
+function clearConflictLocked(scope, ref) {
   const index = loadIndex(scope);
   const rows = Array.isArray(index.conflicts) ? index.conflicts : [];
-  const norm = normalizeText(title, 120);
-  const next = rows.filter((row) => !(row.title === norm && row.scope === (scope.key === 'global' ? 'global' : 'project')));
+  const id = ref && typeof ref === 'object' && ref.id ? ref.id : '';
+  const norm = id ? '' : normalizeText(typeof ref === 'string' ? ref : '', 120);
+  const next = rows.filter((row) => (id ? row.id !== id : !(row.title === norm && row.scope === (scope.key === 'global' ? 'global' : 'project'))));
   if (next.length === rows.length) return rows.length;
   index.conflicts = next;
   saveIndex(scope, index);
@@ -2787,28 +2799,38 @@ export function conflictsOf(scope) {
   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'));
+/** 版本对不上就拒绝：用户看到的草稿和现在这条不是同一版。 */
+function staleDraft(row, ref) {
+  if (!ref || typeof ref !== 'object' || ref.expectedRevision === undefined) return false;
+  return Number(ref.expectedRevision) !== (Number(row.revision) || 1);
+}
+
+/** 确认另存：用队列里的草稿按 distinct 重放一次，成功后按 id 出队。 */
+export function resolveConflict(scope, ref, options = {}) {
+  const row = conflictRowLocked(scope, ref);
   if (!row) return { ok: false, reason: '这条待裁决已经不在了，刷新面板看看' };
+  if (staleDraft(row, ref)) return { ok: false, reasonCode: 'stale_draft', 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 };
+  if (result && result.needsResolution) return { ok: false, reason: '还是相近：换一个标题或等确认', result };
+  if (result && result.needsScope) {
+    const reason = result.reasonCode === 'memory_disabled' ? '这层记忆已关闭' : '这条记忆的适用范围还没定，先说明当前环境';
+    return { ok: false, reason, result };
+  }
+  clearConflictLocked(scope, { id: row.id });
+  return { ok: true, result, record: result && result.record };
 }
 
 /** 删掉待裁决：用户决定不再另存。 */
-export function dropConflict(scope, title) {
-  const before = pendingConflictsOf(scope);
-  clearConflictLocked(scope, title);
-  return pendingConflictsOf(scope) < before;
+export function dropConflict(scope, ref) {
+  const row = conflictRowLocked(scope, ref);
+  if (!row) return { ok: false, reason: '这条待裁决已经不在了，刷新面板看看' };
+  if (staleDraft(row, ref)) return { ok: false, reasonCode: 'stale_draft', reason: '这条待裁决又更新了，刷新后再处理' };
+  clearConflictLocked(scope, { id: row.id });
+  return { ok: true };
 }
 
 /** 当前层还有几条没处理的冲突。 */

package/test/contract.test.mjs

@@ -1213,6 +1213,7 @@ assert.equal(ovArchivedBody.body.body, '右侧留白。');
 // 待裁决：面板看得到队列，确认后按草稿另存，不预写正文
 const cfCwd = fs.mkdtempSync(path.join(os.tmpdir(), 'lite-memory-contract-conflict-'));
 sessionCwds.set('session-conflict-panel', cfCwd);
+sessionCwds.set('session-conflict-other', fs.mkdtempSync(path.join(os.tmpdir(), 'lite-memory-contract-conflict-other-')));
 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 });
@@ -1221,15 +1222,77 @@ 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' });
+const cfRow = cfBefore.body.selected.conflicts[0];
+assert.equal(cfRow.title, '发布窗口');
+assert.equal(cfRow.draft.body, '周五发版。');
+assert.ok(cfRow.id, '待裁决要有稳定 id');
+assert.equal(cfRow.revision, 1);
+const cfScopeKey = cfBefore.body.selected.key;
+
+// 跨项目：当前会话是 A，请求 B 的范围必须拒绝，且不能动到 A 的草稿
+const cfCross = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-panel', scopeKey: '另一个项目', conflictId: cfRow.id, expectedRevision: 1, op: 'drop',
+});
+assert.equal(cfCross.status, 409);
+assert.match(cfCross.body.reason, /只读/);
+assert.equal(store.loadIndex(store.scopeOf(cfCwd)).conflicts.length, 1, '跨项目请求不改数据');
+
+// 关闭项目记忆后，本入口也不能落盘
+await call('/lite-memory/control', { sessionId: 'session-conflict-panel', enabled: false, operationId: 'op_cf_close' });
+const cfClosed = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-panel', scopeKey: cfScopeKey, conflictId: cfRow.id, expectedRevision: 1, op: 'keep',
+});
+assert.equal(cfClosed.status, 409);
+assert.equal(cfClosed.body.code, 'memory_disabled');
+assert.equal(store.loadIndex(store.scopeOf(cfCwd)).entries.length, 0, '关闭状态不写记忆');
+await call('/lite-memory/control', { sessionId: 'session-conflict-panel', enabled: true, operationId: 'op_cf_reopen' });
+
+// 草稿被后来的反馈替换：旧版本点击必须拒绝
+await defs.get('memory_save').execute({ title: '发布窗口', summary: '本项目改成周六发版', body: '周六发版。' }, { agent: cfAgent });
+const cfStale = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-panel', scopeKey: cfScopeKey, conflictId: cfRow.id, expectedRevision: 1, op: 'keep',
+});
+assert.equal(cfStale.status, 409);
+assert.equal(cfStale.body.code, 'stale_draft');
+const cfStaleView = await call('/lite-memory/overview', { sessionId: 'session-conflict-panel' });
+assert.equal(cfStaleView.body.selected.conflicts[0].revision, 2, '草稿换了版本要涨');
+assert.equal(cfStaleView.body.selected.conflicts[0].draft.body, '周六发版。');
+
+const cfKeep = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-panel', scopeKey: cfScopeKey, conflictId: cfRow.id, expectedRevision: 2, 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.ok(cfAfter.body.selected.records.some((row) => row.title === '发布窗口' && row.summary === '本项目改成周六发版'));
+const cfAgain = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-panel', scopeKey: cfScopeKey, conflictId: cfRow.id, expectedRevision: 2, op: 'keep',
+});
 assert.equal(cfAgain.status, 409, '队列没了就明确说，不重复落库');
 
+// 项目记忆关闭时，选全局待裁决也不能借这个入口落盘
+const cfgCwd = fs.mkdtempSync(path.join(os.tmpdir(), 'lite-memory-contract-conflict-global-'));
+sessionCwds.set('session-conflict-global', cfgCwd);
+const cfgAgent = { id: 'session-conflict-global', cwd: cfgCwd, session: { id: 'session-conflict-global', header: { cwd: cfgCwd } } };
+await defs.get('memory_save').execute({ title: '命名规则', summary: '项目里用短横线', body: '短横线。' }, { agent: cfgAgent });
+const cfgSave = await defs.get('memory_save').execute({ title: '命名规则', summary: '所有项目用下划线', body: '下划线。', scope: 'global' }, { agent: cfgAgent });
+assert.equal(cfgSave.needsResolution, true);
+const cfgView = await call('/lite-memory/overview', { sessionId: 'session-conflict-global', scopeKey: 'global' });
+assert.equal(cfgView.body.selected.conflicts.length, 1, '全局层也要有这条待裁决');
+const cfgRow = cfgView.body.selected.conflicts[0];
+await call('/lite-memory/control', { sessionId: 'session-conflict-global', enabled: false, operationId: 'op_cfg_close' });
+const cfgClosed = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-global', scopeKey: 'global', conflictId: cfgRow.id, expectedRevision: cfgRow.revision, op: 'keep',
+});
+assert.equal(cfgClosed.status, 409);
+assert.equal(cfgClosed.body.code, 'memory_disabled');
+assert.equal(store.conflictsOf(store.globalScope()).length, 1, '关闭状态不批准全局草稿');
+await call('/lite-memory/control', { sessionId: 'session-conflict-global', enabled: true, operationId: 'op_cfg_reopen' });
+const cfgKeep = await call('/lite-memory/conflict', {
+  sessionId: 'session-conflict-global', scopeKey: 'global', conflictId: cfgRow.id, expectedRevision: cfgRow.revision, op: 'keep',
+});
+assert.equal(cfgKeep.status, 200);
+assert.equal(store.conflictsOf(store.globalScope()).length, 0);
+
 console.log('contract.test.mjs: all passed');

package/test/crossing.test.mjs

@@ -434,7 +434,7 @@ await test('S12 待裁决留可重放草稿，面板确认另存后才落库', (
   assert.equal(pendingConflictsOf(scope), 0);
   assert.equal(loadIndex(scope).entries.length, 1);
   assert.equal(loadIndex(scope).entries[0].body, '项目补充');
-  assert.equal(dropConflict(scope, '不存在'), false);
+  assert.equal(dropConflict(scope, '不存在').ok, false);
 });
 
 console.log(`crossing.test.mjs: ${passed} passed`);