dsh-lite-memory 0.18.35 → 0.18.37

package/README.md

@@ -63,7 +63,9 @@ Each completed turn keeps a few lines under 「已编辑 N 个文件」, built f
 
 「记忆」页签里，搜索框右侧可以在「列表」「图谱」「宫殿」之间切换；列表、图谱或宫殿占满内容宽度，选中记忆后右侧才出现正文与归属。当前项目里点「修改」可以就地改标题和正文，保存后版本加一；别的项目和全局层只读。图谱按真实数据画，点记忆节点读正文，点标签或主题节点转成搜索，右上角可缩放。宫殿按类型分四间：习惯与规范、方法与经验、资料与入口、其他记录；一次只展开一间，每间每页 24 条，点展品只读正文。宫殿只决定怎么陈列，不改记忆、学习状态和额度。「自进化」页签只作用于当前项目，按「全部 / 候选 / 试用 / 生效 / 暂停」筛选，也能切列表与图谱；详情给出当前经验、适用范围、当前状态、学习依据和变化记录。候选可采纳、修改、放弃，试用可采纳、修改、暂停，生效可修改、暂停，暂停可恢复或查看记录。
 
-The brain icon in the session header opens a centered memory panel. Memory and Self-evolution sit at the top, and Display settings at the top right add two presentation-only switches, Graph and Memory palace, both off by default and remembered per project. Two tabs, Memories and Self-evolution, hold the content. It starts on the current project and can switch to another project or the global layer; switched scopes are read-only and never migrate or create state.
+「记忆」页签顶部出现「N 条保存没确认」时，一条保存相近结论的草稿在等决定。先露两条，点「查看全部 N 条」看完整队列；展开给存到哪层、什么时候用、条件、范围清单、触发词、相近条目和完整正文，底部只做「另存」或「忽略」两个动作，不在面板里合并。
+
+The brain icon in the session header opens a centered memory panel. Memory and Self-evolution sit at the top, and Display settings at the top right add two presentation-only switches, Graph and Memory palace, both off by default and remembered per project. Two tabs, Memories and Self-evolution, hold the content. When the Memories tab shows “N saves awaiting confirmation”, a draft that resembles an existing note needs a decision. Two rows show first; View all N opens the full queue. Expanding a row shows its target layer, when it applies, conditions, scope list, triggers, similar notes and full body, and the only actions are Save as new or Ignore — the panel never merges on its own. It starts on the current project and can switch to another project or the global layer; switched scopes are read-only and never migrate or create state.
 
 On the Memories tab, the search row switches between list, graph and palace; either view fills the content width, and the body pane only appears after a memory is selected. In the current project, Edit changes a memory's title and body in place and bumps its revision on save; other projects and the global layer stay read-only. The graph is drawn from real data: a memory node opens its body, a tag or topic hub becomes a search, and the top-right controls zoom it. The palace sorts memories into four rooms by kind: Habits and conventions, Methods and experience, References and entries, and Other notes; one room opens at a time, each page holds 24 items, and an exhibit only opens its body. The palace changes presentation only, never memory, learning state or quota. The Self-evolution tab acts on the current project only, filters by All / Candidate / Trial / Active / Paused, and also offers list and graph views. It shows the current rule, scope, state, evidence and change history. Candidates can be adopted, edited or discarded; trials can be adopted, edited or paused; active rules can be edited or paused; paused rules can be resumed or inspected.
 

package/client.js

