dsh-lite-memory 0.16.2 → 0.16.4

package/client.js

@@ -315,6 +315,7 @@ window.__ModuleLoader__.load({
       return h('div', { 'data-tool': props.toolName, style: ROW }, h('span', { style: DOT }, '·'), h('span', { style: LABEL }, label), button);
     };
 
+    const scopeTag = (scope) => (scope === 'global' ? '[全局]' : '[项目]');
     const versionLine = (shown) => {
       const scope = shown.scopeLabel || (shown.scope === 'global' ? '全局' : '项目');
       const archived = shown.status === 'archived' ? ' · 已归档' : '';
@@ -389,7 +390,7 @@ window.__ModuleLoader__.load({
         'aria-label': `查看记忆 ${item.title || item.id}`,
         title: item.title || item.id,
         style: ITEM, // ui-copy-ignore
-      }, `${item.title || item.id}${item.origin === 'project_evolution' ? ' · 实验' : ''}`)) : [];
+      }, `${scopeTag(item.scope)} ${item.title || item.id}${item.origin === 'project_evolution' ? ' · 实验' : ''}`)) : [];
       const detail = shown && shown.ref && items.some((item) => item.id === shown.id && item.revision === shown.ref.revision)
         ? h('div', { style: BODY },
           shown.loading ? '读取中' : null,
@@ -686,8 +687,10 @@ window.__ModuleLoader__.load({
       const primaryKind = props.primaryKind || 'memory';
       const graph = React.useMemo(() => (props.graphOf || graphOf)(props.records), [props.records, props.graphOf]);
       const [zoom, setZoom] = React.useState(1);
+      const [hoveredId, setHoveredId] = React.useState('');
       const selectedId = props.selectedId;
-      const labelSet = graph.people <= 10;
+      const labelSet = graph.people <= 40;
+      const pickHub = props.onPickHub;
       const stepZoom = (delta) => setZoom((value) => Math.min(2.5, Math.max(0.75, Math.round((value + delta) * 100) / 100)));
       const frame = React.useMemo(() => {
         const list = graph.nodes;
@@ -765,26 +768,48 @@ window.__ModuleLoader__.load({
         h('g', null, graph.nodes.map((node) => {
           const isPrimary = node.kind === primaryKind;
           const active = node.id === selectedId;
+          const hovered = node.id === hoveredId;
+          const pick = isPrimary ? props.onPick : (pickHub || undefined);
           const fill = !isPrimary ? 'var(--dsw-alias-label-secondary)'
             : node.state ? (STAGE_TONE[node.state] || 'var(--dsw-alias-brand-primary)')
               : node.experimental ? 'var(--dsw-alias-state-warn-primary)' : 'var(--dsw-alias-brand-primary)';
-          const showLabel = active || (isPrimary && labelSet) || !isPrimary;
+          const showLabel = active || hovered || (isPrimary && labelSet) || !isPrimary;
+          const nameChars = active || hovered ? 14 : isPrimary ? 7 : 10;
           return h('g', {
             key: node.id,
             transform: `translate(${node.x} ${node.y})`,
-            onClick: isPrimary ? () => props.onPick(node) : undefined,
-            style: { cursor: isPrimary ? 'pointer' : 'default' },
+            onClick: pick ? () => pick(node) : undefined,
+            onMouseEnter: () => setHoveredId(node.id),
+            onMouseLeave: () => setHoveredId((value) => (value === node.id ? '' : value)),
+            style: { cursor: pick ? 'pointer' : 'default' },
           },
+          h('circle', { r: Math.max(12, node.radius + 6), fill: 'transparent' }),
           active ? h('circle', { r: node.radius + 5, fill: 'none', stroke: 'var(--dsw-alias-brand-primary)', strokeWidth: 1.4, opacity: 0.5 }) : null,
-          h('circle', { r: node.radius, fill, opacity: isPrimary ? 0.9 : 0.5 }),
+          h('circle', {
+            r: node.radius, fill,
+            opacity: active ? 1 : isPrimary ? 0.9 : 0.5,
+            stroke: hovered ? 'var(--dsw-alias-brand-primary)' : 'none',
+            strokeWidth: hovered ? 1.2 : 0,
+          }),
           showLabel ? h('text', {
             y: node.radius + 12, textAnchor: 'middle',
             fill: active ? 'var(--dsw-alias-label-primary)' : 'var(--dsw-alias-label-secondary)',
-            fontSize: isPrimary ? 10 : 8.5, opacity: active ? 0.95 : 0.68,
-          }, SHORT(node.label, isPrimary ? 9 : 10)) : null,
+            fontSize: isPrimary ? 9.5 : 8.5, opacity: active ? 0.95 : 0.72,
+            paintOrder: 'stroke', stroke: 'var(--dsw-alias-bg-layer-1)', strokeWidth: 3,
+            strokeLinejoin: 'round',
+          }, SHORT(node.label, nameChars)) : null,
           h('title', null, node.title || node.label),
           );
         }))),
+        h('div', {
+          style: {
+            position: 'absolute', left: '10px', bottom: '8px', zIndex: 1,
+            maxWidth: 'calc(100% - 60px)', padding: '2px 6px', borderRadius: '6px',
+            background: 'var(--dsw-alias-bg-layer-1)',
+            color: 'var(--dsw-alias-label-secondary)', fontSize: '11px', lineHeight: '1.5',
+            pointerEvents: 'none',
+          },
+        }, props.legend || '圆点 记忆 · 小点 标签/主题 · 虚线 关联'),
       );
     };
 
@@ -1126,6 +1151,11 @@ window.__ModuleLoader__.load({
       const changedCount = activity && typeof activity === 'object' && Number.isInteger(activity.changed)
         ? activity.changed
         : (Number.isInteger(activity && activity.count) ? activity.count : null);
+      const activityReason = activity && typeof activity === 'object' && typeof activity.reason === 'string'
+        ? activity.reason
+        : (latestReceipt && typeof latestReceipt.reason === 'string' ? latestReceipt.reason : '');
+      const staleLearning = /没采用|作废|已更新|换到别的作品/.test(activityReason);
+      const activityReasonText = staleLearning ? '整理过程中反馈或作品变了，这轮结果没采用。' : activityReason;
       let activityText = '';
       if (!evolution && memoryOn) {
         activityText = '读不到自进化状态';
@@ -1142,7 +1172,7 @@ window.__ModuleLoader__.load({
       } else if (activityCode === 'quota' || activityCode === 'exhausted') {
         activityText = '本轮整理额度已用完';
       } else if (activityCode === 'failed' || activityCode === 'error') {
-        activityText = '最近整理失败，可查看原因';
+        activityText = staleLearning ? '这轮整理没采用' : '最近整理失败，可查看原因';
       } else if (activityCode === 'waiting' || activityCode === 'idle' || activityCode === 'empty') {
         activityText = '等待可学习的反馈';
       }
@@ -1155,16 +1185,12 @@ window.__ModuleLoader__.load({
         else if (rules.length === 0) activityText = countsUnknown ? '等待可学习的反馈' : '还没有整理出经验';
         else activityText = '暂无整理记录';
       }
-      const activityReason = activity && typeof activity === 'object' && typeof activity.reason === 'string'
-        ? activity.reason
-        : (latestReceipt && typeof latestReceipt.reason === 'string' ? latestReceipt.reason : '');
-
       const filtered = React.useMemo(() => {
         const needle = query.trim().toLowerCase();
         if (!needle) return records;
         return records.filter((record) => {
           const tags = Array.isArray(record.tags) ? record.tags.join(' ') : '';
-          return `${record.title} ${record.summary} ${tags} ${KIND_LABEL[record.kind] || ''}`.toLowerCase().includes(needle);
+          return `${record.title} ${record.summary} ${tags} ${record.topicKey || ''} ${KIND_LABEL[record.kind] || ''}`.toLowerCase().includes(needle);
         });
       }, [records, query]);
       const filteredRules = React.useMemo(() => {
@@ -1355,7 +1381,15 @@ window.__ModuleLoader__.load({
       const memoryGraphPane = h('div', {
         style: { ...PANEL_CARD, padding: 0, minHeight: 0, overflow: 'hidden', display: 'flex' },
       },
-      h(MemoryGraph, { records: filtered, selectedId: selectedMemory, onPick: onPickNode, emptyText: query ? '没有匹配的记忆' : '还没有记忆', ariaLabel: '记忆关系图' }));
+      h(MemoryGraph, {
+        records: filtered, selectedId: selectedMemory, onPick: onPickNode,
+        onPickHub: (node) => {
+          setQuery(node.kind === 'tag' ? node.label.replace(/^#/, '') : node.label);
+          setMemoryView('list');
+        },
+        emptyText: query ? '没有匹配的记忆' : '还没有记忆', ariaLabel: '记忆关系图',
+        legend: '圆点 记忆 · 小点 标签/主题 · 虚线 关联 · 点任意点筛选或查看',
+      }));
       const memoryTab = h('div', { role: 'tabpanel', 'aria-label': '记忆', style: { flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', gap: '9px' } },
         h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', flex: '0 0 auto' } },
           h('input', {
@@ -1452,6 +1486,7 @@ window.__ModuleLoader__.load({
         records: filteredRules, graphOf: ruleGraphOf, primaryKind: 'rule',
         selectedId: selectedRule, onPick: onPickRuleNode,
         emptyText: evolutionEmptyText, ariaLabel: '经验关系图',
+        legend: '圆点 经验 · 小点 条件 · 虚线 共用条件 · 点圆点查看',
       }));
       const evolutionTab = evolutionFailed ? evolutionFailed : h('div', { role: 'tabpanel', 'aria-label': '自进化', style: { flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', gap: '9px' } },
         h('div', { style: { ...PANEL_CARD, padding: '9px 11px', display: 'flex', alignItems: 'flex-start', gap: '8px', flex: '0 0 auto' } },
@@ -1459,9 +1494,9 @@ window.__ModuleLoader__.load({
           h('div', { style: { display: 'flex', flexDirection: 'column', gap: '2px', minWidth: 0 } },
             h('div', { style: { fontSize: '12px', lineHeight: '1.55' } }, activityText || (rules.length === 0 ? '还没有整理出经验' : '暂无整理记录')),
             countsUnknown ? h('div', { style: PANEL_MUTED }, '数量未知') : null,
-            activityReason
+            activityReasonText
               ? (showReason
-                ? h('div', { style: { ...PANEL_MUTED, whiteSpace: 'pre-wrap', wordBreak: 'break-word' } }, activityReason)
+                ? h('div', { style: { ...PANEL_MUTED, whiteSpace: 'pre-wrap', wordBreak: 'break-word' } }, activityReasonText)
                 : h(Action, { onClick: () => setShowReason(true) }, '查看原因'))
               : null,
           ),
@@ -1536,8 +1571,8 @@ window.__ModuleLoader__.load({
       if (!sessionId && refs.length === 0) return null;
       if (groups.found.length === 0 && groups.provided.length === 0 && groups.update.length === 0) return null;
       return h('div', { style: TAIL },
-        h(RefSection, { label: '检索发现', items: groups.found, sessionId, turnKey: turn }),
-        h(RefSection, { label: '已提供正文', items: groups.provided, sessionId, turnKey: turn }),
+        h(RefSection, { label: '搜索命中', items: groups.found, sessionId, turnKey: turn }),
+        h(RefSection, { label: '读过正文', items: groups.provided, sessionId, turnKey: turn }),
         h(RefSection, { label: '本轮更新', items: groups.update, sessionId, turnKey: turn }),
       );
     };

package/index.js

@@ -1361,7 +1361,7 @@ export function apply(ctx, config) {
 
   ctx.effect(() => tools.register({
     name: 'memory_save',
-    description: `保存一条记忆。只在会改变以后判断时才存；先搜已有条目，能更新就不要新建。保存前先蒸馏：标题是结论，正文只写原则与触发条件，不抄原始输出里的具体数值。用户明确说「记住」时直接调用；用户自己的话已经是长期规则（「以后都这样」「别再 X」）时也直接调用，不要先问。更新同一件事时带 id：身份只看标题、旧标题和前置条件，像不像不授权覆盖。文本相近但标题不同时先不写，返回 needsResolution 与 1–2 条相近条目：确实是同一条就用那个 id 更新，确实是另一条才带 resolution="distinct" 再存。带 id 更新时没给的字段保持原值，正文整段替换，旧正文只留作内部撤回，不展示也不参与检索。条数到硬上限时把同层最久没被读的一条移进归档，结果里写明动了哪条，不拒绝新记忆；单条正文超限只报错、不截断。前置条件不同的同一标题是两条。${NOTES}`,
+    description: `保存一条记忆。只在会改变以后判断时才存；先搜已有条目，能更新就不要新建。保存前先蒸馏：标题是结论，正文只写原则与触发条件，通常 2–4 句；路径、字段表、完整命令、版本号、尺寸数值不要抄进正文，改成文档或 skill 的指针。用户明确说「记住」时直接调用；用户自己的话已经是长期规则（「以后都这样」「别再 X」）时也直接调用，不要先问。更新同一件事时带 id：身份只看标题、旧标题和前置条件，像不像不授权覆盖。文本相近但标题不同时先不写，返回 needsResolution 与 1–2 条相近条目：确实是同一条就用那个 id 更新，确实是另一条才带 resolution="distinct" 再存。带 id 更新时没给的字段保持原值，正文整段替换，旧正文只留作内部撤回，不展示也不参与检索。条数到硬上限时把同层最久没被读的一条移进归档，结果里写明动了哪条，不拒绝新记忆；单条正文超限只报错、不截断。前置条件不同的同一标题是两条。${NOTES}`,
     parameters: SAVE_PARAMS,
     output: {
       presentationMeta: (_args, value) => ({
@@ -2250,7 +2250,7 @@ export function apply(ctx, config) {
       if (sawTool) throw new Error('整理返回了工具调用');
       /** 运行期间用户又给了新反馈：旧结果不能覆盖新纠正，直接作废，等排队的下一次整理。 */
       if ((feedbackRevisions.get(scope.key) || 0) !== candidate.feedbackRevision) {
-        throw new Error('反馈已更新，这次整理作废');
+        throw new Error('反馈已更新，这轮结果没采用');
       }
       const parsed = learning.parseOutput(text, { finish, refs: input.refs, rules: input.rules, ranges });
       if (!parsed.ok) throw new Error(parsed.reason);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "description": "On-demand memory for the DeepSeek Harness: nothing in the system prompt, one muted line only when something is saved, hit or suggested.",
   "type": "module",
   "main": "index.js",

package/store.js

@@ -2546,7 +2546,7 @@ export function commitLearning(scope, batch = {}) {
         if (!episode) throw new Error('作品已经失效，这次整理作废');
         if (batch.sessionId) {
           const focus = evolution.tasks?.sessions?.[batch.sessionId];
-          if (!focus || focus.episodeId !== episodeId) throw new Error('这期已经换到别的作品，这次整理作废');
+          if (!focus || focus.episodeId !== episodeId) throw new Error('这期已经换到别的作品，这轮结果没采用');
         }
         if (batch.episodeUpdatedAt && episode.updatedAt !== batch.episodeUpdatedAt) throw new Error('用户又改过这期，这次整理作废');
         const prepared = new Map((Array.isArray(batch.preparedTargets) ? batch.preparedTargets : []).map((row) => [row.id, row]));

package/test/learning.test.mjs

@@ -433,7 +433,7 @@ test('P06 作品版本变了旧整理整批作废', () => {
   store.saveTaskState(scope, later.tasks, { operationId: 'tasks_later' });
   const stale = commitNew(scope, grown, started, NEW_CHANGE, { now: Date.now() + 2000 });
   assert.equal(stale.ok, false);
-  assert.match(stale.reason, /换到别的作品|改过这期|失效/);
+  assert.match(stale.reason, /换到别的作品|改过这期|失效|没采用/);
   assert.equal(ruleRows(scope).length, 0);
 });