@shadowforge0/aquifer-memory 1.9.0 → 1.9.1

package/core/finalization-review.js

@@ -1,40 +1,19 @@
 'use strict';
 
-const TYPE_LABELS = {
-  state: '狀態',
-  decision: '決策',
-  fact: '事實',
-  preference: '偏好',
-  constraint: '限制',
-  entity_note: '註記',
-  open_loop: '未完成',
-  conclusion: '判斷',
-};
-
-const SESSION_START_TYPE_PRIORITY = {
-  state: 0,
-  open_loop: 1,
-  constraint: 2,
-  preference: 3,
-  decision: 4,
-  fact: 5,
-  conclusion: 6,
-  entity_note: 7,
-};
-
-const AUTHORITY_PRIORITY = {
-  user_explicit: 0,
-  executable_evidence: 1,
-  manual: 2,
-  system: 3,
-  verified_summary: 4,
-  llm_inference: 5,
-  raw_transcript: 6,
-};
+const {
+  assistantShapingMetadata,
+  authoritySortPriority,
+  memoryTypeBootstrapPriority,
+  memoryTypeLabel,
+} = require('./memory-type-policy');
 
 const MEMORY_KEYS = [
   'summary',
   'title',
+  'guidance',
+  'policy',
+  'boundary',
+  'rule',
   'decision',
   'item',
   'conclusion',
@@ -49,13 +28,15 @@ const MEMORY_KEYS = [
 ];
 
 const STRUCTURED_FIELDS = [
+  ['assistant_shaping', 'assistant_shaping'],
+  ['assistant_shaping_memories', 'assistant_shaping'],
+  ['constraints', 'constraint'],
   ['states', 'state'],
   ['state', 'state'],
   ['decisions', 'decision'],
+  ['preferences', 'preference'],
   ['important_facts', 'fact'],
   ['facts', 'fact'],
-  ['preferences', 'preference'],
-  ['constraints', 'constraint'],
   ['conclusions', 'conclusion'],
   ['entity_notes', 'entity_note'],
   ['open_loops', 'open_loop'],
@@ -105,7 +86,7 @@ function memoryTypeOf(value) {
 }
 
 function labelFor(type) {
-  return TYPE_LABELS[type] || TYPE_LABELS[String(type || '').toLowerCase()] || '記憶';
+  return memoryTypeLabel(type);
 }
 
 function pushUnique(out, text) {
@@ -122,6 +103,43 @@ function asLine(type, text, suffix = '') {
   return `${labelFor(type)}：${body}${suffix}`;
 }
 
+function shapingSuffix(type, value = {}) {
+  if (String(type || '').toLowerCase() !== 'assistant_shaping') return '';
+  const metadata = assistantShapingMetadata(value);
+  if (metadata.length === 0) return '';
+  return `（${metadata.map(([key, text]) => `${key}: ${text}`).join('，')}）`;
+}
+
+function reviewTypePriority(type) {
+  return memoryTypeBootstrapPriority(type);
+}
+
+function reviewAuthorityPriority(authority) {
+  return authoritySortPriority(authority);
+}
+
+function reviewAcceptedAt(value) {
+  return Date.parse(value || '') || 0;
+}
+
+function sortReviewEntries(entries = []) {
+  return entries.slice().sort((left, right) => {
+    const leftType = reviewTypePriority(left.type);
+    const rightType = reviewTypePriority(right.type);
+    if (leftType !== rightType) return leftType - rightType;
+
+    const leftAuthority = reviewAuthorityPriority(left.authority);
+    const rightAuthority = reviewAuthorityPriority(right.authority);
+    if (leftAuthority !== rightAuthority) return leftAuthority - rightAuthority;
+
+    const leftAcceptedAt = reviewAcceptedAt(left.acceptedAt);
+    const rightAcceptedAt = reviewAcceptedAt(right.acceptedAt);
+    if (leftAcceptedAt !== rightAcceptedAt) return rightAcceptedAt - leftAcceptedAt;
+
+    return (left.index ?? 0) - (right.index ?? 0);
+  });
+}
+
 function truncate(text, max = 220) {
   const normalized = sanitizeHumanText(text);
   if (normalized.length <= max) return normalized;
@@ -129,6 +147,8 @@ function truncate(text, max = 220) {
 }
 
 function addStructuredItems(out, structuredSummary = {}, filter = null) {
+  const entries = [];
+  let index = 0;
   for (const [field, type] of STRUCTURED_FIELDS) {
     if (filter && !filter(type)) continue;
     const items = Array.isArray(structuredSummary[field]) ? structuredSummary[field] : [];
@@ -138,19 +158,45 @@ function addStructuredItems(out, structuredSummary = {}, filter = null) {
       const owner = type === 'open_loop' && item && typeof item === 'object' && normalizeText(item.owner)
         ? `（owner: ${normalizeText(item.owner)}）`
         : '';
-      pushUnique(out, asLine(type, text, owner));
+      entries.push({
+        type,
+        text,
+        suffix: owner || shapingSuffix(type, item),
+        authority: item && typeof item === 'object' ? (item.authority || item.payload?.authority) : null,
+        acceptedAt: item && typeof item === 'object'
+          ? (item.acceptedAt || item.accepted_at || item.payload?.acceptedAt || item.payload?.accepted_at)
+          : null,
+        index: index++,
+      });
     }
   }
+  for (const entry of sortReviewEntries(entries)) {
+    pushUnique(out, asLine(entry.type, entry.text, entry.suffix));
+  }
 }
 
 function promotedMemoryLines(memoryResults = []) {
-  const lines = [];
+  const entries = [];
+  let index = 0;
   for (const result of memoryResults || []) {
     if (!result || result.action !== 'promote') continue;
     const memory = result.memory || result.record || result.candidate || {};
     const type = memoryTypeOf(memory);
     if (type === 'open_loop') continue;
-    pushUnique(lines, asLine(type, firstText(memory)));
+    const text = firstText(memory);
+    if (!text) continue;
+    entries.push({
+      type,
+      text,
+      suffix: shapingSuffix(type, memory),
+      authority: memory.authority,
+      acceptedAt: memory.acceptedAt || memory.accepted_at,
+      index: index++,
+    });
+  }
+  const lines = [];
+  for (const entry of sortReviewEntries(entries)) {
+    pushUnique(lines, asLine(entry.type, entry.text, entry.suffix));
   }
   return lines;
 }
@@ -285,12 +331,12 @@ function buildSessionStartContext(records = [], opts = {}) {
   }
 
   active.sort((a, b) => {
-    const aType = SESSION_START_TYPE_PRIORITY[memoryTypeOf(a.record)] ?? 99;
-    const bType = SESSION_START_TYPE_PRIORITY[memoryTypeOf(b.record)] ?? 99;
+    const aType = memoryTypeBootstrapPriority(memoryTypeOf(a.record));
+    const bType = memoryTypeBootstrapPriority(memoryTypeOf(b.record));
     if (aType !== bType) return aType - bType;
 
-    const aAuth = AUTHORITY_PRIORITY[a.record.authority] ?? 99;
-    const bAuth = AUTHORITY_PRIORITY[b.record.authority] ?? 99;
+    const aAuth = authoritySortPriority(a.record.authority);
+    const bAuth = authoritySortPriority(b.record.authority);
     if (aAuth !== bAuth) return aAuth - bAuth;
 
     const aAccepted = Date.parse(a.record.acceptedAt || a.record.accepted_at || '') || 0;
@@ -302,7 +348,7 @@ function buildSessionStartContext(records = [], opts = {}) {
   const lines = [];
   for (const { record } of active.slice(0, limit)) {
     const type = memoryTypeOf(record);
-    pushUnique(lines, asLine(type, firstText(record)));
+    pushUnique(lines, asLine(type, firstText(record), shapingSuffix(type, record)));
   }
   let selected = lines;
   let text = `下一段只需要帶：\n${linesOrNone(selected)}\n`;