@@ -813,6 +813,38 @@ window.__ModuleLoader__.load({
       return text.length > size ? `${text.slice(0, size)}…` : text;
     };
 
+    /** 待裁决先露两条；「查看全部 N 条」后按队列原样全列，不截断。 */
+    const conflictVisibleRows = (queued, all) => (all ? queued : queued.slice(0, 2));
+
+    /** 面板展开区一次给全：层级、适用条件、范围清单、触发词、相近条目、完整正文。 */
+    const conflictFactsOf = (row) => {
+      const draft = row && row.draft && typeof row.draft === 'object' ? row.draft : {};
+      const conditions = (Array.isArray(draft.conditions) ? draft.conditions : []).map((item) => {
+        if (!item || typeof item !== 'object') return '';
+        const key = String(item.key || item.name || '').trim();
+        const value = String(item.value || '').trim();
+        return key && value ? `${key}=${value}` : key || value;
+      }).filter(Boolean).join(' · ');
+      const selection = draft.selection && typeof draft.selection === 'object' ? draft.selection : null;
+      let selectionText = '';
+      if (selection && selection.mode === 'complete') selectionText = `清单完整${selection.artifactKey ? ` · ${selection.artifactKey}` : ''}`;
+      else if (selection && selection.mode === 'examples') {
+        const items = Array.isArray(selection.items) ? selection.items.filter(Boolean) : [];
+        selectionText = items.length > 0 ? `举例：${items.join('、')}` : '举例';
+      }
+      const triggers = Array.isArray(draft.triggers) ? draft.triggers.filter(Boolean).join('、') : '';
+      const near = Array.isArray(row && row.candidates) ? row.candidates.map((item) => item && item.title).filter(Boolean) : [];
+      return {
+        scope: row && row.scope === 'global' ? '总记忆' : '本项目',
+        when: typeof draft.when === 'string' ? draft.when : '',
+        conditions,
+        selection: selectionText,
+        triggers,
+        near: near.join('、'),
+        body: String(draft.body || draft.summary || '（没有正文）'),
+      };
+    };
+
     /** 显示设置只决定画不画，不改学习状态；按项目 key 存在本机。 */
     const DISPLAY_DEFAULTS = Object.freeze({ graph: false, palace: false });
     const displayKeyOf = (projectKey) => `lite-memory:display:${projectKey || 'default'}`;
@@ -2158,6 +2190,7 @@ window.__ModuleLoader__.load({
       const [hubFilter, setHubFilter] = React.useState(null);
       const [checkup, setCheckup] = React.useState(false);
       const [expandedConflict, setExpandedConflict] = React.useState('');
+      const [conflictAll, setConflictAll] = React.useState(false);
       const alive = React.useRef(true);
       const generation = React.useRef(0);
       const scopeRef = React.useRef('');
@@ -2192,6 +2225,7 @@ window.__ModuleLoader__.load({
             setDetail(null);
             setDetailNote('');
             setShowReason(false);
+            setConflictAll(false);
           } else {
             setFailed(true);
             setNote(failure(result, '读不到记忆'));
@@ -2225,6 +2259,7 @@ window.__ModuleLoader__.load({
         setShowSettings(false);
         setHubFilter(null);
         setExpandedConflict('');
+        setConflictAll(false);
       }, [selectedKey]);
       React.useEffect(() => {
         setMemoryView((value) => viewModeOf(display, value));
@@ -2732,14 +2767,17 @@ window.__ModuleLoader__.load({
       const evolutionViewActive = graphViewOf(display.graph, evolutionView);
 
       const conflictReadOnly = !memoryOn || (!globalView && selectedKey !== currentKey);
-      const draftScope = (row) => (row.scope === 'global' ? '总记忆' : '本项目');
+      const visibleConflicts = conflictVisibleRows(queued, conflictAll);
       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} 条保存没确认${conflictReadOnly ? ' · 只读' : ''}`),
-      queued.slice(0, 2).map((row) => {
+      h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', minWidth: 0 } },
+        h('span', { style: { ...PANEL_MUTED, lineHeight: '18px', flex: 1, minWidth: 0 } }, `${queued.length} 条保存没确认${conflictReadOnly ? ' · 只读' : ''}`),
+        queued.length > 2 ? h(Action, { disabled: busy, onClick: () => setConflictAll((value) => !value) }, conflictAll ? '收起' : `查看全部 ${queued.length} 条`) : null,
+      ),
+      visibleConflicts.map((row) => {
         const open = expandedConflict === row.id;
-        const draft = row.draft || {};
+        const facts = conflictFactsOf(row);
         return h('div', {
           key: row.id || row.title,
           style: { display: 'flex', flexDirection: 'column', gap: '2px', minWidth: 0 },
@@ -2759,11 +2797,15 @@ window.__ModuleLoader__.load({
           conflictReadOnly ? null : h(Action, { disabled: busy, onClick: () => resolveQueued(row, 'drop') }, '忽略'),
         ),
         open ? h('div', {
-          style: { ...PANEL_MUTED, padding: '2px 0 4px', lineHeight: '18px', overflowWrap: 'anywhere' },
+          style: { ...PANEL_MUTED, padding: '2px 0 4px', lineHeight: '18px', overflowWrap: 'anywhere', maxHeight: '180px', overflowY: 'auto' },
         },
-        h('div', null, `范围：${draftScope(row)}`),
-        draft.when ? h('div', null, `适用：${draft.when}`) : null,
-        h('div', null, String(draft.body || draft.summary || '（没有正文）').slice(0, 400)),
+        h('div', null, `存到：${facts.scope}`),
+        facts.when ? h('div', null, `什么时候用：${facts.when}`) : null,
+        facts.conditions ? h('div', null, `条件：${facts.conditions}`) : null,
+        facts.selection ? h('div', null, `适用范围：${facts.selection}`) : null,
+        facts.triggers ? h('div', null, `触发词：${facts.triggers}`) : null,
+        facts.near ? h('div', null, `相近：${facts.near}`) : null,
+        h('div', { style: { whiteSpace: 'pre-wrap', color: 'var(--dsw-alias-label-primary)' } }, facts.body),
         ) : null);
       }));
       const memoryListPane = h('div', {
@@ -3014,7 +3056,7 @@ window.__ModuleLoader__.load({
 
     // 测试缝：Node 里验引用投影，浏览器里没有任何副作用。
     if (typeof globalThis.__LITE_MEMORY_TEST__ === 'function') {
-      globalThis.__LITE_MEMORY_TEST__({ metaOf, citationOf, citationsOfMeta, citationsOfTurn, dedupe, undoRefOf, graphOf, ruleGraphOf, processingStatusOf, currentBodyOf, historyDiffsOf, MemoryPanel, MemoryGraph, MemoryPalace, TurnMemory, RefSection, displayKeyOf, readDisplaySettings, writeDisplaySettings, graphViewOf, viewModeOf, filterRecords, projectionOf, failureStateOf, evidenceTextOf, evidenceMetaOf, palaceRoomsOf, palaceRoomPageOf, palacePageWindow, palaceToggleOf, palaceMotionOf, palaceRoomIdOf, refMetaOf, explainKeyOf, explainModeOf, setExplainMode, recallLineOf, agoLabel, checkupOf, refSectionRowsOf, refDetailTitleOf, versionLine, titleCountsOf, rowKeyOf, rowKeepFlags, Row });
+      globalThis.__LITE_MEMORY_TEST__({ metaOf, citationOf, citationsOfMeta, citationsOfTurn, dedupe, undoRefOf, graphOf, ruleGraphOf, processingStatusOf, currentBodyOf, historyDiffsOf, MemoryPanel, MemoryGraph, MemoryPalace, TurnMemory, RefSection, displayKeyOf, readDisplaySettings, writeDisplaySettings, graphViewOf, viewModeOf, filterRecords, projectionOf, failureStateOf, evidenceTextOf, evidenceMetaOf, palaceRoomsOf, palaceRoomPageOf, palacePageWindow, palaceToggleOf, palaceMotionOf, palaceRoomIdOf, refMetaOf, explainKeyOf, explainModeOf, setExplainMode, recallLineOf, agoLabel, checkupOf, refSectionRowsOf, refDetailTitleOf, versionLine, titleCountsOf, rowKeyOf, rowKeepFlags, Row, conflictVisibleRows, conflictFactsOf });
     }
 
     return {

package/docs/RELEASE-0.18.36.md

@@ -0,0 +1,8 @@
+# 0.18.36：待裁决看全，再决定另存还是忽略
+
+- 记忆面板的“待裁决”不再只露两条：先显示最近两条，点“查看全部 N 条”按队列原样展开，最多看到全部待办。
+- 每一条展开后给全审阅信息：存到总记忆还是本项目、什么时候用、条件键值、范围清单或举例、触发词、相近条目，以及完整正文，不再截 400 字。
+- 动作仍然只有“另存”和“忽略”。另存按草稿原样重放并涨版本，忽略只删待办；草稿被后来的反馈替换后，旧版本点击仍会被拒。
+- 审阅信息的整理逻辑抽成纯函数，客户端测试覆盖先露两条、查看全部不截断、字段完整与空正文兜底。
+
+验证：`npm test` 全绿；`node ~/.dsh/skills/ui-restraint/scripts/ui-copy-lint.mjs .` 无新增错误；`style-lint` 与中文界面检查通过。

package/docs/RELEASE-0.18.37.md

@@ -0,0 +1,8 @@
+# 0.18.37：npm 提醒先看当前项目层
+
+- 动作前的 npm 提醒不再只查全局层：先查当前项目层的现行记忆，再查全局层，项目规则优先。
+- 本机流程按记忆分层规矩留在项目层，也能在 `npm whoami` / `npm publish` 前拦一次，而不是因为没进全局层就失效。
+- 同一条提醒仍然每轮最多一次，已交付过的条目不会再提示；项目记忆关闭时行为不变。
+- 补回归：项目层与全局层各放一条 npm 规则，验证项目层优先且正文送达。
+
+验证：`npm test` 全绿；`npm run bench` / `npm run bench:evolution` 均 exit 0；`style-lint` 通过。

package/index.js

@@ -2671,8 +2671,16 @@ export function apply(ctx, config) {
       const held = prepared.get(agent);
       if (!held || held.npmHinted) return undefined;
       if (!memoryOnForAgent(agent)) return undefined;
-      const index = loadIndex(globalScope());
-      const row = (index.entries || []).find((entry) => {
+      /** 本机流程按规矩留在项目层；全局层是兜底，先看当前项目再看全局。 */
+      const scopes = [];
+      try {
+        const project = scopeOf(cwdOf({ agent }));
+        if (project && project.confirmed !== false && project.key !== 'global') scopes.push(project);
+      } catch { /* 项目根还没确认时只看全局 */ }
+      scopes.push(globalScope());
+      const row = scopes.flatMap((scope) => {
+        try { return loadIndex(scope).entries || []; } catch { return []; }
+      }).find((entry) => {
         if (!entry || entry.archived || entry.origin === 'project_evolution') return false;
         /** 过期/被取代的规则不能再在动作前拦人。 */
         if (view.lifecycleStatusOf(entry)) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.18.35",
+  "version": "0.18.37",
   "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/test/client.test.mjs

@@ -28,7 +28,7 @@ assert.equal(panel.name, 'shell.overlay');
 assert.equal(panel.order, 30);
 
 const EMPTY_CHILDREN = [];
-const { metaOf, citationOf, citationsOfMeta, citationsOfTurn, dedupe, undoRefOf, graphOf, ruleGraphOf, processingStatusOf, currentBodyOf, historyDiffsOf, MemoryPanel, MemoryGraph, displayKeyOf, readDisplaySettings, writeDisplaySettings, graphViewOf, viewModeOf, filterRecords, projectionOf, failureStateOf, evidenceTextOf, evidenceMetaOf, MemoryPalace, palaceRoomsOf, palaceRoomPageOf, palacePageWindow, palaceToggleOf, palaceMotionOf, palaceRoomIdOf, TurnMemory, refMetaOf, explainKeyOf, explainModeOf, setExplainMode, recallLineOf, agoLabel, checkupOf, refSectionRowsOf, refDetailTitleOf, versionLine, titleCountsOf, rowKeyOf, rowKeepFlags } = seen;
+const { metaOf, citationOf, citationsOfMeta, citationsOfTurn, dedupe, undoRefOf, graphOf, ruleGraphOf, processingStatusOf, currentBodyOf, historyDiffsOf, MemoryPanel, MemoryGraph, displayKeyOf, readDisplaySettings, writeDisplaySettings, graphViewOf, viewModeOf, filterRecords, projectionOf, failureStateOf, evidenceTextOf, evidenceMetaOf, MemoryPalace, palaceRoomsOf, palaceRoomPageOf, palacePageWindow, palaceToggleOf, palaceMotionOf, palaceRoomIdOf, TurnMemory, refMetaOf, explainKeyOf, explainModeOf, setExplainMode, recallLineOf, agoLabel, checkupOf, refSectionRowsOf, refDetailTitleOf, versionLine, titleCountsOf, rowKeyOf, rowKeepFlags, conflictVisibleRows, conflictFactsOf } = seen;
 
 // 图谱只按真实数据画：共享标签成枢纽，显式关联成边，位置由 id 决定。
 const graph = graphOf([
@@ -368,3 +368,31 @@ assert.equal(recallLineOf({ reason: 'made_up', cards: 0, matched: 0 }), '');
 assert.doesNotMatch(recallLineOf({ reason: 'needs_context', cards: 0, matched: 1 }), /needs_context|reasonCode/);
 console.log('client.test.mjs: 22 passed + palace');
 
+
+
+// 待裁决面板：先露两条，查看全部后不截断；展开区给全层级、条件、范围、触发词与完整正文。
+const pendingRows = [
+  { id: 'cf_1', scope: 'global', title: '一', draft: { body: '正文一' } },
+  { id: 'cf_2', scope: 'project', title: '二', draft: { body: '正文二' } },
+  { id: 'cf_3', scope: 'project', title: '三', draft: { body: '正文三' } },
+];
+assert.deepEqual(conflictVisibleRows(pendingRows, false).map((row) => row.id), ['cf_1', 'cf_2']);
+assert.deepEqual(conflictVisibleRows(pendingRows, true).map((row) => row.id), ['cf_1', 'cf_2', 'cf_3']);
+const facts = conflictFactsOf({
+  scope: 'global',
+  candidates: [{ title: '旧结论' }, { title: '另一条' }],
+  draft: {
+    title: '发布窗口', summary: '摘要', body: '周四晚上再发版。', when: '发版前',
+    conditions: [{ key: 'phase', value: 'release' }], triggers: ['发版', '发布'],
+    selection: { mode: 'complete', artifactKey: 'release' },
+  },
+});
+assert.equal(facts.scope, '总记忆');
+assert.equal(facts.when, '发版前');
+assert.equal(facts.conditions, 'phase=release');
+assert.equal(facts.selection, '清单完整 · release');
+assert.equal(facts.triggers, '发版、发布');
+assert.equal(facts.near, '旧结论、另一条');
+assert.equal(facts.body, '周四晚上再发版。');
+assert.equal(conflictFactsOf({ scope: 'project', draft: { selection: { mode: 'examples', items: ['a.md', 'b.md'] } } }).selection, '举例：a.md、b.md');
+assert.equal(conflictFactsOf({ draft: { body: '' } }).body, '（没有正文）');

package/test/recall.test.mjs

@@ -846,6 +846,40 @@ console.log('recall.test.mjs: ok');
   assert.ok(scopeNpm.key, '项目层不受影响');
 }
 
+// A27b：npm 提醒先看当前项目层，再看全局层；本机流程留在项目层也能在动作前拦人。
+{
+  const cwdNpmProject = mkdir('npm-guard-project');
+  const scopeNpmProject = store.scopeOf(cwdNpmProject);
+  store.setRecallMode(scopeNpmProject, 'adaptive', { operationId: 'npm-guard-project-mode' });
+  assert.ok(store.upsert(global, {
+    title: 'npm 全局登录提醒',
+    summary: '全局层的 npm 登录说明',
+    body: '全局层：npm login 会误导，改用 dsh-npm。',
+    tags: ['npm'],
+    applicability: 'all_in_scope',
+  }).record);
+  assert.ok(store.upsert(scopeNpmProject, {
+    title: 'npm 项目发布前先看凭据',
+    summary: '这个项目的 npm 发布步骤',
+    body: '项目层：先读 Keychain 位置，再用 dsh-npm publish，不要 npm whoami。',
+    tags: ['npm', '发布'],
+    applicability: 'all_in_scope',
+  }).record);
+  const guards = [];
+  const agent = makeAgent('agent-npm-project', cwdNpmProject);
+  agent.ctx = {
+    tools: { guard: (fn) => { guards.push(fn); return () => {}; } },
+    effect: (fn) => fn(),
+  };
+  const runtime = boot();
+  runtime.handlers.get('agent/created').at(-1)({ agent });
+  const sig = signal();
+  await runtime.preStep({ agent, signal: sig, turn: 'npm-project-1' }, enter(human('先看下环境状态')));
+  const blocked = guards[0]({ name: 'bash', callId: 'call-npm-project', arguments: { command: 'npm publish' } });
+  assert.match(String(blocked), /项目发布前先看凭据/, '项目层规则优先于全局层');
+  assert.match(String(blocked), /Keychain/, '给项目层正文');
+}
+
 // A28：零命中的同一轮里，关键动作发生后补查一次；补到后不再重复注入。
 {
   const cwdActionKey = mkdir('action-key');