@shadowforge0/aquifer-memory 1.8.1 → 1.9.1

package/core/memory-bootstrap.js

@@ -1,25 +1,11 @@
 'use strict';
 
-const TYPE_PRIORITY = {
-  constraint: 0,
-  state: 1,
-  open_loop: 2,
-  decision: 3,
-  preference: 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 {
+  authoritySortPriority,
+  formatRuntimeMemoryLine,
+  memoryTypeBootstrapPriority,
+  memoryTypeRuntimeContract,
+} = require('./memory-type-policy');
 
 function recordId(record) {
   return String(record.memoryId || record.memory_id || record.id || record.canonicalKey || record.canonical_key);
@@ -42,6 +28,11 @@ function parseTime(value) {
   return Number.isFinite(t) ? t : null;
 }
 
+function numericValue(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+
 function isWithinTime(record, asOf) {
   if (!asOf) return true;
   const at = Date.parse(asOf);
@@ -97,20 +88,28 @@ function resolveApplicableRecords(records = [], opts = {}) {
 }
 
 function sortForBootstrap(a, b, opts = {}) {
+  const aRuntimeContract = memoryTypeRuntimeContract(a.memoryType || a.memory_type);
+  const bRuntimeContract = memoryTypeRuntimeContract(b.memoryType || b.memory_type);
+  if (aRuntimeContract !== bRuntimeContract) return aRuntimeContract ? -1 : 1;
+
   const activeScopePath = opts.activeScopePath || (opts.activeScopeKey ? [opts.activeScopeKey] : ['global']);
   const position = new Map(activeScopePath.map((key, idx) => [key, idx]));
   const aScope = position.get(scopeKey(a)) ?? -1;
   const bScope = position.get(scopeKey(b)) ?? -1;
   if (bScope !== aScope) return bScope - aScope;
 
-  const aType = TYPE_PRIORITY[a.memoryType || a.memory_type] ?? 99;
-  const bType = TYPE_PRIORITY[b.memoryType || b.memory_type] ?? 99;
+  const aType = memoryTypeBootstrapPriority(a.memoryType || a.memory_type);
+  const bType = memoryTypeBootstrapPriority(b.memoryType || b.memory_type);
   if (aType !== bType) return aType - bType;
 
-  const aAuth = AUTHORITY_PRIORITY[a.authority] ?? 99;
-  const bAuth = AUTHORITY_PRIORITY[b.authority] ?? 99;
+  const aAuth = authoritySortPriority(a.authority);
+  const bAuth = authoritySortPriority(b.authority);
   if (aAuth !== bAuth) return aAuth - bAuth;
 
+  const aFeedback = numericValue(a.feedbackScore ?? a.feedback_score);
+  const bFeedback = numericValue(b.feedbackScore ?? b.feedback_score);
+  if (aFeedback !== bFeedback) return bFeedback - aFeedback;
+
   const aAccepted = Date.parse(a.acceptedAt || a.accepted_at || '') || 0;
   const bAccepted = Date.parse(b.acceptedAt || b.accepted_at || '') || 0;
   if (aAccepted !== bAccepted) return bAccepted - aAccepted;
@@ -119,9 +118,7 @@ function sortForBootstrap(a, b, opts = {}) {
 }
 
 function lineFor(record) {
-  const type = record.memoryType || record.memory_type || 'memory';
-  const text = record.summary || record.title || '';
-  return `- ${type}: ${String(text).trim()}`;
+  return formatRuntimeMemoryLine(record);
 }
 
 function buildText(records, meta) {
@@ -184,6 +181,7 @@ function createMemoryBootstrap({ records }) {
       scopeId: opts.scopeId,
       scopeKeys: opts.activeScopePath || (opts.activeScopeKey ? [opts.activeScopeKey] : undefined),
       visibleInBootstrap: true,
+      includeFeedbackScore: true,
       asOf: opts.asOf,
       limit: Math.max(50, Math.min(200, requestedLimit * 4)),
     });